/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/UI/view.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/UI/view.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 293 by bh, Fri Aug 30 10:18:50 2002 UTC revision 303 by bh, Mon Sep 2 16:47:53 2002 UTC
# Line 279  class MapCanvas(wxWindow, Publisher): Line 279  class MapCanvas(wxWindow, Publisher):
279          # if the mouse is outside the window.          # if the mouse is outside the window.
280          self.current_position = None          self.current_position = None
281    
         # If true, OnIdle will call do_redraw to do the actual  
         # redrawing. Set by OnPaint to avoid some unnecessary redraws.  
         # To force a redraw call full_redraw().  
         self.redraw_on_idle = 0  
   
         # The region to update when idle  
         self.update_region = wx.wxRegion()  
   
282          # the bitmap serving as backing store          # the bitmap serving as backing store
283          self.bitmap = None          self.bitmap = None
284    
# Line 306  class MapCanvas(wxWindow, Publisher): Line 298  class MapCanvas(wxWindow, Publisher):
298          EVT_MOTION(self, self.OnMotion)          EVT_MOTION(self, self.OnMotion)
299          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)
300          wx.EVT_SIZE(self, self.OnSize)          wx.EVT_SIZE(self, self.OnSize)
         wx.EVT_IDLE(self, self.OnIdle)  
301    
302      def __del__(self):      def __del__(self):
303          wxWindow.__del__(self)          wxWindow.__del__(self)
# Line 315  class MapCanvas(wxWindow, Publisher): Line 306  class MapCanvas(wxWindow, Publisher):
306      def OnPaint(self, event):      def OnPaint(self, event):
307          dc = wxPaintDC(self)          dc = wxPaintDC(self)
308          if self.map is not None and self.map.HasLayers():          if self.map is not None and self.map.HasLayers():
309              # We have a non-empty map. Redraw it in idle time              self.do_redraw()
             self.redraw_on_idle = 1  
             # update the region that has to be redrawn  
             self.update_region.UnionRegion(self.GetUpdateRegion())  
310          else:          else:
311              # If we've got no map or if the map is empty, simply clear              # If we've got no map or if the map is empty, simply clear
312              # the screen.              # the screen.
# Line 331  class MapCanvas(wxWindow, Publisher): Line 319  class MapCanvas(wxWindow, Publisher):
319              dc.Clear()              dc.Clear()
320              dc.EndDrawing()              dc.EndDrawing()
321    
             # clear the region  
             self.update_region = wx.wxRegion()  
   
322      def do_redraw(self):      def do_redraw(self):
323          # This should only be called if we have a non-empty map.          # This should only be called if we have a non-empty map.
324    
         # get the update region and reset it. We're not actually using  
         # it anymore, though.  
         update_box = self.update_region.GetBox()  
         self.update_region = wx.wxRegion()  
   
325          # Get the window size.          # Get the window size.
326          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
327    
# Line 369  class MapCanvas(wxWindow, Publisher): Line 349  class MapCanvas(wxWindow, Publisher):
349              # draw the map into the bitmap              # draw the map into the bitmap
350              renderer = ScreenRenderer(dc, self.scale, self.offset)              renderer = ScreenRenderer(dc, self.scale, self.offset)
351    
352              # Pass the entire bitmap as update_region to the renderer.              # Pass the entire bitmap as update region to the renderer.
353              # We're redrawing the whole bitmap, after all.              # We're redrawing the whole bitmap, after all.
354              renderer.RenderMap(self.map, (0, 0, width, height),              renderer.RenderMap(self.map, (0, 0, width, height),
355                                 selected_layer, selected_shape)                                 selected_layer, selected_shape)
# Line 412  class MapCanvas(wxWindow, Publisher): Line 392  class MapCanvas(wxWindow, Publisher):
392          self.full_redraw()          self.full_redraw()
393    
394      def Map(self):      def Map(self):
395            """Return the map displayed by this canvas"""
396          return self.map          return self.map
397    
398      def redraw(self, *args):      def redraw(self, *args):
# Line 512  class MapCanvas(wxWindow, Publisher): Line 493  class MapCanvas(wxWindow, Publisher):
493          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
494    
495      def Translate(self, dx, dy):      def Translate(self, dx, dy):
496            """Move the map by dx, dy pixels"""
497          offx, offy = self.offset          offx, offy = self.offset
498          self.set_view_transform(self.scale, (offx + dx, offy + dy))          self.set_view_transform(self.scale, (offx + dx, offy + dy))
499    
500      def ZoomInTool(self):      def ZoomInTool(self):
501            """Start the zoom in tool"""
502          self.tool = ZoomInTool(self)          self.tool = ZoomInTool(self)
503    
504      def ZoomOutTool(self):      def ZoomOutTool(self):
505            """Start the zoom out tool"""
506          self.tool = ZoomOutTool(self)          self.tool = ZoomOutTool(self)
507    
508      def PanTool(self):      def PanTool(self):
509            """Start the pan tool"""
510          self.tool = PanTool(self)          self.tool = PanTool(self)
511    
512      def IdentifyTool(self):      def IdentifyTool(self):
513            """Start the identify tool"""
514          self.tool = IdentifyTool(self)          self.tool = IdentifyTool(self)
515    
516      def LabelTool(self):      def LabelTool(self):
517            """Start the label tool"""
518          self.tool = LabelTool(self)          self.tool = LabelTool(self)
519    
520      def CurrentTool(self):      def CurrentTool(self):
521            """Return the name of the current tool or None if no tool is active"""
522          return self.tool and self.tool.Name() or None          return self.tool and self.tool.Name() or None
523    
524      def CurrentPosition(self):      def CurrentPosition(self):
# Line 588  class MapCanvas(wxWindow, Publisher): Line 576  class MapCanvas(wxWindow, Publisher):
576      def OnLeaveWindow(self, event):      def OnLeaveWindow(self, event):
577          self.set_current_position(None)          self.set_current_position(None)
578    
     def OnIdle(self, event):  
         if self.redraw_on_idle:  
             self.do_redraw()  
         self.redraw_on_idle = 0  
   
579      def OnSize(self, event):      def OnSize(self, event):
580          # the window's size has changed. We have to get a new bitmap. If          # the window's size has changed. We have to get a new bitmap. If
581          # we want to be clever we could try to get by without throwing          # we want to be clever we could try to get by without throwing
# Line 623  class MapCanvas(wxWindow, Publisher): Line 606  class MapCanvas(wxWindow, Publisher):
606          self.last_selected_layer = layer          self.last_selected_layer = layer
607          self.last_selected_shape = shape          self.last_selected_shape = shape
608    
609      def unprojected_rect_around_point(self, x, y):      def unprojected_rect_around_point(self, x, y, dist):
610          """return a rect a few pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
611    
612          The return value is a tuple (minx, miny, maxx, maxy) suitable a          The return value is a tuple (minx, miny, maxx, maxy) suitable a
613          parameter to a layer's ShapesInRegion method.          parameter to a layer's ShapesInRegion method.
# Line 638  class MapCanvas(wxWindow, Publisher): Line 621  class MapCanvas(wxWindow, Publisher):
621          xs = []          xs = []
622          ys = []          ys = []
623          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
624              px, py = self.win_to_proj(x + dx, y + dy)              px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
625              if inverse:              if inverse:
626                  px, py = inverse(px, py)                  px, py = inverse(px, py)
627              xs.append(px)              xs.append(px)
# Line 667  class MapCanvas(wxWindow, Publisher): Line 650  class MapCanvas(wxWindow, Publisher):
650          scale = self.scale          scale = self.scale
651          offx, offy = self.offset          offx, offy = self.offset
652    
         box = self.unprojected_rect_around_point(px, py)  
   
653          if select_labels:          if select_labels:
654              labels = self.map.LabelLayer().Labels()              labels = self.map.LabelLayer().Labels()
655    
# Line 728  class MapCanvas(wxWindow, Publisher): Line 709  class MapCanvas(wxWindow, Publisher):
709    
710              select_shape = -1              select_shape = -1
711    
712                # Determine the ids of the shapes that overlap a tiny area
713                # around the point. For layers containing points we have to
714                # choose a larger size of the box we're testing agains so
715                # that we take the size of the markers into account
716                # FIXME: Once the markers are more flexible this part has to
717                # become more flexible too, of course
718                if shapetype == SHAPETYPE_POINT:
719                    box = self.unprojected_rect_around_point(px, py, 5)
720                else:
721                    box = self.unprojected_rect_around_point(px, py, 1)
722              shape_ids = layer.ShapesInRegion(box)              shape_ids = layer.ShapesInRegion(box)
723              shape_ids.reverse()              shape_ids.reverse()
724    
# Line 790  class MapCanvas(wxWindow, Publisher): Line 781  class MapCanvas(wxWindow, Publisher):
781          return result          return result
782    
783      def LabelShapeAt(self, x, y):      def LabelShapeAt(self, x, y):
784            """Add or remove a label at window position x, y.
785    
786            If there's a label at the given position, remove it. Otherwise
787            determine the shape at the position, run the label dialog and
788            unless the user cancels the dialog, add a laber.
789            """
790          ox = x; oy = y          ox = x; oy = y
791          label_layer = self.map.LabelLayer()          label_layer = self.map.LabelLayer()
792          layer, shape_index = self.find_shape_at(x, y, select_labels = 1)          layer, shape_index = self.find_shape_at(x, y, select_labels = 1)
Legend:
Removed from v.293  
changed lines
  Added in v.303
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26