/[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 288 by bh,
Thu Aug 29 13:31:43 2002 UTC
+revision 296 by bh,
Fri Aug 30 16:10:45 2002 UTC
 Line 284 
 class MapCanvas(wxWindow, Publisher):
          # 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 317 
 class MapCanvas(wxWindow, Publisher):
+Line 314 
 class MapCanvas(wxWindow, Publisher):
          if self.map is not None and self.map.HasLayers():
              # We have a non-empty map. Redraw it in idle time
              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 326 
 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 356 
 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 412 
 class MapCanvas(wxWindow, Publisher):
+Line 399 
 class MapCanvas(wxWindow, Publisher):
          self.full_redraw()
      def Map(self):
+         """Return the map displayed by this canvas"""
          return self.map
      def redraw(self, *args):
-Line 445 
 class MapCanvas(wxWindow, Publisher):
+Line 433 
 class MapCanvas(wxWindow, Publisher):
          return ((x - offx) / self.scale, (offy - y) / self.scale)
      def FitRectToWindow(self, rect):
+         """Fit the rectangular region given by rect into the window.
+         Set scale so that rect (in projected coordinates) just fits into
+         the window and center it.
+         """
          width, height = self.GetSizeTuple()
          llx, lly, urx, ury = rect
          if llx == urx or lly == ury:
-Line 458 
 class MapCanvas(wxWindow, Publisher):
+Line 451 
 class MapCanvas(wxWindow, Publisher):
          self.set_view_transform(scale, (offx, offy))
      def FitMapToWindow(self):
-         """\
+         """Fit the map to the window
-         Set the scale and offset so that the map is centered in the
-         window
+         Set the scale so that the map fits exactly into the window and
+         center it in the window.
          """
          bbox = self.map.ProjectedBoundingBox()
          if bbox is not None:
-Line 486 
 class MapCanvas(wxWindow, Publisher):
+Line 480 
 class MapCanvas(wxWindow, Publisher):
          self.set_view_transform(scale, offset)
      def ZoomOutToRect(self, rect):
-         # rect is given in window coordinates
+         """Zoom out to fit the currently visible region into rect.
+         The rect parameter is given in window coordinates
+         """
          # determine the bbox of the displayed region in projected
          # coordinates
          width, height = self.GetSizeTuple()
-Line 504 
 class MapCanvas(wxWindow, Publisher):
+Line 500 
 class MapCanvas(wxWindow, Publisher):
          self.set_view_transform(scale, (offx, offy))
      def Translate(self, dx, dy):
+         """Move the map by dx, dy pixels"""
          offx, offy = self.offset
          self.set_view_transform(self.scale, (offx + dx, offy + dy))
      def ZoomInTool(self):
+         """Start the zoom in tool"""
          self.tool = ZoomInTool(self)
      def ZoomOutTool(self):
+         """Start the zoom out tool"""
          self.tool = ZoomOutTool(self)
      def PanTool(self):
+         """Start the pan tool"""
          self.tool = PanTool(self)
      def IdentifyTool(self):
+         """Start the identify tool"""
          self.tool = IdentifyTool(self)
      def LabelTool(self):
+         """Start the label tool"""
          self.tool = LabelTool(self)
      def CurrentTool(self):
+         """Return the name of the current tool or None if no tool is active"""
          return self.tool and self.tool.Name() or None
      def CurrentPosition(self):
-Line 782 
 class MapCanvas(wxWindow, Publisher):
+Line 785 
 class MapCanvas(wxWindow, Publisher):
          return result
      def LabelShapeAt(self, x, y):
+         """Add or remove a label at window position x, y.
+         If there's a label at the given position, remove it. Otherwise
+         determine the shape at the position, run the label dialog and
+         unless the user cancels the dialog, add a laber.
+         """
          ox = x; oy = y
          label_layer = self.map.LabelLayer()
          layer, shape_index = self.find_shape_at(x, y, select_labels = 1)

 Legend:



Removed from v.288
 


changed lines


 
Added in v.296
 Legend:



Removed from v.288
 


changed lines


 
Added in v.296
-Removed from v.288
+Added in v.296

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26