/[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 295 by bh, Fri Aug 30 10:39:17 2002 UTC revision 356 by bh, Mon Dec 9 10:32:15 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 517  class MapCanvas(wxWindow, Publisher): Line 497  class MapCanvas(wxWindow, Publisher):
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 SelectTool(self, tool):
501            """Make tool the active tool.
502    
503            The parameter should be an instance of Tool or None to indicate
504            that no tool is active.
505            """
506            self.tool = tool
507    
508      def ZoomInTool(self):      def ZoomInTool(self):
509          """Start the zoom in tool"""          """Start the zoom in tool"""
510          self.tool = ZoomInTool(self)          self.SelectTool(ZoomInTool(self))
511    
512      def ZoomOutTool(self):      def ZoomOutTool(self):
513          """Start the zoom out tool"""          """Start the zoom out tool"""
514          self.tool = ZoomOutTool(self)          self.SelectTool(ZoomOutTool(self))
515    
516      def PanTool(self):      def PanTool(self):
517          """Start the pan tool"""          """Start the pan tool"""
518          self.tool = PanTool(self)          self.SelectTool(PanTool(self))
519    
520      def IdentifyTool(self):      def IdentifyTool(self):
521          """Start the identify tool"""          """Start the identify tool"""
522          self.tool = IdentifyTool(self)          self.SelectTool(IdentifyTool(self))
523    
524      def LabelTool(self):      def LabelTool(self):
525          """Start the label tool"""          """Start the label tool"""
526          self.tool = LabelTool(self)          self.SelectTool(LabelTool(self))
527    
528      def CurrentTool(self):      def CurrentTool(self):
529          """Return the name of the current tool or None if no tool is active"""          """Return the name of the current tool or None if no tool is active"""
# Line 596  class MapCanvas(wxWindow, Publisher): Line 584  class MapCanvas(wxWindow, Publisher):
584      def OnLeaveWindow(self, event):      def OnLeaveWindow(self, event):
585          self.set_current_position(None)          self.set_current_position(None)
586    
     def OnIdle(self, event):  
         if self.redraw_on_idle:  
             self.do_redraw()  
         self.redraw_on_idle = 0  
   
587      def OnSize(self, event):      def OnSize(self, event):
588          # 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
589          # 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 631  class MapCanvas(wxWindow, Publisher): Line 614  class MapCanvas(wxWindow, Publisher):
614          self.last_selected_layer = layer          self.last_selected_layer = layer
615          self.last_selected_shape = shape          self.last_selected_shape = shape
616    
617      def unprojected_rect_around_point(self, x, y):      def unprojected_rect_around_point(self, x, y, dist):
618          """return a rect a few pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
619    
620          The return value is a tuple (minx, miny, maxx, maxy) suitable a          The return value is a tuple (minx, miny, maxx, maxy) suitable a
621          parameter to a layer's ShapesInRegion method.          parameter to a layer's ShapesInRegion method.
# Line 646  class MapCanvas(wxWindow, Publisher): Line 629  class MapCanvas(wxWindow, Publisher):
629          xs = []          xs = []
630          ys = []          ys = []
631          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
632              px, py = self.win_to_proj(x + dx, y + dy)              px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
633              if inverse:              if inverse:
634                  px, py = inverse(px, py)                  px, py = inverse(px, py)
635              xs.append(px)              xs.append(px)
# Line 675  class MapCanvas(wxWindow, Publisher): Line 658  class MapCanvas(wxWindow, Publisher):
658          scale = self.scale          scale = self.scale
659          offx, offy = self.offset          offx, offy = self.offset
660    
         box = self.unprojected_rect_around_point(px, py)  
   
661          if select_labels:          if select_labels:
662              labels = self.map.LabelLayer().Labels()              labels = self.map.LabelLayer().Labels()
663    
# Line 736  class MapCanvas(wxWindow, Publisher): Line 717  class MapCanvas(wxWindow, Publisher):
717    
718              select_shape = -1              select_shape = -1
719    
720                # Determine the ids of the shapes that overlap a tiny area
721                # around the point. For layers containing points we have to
722                # choose a larger size of the box we're testing agains so
723                # that we take the size of the markers into account
724                # FIXME: Once the markers are more flexible this part has to
725                # become more flexible too, of course
726                if shapetype == SHAPETYPE_POINT:
727                    box = self.unprojected_rect_around_point(px, py, 5)
728                else:
729                    box = self.unprojected_rect_around_point(px, py, 1)
730              shape_ids = layer.ShapesInRegion(box)              shape_ids = layer.ShapesInRegion(box)
731              shape_ids.reverse()              shape_ids.reverse()
732    
Legend:
Removed from v.295  
changed lines
  Added in v.356
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26