/[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 239 by bh, Wed Jul 24 17:15:54 2002 UTC revision 799 by jonathan, Wed Apr 30 17:02: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,\
# Line 24  from wxproj import point_in_polygon_shap Line 26  from wxproj import point_in_polygon_shap
26    
27    
28  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \
29       LAYERS_CHANGED, LAYER_LEGEND_CHANGED, LAYER_VISIBILITY_CHANGED       MAP_LAYERS_CHANGED, LAYER_CHANGED, LAYER_VISIBILITY_CHANGED
30  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \
31       SHAPETYPE_POINT       SHAPETYPE_POINT
32  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \
33       ALIGN_LEFT, ALIGN_RIGHT       ALIGN_LEFT, ALIGN_RIGHT
34  from Thuban.Lib.connector import Publisher  from Thuban.Lib.connector import Publisher
35    from Thuban.Model.color import Color
36    
37    from selection import Selection
38  from renderer import ScreenRenderer, PrinterRender  from renderer import ScreenRenderer, PrinterRender
39    
40  import labeldialog  import labeldialog
41    
42  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
43    
44    
45  #  #
# Line 129  class ZoomInTool(RectTool): Line 133  class ZoomInTool(RectTool):
133              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
134              sx, sy = self.start              sx, sy = self.start
135              cx, cy = self.current              cx, cy = self.current
136              if sx == cx and sy == cy:              if sx == cx or sy == cy:
137                  # Just a mouse click. Simply zoom in by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
138                    # zoom in by a factor of two
139                    # FIXME: For a click this is the desired behavior but should we
140                    # really do this for degenrate rectagles as well or
141                    # should we ignore them?
142                  self.view.ZoomFactor(2, center = (cx, cy))                  self.view.ZoomFactor(2, center = (cx, cy))
143              else:              else:
144                  # A drag. Zoom in to the rectangle                  # A drag. Zoom in to the rectangle
# Line 149  class ZoomOutTool(RectTool): Line 157  class ZoomOutTool(RectTool):
157              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
158              sx, sy = self.start              sx, sy = self.start
159              cx, cy = self.current              cx, cy = self.current
160              if sx == cx and sy == cy:              if sx == cx or sy == cy:
161                  # Just a mouse click. Simply zoom out by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
162                    # zoom out by a factor of two.
163                    # FIXME: For a click this is the desired behavior but should we
164                    # really do this for degenrate rectagles as well or
165                    # should we ignore them?
166                  self.view.ZoomFactor(0.5, center = (cx, cy))                  self.view.ZoomFactor(0.5, center = (cx, cy))
167              else:              else:
168                  # A drag. Zoom out to the rectangle                  # A drag. Zoom out to the rectangle
# Line 184  class PanTool(Tool): Line 196  class PanTool(Tool):
196              sx, sy = self.start              sx, sy = self.start
197              cx, cy = self.current              cx, cy = self.current
198              self.view.Translate(cx - sx, cy - sy)              self.view.Translate(cx - sx, cy - sy)
199            
200  class IdentifyTool(Tool):  class IdentifyTool(Tool):
201    
202      """The "Identify" Tool"""      """The "Identify" Tool"""
203        
204      def Name(self):      def Name(self):
205          return "IdentifyTool"          return "IdentifyTool"
206    
# Line 242  class MapPrintout(wx.wxPrintout): Line 254  class MapPrintout(wx.wxPrintout):
254          renderer = PrinterRender(dc, scale, (offx, offy), resolution = resx)          renderer = PrinterRender(dc, scale, (offx, offy), resolution = resx)
255          renderer.RenderMap(self.map)          renderer.RenderMap(self.map)
256          return wx.true          return wx.true
257            
258    
259  class MapCanvas(wxWindow, Publisher):  class MapCanvas(wxWindow, Publisher):
260    
261      """A widget that displays a map and offers some interaction"""      """A widget that displays a map and offers some interaction"""
262    
263      def __init__(self, parent, winid, interactor):      # Some messages that can be subscribed/unsubscribed directly through
264        # the MapCanvas come in fact from other objects. This is a dict
265        # mapping those messages to the names of the instance variables they
266        # actually come from. The delegation is implemented in the Subscribe
267        # and Unsubscribe methods
268        delegated_messages = {LAYER_SELECTED: "selection",
269                              SHAPES_SELECTED: "selection"}
270    
271        # Methods delegated to some instance variables. The delegation is
272        # implemented in the __getattr__ method.
273        delegated_methods = {"SelectLayer": "selection",
274                             "SelectShapes": "selection",
275                             "SelectedLayer": "selection",
276                             "HasSelectedLayer": "selection"}
277    
278        def __init__(self, parent, winid):
279          wxWindow.__init__(self, parent, winid)          wxWindow.__init__(self, parent, winid)
280          self.SetBackgroundColour(wxColour(255, 255, 255))          self.SetBackgroundColour(wxColour(255, 255, 255))
281    
# Line 271  class MapCanvas(wxWindow, Publisher): Line 298  class MapCanvas(wxWindow, Publisher):
298          # if the mouse is outside the window.          # if the mouse is outside the window.
299          self.current_position = None          self.current_position = None
300    
         # 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()  
   
301          # the bitmap serving as backing store          # the bitmap serving as backing store
302          self.bitmap = None          self.bitmap = None
303    
304          # the interactor          # the selection
305          self.interactor = interactor          self.selection = Selection()
306          self.interactor.Subscribe(SELECTED_SHAPE, self.shape_selected)          self.selection.Subscribe(SHAPES_SELECTED , self.shape_selected)
307    
308          # keep track of which layers/shapes are selected to make sure we          # keep track of which layers/shapes are selected to make sure we
309          # only redraw when necessary          # only redraw when necessary
# Line 298  class MapCanvas(wxWindow, Publisher): Line 317  class MapCanvas(wxWindow, Publisher):
317          EVT_MOTION(self, self.OnMotion)          EVT_MOTION(self, self.OnMotion)
318          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)
319          wx.EVT_SIZE(self, self.OnSize)          wx.EVT_SIZE(self, self.OnSize)
         wx.EVT_IDLE(self, self.OnIdle)  
320    
321      def __del__(self):      def __del__(self):
322          wxWindow.__del__(self)          wxWindow.__del__(self)
323          Publisher.__del__(self)          Publisher.__del__(self)
324    
325        def Subscribe(self, channel, *args):
326            """Extend the inherited method to handle delegated messages.
327    
328            If channel is one of the delegated messages call the appropriate
329            object's Subscribe method. Otherwise just call the inherited
330            method.
331            """
332            if channel in self.delegated_messages:
333                object = getattr(self, self.delegated_messages[channel])
334                object.Subscribe(channel, *args)
335            else:
336                Publisher.Subscribe(self, channel, *args)
337    
338        def Unsubscribe(self, channel, *args):
339            """Extend the inherited method to handle delegated messages.
340    
341            If channel is one of the delegated messages call the appropriate
342            object's Unsubscribe method. Otherwise just call the inherited
343            method.
344            """
345            if channel in self.delegated_messages:
346                object = getattr(self, self.delegated_messages[channel])
347                object.Unsubscribe(channel, *args)
348            else:
349                Publisher.Unsubscribe(self, channel, *args)
350    
351        def __getattr__(self, attr):
352            if attr in self.delegated_methods:
353                return getattr(getattr(self, self.delegated_methods[attr]), attr)
354            raise AttributeError(attr)
355    
356      def OnPaint(self, event):      def OnPaint(self, event):
357          dc = wxPaintDC(self)          dc = wxPaintDC(self)
358          if self.map is not None and self.map.HasLayers():          clear = self.map is None or not self.map.HasLayers()
359              # We have a non-empty map. Redraw it in idle time  
360              self.redraw_on_idle = 1          if not clear:
361              # update the region that has to be redrawn              try:
362              self.update_region.UnionRegion(self.GetUpdateRegion())                  self.do_redraw()
363          else:              except:
364                    print "Error during drawing:", sys.exc_info()[0]
365                    clear = True
366    
367            if clear:
368              # 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
369              # the screen.              # the screen.
370                
371              # XXX it's probably possible to get rid of this. The              # XXX it's probably possible to get rid of this. The
372              # background color of the window is already white and the              # background color of the window is already white and the
373              # only thing we may have to do is to call self.Refresh()              # only thing we may have to do is to call self.Refresh()
374              # with a true argument in the right places.              # with a true argument in the right places.
375              dc.BeginDrawing()              dc.BeginDrawing()
376              dc.Clear()                          dc.Clear()
377              dc.EndDrawing()              dc.EndDrawing()
378    
             # clear the region  
             self.update_region = wx.wxRegion()  
   
379      def do_redraw(self):      def do_redraw(self):
380          # This should only be called if we have a non-empty map.          # This should only be called if we have a non-empty map.
381    
         # 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()  
   
382          # Get the window size.          # Get the window size.
383          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
384    
# Line 347  class MapCanvas(wxWindow, Publisher): Line 392  class MapCanvas(wxWindow, Publisher):
392              dc.BeginDrawing()              dc.BeginDrawing()
393    
394              # clear the background              # clear the background
395              dc.SetBrush(wx.wxWHITE_BRUSH)              #dc.SetBrush(wx.wxWHITE_BRUSH)
396              dc.SetPen(wx.wxTRANSPARENT_PEN)              #dc.SetPen(wx.wxTRANSPARENT_PEN)
397              dc.DrawRectangle(0, 0, width, height)              #dc.DrawRectangle(0, 0, width, height)
398                dc.SetBackground(wx.wxWHITE_BRUSH)
399              if 1: #self.interactor.selected_map is self.map:              dc.Clear()
400                  selected_layer = self.interactor.selected_layer  
401                  selected_shape = self.interactor.selected_shape              selected_layer = self.selection.SelectedLayer()
402              else:              selected_shapes = self.selection.SelectedShapes()
                 selected_layer = None  
                 selected_shape = None  
403    
404              # draw the map into the bitmap              # draw the map into the bitmap
405              renderer = ScreenRenderer(dc, self.scale, self.offset)              renderer = ScreenRenderer(dc, self.scale, self.offset)
406    
407              # Pass the entire bitmap as update_region to the renderer.              # Pass the entire bitmap as update region to the renderer.
408              # We're redrawing the whole bitmap, after all.              # We're redrawing the whole bitmap, after all.
409              renderer.RenderMap(self.map, (0, 0, width, height),              renderer.RenderMap(self.map, (0, 0, width, height),
410                                 selected_layer, selected_shape)                                 selected_layer, selected_shapes)
411    
412              dc.EndDrawing()              dc.EndDrawing()
413              dc.SelectObject(wx.wxNullBitmap)              dc.SelectObject(wx.wxNullBitmap)
# Line 383  class MapCanvas(wxWindow, Publisher): Line 426  class MapCanvas(wxWindow, Publisher):
426          printout = MapPrintout(self.map)          printout = MapPrintout(self.map)
427          printer.Print(self, printout, wx.true)          printer.Print(self, printout, wx.true)
428          printout.Destroy()          printout.Destroy()
429            
430      def SetMap(self, map):      def SetMap(self, map):
431          redraw_channels = (LAYERS_CHANGED, LAYER_LEGEND_CHANGED,          redraw_channels = (MAP_LAYERS_CHANGED, LAYER_CHANGED,
432                             LAYER_VISIBILITY_CHANGED)                             LAYER_VISIBILITY_CHANGED)
433          if self.map is not None:          if self.map is not None:
434              for channel in redraw_channels:              for channel in redraw_channels:
# Line 393  class MapCanvas(wxWindow, Publisher): Line 436  class MapCanvas(wxWindow, Publisher):
436              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,
437                                   self.projection_changed)                                   self.projection_changed)
438          self.map = map          self.map = map
439            self.selection.ClearSelection()
440          if self.map is not None:          if self.map is not None:
441              for channel in redraw_channels:              for channel in redraw_channels:
442                  self.map.Subscribe(channel, self.full_redraw)                  self.map.Subscribe(channel, self.full_redraw)
# Line 404  class MapCanvas(wxWindow, Publisher): Line 448  class MapCanvas(wxWindow, Publisher):
448          self.full_redraw()          self.full_redraw()
449    
450      def Map(self):      def Map(self):
451            """Return the map displayed by this canvas"""
452          return self.map          return self.map
453    
454      def redraw(self, *args):      def redraw(self, *args):
# Line 437  class MapCanvas(wxWindow, Publisher): Line 482  class MapCanvas(wxWindow, Publisher):
482          return ((x - offx) / self.scale, (offy - y) / self.scale)          return ((x - offx) / self.scale, (offy - y) / self.scale)
483    
484      def FitRectToWindow(self, rect):      def FitRectToWindow(self, rect):
485            """Fit the rectangular region given by rect into the window.
486    
487            Set scale so that rect (in projected coordinates) just fits into
488            the window and center it.
489            """
490          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
491          llx, lly, urx, ury = rect          llx, lly, urx, ury = rect
492          if llx == urx or lly == ury:          if llx == urx or lly == ury:
493              # zero with or zero height. Do Nothing              # zero width or zero height. Do Nothing
494              return              return
495          scalex = width / (urx - llx)          scalex = width / (urx - llx)
496          scaley = height / (ury - lly)          scaley = height / (ury - lly)
# Line 450  class MapCanvas(wxWindow, Publisher): Line 500  class MapCanvas(wxWindow, Publisher):
500          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
501    
502      def FitMapToWindow(self):      def FitMapToWindow(self):
503          """\          """Fit the map to the window
504          Set the scale and offset so that the map is centered in the  
505          window          Set the scale so that the map fits exactly into the window and
506            center it in the window.
507          """          """
508          bbox = self.map.ProjectedBoundingBox()          bbox = self.map.ProjectedBoundingBox()
509          if bbox is not None:          if bbox is not None:
# Line 478  class MapCanvas(wxWindow, Publisher): Line 529  class MapCanvas(wxWindow, Publisher):
529          self.set_view_transform(scale, offset)          self.set_view_transform(scale, offset)
530    
531      def ZoomOutToRect(self, rect):      def ZoomOutToRect(self, rect):
532          # rect is given in window coordinates          """Zoom out to fit the currently visible region into rect.
533    
534            The rect parameter is given in window coordinates
535            """
536          # determine the bbox of the displayed region in projected          # determine the bbox of the displayed region in projected
537          # coordinates          # coordinates
538          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
# Line 496  class MapCanvas(wxWindow, Publisher): Line 549  class MapCanvas(wxWindow, Publisher):
549          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
550    
551      def Translate(self, dx, dy):      def Translate(self, dx, dy):
552            """Move the map by dx, dy pixels"""
553          offx, offy = self.offset          offx, offy = self.offset
554          self.set_view_transform(self.scale, (offx + dx, offy + dy))          self.set_view_transform(self.scale, (offx + dx, offy + dy))
555    
556        def SelectTool(self, tool):
557            """Make tool the active tool.
558    
559            The parameter should be an instance of Tool or None to indicate
560            that no tool is active.
561            """
562            self.tool = tool
563    
564      def ZoomInTool(self):      def ZoomInTool(self):
565          self.tool = ZoomInTool(self)          """Start the zoom in tool"""
566            self.SelectTool(ZoomInTool(self))
567    
568      def ZoomOutTool(self):      def ZoomOutTool(self):
569          self.tool = ZoomOutTool(self)          """Start the zoom out tool"""
570            self.SelectTool(ZoomOutTool(self))
571    
572      def PanTool(self):      def PanTool(self):
573          self.tool = PanTool(self)          """Start the pan tool"""
574            self.SelectTool(PanTool(self))
575    
576      def IdentifyTool(self):      def IdentifyTool(self):
577          self.tool = IdentifyTool(self)          """Start the identify tool"""
578            self.SelectTool(IdentifyTool(self))
579    
580      def LabelTool(self):      def LabelTool(self):
581          self.tool = LabelTool(self)          """Start the label tool"""
582            self.SelectTool(LabelTool(self))
583    
584      def CurrentTool(self):      def CurrentTool(self):
585            """Return the name of the current tool or None if no tool is active"""
586          return self.tool and self.tool.Name() or None          return self.tool and self.tool.Name() or None
587    
588      def CurrentPosition(self):      def CurrentPosition(self):
# Line 552  class MapCanvas(wxWindow, Publisher): Line 620  class MapCanvas(wxWindow, Publisher):
620              self.tool.MouseDown(event)              self.tool.MouseDown(event)
621              self.tool.Show(self.drag_dc)              self.tool.Show(self.drag_dc)
622              self.dragging = 1              self.dragging = 1
623            
624      def OnLeftUp(self, event):      def OnLeftUp(self, event):
         self.ReleaseMouse()  
625          self.set_current_position(event)          self.set_current_position(event)
626          if self.dragging:          if self.dragging:
627              self.tool.Hide(self.drag_dc)              self.ReleaseMouse()
628              self.tool.MouseUp(event)              try:
629              self.drag_dc = None                  self.tool.Hide(self.drag_dc)
630          self.dragging = 0                  self.tool.MouseUp(event)
631                finally:
632                    self.drag_dc = None
633                    self.dragging = 0
634    
635      def OnMotion(self, event):      def OnMotion(self, event):
636          self.set_current_position(event)          self.set_current_position(event)
# Line 572  class MapCanvas(wxWindow, Publisher): Line 642  class MapCanvas(wxWindow, Publisher):
642      def OnLeaveWindow(self, event):      def OnLeaveWindow(self, event):
643          self.set_current_position(None)          self.set_current_position(None)
644    
     def OnIdle(self, event):  
         if self.redraw_on_idle:  
             self.do_redraw()  
         self.redraw_on_idle = 0  
   
645      def OnSize(self, event):      def OnSize(self, event):
646          # 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
647          # 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 650  class MapCanvas(wxWindow, Publisher):
650          # Even when the window becomes larger some parts of the bitmap          # Even when the window becomes larger some parts of the bitmap
651          # could be reused.          # could be reused.
652          self.full_redraw()          self.full_redraw()
653            pass
654    
655      def shape_selected(self, layer, shape):      def shape_selected(self, layer, shape):
656          """Redraw the map.          """Receiver for the SHAPES_SELECTED messages. Redraw the map."""
657            # The selection object takes care that it only issues
658          Receiver for the SELECTED_SHAPE messages. Try to redraw only          # SHAPES_SELECTED messages when the set of selected shapes has
659          when necessary.          # actually changed, so we can do a full redraw unconditionally.
660          """          # FIXME: We should perhaps try to limit the redraw to the are
661          # A redraw is necessary when the display has to change, which          # actually covered by the shapes before and after the selection
662          # means that either the status changes from having no selection          # change.
663          # 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  
664    
665      def unprojected_rect_around_point(self, x, y):      def unprojected_rect_around_point(self, x, y, dist):
666          """return a rect a few pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
667    
668          The return value is a tuple (minx, miny, maxx, maxy) suitable a          The return value is a tuple (minx, miny, maxx, maxy) suitable a
669          parameter to a layer's ShapesInRegion method.          parameter to a layer's ShapesInRegion method.
# Line 622  class MapCanvas(wxWindow, Publisher): Line 677  class MapCanvas(wxWindow, Publisher):
677          xs = []          xs = []
678          ys = []          ys = []
679          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
680              px, py = self.win_to_proj(x + dx, y + dy)              px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
681              if inverse:              if inverse:
682                  px, py = inverse(px, py)                  px, py = inverse(px, py)
683              xs.append(px)              xs.append(px)
684              ys.append(py)              ys.append(py)
685          return (min(xs), min(ys), max(xs), max(ys))          return (min(xs), min(ys), max(xs), max(ys))
686    
687      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):
688          """Determine the shape at point px, py in window coords          """Determine the shape at point px, py in window coords
689    
690          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 694  class MapCanvas(wxWindow, Publisher):
694          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
695          as the shape and None as the layer.          as the shape and None as the layer.
696    
697          If the optional parameter selected_layer is true (default), only          If the optional parameter searched_layer is given (or not None
698          search in the currently selected layer.          which it defaults to), only search in that layer.
699          """          """
700          map_proj = self.map.projection          map_proj = self.map.projection
701          if map_proj is not None:          if map_proj is not None:
# Line 651  class MapCanvas(wxWindow, Publisher): Line 706  class MapCanvas(wxWindow, Publisher):
706          scale = self.scale          scale = self.scale
707          offx, offy = self.offset          offx, offy = self.offset
708    
         box = self.unprojected_rect_around_point(px, py)  
   
709          if select_labels:          if select_labels:
710              labels = self.map.LabelLayer().Labels()              labels = self.map.LabelLayer().Labels()
711                
712              if labels:              if labels:
713                  dc = wxClientDC(self)                  dc = wxClientDC(self)
714                  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 740  class MapCanvas(wxWindow, Publisher):
740                      if x <= px < x + width and y <= py <= y + height:                      if x <= px < x + width and y <= py <= y + height:
741                          return None, i                          return None, i
742    
743          if selected_layer:          if searched_layer:
744              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 = []  
745          else:          else:
746              layers = self.map.Layers()              layers = self.map.Layers()
747    
# Line 705  class MapCanvas(wxWindow, Publisher): Line 752  class MapCanvas(wxWindow, Publisher):
752              if not layer.Visible():              if not layer.Visible():
753                  continue                  continue
754    
755              filled = layer.fill is not None              filled = layer.GetClassification().GetDefaultFill() \
756              stroked = layer.stroke is not None                       is not Color.Transparent
757                                stroked = layer.GetClassification().GetDefaultLineColor() \
758                          is not Color.Transparent
759    
760              layer_proj = layer.projection              layer_proj = layer.projection
761              if layer_proj is not None:              if layer_proj is not None:
762                  inverse = layer_proj.Inverse                  inverse = layer_proj.Inverse
763              else:              else:
764                  inverse = None                  inverse = None
765                    
766              shapetype = layer.ShapeType()              shapetype = layer.ShapeType()
767    
768              select_shape = -1              select_shape = -1
769    
770                # Determine the ids of the shapes that overlap a tiny area
771                # around the point. For layers containing points we have to
772                # choose a larger size of the box we're testing agains so
773                # that we take the size of the markers into account
774                # FIXME: Once the markers are more flexible this part has to
775                # become more flexible too, of course
776                if shapetype == SHAPETYPE_POINT:
777                    box = self.unprojected_rect_around_point(px, py, 5)
778                else:
779                    box = self.unprojected_rect_around_point(px, py, 1)
780              shape_ids = layer.ShapesInRegion(box)              shape_ids = layer.ShapesInRegion(box)
781              shape_ids.reverse()              shape_ids.reverse()
782    
# Line 760  class MapCanvas(wxWindow, Publisher): Line 819  class MapCanvas(wxWindow, Publisher):
819                  return layer, select_shape                  return layer, select_shape
820          return None, None          return None, None
821    
822      def SelectShapeAt(self, x, y):      def SelectShapeAt(self, x, y, layer = None):
823          layer, shape = self.find_shape_at(x, y, selected_layer = 0)          """\
824            Select and return the shape and its layer at window position (x, y)
825    
826            If layer is given, only search in that layer. If no layer is
827            given, search through all layers.
828    
829            Return a tuple (layer, shapeid). If no shape is found, return
830            (None, None).
831            """
832            layer, shape = result = self.find_shape_at(x, y, searched_layer=layer)
833          # 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
834          # to deselect the currently selected layer, so we simply select          # to deselect the currently selected layer, so we simply select
835          # the already selected layer again.          # the already selected layer again.
836          if layer is None:          if layer is None:
837              layer = self.interactor.SelectedLayer()              layer = self.selection.SelectedLayer()
838          self.interactor.SelectLayerAndShape(layer, shape)              shapes = []
839            else:
840                shapes = [shape]
841            self.selection.SelectShapes(layer, shapes)
842            return result
843    
844      def LabelShapeAt(self, x, y):      def LabelShapeAt(self, x, y):
845            """Add or remove a label at window position x, y.
846    
847            If there's a label at the given position, remove it. Otherwise
848            determine the shape at the position, run the label dialog and
849            unless the user cancels the dialog, add a laber.
850            """
851          ox = x; oy = y          ox = x; oy = y
852          label_layer = self.map.LabelLayer()          label_layer = self.map.LabelLayer()
853          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.239  
changed lines
  Added in v.799
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26