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

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

Parent Directory | Revision Log | View Patch Patch

-revision 76 by bh,
Mon Feb  4 19:23:30 2002 UTC
+revision 144 by bh,
Tue May  7 14:54:02 2002 UTC
 Line 87 
 class MapRenderer:
          shapetype = layer.ShapeType()
          if shapetype == SHAPETYPE_POLYGON:
-             for i in range(layer.NumShapes()):
+             for i in self.layer_ids(layer):
                  self.draw_polygon_shape(layer, i, pen, brush)
+         elif shapetype == SHAPETYPE_ARC:
+             for i in self.layer_ids(layer):
+                 self.draw_polygon_shape(layer, i, pen, None)
          else:
              self.dc.SetBrush(brush)
              self.dc.SetPen(pen)
-Line 96 
 class MapRenderer:
+Line 99 
 class MapRenderer:
                  f = self.draw_arc_shape
              elif shapetype == SHAPETYPE_POINT:
                  f = self.draw_point_shape
-             for i in range(layer.NumShapes()):
+             for i in self.layer_ids(layer):
                  f(layer, i)
+     def layer_ids(self, layer):
+         """Return the shape ids of the given layer that have to be drawn.
+         The default implementation simply returns all ids in the layer.
+         Override in derived classes to be more precise.
+         """
+         return range(layer.NumShapes())
      def draw_polygon_shape(self, layer, index, pen, brush):
          offx, offy = self.offset
          draw_polygon_shape(layer.shapefile.cobject(), index,
-Line 183 
 class ScreenRenderer(MapRenderer):
+Line 194 
 class ScreenRenderer(MapRenderer):
      # On the screen we want to see only visible layers by default
      honor_visibility = 1
-     def RenderMap(self, map, selected_layer, selected_shape):
+     def RenderMap(self, map, region, selected_layer, selected_shape):
+         """Render the map.
+         Only the given region (a wxRect in window coordinates) needs to
+         be redrawn. Highlight the shape with id selected_shape in the
+         selected_layer.
+         """
+         self.update_region = region
          self.selected_layer = selected_layer
          self.selected_shape = selected_shape
          self.render_map(map)
-Line 207 
 class ScreenRenderer(MapRenderer):
+Line 225 
 class ScreenRenderer(MapRenderer):
                      f = self.draw_point_shape
                  f(layer, index)
+     def layer_ids(self, layer):
+         """Return the shapeids covered by the region that has to be redrawn
+         Call the layer's ShapesInRegion method to determine the ids so
+         that it can use the quadtree.
+         """
+         # FIXME: the quad-tree should be built from the projected
+         # coordinates not the lat-long ones because it's not trivial to
+         # determine an appropriate rectangle in lat-long for a given
+         # rectangle in projected coordinates which we have to start from
+         # here.
+         proj = self.map.projection
+         if proj is not None:
+             inverse = proj.Inverse
+         else:
+             inverse = None
+         scale = self.scale
+         offx, offy = self.offset
+         xs = []
+         ys = []
+         x, y, width, height = self.update_region.asTuple()
+         for winx, winy in ((x, y), (x + width, y),
+                            (x + width, y + height), (x, y + height)):
+             px = (winx - offx) / scale
+             py = -(winy - offy) / scale
+             if inverse:
+                 px, py = inverse(px, py)
+             xs.append(px)
+             ys.append(py)
+         left = min(xs)
+         right = max(xs)
+         top = max(ys)
+         bottom = min(ys)
+         return layer.ShapesInRegion((left, bottom, right, top))
  class PrinterRender(MapRenderer):

 Legend:



Removed from v.76
 


changed lines


 
Added in v.144
 Legend:



Removed from v.76
 


changed lines


 
Added in v.144
-Removed from v.76
+Added in v.144

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26