/[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 1481 by bh, Thu Jul 24 17:52:59 2003 UTC revision 1927 by bh, Mon Nov 10 16:57:35 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_TYPE_JPEG
     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       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  
   
 class MapRenderer:  
   
     """Class to render a map onto a wxDC"""  
38    
     honor_visibility = 1  
39    
40      def __init__(self, dc, scale, offset, resolution = 72.0,  # Map the strings used for the format parameter of the draw_raster_data
41                   honor_visibility = None):  # method to the appropriate wxWindows constants
42          """Inititalize the renderer.  raster_format_map = {
43        "BMP": wxBITMAP_TYPE_BMP,
44          dc -- the wxPython DC to render on      "JPEG": wxBITMAP_TYPE_JPEG,
45          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  
46    
47          self.dc = dc  class MapRenderer(BaseRenderer):
         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  
48    
49          self.dc.BeginDrawing()      """Class to render a map onto a wxDC"""
   
         #  
         # This is only a good optimization if there is only one  
         # raster layer and the image covers the entire window (as  
         # it currently does). We note if there is a raster layer  
         # 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()  
50    
51        TRANSPARENT_PEN = wxTRANSPARENT_PEN
52        TRANSPARENT_BRUSH = wxTRANSPARENT_BRUSH
53    
54        make_point = wxPoint
55    
56          if shapetype == SHAPETYPE_POINT:      def tools_for_property(self, prop):
57              draw_func = self.draw_point_shape          fill = prop.GetFill()
58              draw_func_param = layer          if fill is Transparent:
59                brush = self.TRANSPARENT_BRUSH
60          else:          else:
61              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):  
62    
63              if field is None:          stroke = prop.GetLineColor()
64                  group = defaultGroup          if stroke is Transparent:
65              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  
66          else:          else:
67              if data is not None:              pen = wxPen(Color2wxColour(stroke), prop.GetLineWidth(), wxSOLID)
68                  stream = cStringIO.StringIO(data)          return pen, brush
                 image = wxImageFromStream(stream, wxBITMAP_TYPE_BMP)  
                 bitmap = wxBitmapFromImage(image)  
                 self.dc.DrawBitmap(bitmap, 0, 0)  
69    
70      def layer_ids(self, layer):      def low_level_renderer(self, layer):
71          """Return the shape ids of the given layer that have to be drawn.          """Override inherited method to provide more efficient renderers
72    
73          The default implementation simply returns all ids in the layer.          If the underlying data format is not a shapefile or the layer
74          Override in derived classes to be more precise.          contains points shapes, simply use what the inherited method
75            returns.
76    
77            Otherwise, i.e. for arc and polygon use the more efficient
78            wxproj.draw_polygon_shape and its corresponding parameter
79            created with wxproj.draw_polygon_init.
80          """          """
81          return range(layer.NumShapes())          if (layer.ShapeStore().RawShapeFormat() == RAW_SHAPEFILE
82                and layer.ShapeType() in (SHAPETYPE_ARC, SHAPETYPE_POLYGON)):
83      def polygon_render_param(self, layer):              offx, offy = self.offset
84          """Return the low-lever render parameter for the layer"""              return (True, draw_polygon_shape,
85          offx, offy = self.offset                      draw_polygon_init(layer.ShapeStore().Shapefile(),
86          return draw_polygon_init(layer.ShapeStore().Shapefile(), self.dc,                                        self.dc, self.map.projection,
87                                   self.map.projection,                                        layer.projection,
88                                   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  
89          else:          else:
90              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)  
91    
92      def draw_label_layer(self, layer):      def label_font(self):
93          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)  
94    
95          map_proj = self.map.projection      def draw_raster_data(self, data, format = 'BMP'):
96          if map_proj is not None:          stream = cStringIO.StringIO(data)
97              forward = map_proj.Forward          image = wxImageFromStream(stream, raster_format_map[format])
98          else:          bitmap = wxBitmapFromImage(image)
99              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)  
100    
101    
102  class ScreenRenderer(MapRenderer):  class ScreenRenderer(MapRenderer):
103    
104      # On the screen we want to see only visible layers by default      # On the screen we want to see only visible layers by default
105      honor_visibility = 1      honor_visibility = 1
106        
107      def RenderMap(self, map, region, selected_layer, selected_shapes):      def RenderMap(self, selected_layer, selected_shapes):
108          """Render the map.          """Render the map.
109    
110          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 112  class ScreenRenderer(MapRenderer):
112          shapes given by the ids in selected_shapes in the          shapes given by the ids in selected_shapes in the
113          selected_layer.          selected_layer.
114          """          """
         self.update_region = region  
115          self.selected_layer = selected_layer          self.selected_layer = selected_layer
116          self.selected_shapes = selected_shapes          self.selected_shapes = selected_shapes
117          self.render_map(map)          self.render_map()
118    
119      def draw_shape_layer(self, layer):      def RenderMapIncrementally(self):
120          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)  
121    
122              for index in self.selected_shapes:          Only the given region (a tuple in window coordinates as returned
123                  func(renderparam, index, *args)          by a wxrect's asTuple method) needs to be redrawn. Highlight the
124            shapes given by the ids in selected_shapes in the
125            selected_layer.
126            """
127            return self.render_map_incrementally()
128    
129      def layer_ids(self, layer):      def draw_selection_incrementally(self, layer, selected_shapes):
130            pen = wxPen(wxBLACK, 3, wxSOLID)
131            brush = wxBrush(wxBLACK, wxCROSS_HATCH)
132    
133            shapetype = layer.ShapeType()
134            useraw, func, param = self.low_level_renderer(layer)
135            args = (pen, brush)
136            count = 0
137            for index in selected_shapes:
138                count += 1
139                shape = layer.Shape(index)
140                if useraw:
141                    data = shape.RawData()
142                else:
143                    data = shape.Points()
144                func(param, data, *args)
145                if count % 500 == 0:
146                    yield True
147    
148        def layer_shapes(self, layer):
149          """Return the shapeids covered by the region that has to be redrawn          """Return the shapeids covered by the region that has to be redrawn
150    
151          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 166  class ScreenRenderer(MapRenderer):
166          offx, offy = self.offset          offx, offy = self.offset
167          xs = []          xs = []
168          ys = []          ys = []
169          x, y, width, height = self.update_region          x, y, width, height = self.region
170          for winx, winy in ((x, y), (x + width, y),          for winx, winy in ((x, y), (x + width, y),
171                             (x + width, y + height), (x, y + height)):                             (x + width, y + height), (x, y + height)):
172              px = (winx - offx) / scale              px = (winx - offx) / scale
# Line 401  class ScreenRenderer(MapRenderer): Line 186  class ScreenRenderer(MapRenderer):
186  class ExportRenderer(ScreenRenderer):  class ExportRenderer(ScreenRenderer):
187    
188      honor_visibility = 1      honor_visibility = 1
189        
190      def RenderMap(self, map, region, mapregion,      def __init__(self, *args, **kw):
191                    selected_layer, selected_shapes ):          """Initialize the ExportRenderer.
192    
193            In addition to all parameters of the the ScreenRender
194            constructor, this class requires and additional keyword argument
195            destination_region with a tuple (minx, miny, maxx, maxy) giving
196            the region in dc coordinates which is to contain the map.
197            """
198            self.destination_region = kw["destination_region"]
199            del kw["destination_region"]
200            ScreenRenderer.__init__(self, *args, **kw)
201    
202        def RenderMap(self, selected_layer, selected_shapes):
203          """Render the map.          """Render the map.
204    
205          The rendering device has been specified during initialisation.          The rendering device has been specified during initialisation.
206          The device border distance was set in Thuban.UI.view.OutputTranform().          The device border distance was set in
207                    Thuban.UI.viewport.output_transform().
208    
209          RenderMap renders a frame set (one page frame, one around          RenderMap renders a frame set (one page frame, one around
210          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
211          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
212          in the canvas view, centered on the area available for map display.          region displayed in the canvas view, centered on the area
213            available for map display.
214          """          """
215            
         self.update_region = region  
216          self.selected_layer = selected_layer          self.selected_layer = selected_layer
217          self.selected_shapes = selected_shapes          self.selected_shapes = selected_shapes
218    
219          # Get some dimensions          # Get some dimensions
220          llx, lly, urx, ury = region          llx, lly, urx, ury = self.region
221          self.mapregion = mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
         mminx, mminy, mmaxx, mmaxy = self.mapregion  
222    
223          # Manipulate the offset to position the map          # Manipulate the offset to position the map
224          offx, offy = self.offset          offx, offy = self.offset
225          # 1. Shift to corner of map drawing area          # 1. Shift to corner of map drawing area
226          offx = offx + mminx          offx = offx + mminx
227          offy = offy + mminy          offy = offy + mminy
228    
229          # 2. Center the map on the map drawing area:          # 2. Center the map on the map drawing area:
230          # region identifies the region on the canvas view:          # region identifies the region on the canvas view:
231          # center of map drawing area - half the size of region: rendering origin          # center of map drawing area - half the size of region: rendering origin
232          self.shiftx = (mmaxx - mminx)*0.5 - (urx - llx)*0.5          self.shiftx = (mmaxx - mminx)*0.5 - (urx - llx)*0.5
233          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 237  class ExportRenderer(ScreenRenderer):
237          # Draw the map          # Draw the map
238          self.dc.BeginDrawing()          self.dc.BeginDrawing()
239          self.dc.DestroyClippingRegion()          self.dc.DestroyClippingRegion()
240          self.dc.SetClippingRegion(mminx+self.shiftx, mminy+self.shifty,          self.dc.SetClippingRegion(mminx+self.shiftx, mminy+self.shifty,
241                                    urx, ury)                                    urx, ury)
242          self.render_map(map)          self.render_map()
243          self.dc.EndDrawing()          self.dc.EndDrawing()
244    
245          # Draw the rest (frames, legend, scalebar)          # Draw the rest (frames, legend, scalebar)
# Line 454  class ExportRenderer(ScreenRenderer): Line 250  class ExportRenderer(ScreenRenderer):
250          font = wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)          font = wxFont(self.resolution * 10, wxSWISS, wxNORMAL, wxNORMAL)
251          self.dc.SetFont(font)          self.dc.SetFont(font)
252    
253          self.render_frame(region)          self.render_frame()
254          self.render_legend(map)          self.render_legend()
255          self.render_scalebar(map)          self.render_scalebar()
256          self.dc.EndDrawing()          self.dc.EndDrawing()
257    
258      def render_frame(self, region):      def render_frame(self):
259          """Render the frames for map and legend/scalebar."""          """Render the frames for map and legend/scalebar."""
260    
261          dc = self.dc          dc = self.dc
# Line 468  class ExportRenderer(ScreenRenderer): Line 264  class ExportRenderer(ScreenRenderer):
264    
265          # Dimension stuff          # Dimension stuff
266          width, height = dc.GetSizeTuple()          width, height = dc.GetSizeTuple()
267          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
268    
269          # Page Frame          # Page Frame
270          dc.DrawRectangle(15,15,width-30, (mmaxy-mminy)+10)          dc.DrawRectangle(15,15,width-30, (mmaxy-mminy)+10)
271            
272          # Map Frame          # Map Frame
273          llx, lly, urx, ury = region          llx, lly, urx, ury = self.region
274          dc.DrawRectangle(mminx + self.shiftx, mminy + self.shifty, urx, ury)          dc.DrawRectangle(mminx + self.shiftx, mminy + self.shifty, urx, ury)
275            
276          # Legend Frame          # Legend Frame
277          dc.DrawRectangle(mmaxx+10,mminy,(width-20) - (mmaxx+10), mmaxy-mminy)          dc.DrawRectangle(mmaxx+10,mminy,(width-20) - (mmaxx+10), mmaxy-mminy)
278    
# Line 484  class ExportRenderer(ScreenRenderer): Line 280  class ExportRenderer(ScreenRenderer):
280          dc.SetClippingRegion(mmaxx+10,mminy,          dc.SetClippingRegion(mmaxx+10,mminy,
281                               (width-20) - (mmaxx+10), mmaxy-mminy)                               (width-20) - (mmaxx+10), mmaxy-mminy)
282    
283      def render_legend(self, map):      def render_legend(self):
284          """Render the legend on the Map."""          """Render the legend on the Map."""
285    
286          previewer = ClassDataPreviewer()          previewer = ClassDataPreviewer()
# Line 494  class ExportRenderer(ScreenRenderer): Line 290  class ExportRenderer(ScreenRenderer):
290    
291          # Dimension stuff          # Dimension stuff
292          width, height = dc.GetSizeTuple()          width, height = dc.GetSizeTuple()
293          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
294          textwidth, textheight = dc.GetTextExtent("0")          textwidth, textheight = dc.GetTextExtent("0")
295          iconwidth  = textheight          iconwidth  = textheight
296          iconheight = textheight          iconheight = textheight
297          stepy = textheight+3          stepy = textheight+3
298          dx = 10          dx = 10
299          posx = mmaxx + 10 + 5   # 10 pix distance mapframe/legend frame,          posx = mmaxx + 10 + 5   # 10 pix distance mapframe/legend frame,
300                                  # 5 pix inside legend frame                                  # 5 pix inside legend frame
301          posy = mminy + 5        # 5 pix inside legend frame          posy = mminy + 5        # 5 pix inside legend frame
302            
303          # Render the legend          # Render the legend
304          dc.SetTextForeground(wxBLACK)          dc.SetTextForeground(wxBLACK)
305          if map.HasLayers():          if self.map.HasLayers():
306              layers = map.Layers()              layers = self.map.Layers()[:]
307              layers.reverse()              layers.reverse()
308              for l in layers:              for l in layers:
309                  if l.Visible():                  if l.Visible():
# Line 520  class ExportRenderer(ScreenRenderer): Line 316  class ExportRenderer(ScreenRenderer):
316                          shapeType = l.ShapeType()                          shapeType = l.ShapeType()
317                          for g in clazz:                          for g in clazz:
318                              if g.IsVisible():                              if g.IsVisible():
319                                  previewer.Draw(dc,                                  previewer.Draw(dc,
320                                      wxRect(posx+dx, posy,                                      wxRect(posx+dx, posy,
321                                             iconwidth, iconheight),                                             iconwidth, iconheight),
322                                      g.GetProperties(), shapeType)                                      g.GetProperties(), shapeType)
323                                  dc.DrawText(g.GetDisplayText(),                                  dc.DrawText(g.GetDisplayText(),
324                                              posx+2*dx+iconwidth, posy)                                              posx+2*dx+iconwidth, posy)
325                                  posy+=stepy                                  posy+=stepy
326            
327      def render_scalebar(self, map):      def render_scalebar(self):
328          """Render the scalebar."""          """Render the scalebar."""
329    
330          scalebar = ScaleBar(map)          scalebar = ScaleBar(self.map)
331    
332          # Dimension stuff          # Dimension stuff
333          width, height = self.dc.GetSizeTuple()          width, height = self.dc.GetSizeTuple()
334          mminx, mminy, mmaxx, mmaxy = self.mapregion          mminx, mminy, mmaxx, mmaxy = self.destination_region
335          
336          # Render the scalebar          # Render the scalebar
337          scalebar.DrawScaleBar(self.scale, self.dc,          scalebar.DrawScaleBar(self.scale, self.dc,
338                               (mmaxx+10+5, mmaxy-25),                               (mmaxx+10+5, mmaxy-25),
339                               ((width-15-5) - (mmaxx+10+5),20)                               ((width-15-5) - (mmaxx+10+5),20)
340                              )                              )

Legend:
Removed from v.1481  
changed lines
  Added in v.1927

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26