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

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

Parent Directory | Revision Log | View Patch Patch

-revision 295 by bh,
Fri Aug 30 10:39:17 2002 UTC
+revision 303 by bh,
Mon Sep  2 16:47:53 2002 UTC
 Line 279 
 class MapCanvas(wxWindow, Publisher):
          # if the mouse is outside the window.
          self.current_position = None
-         # 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()
          # the bitmap serving as backing store
          self.bitmap = None
-Line 306 
 class MapCanvas(wxWindow, Publisher):
+Line 298 
 class MapCanvas(wxWindow, Publisher):
          EVT_MOTION(self, self.OnMotion)
          EVT_LEAVE_WINDOW(self, self.OnLeaveWindow)
          wx.EVT_SIZE(self, self.OnSize)
-         wx.EVT_IDLE(self, self.OnIdle)
      def __del__(self):
          wxWindow.__del__(self)
-Line 315 
 class MapCanvas(wxWindow, Publisher):
+Line 306 
 class MapCanvas(wxWindow, Publisher):
      def OnPaint(self, event):
          dc = wxPaintDC(self)
          if self.map is not None and self.map.HasLayers():
-             # We have a non-empty map. Redraw it in idle time
+             self.do_redraw()
-             self.redraw_on_idle = 1
-             # update the region that has to be redrawn
-             self.update_region.UnionRegion(self.GetUpdateRegion())
          else:
              # If we've got no map or if the map is empty, simply clear
              # the screen.
-Line 331 
 class MapCanvas(wxWindow, Publisher):
+Line 319 
 class MapCanvas(wxWindow, Publisher):
              dc.Clear()
              dc.EndDrawing()
-             # clear the region
-             self.update_region = wx.wxRegion()
      def do_redraw(self):
          # This should only be called if we have a non-empty map.
-         # 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()
          # Get the window size.
          width, height = self.GetSizeTuple()
-Line 369 
 class MapCanvas(wxWindow, Publisher):
+Line 349 
 class MapCanvas(wxWindow, Publisher):
              # draw the map into the bitmap
              renderer = ScreenRenderer(dc, self.scale, self.offset)
-             # Pass the entire bitmap as update_region to the renderer.
+             # Pass the entire bitmap as update region to the renderer.
              # We're redrawing the whole bitmap, after all.
              renderer.RenderMap(self.map, (0, 0, width, height),
                                 selected_layer, selected_shape)
-Line 596 
 class MapCanvas(wxWindow, Publisher):
+Line 576 
 class MapCanvas(wxWindow, Publisher):
      def OnLeaveWindow(self, event):
          self.set_current_position(None)
-     def OnIdle(self, event):
-         if self.redraw_on_idle:
-             self.do_redraw()
-         self.redraw_on_idle = 0
      def OnSize(self, event):
          # the window's size has changed. We have to get a new bitmap. If
          # we want to be clever we could try to get by without throwing
-Line 631 
 class MapCanvas(wxWindow, Publisher):
+Line 606 
 class MapCanvas(wxWindow, Publisher):
          self.last_selected_layer = layer
          self.last_selected_shape = shape
-     def unprojected_rect_around_point(self, x, y):
+     def unprojected_rect_around_point(self, x, y, dist):
-         """return a rect a few pixels around (x, y) in unprojected corrdinates
+         """return a rect dist pixels around (x, y) in unprojected corrdinates
          The return value is a tuple (minx, miny, maxx, maxy) suitable a
          parameter to a layer's ShapesInRegion method.
-Line 646 
 class MapCanvas(wxWindow, Publisher):
+Line 621 
 class MapCanvas(wxWindow, Publisher):
          xs = []
          ys = []
          for dx, dy in ((-1, -1), (1, -1), (1, 1), (-1, 1)):
-             px, py = self.win_to_proj(x + dx, y + dy)
+             px, py = self.win_to_proj(x + dist * dx, y + dist * dy)
              if inverse:
                  px, py = inverse(px, py)
              xs.append(px)
-Line 675 
 class MapCanvas(wxWindow, Publisher):
+Line 650 
 class MapCanvas(wxWindow, Publisher):
          scale = self.scale
          offx, offy = self.offset
-         box = self.unprojected_rect_around_point(px, py)
          if select_labels:
              labels = self.map.LabelLayer().Labels()
-Line 736 
 class MapCanvas(wxWindow, Publisher):
+Line 709 
 class MapCanvas(wxWindow, Publisher):
              select_shape = -1
+             # Determine the ids of the shapes that overlap a tiny area
+             # around the point. For layers containing points we have to
+             # choose a larger size of the box we're testing agains so
+             # that we take the size of the markers into account
+             # FIXME: Once the markers are more flexible this part has to
+             # become more flexible too, of course
+             if shapetype == SHAPETYPE_POINT:
+                 box = self.unprojected_rect_around_point(px, py, 5)
+             else:
+                 box = self.unprojected_rect_around_point(px, py, 1)
              shape_ids = layer.ShapesInRegion(box)
              shape_ids.reverse()

 Legend:



Removed from v.295
 


changed lines


 
Added in v.303
 Legend:



Removed from v.295
 


changed lines


 
Added in v.303
-Removed from v.295
+Added in v.303

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26