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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1539 by bh, Fri Aug 1 14:27:57 2003 UTC revision 1866 by bh, Mon Oct 27 13:01:58 2003 UTC
# Line 7  Line 7 
7  # This program is free software under the GPL (>=v2)  # This program is free software under the GPL (>=v2)
8  # Read the file COPYING coming with Thuban for details.  # Read the file COPYING coming with Thuban for details.
9    
10    from __future__ import generators
11    
12  __version__ = "$Revision$"  __version__ = "$Revision$"
13    # $Source$
14    # $Id$
15    
16  import cStringIO  import cStringIO
17    
18  from Thuban import _  from Thuban import _
19    
20  from wxPython.wx import wxMemoryDC, wxEmptyBitmap, \  from wxPython.wx import wxPoint, wxRect, wxPen, wxBrush, wxFont, \
     wxPoint, wxRect, wxPen, wxBrush, wxFont, \  
21      wxTRANSPARENT_PEN, wxTRANSPARENT_BRUSH, \      wxTRANSPARENT_PEN, wxTRANSPARENT_BRUSH, \
22      wxBLACK_PEN, wxRED_PEN, wxBLACK, \      wxBLACK_PEN, wxBLACK, wxSOLID, wxCROSS_HATCH, wxSWISS, wxNORMAL, \
23      wxSOLID, wxCROSS_HATCH, wxSWISS, wxNORMAL, \      wxBitmapFromImage, wxImageFromStream, wxBITMAP_TYPE_BMP
     wxBitmap, wxImageFromBitmap, wxBitmapFromImage, \  
     wxImageFromStream, wxBITMAP_TYPE_BMP  
24    
25  from wxproj import draw_polygon_shape, draw_polygon_init  from wxproj import draw_polygon_shape, draw_polygon_init
26    
# Line 27  from Thuban.UI.common import Color2wxCol Line 28  from Thuban.UI.common import Color2wxCol
28  from Thuban.UI.classifier import ClassDataPreviewer  from Thuban.UI.classifier import ClassDataPreviewer
29  from Thuban.UI.scalebar import ScaleBar  from Thuban.UI.scalebar import ScaleBar
30    
31  from Thuban.Model.layer import Layer, RasterLayer  from Thuban.Model.data import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \
32  from Thuban.Model.data import SHAPETYPE_POLYGON, SHAPETYPE_ARC, SHAPETYPE_POINT       SHAPETYPE_POINT, RAW_SHAPEFILE
 from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \  
      ALIGN_LEFT, ALIGN_RIGHT, ALIGN_BASELINE  
33    
 from Thuban.Model.classification import Classification  
34  from Thuban.Model.color import Transparent  from Thuban.Model.color import Transparent
35  import Thuban.Model.resource  import Thuban.Model.resource
36    
37  if Thuban.Model.resource.has_gdal_support():  from baserenderer import BaseRenderer
     from gdalwarp import ProjectRasterFile  
38    
39  class MapRenderer:  class MapRenderer(BaseRenderer):
40    
41      """Class to render a map onto a wxDC"""      """Class to render a map onto a wxDC"""
42    
43      honor_visibility = 1      TRANSPARENT_PEN = wxTRANSPARENT_PEN
44        TRANSPARENT_BRUSH = wxTRANSPARENT_BRUSH
     def __init__(self, dc, scale, offset, resolution = 72.0,  
                  honor_visibility = None):  
         """Inititalize the renderer.  
   
         dc -- the wxPython DC to render on  
         scale, offset -- the scale factor and translation to convert  
                 between projected coordinates and the DC coordinates  
   
         resolution -- the assumed resolution of the DC. Used to convert  
                 absolute lengths like font sizes to DC coordinates  
   
         honor_visibility -- boolean. If true, honor the visibility flag  
                 of the layers, otherwise draw all layers. If None, use  
                 the renderer's default.  
         """  
         # resolution in pixel/inch  
   
         self.dc = dc  
         self.scale = scale  
         self.offset = offset  
         if honor_visibility is not None:  
             self.honor_visibility = honor_visibility  
         # store the resolution in pixel/point because it's more useful  
         # later.  
         self.resolution = resolution / 72.0  
   
     def render_map(self, map):  
         self.map = map  
         seenRaster = True  
45    
46          self.dc.BeginDrawing()      make_point = wxPoint
47    
48          #      def tools_for_property(self, prop):
49          # This is only a good optimization if there is only one          fill = prop.GetFill()
50          # raster layer and the image covers the entire window (as          if fill is Transparent:
51          # it currently does). We note if there is a raster layer              brush = self.TRANSPARENT_BRUSH
         # and only begin drawing layers once we have drawn it.  
         # That way we avoid drawing layers that won't be seen.  
         #  
         if Thuban.Model.resource.has_gdal_support():  
             for layer in map.Layers():  
                 if isinstance(layer, RasterLayer) and layer.Visible():  
                     seenRaster = False  
                     break  
   
         for layer in map.Layers():  
             # if honor_visibility is true, only draw visible layers,  
             # otherwise draw all layers  
             if not self.honor_visibility or layer.Visible():  
                 if isinstance(layer, Layer) and seenRaster:  
                     self.draw_shape_layer(layer)  
                 elif isinstance(layer, RasterLayer) \  
                     and Thuban.Model.resource.has_gdal_support():  
                     self.draw_raster_layer(layer)  
                     seenRaster = True  
   
         self.draw_label_layer(map.LabelLayer())  
   
         self.dc.EndDrawing()  
   
     def draw_shape_layer(self, layer):  
         scale = self.scale  
         offx, offy = self.offset  
   
         map_proj = self.map.projection  
         layer_proj = layer.projection  
   
         shapetype = layer.ShapeType()  
   
         brush = wxTRANSPARENT_BRUSH  
         pen   = wxTRANSPARENT_PEN  
   
         old_prop = None  
         old_group = None  
         lc = layer.GetClassification()  
         field = layer.GetClassificationColumn()  
         defaultGroup = lc.GetDefaultGroup()  
   
   
   
         if shapetype == SHAPETYPE_POINT:  
             draw_func = self.draw_point_shape  
             draw_func_param = layer  
52          else:          else:
53              draw_func = draw_polygon_shape              brush = wxBrush(Color2wxColour(fill), wxSOLID)
             draw_func_param = self.polygon_render_param(layer)  
   
         table = layer.ShapeStore().Table()  
         for i in self.layer_ids(layer):  
54    
55              if field is None:          stroke = prop.GetLineColor()
56                  group = defaultGroup          if stroke is Transparent:
57              else:              pen = self.TRANSPARENT_PEN
                 record = table.ReadRowAsDict(i)  
                 assert record is not None  
                 group = lc.FindGroup(record[field])  
   
   
             if not group.IsVisible():  
                 continue  
   
   
             # don't recreate new objects if they are the same as before  
             if group is not old_group:  
                 old_group = group  
   
                 prop = group.GetProperties()  
   
                 if prop != old_prop:  
                     old_prop = prop  
   
                     if shapetype == SHAPETYPE_ARC:  
                         fill = Transparent  
                     else:  
                         fill = prop.GetFill()  
   
   
                     if fill is Transparent:  
                         brush = wxTRANSPARENT_BRUSH  
                     else:  
                         color = Color2wxColour(fill)  
                         brush = wxBrush(color, wxSOLID)  
   
                     stroke = prop.GetLineColor()  
                     stroke_width = prop.GetLineWidth()  
                     if stroke is Transparent:  
                         pen = wxTRANSPARENT_PEN  
                     else:  
                         color = Color2wxColour(stroke)  
                         pen = wxPen(color, stroke_width, wxSOLID)  
   
             draw_func(draw_func_param, i, pen, brush)  
   
     def draw_raster_layer(self, layer):  
         data = None  
         offx, offy = self.offset  
         width, height = self.dc.GetSizeTuple()  
   
         inProj = ""  
         proj = layer.GetProjection()  
         if proj is not None:  
             for p in proj.GetAllParameters():  
                 inProj += "+" + p + " "  
   
         outProj = ""  
         proj = self.map.GetProjection()  
         if proj is not None:  
             for p in proj.GetAllParameters():  
                 outProj += "+" + p + " "  
   
         xmin = (0 - offx) / self.scale  
         ymin = (offy - height) / self.scale  
         xmax = (width - offx) / self.scale  
         ymax = (offy - 0) / self.scale  
   
         try:  
             data = ProjectRasterFile(  
                 layer.GetImageFilename(),  
                 inProj,  
                 outProj,  
                 (xmin, ymin, xmax, ymax),  
                 "", (width, height))  
         except IOError, (strerr):  
             print strerr  
         except (AttributeError, ValueError):  
             pass  
58          else:          else:
59              if data is not None:              pen = wxPen(Color2wxColour(stroke), prop.GetLineWidth(), wxSOLID)
60                  stream = cStringIO.StringIO(data)          return pen, brush
                 image = wxImageFromStream(stream, wxBITMAP_TYPE_BMP)  
                 bitmap = wxBitmapFromImage(image)  
                 self.dc.DrawBitmap(bitmap, 0, 0)  
61    
62      def layer_ids(self, layer):      def low_level_renderer(self, layer):
63          """Return the shape ids of the given layer that have to be drawn.          """Override inherited method to provide more efficient renderers
64    
65          The default implementation simply returns all ids in the layer.          If the underlying data format is not a shapefile or the layer
66          Override in derived classes to be more precise.          contains points shapes, simply use what the inherited method
67            returns.
68    
69            Otherwise, i.e. for arc and polygon use the more efficient
70            wxproj.draw_polygon_shape and its corresponding parameter
71            created with wxproj.draw_polygon_init.
72          """          """
73          return range(layer.NumShapes())          if (layer.ShapeStore().RawShapeFormat() == RAW_SHAPEFILE
74                and layer.ShapeType() in (SHAPETYPE_ARC, SHAPETYPE_POLYGON)):
75      def polygon_render_param(self, layer):              offx, offy = self.offset
76          """Return the low-lever render parameter for the layer"""              return (True, draw_polygon_shape,
77          offx, offy = self.offset                      draw_polygon_init(layer.ShapeStore().Shapefile(),
78          return draw_polygon_init(layer.ShapeStore().Shapefile(), self.dc,                                        self.dc, self.map.projection,
79                                   self.map.projection,                                        layer.projection,
80                                   layer.projection,                                        self.scale, -self.scale, offx, offy))
                                  self.scale, -self.scale,  
                                  offx, offy)  
   
     def draw_polygon_shape(self, draw_polygon_info, index, pen, brush):  
         draw_polygon_shape(draw_polygon_info, index, pen, brush)  
   
     def projected_points(self, layer, index):  
         proj = self.map.GetProjection()  
         if proj is not None:  
             forward = proj.Forward  
81          else:          else:
82              forward = None              return BaseRenderer.low_level_renderer(self, layer)
         proj = layer.GetProjection()  
         if proj is not None:  
             inverse = proj.Inverse  
         else:  
             inverse = None  
         shape = layer.Shape(index)  
         points = []  
         scale = self.scale  
         offx, offy = self.offset  
         for x, y in shape.Points():  
             if inverse:  
                 x, y = inverse(x, y)  
             if forward:  
                 x, y = forward(x, y)  
             points.append(wxPoint(x * scale + offx,  
                                   -y * scale + offy))  
         return points  
   
     def draw_arc_shape(self, layer, index):  
         points = self.projected_points(layer, index)  
         self.dc.DrawLines(points)  
   
     def draw_point_shape(self, layer, index, pen, brush):  
         pp = self.projected_points(layer, index)  
   
         if len(pp) == 0: return # ignore Null Shapes which have no points  
   
         p = pp[0]  
         radius = self.resolution * 5  
         self.dc.SetBrush(brush)  
         self.dc.SetPen(pen)  
         self.dc.DrawEllipse(p.x - radius, p.y - radius, 2*radius, 2*radius)  
83    
84      def draw_label_layer(self, layer):      def label_font(self):
85          scale = self.scale          return wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)
         offx, offy = self.offset  
   
         font = wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)  
         self.dc.SetFont(font)  
86    
87          map_proj = self.map.projection      def draw_raster_data(self, data):
88          if map_proj is not None:          stream = cStringIO.StringIO(data)
89              forward = map_proj.Forward          image = wxImageFromStream(stream, wxBITMAP_TYPE_BMP)
90          else:          bitmap = wxBitmapFromImage(image)
91              forward = None          self.dc.DrawBitmap(bitmap, 0, 0)
   
         for label in layer.Labels():  
             x = label.x  
             y = label.y  
             text = label.text  
             if forward:  
                 x, y = forward(x, y)  
             x = x * scale + offx  
             y = -y * scale + offy  
             width, height = self.dc.GetTextExtent(text)  
             if label.halign == ALIGN_LEFT:  
                 # nothing to be done  
                 pass  
             elif label.halign == ALIGN_RIGHT:  
                 x = x - width  
             elif label.halign == ALIGN_CENTER:  
                 x = x - width/2  
             if label.valign == ALIGN_TOP:  
                 # nothing to be done  
                 pass  
             elif label.valign == ALIGN_BOTTOM:  
                 y = y - height  
             elif label.valign == ALIGN_CENTER:  
                 y = y - height/2  
             self.dc.DrawText(text, x, y)  
92    
93    
94  class ScreenRenderer(MapRenderer):  class ScreenRenderer(MapRenderer):
95    
96      # On the screen we want to see only visible layers by default      # On the screen we want to see only visible layers by default
97      honor_visibility = 1      honor_visibility = 1
98        
99      def RenderMap(self, map, region, selected_layer, selected_shapes):      def RenderMap(self, selected_layer, selected_shapes):
100          """Render the map.          """Render the map.
101    
102          Only the given region (a tuple in window coordinates as returned          Only the given region (a tuple in window coordinates as returned
# Line 329  class ScreenRenderer(MapRenderer): Line 104  class ScreenRenderer(MapRenderer):
104          shapes given by the ids in selected_shapes in the          shapes given by the ids in selected_shapes in the
105          selected_layer.          selected_layer.
106          """          """
         self.update_region = region  
107          self.selected_layer = selected_layer          self.selected_layer = selected_layer
108          self.selected_shapes = selected_shapes          self.selected_shapes = selected_shapes
109          self.render_map(map)          self.render_map()
110    
111      def draw_shape_layer(self, layer):      def RenderMapIncrementally(self):
112          MapRenderer.draw_shape_layer(self, layer)          """Render the map.
         if layer is self.selected_layer and self.selected_shapes:  
             pen = wxPen(wxBLACK, 3, wxSOLID)  
             brush = wxBrush(wxBLACK, wxCROSS_HATCH)  
   
             shapetype = layer.ShapeType()  
             if shapetype == SHAPETYPE_POLYGON:  
                 offx, offy = self.offset  
                 renderparam = self.polygon_render_param(layer)  
                 func = self.draw_polygon_shape  
                 args = (pen, brush)  
             elif shapetype == SHAPETYPE_ARC:  
                 renderparam = self.polygon_render_param(layer)  
                 func = self.draw_polygon_shape  
                 args = (pen, None)  
             elif shapetype == SHAPETYPE_POINT:  
                 renderparam = layer  
                 func = self.draw_point_shape  
                 args = (pen, brush)  
             else:  
                 raise TypeError(_("Unhandled shape type %s") % shapetype)  
113    
114              for index in self.selected_shapes:          Only the given region (a tuple in window coordinates as returned
115                  func(renderparam, index, *args)          by a wxrect's asTuple method) needs to be redrawn. Highlight the
116            shapes given by the ids in selected_shapes in the
117            selected_layer.
118            """
119            return self.render_map_incrementally()
120    
121      def layer_ids(self, layer):      def draw_selection_incrementally(self, layer, selected_shapes):
122            pen = wxPen(wxBLACK, 3, wxSOLID)
123            brush = wxBrush(wxBLACK, wxCROSS_HATCH)
124    
125            shapetype = layer.ShapeType()
126            useraw, func, param = self.low_level_renderer(layer)
127            args = (pen, brush)
128            count = 0
129            for index in selected_shapes:
130                count += 1
131                shape = layer.Shape(index)
132                if useraw:
133                    data = shape.RawData()
134                else:
135                    data = shape.Points()
136                func(param, data, *args)
137                if count % 500 == 0:
138                    yield True
139    
140        def layer_shapes(self, layer):
141          """Return the shapeids covered by the region that has to be redrawn          """Return the shapeids covered by the region that has to be redrawn
142    
143          Call the layer's ShapesInRegion method to determine the ids so          Call the layer's ShapesInRegion method to determine the ids so
# Line 381  class ScreenRenderer(MapRenderer): Line 158  class ScreenRenderer(MapRenderer):
158          offx, offy = self.offset          offx, offy = self.offset
159          xs = []          xs = []
160          ys = []          ys = []
161          x, y, width, height = self.update_region          x, y, width, height = self.region
162          for winx, winy in ((x, y), (x + width, y),          for winx, winy in ((x, y), (x + width, y),
163                             (x + width, y + height), (x, y + height)):                             (x + width, y + height), (x, y + height)):
164              px = (winx - offx) / scale              px = (winx - offx) / scale
# Line 401  class ScreenRenderer(MapRenderer): Line 178  class ScreenRenderer(MapRenderer):
178  class ExportRenderer(ScreenRenderer):  class ExportRenderer(ScreenRenderer):
179    
180      honor_visibility = 1      honor_visibility = 1
181        
182      def RenderMap(self, map, region, mapregion,      def __init__(self, *args, **kw):
183                    selected_layer, selected_shapes ):          """Initialize the ExportRenderer.
184    
185            In addition to all parameters of the the ScreenRender
186            constructor, this class requires and additional keyword argument
187            destination_region with a tuple (minx, miny, maxx, maxy) giving
188            the region in dc coordinates which is to contain the map.
189            """
190            self.destination_region = kw["destination_region"]
191            del kw["destination_region"]
192            ScreenRenderer.__init__(self, *args, **kw)
193    
194        def RenderMap(self, selected_layer, selected_shapes):
195          """Render the map.          """Render the map.
196    
197          The rendering device has been specified during initialisation.          The rendering device has been specified during initialisation.
198          The device border distance was set in Thuban.UI.view.OutputTranform().          The device border distance was set in
199                    Thuban.UI.viewport.output_transform().
200    
201          RenderMap renders a frame set (one page frame, one around          RenderMap renders a frame set (one page frame, one around
202          legend/scalebar and one around the map), the map, the legend and the          legend/scalebar and one around the map), the map, the legend and
203          scalebar on the given DC. The map is rendered with the region displayed          the scalebar on the given DC. The map is rendered with the
204          in the canvas view, centered on the area available for map display.          region displayed in the canvas view, centered on the area
205            available for map display.
206          """          """
207            
         self.update_region = region  
208          self.selected_layer = selected_layer          self.selected_layer = selected_layer
209          self.selected_shapes = selected_shapes          self.selected_shapes = selected_shapes
210    
211          # Get some dimensions          # Get some dimensions
212          llx, lly, urx, ury = region          llx, lly, urx, ury = self.region
213          self.mapregion = mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
         mminx, mminy, mmaxx, mmaxy = self.mapregion  
214    
215          # Manipulate the offset to position the map          # Manipulate the offset to position the map
216          offx, offy = self.offset          offx, offy = self.offset
217          # 1. Shift to corner of map drawing area          # 1. Shift to corner of map drawing area
218          offx = offx + mminx          offx = offx + mminx
219          offy = offy + mminy          offy = offy + mminy
220    
221          # 2. Center the map on the map drawing area:          # 2. Center the map on the map drawing area:
222          # region identifies the region on the canvas view:          # region identifies the region on the canvas view:
223          # center of map drawing area - half the size of region: rendering origin          # center of map drawing area - half the size of region: rendering origin
224          self.shiftx = (mmaxx - mminx)*0.5 - (urx - llx)*0.5          self.shiftx = (mmaxx - mminx)*0.5 - (urx - llx)*0.5
225          self.shifty = (mmaxy - mminy)*0.5 - (ury - lly)*0.5          self.shifty = (mmaxy - mminy)*0.5 - (ury - lly)*0.5
# Line 441  class ExportRenderer(ScreenRenderer): Line 229  class ExportRenderer(ScreenRenderer):
229          # Draw the map          # Draw the map
230          self.dc.BeginDrawing()          self.dc.BeginDrawing()
231          self.dc.DestroyClippingRegion()          self.dc.DestroyClippingRegion()
232          self.dc.SetClippingRegion(mminx+self.shiftx, mminy+self.shifty,          self.dc.SetClippingRegion(mminx+self.shiftx, mminy+self.shifty,
233                                    urx, ury)                                    urx, ury)
234          self.render_map(map)          self.render_map()
235          self.dc.EndDrawing()          self.dc.EndDrawing()
236    
237          # Draw the rest (frames, legend, scalebar)          # Draw the rest (frames, legend, scalebar)
# Line 454  class ExportRenderer(ScreenRenderer): Line 242  class ExportRenderer(ScreenRenderer):
242          font = wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)          font = wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)
243          self.dc.SetFont(font)          self.dc.SetFont(font)
244    
245          self.render_frame(region)          self.render_frame()
246          self.render_legend(map)          self.render_legend()
247          self.render_scalebar(map)          self.render_scalebar()
248          self.dc.EndDrawing()          self.dc.EndDrawing()
249    
250      def render_frame(self, region):      def render_frame(self):
251          """Render the frames for map and legend/scalebar."""          """Render the frames for map and legend/scalebar."""
252    
253          dc = self.dc          dc = self.dc
# Line 468  class ExportRenderer(ScreenRenderer): Line 256  class ExportRenderer(ScreenRenderer):
256    
257          # Dimension stuff          # Dimension stuff
258          width, height = dc.GetSizeTuple()          width, height = dc.GetSizeTuple()
259          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
260    
261          # Page Frame          # Page Frame
262          dc.DrawRectangle(15,15,width-30, (mmaxy-mminy)+10)          dc.DrawRectangle(15,15,width-30, (mmaxy-mminy)+10)
263            
264          # Map Frame          # Map Frame
265          llx, lly, urx, ury = region          llx, lly, urx, ury = self.region
266          dc.DrawRectangle(mminx + self.shiftx, mminy + self.shifty, urx, ury)          dc.DrawRectangle(mminx + self.shiftx, mminy + self.shifty, urx, ury)
267            
268          # Legend Frame          # Legend Frame
269          dc.DrawRectangle(mmaxx+10,mminy,(width-20) - (mmaxx+10), mmaxy-mminy)          dc.DrawRectangle(mmaxx+10,mminy,(width-20) - (mmaxx+10), mmaxy-mminy)
270    
# Line 484  class ExportRenderer(ScreenRenderer): Line 272  class ExportRenderer(ScreenRenderer):
272          dc.SetClippingRegion(mmaxx+10,mminy,          dc.SetClippingRegion(mmaxx+10,mminy,
273                               (width-20) - (mmaxx+10), mmaxy-mminy)                               (width-20) - (mmaxx+10), mmaxy-mminy)
274    
275      def render_legend(self, map):      def render_legend(self):
276          """Render the legend on the Map."""          """Render the legend on the Map."""
277    
278          previewer = ClassDataPreviewer()          previewer = ClassDataPreviewer()
# Line 494  class ExportRenderer(ScreenRenderer): Line 282  class ExportRenderer(ScreenRenderer):
282    
283          # Dimension stuff          # Dimension stuff
284          width, height = dc.GetSizeTuple()          width, height = dc.GetSizeTuple()
285          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
286          textwidth, textheight = dc.GetTextExtent("0")          textwidth, textheight = dc.GetTextExtent("0")
287          iconwidth  = textheight          iconwidth  = textheight
288          iconheight = textheight          iconheight = textheight
289          stepy = textheight+3          stepy = textheight+3
290          dx = 10          dx = 10
291          posx = mmaxx + 10 + 5   # 10 pix distance mapframe/legend frame,          posx = mmaxx + 10 + 5   # 10 pix distance mapframe/legend frame,
292                                  # 5 pix inside legend frame                                  # 5 pix inside legend frame
293          posy = mminy + 5        # 5 pix inside legend frame          posy = mminy + 5        # 5 pix inside legend frame
294            
295          # Render the legend          # Render the legend
296          dc.SetTextForeground(wxBLACK)          dc.SetTextForeground(wxBLACK)
297          if map.HasLayers():          if self.map.HasLayers():
298              layers = map.Layers()              layers = self.map.Layers()[:]
299              layers.reverse()              layers.reverse()
300              for l in layers:              for l in layers:
301                  if l.Visible():                  if l.Visible():
# Line 520  class ExportRenderer(ScreenRenderer): Line 308  class ExportRenderer(ScreenRenderer):
308                          shapeType = l.ShapeType()                          shapeType = l.ShapeType()
309                          for g in clazz:                          for g in clazz:
310                              if g.IsVisible():                              if g.IsVisible():
311                                  previewer.Draw(dc,                                  previewer.Draw(dc,
312                                      wxRect(posx+dx, posy,                                      wxRect(posx+dx, posy,
313                                             iconwidth, iconheight),                                             iconwidth, iconheight),
314                                      g.GetProperties(), shapeType)                                      g.GetProperties(), shapeType)
315                                  dc.DrawText(g.GetDisplayText(),                                  dc.DrawText(g.GetDisplayText(),
316                                              posx+2*dx+iconwidth, posy)                                              posx+2*dx+iconwidth, posy)
317                                  posy+=stepy                                  posy+=stepy
318            
319      def render_scalebar(self, map):      def render_scalebar(self):
320          """Render the scalebar."""          """Render the scalebar."""
321    
322          scalebar = ScaleBar(map)          scalebar = ScaleBar(self.map)
323    
324          # Dimension stuff          # Dimension stuff
325          width, height = self.dc.GetSizeTuple()          width, height = self.dc.GetSizeTuple()
326          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
327          
328          # Render the scalebar          # Render the scalebar
329          scalebar.DrawScaleBar(self.scale, self.dc,          scalebar.DrawScaleBar(self.scale, self.dc,
330                               (mmaxx+10+5, mmaxy-25),                               (mmaxx+10+5, mmaxy-25),
331                               ((width-15-5) - (mmaxx+10+5),20)                               ((width-15-5) - (mmaxx+10+5),20)
332                              )                              )
Legend:
Removed from v.1539  
changed lines
  Added in v.1866
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26