/[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 176 by bh, Wed May 15 13:38:49 2002 UTC revision 831 by jonathan, Tue May 6 12:07:21 2003 UTC
# Line 1  Line 1 
1  # Copyright (c) 2001, 2002 by Intevation GmbH  # Copyright (c) 2001, 2002, 2003 by Intevation GmbH
2  # Authors:  # Authors:
3  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
4  #  #
# Line 11  Classes for display of a map and interac Line 11  Classes for display of a map and interac
11    
12  __version__ = "$Revision$"  __version__ = "$Revision$"
13    
14    import sys
15    
16  from math import hypot  from math import hypot
17    
18  from wxPython.wx import wxWindow,\  from wxPython.wx import wxWindow,\
19       wxPaintDC, wxColour, wxClientDC, wxINVERT, wxTRANSPARENT_BRUSH, wxFont,\       wxPaintDC, wxColour, wxClientDC, wxINVERT, wxTRANSPARENT_BRUSH, wxFont,\
20       EVT_PAINT, EVT_LEFT_DOWN, EVT_LEFT_UP, EVT_MOTION, EVT_LEAVE_WINDOW       EVT_PAINT, EVT_LEFT_DOWN, EVT_LEFT_UP, EVT_MOTION, EVT_LEAVE_WINDOW, \
21         wxBITMAP_TYPE_XPM, wxBeginBusyCursor, wxEndBusyCursor, wxCursor, \
22         wxImageFromBitmap
23    
24    
25  from wxPython import wx  from wxPython import wx
# Line 24  from wxproj import point_in_polygon_shap Line 28  from wxproj import point_in_polygon_shap
28    
29    
30  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \
31       LAYERS_CHANGED, LAYER_LEGEND_CHANGED, LAYER_VISIBILITY_CHANGED       MAP_LAYERS_CHANGED, LAYER_CHANGED, LAYER_VISIBILITY_CHANGED
32  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \
33       SHAPETYPE_POINT       SHAPETYPE_POINT
34  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \
35       ALIGN_LEFT, ALIGN_RIGHT       ALIGN_LEFT, ALIGN_RIGHT
36  from Thuban.Lib.connector import Publisher  from Thuban.Lib.connector import Publisher
37    from Thuban.Model.color import Color
38    
39    import resource
40    
41    from selection import Selection
42  from renderer import ScreenRenderer, PrinterRender  from renderer import ScreenRenderer, PrinterRender
43    
44  import labeldialog  import labeldialog
45    
46  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
47    
48    
49  #  #
# Line 129  class ZoomInTool(RectTool): Line 137  class ZoomInTool(RectTool):
137              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
138              sx, sy = self.start              sx, sy = self.start
139              cx, cy = self.current              cx, cy = self.current
140              if sx == cx and sy == cy:              if sx == cx or sy == cy:
141                  # Just a mouse click. Simply zoom in by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
142                    # zoom in by a factor of two
143                    # FIXME: For a click this is the desired behavior but should we
144                    # really do this for degenrate rectagles as well or
145                    # should we ignore them?
146                  self.view.ZoomFactor(2, center = (cx, cy))                  self.view.ZoomFactor(2, center = (cx, cy))
147              else:              else:
148                  # A drag. Zoom in to the rectangle                  # A drag. Zoom in to the rectangle
# Line 140  class ZoomInTool(RectTool): Line 152  class ZoomInTool(RectTool):
152  class ZoomOutTool(RectTool):  class ZoomOutTool(RectTool):
153    
154      """The Zoom-Out Tool"""      """The Zoom-Out Tool"""
155        
156      def Name(self):      def Name(self):
157          return "ZoomOutTool"          return "ZoomOutTool"
158    
# Line 149  class ZoomOutTool(RectTool): Line 161  class ZoomOutTool(RectTool):
161              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
162              sx, sy = self.start              sx, sy = self.start
163              cx, cy = self.current              cx, cy = self.current
164              if sx == cx and sy == cy:              if sx == cx or sy == cy:
165                  # Just a mouse click. Simply zoom out by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
166                  self.view.ZoomFactor(0.5, center = (cy, cy))                  # zoom out by a factor of two.
167                    # FIXME: For a click this is the desired behavior but should we
168                    # really do this for degenrate rectagles as well or
169                    # should we ignore them?
170                    self.view.ZoomFactor(0.5, center = (cx, cy))
171              else:              else:
172                  # A drag. Zoom out to the rectangle                  # A drag. Zoom out to the rectangle
173                  self.view.ZoomOutToRect((min(sx, cx), min(sy, cy),                  self.view.ZoomOutToRect((min(sx, cx), min(sy, cy),
# Line 184  class PanTool(Tool): Line 200  class PanTool(Tool):
200              sx, sy = self.start              sx, sy = self.start
201              cx, cy = self.current              cx, cy = self.current
202              self.view.Translate(cx - sx, cy - sy)              self.view.Translate(cx - sx, cy - sy)
203            
204  class IdentifyTool(Tool):  class IdentifyTool(Tool):
205    
206      """The "Identify" Tool"""      """The "Identify" Tool"""
207        
208      def Name(self):      def Name(self):
209          return "IdentifyTool"          return "IdentifyTool"
210    
# Line 242  class MapPrintout(wx.wxPrintout): Line 258  class MapPrintout(wx.wxPrintout):
258          renderer = PrinterRender(dc, scale, (offx, offy), resolution = resx)          renderer = PrinterRender(dc, scale, (offx, offy), resolution = resx)
259          renderer.RenderMap(self.map)          renderer.RenderMap(self.map)
260          return wx.true          return wx.true
261            
262    
263  class MapCanvas(wxWindow, Publisher):  class MapCanvas(wxWindow, Publisher):
264    
265      """A widget that displays a map and offers some interaction"""      """A widget that displays a map and offers some interaction"""
266    
267      def __init__(self, parent, winid, interactor):      # Some messages that can be subscribed/unsubscribed directly through
268        # the MapCanvas come in fact from other objects. This is a dict
269        # mapping those messages to the names of the instance variables they
270        # actually come from. The delegation is implemented in the Subscribe
271        # and Unsubscribe methods
272        delegated_messages = {LAYER_SELECTED: "selection",
273                              SHAPES_SELECTED: "selection"}
274    
275        # Methods delegated to some instance variables. The delegation is
276        # implemented in the __getattr__ method.
277        delegated_methods = {"SelectLayer": "selection",
278                             "SelectShapes": "selection",
279                             "SelectedLayer": "selection",
280                             "HasSelectedLayer": "selection",
281                             "HasSelectedShapes": "selection"}
282    
283        def __init__(self, parent, winid):
284          wxWindow.__init__(self, parent, winid)          wxWindow.__init__(self, parent, winid)
285          self.SetBackgroundColour(wxColour(255, 255, 255))          self.SetBackgroundColour(wxColour(255, 255, 255))
286    
# Line 271  class MapCanvas(wxWindow, Publisher): Line 303  class MapCanvas(wxWindow, Publisher):
303          # if the mouse is outside the window.          # if the mouse is outside the window.
304          self.current_position = None          self.current_position = None
305    
         # 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()  
   
306          # the bitmap serving as backing store          # the bitmap serving as backing store
307          self.bitmap = None          self.bitmap = None
308    
309          # the interactor          # the selection
310          self.interactor = interactor          self.selection = Selection()
311          self.interactor.Subscribe(SELECTED_SHAPE, self.shape_selected)          self.selection.Subscribe(SHAPES_SELECTED , self.shape_selected)
312    
313          # keep track of which layers/shapes are selected to make sure we          # keep track of which layers/shapes are selected to make sure we
314          # only redraw when necessary          # only redraw when necessary
# Line 298  class MapCanvas(wxWindow, Publisher): Line 322  class MapCanvas(wxWindow, Publisher):
322          EVT_MOTION(self, self.OnMotion)          EVT_MOTION(self, self.OnMotion)
323          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)
324          wx.EVT_SIZE(self, self.OnSize)          wx.EVT_SIZE(self, self.OnSize)
         wx.EVT_IDLE(self, self.OnIdle)  
325    
326      def __del__(self):      def __del__(self):
327          wxWindow.__del__(self)          wxWindow.__del__(self)
328          Publisher.__del__(self)          Publisher.__del__(self)
329    
330        def Subscribe(self, channel, *args):
331            """Extend the inherited method to handle delegated messages.
332    
333            If channel is one of the delegated messages call the appropriate
334            object's Subscribe method. Otherwise just call the inherited
335            method.
336            """
337            if channel in self.delegated_messages:
338                object = getattr(self, self.delegated_messages[channel])
339                object.Subscribe(channel, *args)
340            else:
341                Publisher.Subscribe(self, channel, *args)
342    
343        def Unsubscribe(self, channel, *args):
344            """Extend the inherited method to handle delegated messages.
345    
346            If channel is one of the delegated messages call the appropriate
347            object's Unsubscribe method. Otherwise just call the inherited
348            method.
349            """
350            if channel in self.delegated_messages:
351                object = getattr(self, self.delegated_messages[channel])
352                object.Unsubscribe(channel, *args)
353            else:
354                Publisher.Unsubscribe(self, channel, *args)
355    
356        def __getattr__(self, attr):
357            if attr in self.delegated_methods:
358                return getattr(getattr(self, self.delegated_methods[attr]), attr)
359            raise AttributeError(attr)
360    
361      def OnPaint(self, event):      def OnPaint(self, event):
362          dc = wxPaintDC(self)          dc = wxPaintDC(self)
363          if self.map is not None and self.map.HasLayers():          clear = self.map is None or not self.map.HasLayers()
364              # We have a non-empty map. Redraw it in idle time  
365              self.redraw_on_idle = 1          #wxBeginBusyCursor()
366              # update the region that has to be redrawn  
367              self.update_region.UnionRegion(self.GetUpdateRegion())          if not clear:
368          else:              try:
369                    self.do_redraw()
370                except:
371                    print "Error during drawing:", sys.exc_info()[0]
372                    clear = True
373    
374            if clear:
375              # 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
376              # the screen.              # the screen.
377                
378              # XXX it's probably possible to get rid of this. The              # XXX it's probably possible to get rid of this. The
379              # background color of the window is already white and the              # background color of the window is already white and the
380              # only thing we may have to do is to call self.Refresh()              # only thing we may have to do is to call self.Refresh()
381              # with a true argument in the right places.              # with a true argument in the right places.
382              dc.BeginDrawing()              dc.BeginDrawing()
383              dc.Clear()                          dc.Clear()
384              dc.EndDrawing()              dc.EndDrawing()
385    
386              # clear the region          #wxEndBusyCursor()
             self.update_region = wx.wxRegion()  
387    
388      def do_redraw(self):      def do_redraw(self):
389          # This should only be called if we have a non-empty map.          # This should only be called if we have a non-empty map.
390    
         # 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()  
   
391          # Get the window size.          # Get the window size.
392          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
393    
# Line 347  class MapCanvas(wxWindow, Publisher): Line 401  class MapCanvas(wxWindow, Publisher):
401              dc.BeginDrawing()              dc.BeginDrawing()
402    
403              # clear the background              # clear the background
404              dc.SetBrush(wx.wxWHITE_BRUSH)              #dc.SetBrush(wx.wxWHITE_BRUSH)
405              dc.SetPen(wx.wxTRANSPARENT_PEN)              #dc.SetPen(wx.wxTRANSPARENT_PEN)
406              dc.DrawRectangle(0, 0, width, height)              #dc.DrawRectangle(0, 0, width, height)
407                dc.SetBackground(wx.wxWHITE_BRUSH)
408              if 1: #self.interactor.selected_map is self.map:              dc.Clear()
409                  selected_layer = self.interactor.selected_layer  
410                  selected_shape = self.interactor.selected_shape              selected_layer = self.selection.SelectedLayer()
411              else:              selected_shapes = self.selection.SelectedShapes()
                 selected_layer = None  
                 selected_shape = None  
412    
413              # draw the map into the bitmap              # draw the map into the bitmap
414              renderer = ScreenRenderer(dc, self.scale, self.offset)              renderer = ScreenRenderer(dc, self.scale, self.offset)
415    
416              # Pass the entire bitmap as update_region to the renderer.              # Pass the entire bitmap as update region to the renderer.
417              # We're redrawing the whole bitmap, after all.              # We're redrawing the whole bitmap, after all.
418              renderer.RenderMap(self.map, (0, 0, width, height),              renderer.RenderMap(self.map, (0, 0, width, height),
419                                 selected_layer, selected_shape)                                 selected_layer, selected_shapes)
420    
421              dc.EndDrawing()              dc.EndDrawing()
422              dc.SelectObject(wx.wxNullBitmap)              dc.SelectObject(wx.wxNullBitmap)
# Line 383  class MapCanvas(wxWindow, Publisher): Line 435  class MapCanvas(wxWindow, Publisher):
435          printout = MapPrintout(self.map)          printout = MapPrintout(self.map)
436          printer.Print(self, printout, wx.true)          printer.Print(self, printout, wx.true)
437          printout.Destroy()          printout.Destroy()
438            
439      def SetMap(self, map):      def SetMap(self, map):
440          redraw_channels = (LAYERS_CHANGED, LAYER_LEGEND_CHANGED,          redraw_channels = (MAP_LAYERS_CHANGED, LAYER_CHANGED,
441                             LAYER_VISIBILITY_CHANGED)                             LAYER_VISIBILITY_CHANGED)
442          if self.map is not None:          if self.map is not None:
443              for channel in redraw_channels:              for channel in redraw_channels:
# Line 393  class MapCanvas(wxWindow, Publisher): Line 445  class MapCanvas(wxWindow, Publisher):
445              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,
446                                   self.projection_changed)                                   self.projection_changed)
447          self.map = map          self.map = map
448            self.selection.ClearSelection()
449          if self.map is not None:          if self.map is not None:
450              for channel in redraw_channels:              for channel in redraw_channels:
451                  self.map.Subscribe(channel, self.full_redraw)                  self.map.Subscribe(channel, self.full_redraw)
# Line 404  class MapCanvas(wxWindow, Publisher): Line 457  class MapCanvas(wxWindow, Publisher):
457          self.full_redraw()          self.full_redraw()
458    
459      def Map(self):      def Map(self):
460            """Return the map displayed by this canvas"""
461          return self.map          return self.map
462    
463      def redraw(self, *args):      def redraw(self, *args):
# Line 437  class MapCanvas(wxWindow, Publisher): Line 491  class MapCanvas(wxWindow, Publisher):
491          return ((x - offx) / self.scale, (offy - y) / self.scale)          return ((x - offx) / self.scale, (offy - y) / self.scale)
492    
493      def FitRectToWindow(self, rect):      def FitRectToWindow(self, rect):
494            """Fit the rectangular region given by rect into the window.
495    
496            Set scale so that rect (in projected coordinates) just fits into
497            the window and center it.
498            """
499          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
500          llx, lly, urx, ury = rect          llx, lly, urx, ury = rect
501          if llx == urx or lly == ury:          if llx == urx or lly == ury:
502              # zero with or zero height. Do Nothing              # zero width or zero height. Do Nothing
503              return              return
504          scalex = width / (urx - llx)          scalex = width / (urx - llx)
505          scaley = height / (ury - lly)          scaley = height / (ury - lly)
# Line 450  class MapCanvas(wxWindow, Publisher): Line 509  class MapCanvas(wxWindow, Publisher):
509          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
510    
511      def FitMapToWindow(self):      def FitMapToWindow(self):
512          """\          """Fit the map to the window
513          Set the scale and offset so that the map is centered in the  
514          window          Set the scale so that the map fits exactly into the window and
515            center it in the window.
516          """          """
517          bbox = self.map.ProjectedBoundingBox()          bbox = self.map.ProjectedBoundingBox()
518          if bbox is not None:          if bbox is not None:
519              self.FitRectToWindow(bbox)              self.FitRectToWindow(bbox)
520    
521        def FitLayerToWindow(self, layer):
522            """Fit the given layer to the window.
523    
524            Set the scale so that the layer fits exactly into the window and
525            center it in the window.
526            """
527            
528            bbox = layer.LatLongBoundingBox()
529            if bbox is not None:
530                proj = self.map.GetProjection()
531                if proj is not None:
532                    bbox = proj.ForwardBBox(bbox)
533    
534                if bbox is not None:
535                    self.FitRectToWindow(bbox)
536    
537        def FitSelectedToWindow(self):
538            layer = self.selection.SelectedLayer()
539            shapes = self.selection.SelectedShapes()
540    
541            bbox = layer.ShapesBoundingBox(shapes)
542            if bbox is not None:
543                proj = self.map.GetProjection()
544                if proj is not None:
545                    bbox = proj.ForwardBBox(bbox)
546    
547                if bbox is not None:
548                    self.FitRectToWindow(bbox)
549    
550      def ZoomFactor(self, factor, center = None):      def ZoomFactor(self, factor, center = None):
551          """Multiply the zoom by factor and center on center.          """Multiply the zoom by factor and center on center.
552    
# Line 478  class MapCanvas(wxWindow, Publisher): Line 567  class MapCanvas(wxWindow, Publisher):
567          self.set_view_transform(scale, offset)          self.set_view_transform(scale, offset)
568    
569      def ZoomOutToRect(self, rect):      def ZoomOutToRect(self, rect):
570          # rect is given in window coordinates          """Zoom out to fit the currently visible region into rect.
571    
572            The rect parameter is given in window coordinates
573            """
574          # determine the bbox of the displayed region in projected          # determine the bbox of the displayed region in projected
575          # coordinates          # coordinates
576          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
# Line 496  class MapCanvas(wxWindow, Publisher): Line 587  class MapCanvas(wxWindow, Publisher):
587          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
588    
589      def Translate(self, dx, dy):      def Translate(self, dx, dy):
590            """Move the map by dx, dy pixels"""
591          offx, offy = self.offset          offx, offy = self.offset
592          self.set_view_transform(self.scale, (offx + dx, offy + dy))          self.set_view_transform(self.scale, (offx + dx, offy + dy))
593    
594        def SelectTool(self, tool):
595            """Make tool the active tool.
596    
597            The parameter should be an instance of Tool or None to indicate
598            that no tool is active.
599            """
600            self.tool = tool
601    
602      def ZoomInTool(self):      def ZoomInTool(self):
603          self.tool = ZoomInTool(self)          """Start the zoom in tool"""
604            self.SelectTool(ZoomInTool(self))
605    
606      def ZoomOutTool(self):      def ZoomOutTool(self):
607          self.tool = ZoomOutTool(self)          """Start the zoom out tool"""
608            self.SelectTool(ZoomOutTool(self))
609    
610      def PanTool(self):      def PanTool(self):
611          self.tool = PanTool(self)          """Start the pan tool"""
612            self.SelectTool(PanTool(self))
613            #img = resource.GetImageResource("pan", wxBITMAP_TYPE_XPM)
614            #bmp = resource.GetBitmapResource("pan", wxBITMAP_TYPE_XPM)
615            #print bmp
616            #img = wxImageFromBitmap(bmp)
617            #print img
618            #cur = wxCursor(img)
619            #print cur
620            #self.SetCursor(cur)
621    
622      def IdentifyTool(self):      def IdentifyTool(self):
623          self.tool = IdentifyTool(self)          """Start the identify tool"""
624            self.SelectTool(IdentifyTool(self))
625    
626      def LabelTool(self):      def LabelTool(self):
627          self.tool = LabelTool(self)          """Start the label tool"""
628            self.SelectTool(LabelTool(self))
629    
630      def CurrentTool(self):      def CurrentTool(self):
631            """Return the name of the current tool or None if no tool is active"""
632          return self.tool and self.tool.Name() or None          return self.tool and self.tool.Name() or None
633    
634      def CurrentPosition(self):      def CurrentPosition(self):
# Line 552  class MapCanvas(wxWindow, Publisher): Line 666  class MapCanvas(wxWindow, Publisher):
666              self.tool.MouseDown(event)              self.tool.MouseDown(event)
667              self.tool.Show(self.drag_dc)              self.tool.Show(self.drag_dc)
668              self.dragging = 1              self.dragging = 1
669            
670      def OnLeftUp(self, event):      def OnLeftUp(self, event):
         self.ReleaseMouse()  
671          self.set_current_position(event)          self.set_current_position(event)
672          if self.dragging:          if self.dragging:
673              self.tool.Hide(self.drag_dc)              self.ReleaseMouse()
674              self.tool.MouseUp(event)              try:
675              self.drag_dc = None                  self.tool.Hide(self.drag_dc)
676          self.dragging = 0                  self.tool.MouseUp(event)
677                finally:
678                    self.drag_dc = None
679                    self.dragging = 0
680    
681      def OnMotion(self, event):      def OnMotion(self, event):
682          self.set_current_position(event)          self.set_current_position(event)
# Line 572  class MapCanvas(wxWindow, Publisher): Line 688  class MapCanvas(wxWindow, Publisher):
688      def OnLeaveWindow(self, event):      def OnLeaveWindow(self, event):
689          self.set_current_position(None)          self.set_current_position(None)
690    
     def OnIdle(self, event):  
         if self.redraw_on_idle:  
             self.do_redraw()  
         self.redraw_on_idle = 0  
   
691      def OnSize(self, event):      def OnSize(self, event):
692          # 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
693          # 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 585  class MapCanvas(wxWindow, Publisher): Line 696  class MapCanvas(wxWindow, Publisher):
696          # Even when the window becomes larger some parts of the bitmap          # Even when the window becomes larger some parts of the bitmap
697          # could be reused.          # could be reused.
698          self.full_redraw()          self.full_redraw()
699            pass
700    
701      def shape_selected(self, layer, shape):      def shape_selected(self, layer, shape):
702          """Redraw the map.          """Receiver for the SHAPES_SELECTED messages. Redraw the map."""
703            # The selection object takes care that it only issues
704          Receiver for the SELECTED_SHAPE messages. Try to redraw only          # SHAPES_SELECTED messages when the set of selected shapes has
705          when necessary.          # actually changed, so we can do a full redraw unconditionally.
706          """          # FIXME: We should perhaps try to limit the redraw to the are
707          # A redraw is necessary when the display has to change, which          # actually covered by the shapes before and after the selection
708          # means that either the status changes from having no selection          # change.
709          # to having a selection shape or vice versa, or when the fact          self.full_redraw()
         # whether there is a selection at all doesn't change, when the  
         # shape which is selected has changed (which means that layer or  
         # shapeid changes).  
         if ((shape is not None or self.last_selected_shape is not None)  
             and (shape != self.last_selected_shape  
                  or layer != self.last_selected_layer)):  
             self.full_redraw()  
   
         # remember the selection so we can compare when it changes again.  
         self.last_selected_layer = layer  
         self.last_selected_shape = shape  
710    
711      def unprojected_rect_around_point(self, x, y):      def unprojected_rect_around_point(self, x, y, dist):
712          """return a rect a few pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
713    
714          The return value is a tuple (minx, miny, maxx, maxy) suitable a          The return value is a tuple (minx, miny, maxx, maxy) suitable a
715          parameter to a layer's ShapesInRegion method.          parameter to a layer's ShapesInRegion method.
# Line 622  class MapCanvas(wxWindow, Publisher): Line 723  class MapCanvas(wxWindow, Publisher):
723          xs = []          xs = []
724          ys = []          ys = []
725          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
726              px, py = self.win_to_proj(x + dx, y + dy)              px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
727              if inverse:              if inverse:
728                  px, py = inverse(px, py)                  px, py = inverse(px, py)
729              xs.append(px)              xs.append(px)
730              ys.append(py)              ys.append(py)
731          return (min(xs), min(ys), max(xs), max(ys))          return (min(xs), min(ys), max(xs), max(ys))
732    
733      def find_shape_at(self, px, py, select_labels = 0, selected_layer = 1):      def find_shape_at(self, px, py, select_labels = 0, searched_layer = None):
734          """Determine the shape at point px, py in window coords          """Determine the shape at point px, py in window coords
735    
736          Return the shape and the corresponding layer as a tuple (layer,          Return the shape and the corresponding layer as a tuple (layer,
# Line 639  class MapCanvas(wxWindow, Publisher): Line 740  class MapCanvas(wxWindow, Publisher):
740          search through the labels. If a label is found return it's index          search through the labels. If a label is found return it's index
741          as the shape and None as the layer.          as the shape and None as the layer.
742    
743          If the optional parameter selected_layer is true (default), only          If the optional parameter searched_layer is given (or not None
744          search in the currently selected layer.          which it defaults to), only search in that layer.
745          """          """
746          map_proj = self.map.projection          map_proj = self.map.projection
747          if map_proj is not None:          if map_proj is not None:
# Line 651  class MapCanvas(wxWindow, Publisher): Line 752  class MapCanvas(wxWindow, Publisher):
752          scale = self.scale          scale = self.scale
753          offx, offy = self.offset          offx, offy = self.offset
754    
         box = self.unprojected_rect_around_point(px, py)  
   
755          if select_labels:          if select_labels:
756              labels = self.map.LabelLayer().Labels()              labels = self.map.LabelLayer().Labels()
757                
758              if labels:              if labels:
759                  dc = wxClientDC(self)                  dc = wxClientDC(self)
760                  font = wxFont(10, wx.wxSWISS, wx.wxNORMAL, wx.wxNORMAL)                  font = wxFont(10, wx.wxSWISS, wx.wxNORMAL, wx.wxNORMAL)
# Line 687  class MapCanvas(wxWindow, Publisher): Line 786  class MapCanvas(wxWindow, Publisher):
786                      if x <= px < x + width and y <= py <= y + height:                      if x <= px < x + width and y <= py <= y + height:
787                          return None, i                          return None, i
788    
789          if selected_layer:          if searched_layer:
790              layer = self.interactor.SelectedLayer()              layers = [searched_layer]
             if layer is not None:  
                 layers = [layer]  
             else:  
                 # no layer selected. Use an empty list to effectively  
                 # ignore all layers.  
                 layers = []  
791          else:          else:
792              layers = self.map.Layers()              layers = self.map.Layers()
793    
# Line 705  class MapCanvas(wxWindow, Publisher): Line 798  class MapCanvas(wxWindow, Publisher):
798              if not layer.Visible():              if not layer.Visible():
799                  continue                  continue
800    
801              filled = layer.fill is not None              filled = layer.GetClassification().GetDefaultFill() \
802              stroked = layer.stroke is not None                       is not Color.Transparent
803                                stroked = layer.GetClassification().GetDefaultLineColor() \
804                          is not Color.Transparent
805    
806              layer_proj = layer.projection              layer_proj = layer.projection
807              if layer_proj is not None:              if layer_proj is not None:
808                  inverse = layer_proj.Inverse                  inverse = layer_proj.Inverse
809              else:              else:
810                  inverse = None                  inverse = None
811                    
812              shapetype = layer.ShapeType()              shapetype = layer.ShapeType()
813    
814              select_shape = -1              select_shape = -1
815    
816                # Determine the ids of the shapes that overlap a tiny area
817                # around the point. For layers containing points we have to
818                # choose a larger size of the box we're testing agains so
819                # that we take the size of the markers into account
820                # FIXME: Once the markers are more flexible this part has to
821                # become more flexible too, of course
822                if shapetype == SHAPETYPE_POINT:
823                    box = self.unprojected_rect_around_point(px, py, 5)
824                else:
825                    box = self.unprojected_rect_around_point(px, py, 1)
826              shape_ids = layer.ShapesInRegion(box)              shape_ids = layer.ShapesInRegion(box)
827              shape_ids.reverse()              shape_ids.reverse()
828    
# Line 760  class MapCanvas(wxWindow, Publisher): Line 865  class MapCanvas(wxWindow, Publisher):
865                  return layer, select_shape                  return layer, select_shape
866          return None, None          return None, None
867    
868      def SelectShapeAt(self, x, y):      def SelectShapeAt(self, x, y, layer = None):
869          layer, shape = self.find_shape_at(x, y, selected_layer = 0)          """\
870            Select and return the shape and its layer at window position (x, y)
871    
872            If layer is given, only search in that layer. If no layer is
873            given, search through all layers.
874    
875            Return a tuple (layer, shapeid). If no shape is found, return
876            (None, None).
877            """
878            layer, shape = result = self.find_shape_at(x, y, searched_layer=layer)
879          # If layer is None, then shape will also be None. We don't want          # If layer is None, then shape will also be None. We don't want
880          # to deselect the currently selected layer, so we simply select          # to deselect the currently selected layer, so we simply select
881          # the already selected layer again.          # the already selected layer again.
882          if layer is None:          if layer is None:
883              layer = self.interactor.SelectedLayer()              layer = self.selection.SelectedLayer()
884          self.interactor.SelectLayerAndShape(layer, shape)              shapes = []
885            else:
886                shapes = [shape]
887            self.selection.SelectShapes(layer, shapes)
888            return result
889    
890      def LabelShapeAt(self, x, y):      def LabelShapeAt(self, x, y):
891            """Add or remove a label at window position x, y.
892    
893            If there's a label at the given position, remove it. Otherwise
894            determine the shape at the position, run the label dialog and
895            unless the user cancels the dialog, add a laber.
896            """
897          ox = x; oy = y          ox = x; oy = y
898          label_layer = self.map.LabelLayer()          label_layer = self.map.LabelLayer()
899          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.176  
changed lines
  Added in v.831
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26