/[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 246 by bh, Mon Jul 29 13:38:04 2002 UTC revision 883 by jonathan, Fri May 9 16:34:39 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                         SCALE_CHANGED
48    
49    
50  #  #
# Line 129  class ZoomInTool(RectTool): Line 138  class ZoomInTool(RectTool):
138              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
139              sx, sy = self.start              sx, sy = self.start
140              cx, cy = self.current              cx, cy = self.current
141              if sx == cx and sy == cy:              if sx == cx or sy == cy:
142                  # Just a mouse click. Simply zoom in by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
143                    # zoom in by a factor of two
144                    # FIXME: For a click this is the desired behavior but should we
145                    # really do this for degenrate rectagles as well or
146                    # should we ignore them?
147                  self.view.ZoomFactor(2, center = (cx, cy))                  self.view.ZoomFactor(2, center = (cx, cy))
148              else:              else:
149                  # A drag. Zoom in to the rectangle                  # A drag. Zoom in to the rectangle
# Line 149  class ZoomOutTool(RectTool): Line 162  class ZoomOutTool(RectTool):
162              Tool.MouseUp(self, event)              Tool.MouseUp(self, event)
163              sx, sy = self.start              sx, sy = self.start
164              cx, cy = self.current              cx, cy = self.current
165              if sx == cx and sy == cy:              if sx == cx or sy == cy:
166                  # Just a mouse click. Simply zoom out by a factor of two                  # Just a mouse click or a degenerate rectangle. Simply
167                    # zoom out by a factor of two.
168                    # FIXME: For a click this is the desired behavior but should we
169                    # really do this for degenrate rectagles as well or
170                    # should we ignore them?
171                  self.view.ZoomFactor(0.5, center = (cx, cy))                  self.view.ZoomFactor(0.5, center = (cx, cy))
172              else:              else:
173                  # A drag. Zoom out to the rectangle                  # A drag. Zoom out to the rectangle
# Line 248  class MapCanvas(wxWindow, Publisher): Line 265  class MapCanvas(wxWindow, Publisher):
265    
266      """A widget that displays a map and offers some interaction"""      """A widget that displays a map and offers some interaction"""
267    
268      def __init__(self, parent, winid, interactor):      # Some messages that can be subscribed/unsubscribed directly through
269        # the MapCanvas come in fact from other objects. This is a dict
270        # mapping those messages to the names of the instance variables they
271        # actually come from. The delegation is implemented in the Subscribe
272        # and Unsubscribe methods
273        delegated_messages = {LAYER_SELECTED: "selection",
274                              SHAPES_SELECTED: "selection"}
275    
276        # Methods delegated to some instance variables. The delegation is
277        # implemented in the __getattr__ method.
278        delegated_methods = {"SelectLayer": "selection",
279                             "SelectShapes": "selection",
280                             "SelectedLayer": "selection",
281                             "HasSelectedLayer": "selection",
282                             "HasSelectedShapes": "selection",
283                             "SelectedShapes": "selection"}
284    
285        def __init__(self, parent, winid):
286          wxWindow.__init__(self, parent, winid)          wxWindow.__init__(self, parent, winid)
287          self.SetBackgroundColour(wxColour(255, 255, 255))          self.SetBackgroundColour(wxColour(255, 255, 255))
288    
# Line 271  class MapCanvas(wxWindow, Publisher): Line 305  class MapCanvas(wxWindow, Publisher):
305          # if the mouse is outside the window.          # if the mouse is outside the window.
306          self.current_position = None          self.current_position = None
307    
         # 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()  
   
308          # the bitmap serving as backing store          # the bitmap serving as backing store
309          self.bitmap = None          self.bitmap = None
310    
311          # the interactor          # the selection
312          self.interactor = interactor          self.selection = Selection()
313          self.interactor.Subscribe(SELECTED_SHAPE, self.shape_selected)          self.selection.Subscribe(SHAPES_SELECTED , self.shape_selected)
314    
315          # keep track of which layers/shapes are selected to make sure we          # keep track of which layers/shapes are selected to make sure we
316          # only redraw when necessary          # only redraw when necessary
# Line 298  class MapCanvas(wxWindow, Publisher): Line 324  class MapCanvas(wxWindow, Publisher):
324          EVT_MOTION(self, self.OnMotion)          EVT_MOTION(self, self.OnMotion)
325          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)
326          wx.EVT_SIZE(self, self.OnSize)          wx.EVT_SIZE(self, self.OnSize)
         wx.EVT_IDLE(self, self.OnIdle)  
327    
328      def __del__(self):      def __del__(self):
329          wxWindow.__del__(self)          wxWindow.__del__(self)
330          Publisher.__del__(self)          Publisher.__del__(self)
331    
332        def Subscribe(self, channel, *args):
333            """Extend the inherited method to handle delegated messages.
334    
335            If channel is one of the delegated messages call the appropriate
336            object's Subscribe method. Otherwise just call the inherited
337            method.
338            """
339            if channel in self.delegated_messages:
340                object = getattr(self, self.delegated_messages[channel])
341                object.Subscribe(channel, *args)
342            else:
343                Publisher.Subscribe(self, channel, *args)
344    
345        def Unsubscribe(self, channel, *args):
346            """Extend the inherited method to handle delegated messages.
347    
348            If channel is one of the delegated messages call the appropriate
349            object's Unsubscribe method. Otherwise just call the inherited
350            method.
351            """
352            if channel in self.delegated_messages:
353                object = getattr(self, self.delegated_messages[channel])
354                object.Unsubscribe(channel, *args)
355            else:
356                Publisher.Unsubscribe(self, channel, *args)
357    
358        def __getattr__(self, attr):
359            if attr in self.delegated_methods:
360                return getattr(getattr(self, self.delegated_methods[attr]), attr)
361            raise AttributeError(attr)
362    
363      def OnPaint(self, event):      def OnPaint(self, event):
364          dc = wxPaintDC(self)          dc = wxPaintDC(self)
365          if self.map is not None and self.map.HasLayers():          clear = self.map is None or not self.map.HasLayers()
366              # We have a non-empty map. Redraw it in idle time  
367              self.redraw_on_idle = 1          #wxBeginBusyCursor()
368              # update the region that has to be redrawn  
369              self.update_region.UnionRegion(self.GetUpdateRegion())          if not clear:
370          else:              try:
371                    self.do_redraw()
372                except:
373                    print "Error during drawing:", sys.exc_info()[0]
374                    clear = True
375    
376            if clear:
377              # 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
378              # the screen.              # the screen.
379    
# Line 323  class MapCanvas(wxWindow, Publisher): Line 385  class MapCanvas(wxWindow, Publisher):
385              dc.Clear()              dc.Clear()
386              dc.EndDrawing()              dc.EndDrawing()
387    
388              # clear the region          #wxEndBusyCursor()
             self.update_region = wx.wxRegion()  
389    
390      def do_redraw(self):      def do_redraw(self):
391          # This should only be called if we have a non-empty map.          # This should only be called if we have a non-empty map.
392    
         # 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()  
   
393          # Get the window size.          # Get the window size.
394          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
395    
# Line 347  class MapCanvas(wxWindow, Publisher): Line 403  class MapCanvas(wxWindow, Publisher):
403              dc.BeginDrawing()              dc.BeginDrawing()
404    
405              # clear the background              # clear the background
406              dc.SetBrush(wx.wxWHITE_BRUSH)              #dc.SetBrush(wx.wxWHITE_BRUSH)
407              dc.SetPen(wx.wxTRANSPARENT_PEN)              #dc.SetPen(wx.wxTRANSPARENT_PEN)
408              dc.DrawRectangle(0, 0, width, height)              #dc.DrawRectangle(0, 0, width, height)
409                dc.SetBackground(wx.wxWHITE_BRUSH)
410              if 1: #self.interactor.selected_map is self.map:              dc.Clear()
411                  selected_layer = self.interactor.selected_layer  
412                  selected_shape = self.interactor.selected_shape              selected_layer = self.selection.SelectedLayer()
413              else:              selected_shapes = self.selection.SelectedShapes()
                 selected_layer = None  
                 selected_shape = None  
414    
415              # draw the map into the bitmap              # draw the map into the bitmap
416              renderer = ScreenRenderer(dc, self.scale, self.offset)              renderer = ScreenRenderer(dc, self.scale, self.offset)
417    
418              # Pass the entire bitmap as update_region to the renderer.              # Pass the entire bitmap as update region to the renderer.
419              # We're redrawing the whole bitmap, after all.              # We're redrawing the whole bitmap, after all.
420              renderer.RenderMap(self.map, (0, 0, width, height),              renderer.RenderMap(self.map, (0, 0, width, height),
421                                 selected_layer, selected_shape)                                 selected_layer, selected_shapes)
422    
423              dc.EndDrawing()              dc.EndDrawing()
424              dc.SelectObject(wx.wxNullBitmap)              dc.SelectObject(wx.wxNullBitmap)
# Line 385  class MapCanvas(wxWindow, Publisher): Line 439  class MapCanvas(wxWindow, Publisher):
439          printout.Destroy()          printout.Destroy()
440    
441      def SetMap(self, map):      def SetMap(self, map):
442          redraw_channels = (LAYERS_CHANGED, LAYER_LEGEND_CHANGED,          redraw_channels = (MAP_LAYERS_CHANGED, LAYER_CHANGED,
443                             LAYER_VISIBILITY_CHANGED)                             LAYER_VISIBILITY_CHANGED)
444          if self.map is not None:          if self.map is not None:
445              for channel in redraw_channels:              for channel in redraw_channels:
# Line 393  class MapCanvas(wxWindow, Publisher): Line 447  class MapCanvas(wxWindow, Publisher):
447              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,
448                                   self.projection_changed)                                   self.projection_changed)
449          self.map = map          self.map = map
450            self.selection.ClearSelection()
451          if self.map is not None:          if self.map is not None:
452              for channel in redraw_channels:              for channel in redraw_channels:
453                  self.map.Subscribe(channel, self.full_redraw)                  self.map.Subscribe(channel, self.full_redraw)
# Line 404  class MapCanvas(wxWindow, Publisher): Line 459  class MapCanvas(wxWindow, Publisher):
459          self.full_redraw()          self.full_redraw()
460    
461      def Map(self):      def Map(self):
462            """Return the map displayed by this canvas"""
463          return self.map          return self.map
464    
465      def redraw(self, *args):      def redraw(self, *args):
# Line 421  class MapCanvas(wxWindow, Publisher): Line 477  class MapCanvas(wxWindow, Publisher):
477          self.scale = scale          self.scale = scale
478          self.offset = offset          self.offset = offset
479          self.full_redraw()          self.full_redraw()
480            self.issue(SCALE_CHANGED, scale)
481    
482      def proj_to_win(self, x, y):      def proj_to_win(self, x, y):
483          """\          """\
# Line 437  class MapCanvas(wxWindow, Publisher): Line 494  class MapCanvas(wxWindow, Publisher):
494          return ((x - offx) / self.scale, (offy - y) / self.scale)          return ((x - offx) / self.scale, (offy - y) / self.scale)
495    
496      def FitRectToWindow(self, rect):      def FitRectToWindow(self, rect):
497            """Fit the rectangular region given by rect into the window.
498    
499            Set scale so that rect (in projected coordinates) just fits into
500            the window and center it.
501            """
502          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
503          llx, lly, urx, ury = rect          llx, lly, urx, ury = rect
504          if llx == urx or lly == ury:          if llx == urx or lly == ury:
505              # zero with or zero height. Do Nothing              # zero width or zero height. Do Nothing
506              return              return
507          scalex = width / (urx - llx)          scalex = width / (urx - llx)
508          scaley = height / (ury - lly)          scaley = height / (ury - lly)
# Line 450  class MapCanvas(wxWindow, Publisher): Line 512  class MapCanvas(wxWindow, Publisher):
512          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
513    
514      def FitMapToWindow(self):      def FitMapToWindow(self):
515          """\          """Fit the map to the window
516          Set the scale and offset so that the map is centered in the  
517          window          Set the scale so that the map fits exactly into the window and
518            center it in the window.
519          """          """
520          bbox = self.map.ProjectedBoundingBox()          bbox = self.map.ProjectedBoundingBox()
521          if bbox is not None:          if bbox is not None:
522              self.FitRectToWindow(bbox)              self.FitRectToWindow(bbox)
523    
524        def FitLayerToWindow(self, layer):
525            """Fit the given layer to the window.
526    
527            Set the scale so that the layer fits exactly into the window and
528            center it in the window.
529            """
530            
531            bbox = layer.LatLongBoundingBox()
532            if bbox is not None:
533                proj = self.map.GetProjection()
534                if proj is not None:
535                    bbox = proj.ForwardBBox(bbox)
536    
537                if bbox is not None:
538                    self.FitRectToWindow(bbox)
539    
540        def FitSelectedToWindow(self):
541            layer = self.selection.SelectedLayer()
542            shapes = self.selection.SelectedShapes()
543    
544            bbox = layer.ShapesBoundingBox(shapes)
545            if bbox is not None:
546                proj = self.map.GetProjection()
547                if proj is not None:
548                    bbox = proj.ForwardBBox(bbox)
549    
550                if bbox is not None:
551                    self.FitRectToWindow(bbox)
552    
553      def ZoomFactor(self, factor, center = None):      def ZoomFactor(self, factor, center = None):
554          """Multiply the zoom by factor and center on center.          """Multiply the zoom by factor and center on center.
555    
# Line 478  class MapCanvas(wxWindow, Publisher): Line 570  class MapCanvas(wxWindow, Publisher):
570          self.set_view_transform(scale, offset)          self.set_view_transform(scale, offset)
571    
572      def ZoomOutToRect(self, rect):      def ZoomOutToRect(self, rect):
573          # rect is given in window coordinates          """Zoom out to fit the currently visible region into rect.
574    
575            The rect parameter is given in window coordinates
576            """
577          # determine the bbox of the displayed region in projected          # determine the bbox of the displayed region in projected
578          # coordinates          # coordinates
579          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
# Line 496  class MapCanvas(wxWindow, Publisher): Line 590  class MapCanvas(wxWindow, Publisher):
590          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
591    
592      def Translate(self, dx, dy):      def Translate(self, dx, dy):
593            """Move the map by dx, dy pixels"""
594          offx, offy = self.offset          offx, offy = self.offset
595          self.set_view_transform(self.scale, (offx + dx, offy + dy))          self.set_view_transform(self.scale, (offx + dx, offy + dy))
596    
597        def SelectTool(self, tool):
598            """Make tool the active tool.
599    
600            The parameter should be an instance of Tool or None to indicate
601            that no tool is active.
602            """
603            self.tool = tool
604    
605      def ZoomInTool(self):      def ZoomInTool(self):
606          self.tool = ZoomInTool(self)          """Start the zoom in tool"""
607            self.SelectTool(ZoomInTool(self))
608    
609      def ZoomOutTool(self):      def ZoomOutTool(self):
610          self.tool = ZoomOutTool(self)          """Start the zoom out tool"""
611            self.SelectTool(ZoomOutTool(self))
612    
613      def PanTool(self):      def PanTool(self):
614          self.tool = PanTool(self)          """Start the pan tool"""
615            self.SelectTool(PanTool(self))
616            #img = resource.GetImageResource("pan", wxBITMAP_TYPE_XPM)
617            #bmp = resource.GetBitmapResource("pan", wxBITMAP_TYPE_XPM)
618            #print bmp
619            #img = wxImageFromBitmap(bmp)
620            #print img
621            #cur = wxCursor(img)
622            #print cur
623            #self.SetCursor(cur)
624    
625      def IdentifyTool(self):      def IdentifyTool(self):
626          self.tool = IdentifyTool(self)          """Start the identify tool"""
627            self.SelectTool(IdentifyTool(self))
628    
629      def LabelTool(self):      def LabelTool(self):
630          self.tool = LabelTool(self)          """Start the label tool"""
631            self.SelectTool(LabelTool(self))
632    
633      def CurrentTool(self):      def CurrentTool(self):
634            """Return the name of the current tool or None if no tool is active"""
635          return self.tool and self.tool.Name() or None          return self.tool and self.tool.Name() or None
636    
637      def CurrentPosition(self):      def CurrentPosition(self):
# Line 554  class MapCanvas(wxWindow, Publisher): Line 671  class MapCanvas(wxWindow, Publisher):
671              self.dragging = 1              self.dragging = 1
672    
673      def OnLeftUp(self, event):      def OnLeftUp(self, event):
         self.ReleaseMouse()  
674          self.set_current_position(event)          self.set_current_position(event)
675          if self.dragging:          if self.dragging:
676              self.tool.Hide(self.drag_dc)              self.ReleaseMouse()
677              self.tool.MouseUp(event)              try:
678              self.drag_dc = None                  self.tool.Hide(self.drag_dc)
679          self.dragging = 0                  self.tool.MouseUp(event)
680                finally:
681                    self.drag_dc = None
682                    self.dragging = 0
683    
684      def OnMotion(self, event):      def OnMotion(self, event):
685          self.set_current_position(event)          self.set_current_position(event)
# Line 572  class MapCanvas(wxWindow, Publisher): Line 691  class MapCanvas(wxWindow, Publisher):
691      def OnLeaveWindow(self, event):      def OnLeaveWindow(self, event):
692          self.set_current_position(None)          self.set_current_position(None)
693    
     def OnIdle(self, event):  
         if self.redraw_on_idle:  
             self.do_redraw()  
         self.redraw_on_idle = 0  
   
694      def OnSize(self, event):      def OnSize(self, event):
695          # 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
696          # 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 699  class MapCanvas(wxWindow, Publisher):
699          # Even when the window becomes larger some parts of the bitmap          # Even when the window becomes larger some parts of the bitmap
700          # could be reused.          # could be reused.
701          self.full_redraw()          self.full_redraw()
702            pass
703    
704      def shape_selected(self, layer, shape):      def shape_selected(self, layer, shape):
705          """Redraw the map.          """Receiver for the SHAPES_SELECTED messages. Redraw the map."""
706            # The selection object takes care that it only issues
707          Receiver for the SELECTED_SHAPE messages. Try to redraw only          # SHAPES_SELECTED messages when the set of selected shapes has
708          when necessary.          # actually changed, so we can do a full redraw unconditionally.
709          """          # FIXME: We should perhaps try to limit the redraw to the are
710          # A redraw is necessary when the display has to change, which          # actually covered by the shapes before and after the selection
711          # means that either the status changes from having no selection          # change.
712          # 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  
713    
714      def unprojected_rect_around_point(self, x, y):      def unprojected_rect_around_point(self, x, y, dist):
715          """return a rect a few pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
716    
717          The return value is a tuple (minx, miny, maxx, maxy) suitable a          The return value is a tuple (minx, miny, maxx, maxy) suitable a
718          parameter to a layer's ShapesInRegion method.          parameter to a layer's ShapesInRegion method.
# Line 622  class MapCanvas(wxWindow, Publisher): Line 726  class MapCanvas(wxWindow, Publisher):
726          xs = []          xs = []
727          ys = []          ys = []
728          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
729              px, py = self.win_to_proj(x + dx, y + dy)              px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
730              if inverse:              if inverse:
731                  px, py = inverse(px, py)                  px, py = inverse(px, py)
732              xs.append(px)              xs.append(px)
# Line 651  class MapCanvas(wxWindow, Publisher): Line 755  class MapCanvas(wxWindow, Publisher):
755          scale = self.scale          scale = self.scale
756          offx, offy = self.offset          offx, offy = self.offset
757    
         box = self.unprojected_rect_around_point(px, py)  
   
758          if select_labels:          if select_labels:
759              labels = self.map.LabelLayer().Labels()              labels = self.map.LabelLayer().Labels()
760    
# Line 699  class MapCanvas(wxWindow, Publisher): Line 801  class MapCanvas(wxWindow, Publisher):
801              if not layer.Visible():              if not layer.Visible():
802                  continue                  continue
803    
804              filled = layer.fill is not None              filled = layer.GetClassification().GetDefaultFill() \
805              stroked = layer.stroke is not None                       is not Color.Transparent
806                stroked = layer.GetClassification().GetDefaultLineColor() \
807                          is not Color.Transparent
808    
809              layer_proj = layer.projection              layer_proj = layer.projection
810              if layer_proj is not None:              if layer_proj is not None:
# Line 712  class MapCanvas(wxWindow, Publisher): Line 816  class MapCanvas(wxWindow, Publisher):
816    
817              select_shape = -1              select_shape = -1
818    
819                # Determine the ids of the shapes that overlap a tiny area
820                # around the point. For layers containing points we have to
821                # choose a larger size of the box we're testing agains so
822                # that we take the size of the markers into account
823                # FIXME: Once the markers are more flexible this part has to
824                # become more flexible too, of course
825                if shapetype == SHAPETYPE_POINT:
826                    box = self.unprojected_rect_around_point(px, py, 5)
827                else:
828                    box = self.unprojected_rect_around_point(px, py, 1)
829              shape_ids = layer.ShapesInRegion(box)              shape_ids = layer.ShapesInRegion(box)
830              shape_ids.reverse()              shape_ids.reverse()
831    
# Line 769  class MapCanvas(wxWindow, Publisher): Line 883  class MapCanvas(wxWindow, Publisher):
883          # to deselect the currently selected layer, so we simply select          # to deselect the currently selected layer, so we simply select
884          # the already selected layer again.          # the already selected layer again.
885          if layer is None:          if layer is None:
886              layer = self.interactor.SelectedLayer()              layer = self.selection.SelectedLayer()
887          self.interactor.SelectLayerAndShape(layer, shape)              shapes = []
888            else:
889                shapes = [shape]
890            self.selection.SelectShapes(layer, shapes)
891          return result          return result
892    
893      def LabelShapeAt(self, x, y):      def LabelShapeAt(self, x, y):
894            """Add or remove a label at window position x, y.
895    
896            If there's a label at the given position, remove it. Otherwise
897            determine the shape at the position, run the label dialog and
898            unless the user cancels the dialog, add a laber.
899            """
900          ox = x; oy = y          ox = x; oy = y
901          label_layer = self.map.LabelLayer()          label_layer = self.map.LabelLayer()
902          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.246  
changed lines
  Added in v.883
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26