/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/layer.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/layer.py

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

revision 1142 by bh, Tue Jun 10 09:41:57 2003 UTC revision 2614 by jonathan, Fri May 6 14:16:38 2005 UTC
# Line 1  Line 1 
1  # Copyright (c) 2001, 2002, 2003 by Intevation GmbH  # Copyright (c) 2001, 2002, 2003, 2004 by Intevation GmbH
2  # Authors:  # Authors:
3  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
4  # Jonathan Coles <[email protected]>  # Jonathan Coles <[email protected]>
5    # Silke Reimer <[email protected]>
6  #  #
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  __version__ = "$Revision$"  __version__ = "$Revision$"
11    
12  from math import log, ceil  import os
13    import warnings
14    
15  from Thuban import _  from Thuban import _
16    
 import shapelib, shptree  
   
 import gdal  
 from gdalconst import GA_ReadOnly  
   
17  from messages import LAYER_PROJECTION_CHANGED, LAYER_VISIBILITY_CHANGED, \  from messages import LAYER_PROJECTION_CHANGED, LAYER_VISIBILITY_CHANGED, \
18       LAYER_CHANGED, LAYER_SHAPESTORE_REPLACED       LAYER_CHANGED, LAYER_SHAPESTORE_REPLACED, CLASS_CHANGED
   
 from color import Color  
19    
20  import classification  import classification
21    
22    from color import Transparent, Black
23  from base import TitledObject, Modifiable  from base import TitledObject, Modifiable
24    from data import SHAPETYPE_POLYGON, SHAPETYPE_ARC, SHAPETYPE_POINT
25    
26    import resource
27    
28  class Shape:  from color import Color
   
     """Represent one shape"""  
   
     def __init__(self, points):  
         self.points = points  
         #self.compute_bbox()  
         self.bbox = None  
   
     def compute_bbox(self):  
         if self.bbox is not None:  
             return self.bbox  
   
         xs = []  
         ys = []  
         for x, y in self.points:  
             xs.append(x)  
             ys.append(y)  
         self.llx = min(xs)  
         self.lly = min(ys)  
         self.urx = max(xs)  
         self.ury = max(ys)  
   
         self.bbox = (self.llx, self.lly, self.urx, self.ury)  
   
         return self.bbox  
   
     def Points(self):  
         return self.points  
   
   
   
 # Shape type constants  
 SHAPETYPE_POLYGON = "polygon"  
 SHAPETYPE_ARC = "arc"  
 SHAPETYPE_POINT = "point"  
   
 # mapping from shapelib shapetype constants to our constants  
 shapelib_shapetypes = {shapelib.SHPT_POLYGON: SHAPETYPE_POLYGON,  
                        shapelib.SHPT_ARC: SHAPETYPE_ARC,  
                        shapelib.SHPT_POINT: SHAPETYPE_POINT}  
29    
30  shapetype_names = {SHAPETYPE_POINT: "Point",  shapetype_names = {SHAPETYPE_POINT: "Point",
31                     SHAPETYPE_ARC: "Arc",                     SHAPETYPE_ARC: "Arc",
# Line 98  class BaseLayer(TitledObject, Modifiable Line 56  class BaseLayer(TitledObject, Modifiable
56          self.issue(LAYER_VISIBILITY_CHANGED, self)          self.issue(LAYER_VISIBILITY_CHANGED, self)
57    
58      def HasClassification(self):      def HasClassification(self):
59          """Determine if this layer support classifications."""          """Determine if this layer supports classifications."""
60            return False
61    
62        def HasShapes(self):
63            """Determine if this layer supports shapes."""
64          return False          return False
65    
66      def GetProjection(self):      def GetProjection(self):
# Line 106  class BaseLayer(TitledObject, Modifiable Line 68  class BaseLayer(TitledObject, Modifiable
68          return self.projection          return self.projection
69    
70      def SetProjection(self, projection):      def SetProjection(self, projection):
71          """Set the layer's projection"""          """Set the layer's projection."""
72          self.projection = projection          self.projection = projection
73          self.changed(LAYER_PROJECTION_CHANGED, self)          self.changed(LAYER_PROJECTION_CHANGED, self)
74    
75        def Type(self):
76            return "Unknown"
77    
78  class Layer(BaseLayer):  class Layer(BaseLayer):
79    
80      """Represent the information of one geodata file (currently a shapefile)      """Represent the information of one geodata file (currently a shapefile)
# Line 117  class Layer(BaseLayer): Line 82  class Layer(BaseLayer):
82      All children of the layer have the same type.      All children of the layer have the same type.
83    
84      A layer has fill and stroke colors. Colors should be instances of      A layer has fill and stroke colors. Colors should be instances of
85      Color. They can also be None, indicating no fill or no stroke.      Color. They can also be Transparent, indicating no fill or no stroke.
86    
87      The layer objects send the following events, all of which have the      The layer objects send the following events, all of which have the
88      layer object as parameter:      layer object as parameter:
# Line 127  class Layer(BaseLayer): Line 92  class Layer(BaseLayer):
92      """      """
93    
94      def __init__(self, title, data, projection = None,      def __init__(self, title, data, projection = None,
95                   fill = Color.Transparent,                   fill = Transparent,
96                   stroke = Color.Black,                   stroke = Black,
97                   lineWidth = 1,                   lineWidth = 1,
98                   visible = True):                   visible = True):
99          """Initialize the layer.          """Initialize the layer.
# Line 138  class Layer(BaseLayer): Line 103  class Layer(BaseLayer):
103          projection -- the projection object. Its Inverse method is          projection -- the projection object. Its Inverse method is
104                 assumed to map the layer's coordinates to lat/long                 assumed to map the layer's coordinates to lat/long
105                 coordinates                 coordinates
106          fill -- the fill color or Color.Transparent if the shapes are          fill -- the fill color or Transparent if the shapes are
107                  not filled                  not filled
108          stroke -- the stroke color or Color.Transparent if the shapes          stroke -- the stroke color or Transparent if the shapes
109                  are not stroked                  are not stroked
110          visible -- boolean. If true the layer is visible.          visible -- boolean. If true the layer is visible.
111    
# Line 150  class Layer(BaseLayer): Line 115  class Layer(BaseLayer):
115                                   visible = visible,                                   visible = visible,
116                                   projection = projection)                                   projection = projection)
117    
         #  
         # this is really important so that when the classification class  
         # tries to set its parent layer the variable will exist  
         #  
118          self.__classification = None          self.__classification = None
119          self.__setClassLock = False          self.store = None
120    
121          self.SetShapeStore(data)          self.SetShapeStore(data)
122    
123            self.classification_column = None
124            self.SetClassificationColumn(None)
125          self.SetClassification(None)          self.SetClassification(None)
126    
127          self.__classification.SetDefaultLineColor(stroke)          self.__classification.SetDefaultLineColor(stroke)
128          self.__classification.SetDefaultLineWidth(lineWidth)          self.__classification.SetDefaultLineWidth(lineWidth)
129          self.__classification.SetDefaultFill(fill)          self.__classification.SetDefaultFill(fill)
         self.__classification.SetLayer(self)  
130    
131          self.UnsetModified()          self.UnsetModified()
132    
   
133      def SetShapeStore(self, store):      def SetShapeStore(self, store):
         self.store = store  
         self.shapefile = self.store.Shapefile()  
         self.shapetable = self.store.Table()  
         if hasattr(self.store, "FileName"):  
             self.filename = self.store.FileName()  
         self.table = self.shapetable  
   
         numshapes, shapetype, mins, maxs = self.shapefile.info()  
         self.numshapes = numshapes  
         self.shapetype = shapelib_shapetypes[shapetype]  
   
         # if there are shapes, set the bbox accordingly. Otherwise  
         # set it to None.  
         if self.numshapes:  
             self.bbox = mins[:2] + maxs[:2]  
         else:  
             self.bbox = None  
   
         # estimate a good depth for the quad tree. Each depth  
         # multiplies the number of nodes by four, therefore we  
         # basically take the base 4 logarithm of the number of  
         # shapes.  
         if self.numshapes < 4:  
             maxdepth = 1  
         else:  
             maxdepth = int(ceil(log(self.numshapes / 4.0) / log(4)))  
   
         self.shapetree = shptree.SHPTree(self.shapefile.cobject(), 2,  
                                          maxdepth)  
134          # Set the classification to None if there is a classification          # Set the classification to None if there is a classification
135          # and the new shapestore doesn't have a table with a suitable          # and the new shapestore doesn't have a table with a suitable
136          # column, i.e one with the same name and type as before          # column, i.e one with the same name and type as before
137          # FIXME: Maybe we should keep it the same if the type is          # FIXME: Maybe we should keep it the same if the type is
138          # compatible enough such as FIELDTYPE_DOUBLE and FIELDTYPE_INT          # compatible enough such as FIELDTYPE_DOUBLE and FIELDTYPE_INT
139          if self.__classification is not None:          if self.__classification is not None:
140              fieldname = self.__classification.GetField()              columnname = self.classification_column
141              fieldtype = self.__classification.GetFieldType()              columntype = self.GetFieldType(columnname)
142              table = self.store.Table()              table = store.Table()
143              if (fieldname is not None              if (columnname is not None
144                  and (not table.HasColumn(fieldname)                  and (not table.HasColumn(columnname)
145                       or table.Column(fieldname).type != fieldtype)):                       or table.Column(columnname).type != columntype)):
146                  self.SetClassification(None)                  self.SetClassification(None)
147    
148            self.store = store
149    
150          self.changed(LAYER_SHAPESTORE_REPLACED, self)          self.changed(LAYER_SHAPESTORE_REPLACED, self)
151    
152      def ShapeStore(self):      def ShapeStore(self):
# Line 219  class Layer(BaseLayer): Line 154  class Layer(BaseLayer):
154    
155      def Destroy(self):      def Destroy(self):
156          BaseLayer.Destroy(self)          BaseLayer.Destroy(self)
157          self.SetClassification(None)          if self.__classification is not None:
158          self.store = self.shapetree = None              self.__classification.Unsubscribe(CLASS_CHANGED,
159          self.table = self.shapefile = self.shapetable = None                                                self._classification_changed)
160    
161      def BoundingBox(self):      def BoundingBox(self):
162          """Return the layer's bounding box in the intrinsic coordinate system.          """Return the layer's bounding box in the intrinsic coordinate system.
163    
164          If the layer has no shapes, return None.          If the layer has no shapes, return None.
165          """          """
166          return self.bbox          return self.store.BoundingBox()
167    
168      def LatLongBoundingBox(self):      def LatLongBoundingBox(self):
169          """Return the layer's bounding box in lat/long coordinates.          """Return the layer's bounding box in lat/long coordinates.
# Line 236  class Layer(BaseLayer): Line 171  class Layer(BaseLayer):
171          Return None, if the layer doesn't contain any shapes.          Return None, if the layer doesn't contain any shapes.
172          """          """
173          bbox = self.BoundingBox()          bbox = self.BoundingBox()
174          if bbox is not None:          if bbox is not None and self.projection is not None:
175              llx, lly, urx, ury = bbox              bbox = self.projection.InverseBBox(bbox)
176              if self.projection is not None:          return bbox
177                  llx, lly = self.projection.Inverse(llx, lly)  
178                  urx, ury = self.projection.Inverse(urx, ury)      def Type(self):
179              return llx, lly, urx, ury          return self.ShapeType();
         else:  
             return None  
180    
181      def ShapesBoundingBox(self, shapes):      def ShapesBoundingBox(self, shapes):
182          """Return a bounding box in lat/long coordinates for the given          """Return a bounding box in lat/long coordinates for the given
# Line 254  class Layer(BaseLayer): Line 187  class Layer(BaseLayer):
187    
188          if shapes is None or len(shapes) == 0: return None          if shapes is None or len(shapes) == 0: return None
189    
190          llx = []          xs = []
191          lly = []          ys = []
         urx = []  
         ury = []  
   
         if self.projection is not None:  
             inverse = lambda x, y: self.projection.Inverse(x, y)  
         else:  
             inverse = lambda x, y: (x, y)  
192    
193          for id in shapes:          for id in shapes:
194              left, bottom, right, top = self.Shape(id).compute_bbox()              bbox = self.Shape(id).compute_bbox()
195                if self.projection is not None:
196              left, bottom = inverse(left, bottom)                  bbox = self.projection.InverseBBox(bbox)
197              right, top   = inverse(right, top)              left, bottom, right, top = bbox
198                xs.append(left); xs.append(right)
199                ys.append(bottom); ys.append(top)
200    
201              llx.append(left)          return (min(xs), min(ys), max(xs), max(ys))
             lly.append(bottom)  
             urx.append(right)  
             ury.append(top)  
202    
         return (min(llx), min(lly), max(urx), max(ury))  
203    
204      def GetFieldType(self, fieldName):      def GetFieldType(self, fieldName):
205          if self.table.HasColumn(fieldName):          if self.store:
206              return self.table.Column(fieldName).type              table = self.store.Table()
207                if table.HasColumn(fieldName):
208                    return table.Column(fieldName).type
209          return None          return None
210    
211        def HasShapes(self):
212            return True
213    
214      def NumShapes(self):      def NumShapes(self):
215          """Return the number of shapes in the layer"""          """Return the number of shapes in the layer"""
216          return self.numshapes          return self.store.NumShapes()
217    
218      def ShapeType(self):      def ShapeType(self):
219          """Return the type of the shapes in the layer.          """Return the type of the shapes in the layer.
220          This is either SHAPETYPE_POINT, SHAPETYPE_ARC or SHAPETYPE_POLYGON.  
221            The return value is one of the SHAPETYPE_* constants defined in
222            Thuban.Model.data.
223          """          """
224          return self.shapetype          return self.store.ShapeType()
225    
226      def Shape(self, index):      def Shape(self, index):
227          """Return the shape with index index"""          """Return the shape with index index"""
228          shape = self.shapefile.read_object(index)          return self.store.Shape(index)
   
         if self.shapetype == SHAPETYPE_POINT:  
             points = shape.vertices()  
         else:  
             #for poly in shape.vertices():  
             poly = shape.vertices()[0]  
             points = []  
             for x, y in poly:  
                 points.append((x, y))  
   
         return Shape(points)  
229    
230      def ShapesInRegion(self, box):      def ShapesInRegion(self, bbox):
231          """Return the ids of the shapes that overlap the box.          """Return an iterable over the shapes that overlap the bounding box.
232    
233          Box is a tuple (left, bottom, right, top) in unprojected coordinates.          The bbox parameter should be the bounding box as a tuple in the
234            form (minx, miny, maxx, maxy) in unprojected coordinates.
235          """          """
         left, bottom, right, top = box  
   
236          if self.projection is not None:          if self.projection is not None:
237              left,  bottom = self.projection.Forward(left, bottom)              # Ensure that region lies within the layer's bounding box
238              right, top    = self.projection.Forward(right, top)              # Otherwise projection of the region would lead to incorrect
239                # values.
240          return self.shapetree.find_shapes((left, bottom), (right, top))              clipbbox = self.ClipBoundingBox(bbox)
241                bbox = self.projection.ForwardBBox(clipbbox)
242            return self.store.ShapesInRegion(bbox)
243    
244        def GetClassificationColumn(self):
245            return self.classification_column
246    
247        def SetClassificationColumn(self, column):
248            """Set the column to classifiy on, or None. If column is not None
249            and the column does not exist in the table, raise a ValueError.
250            """
251            if column:
252                columnType = self.GetFieldType(column)
253                if columnType is None:
254                    raise ValueError()
255            changed = self.classification_column != column
256            self.classification_column = column
257            if changed:
258                self.changed(LAYER_CHANGED, self)
259    
260      def HasClassification(self):      def HasClassification(self):
261          return True          return True
# Line 327  class Layer(BaseLayer): Line 264  class Layer(BaseLayer):
264          return self.__classification          return self.__classification
265    
266      def SetClassification(self, clazz):      def SetClassification(self, clazz):
267          """Set the classification to 'clazz'          """Set the classification used by this layer to 'clazz'
268    
269          If 'clazz' is None a default classification is created          If 'clazz' is None a default classification is created.
         """  
270    
271          # prevent infinite recursion when calling SetLayer()          This issues a LAYER_CHANGED event.
272          if self.__setClassLock: return          """
273    
274          self.__setClassLock = True          if self.__classification is not None:
275                self.__classification.Unsubscribe(CLASS_CHANGED,
276                                                  self._classification_changed)
277    
278          if clazz is None:          if clazz is None:
279              if self.__classification is not None:              clazz = classification.Classification()
                 self.__classification.SetLayer(None)  
             self.__classification = classification.Classification()  
         else:  
             self.__classification = clazz  
             try:  
                 self.__classification.SetLayer(self)  
             except ValueError:  
                 self.__setClassLock = False  
                 raise ValueError  
280    
281          self.changed(LAYER_CHANGED, self)          self.__classification = clazz
282            self.__classification.Subscribe(CLASS_CHANGED,
283                                            self._classification_changed)
284    
285          self.__setClassLock = False          self._classification_changed()
286    
287      def ClassChanged(self):      def _classification_changed(self):
288          """Called from the classification object when it has changed."""          """Called from the classification object when it has changed."""
289          self.changed(LAYER_CHANGED, self)          self.changed(LAYER_CHANGED, self)
290    
291      def TreeInfo(self):      def TreeInfo(self):
292          items = []          items = []
293    
294          if hasattr(self, 'filename'):          items.append(_("Filename: %s") % self.ShapeStore().FileName())
             items.append(_("Filename: %s") % self.filename)  
295    
296          if self.Visible():          if self.Visible():
297              items.append(_("Shown"))              items.append(_("Shown"))
# Line 371  class Layer(BaseLayer): Line 301  class Layer(BaseLayer):
301    
302          bbox = self.LatLongBoundingBox()          bbox = self.LatLongBoundingBox()
303          if bbox is not None:          if bbox is not None:
304              items.append(_("Extent (lat-lon): (%g, %g, %g, %g)") % bbox)              items.append(_("Extent (lat-lon): (%g, %g, %g, %g)") % tuple(bbox))
305          else:          else:
306              items.append(_("Extent (lat-lon):"))              items.append(_("Extent (lat-lon):"))
307          items.append(_("Shapetype: %s") % shapetype_names[self.ShapeType()])          items.append(_("Shapetype: %s") % shapetype_names[self.ShapeType()])
# Line 384  class Layer(BaseLayer): Line 314  class Layer(BaseLayer):
314    
315          return (_("Layer '%s'") % self.Title(), items)          return (_("Layer '%s'") % self.Title(), items)
316    
317        def ClipBoundingBox(self, bbox):
318            """ Clip bbox to layer's bounding box.
319    
320            Returns that part of bbox that lies within the layers bounding box.
321            If bbox is completely outside of the layers bounding box, bbox is
322            returned.  It is assumed that bbox has sensible values, i.e. bminx
323            < bmaxx and bminy < bmaxy.
324            """
325            bminx, bminy, bmaxx, bmaxy = bbox
326            lminx, lminy, lmaxx, lmaxy = self.LatLongBoundingBox()
327            if bminx > lmaxx or bmaxx < lminx:
328                left, right = bminx, bmaxx
329            else:
330                left = max(lminx, bminx)
331                right = min(lmaxx, bmaxx)
332            if bminy > lmaxy or bmaxy < lminy:
333                bottom, top = bminy, bmaxy
334            else:
335                bottom = max(lminy, bminy)
336                top = min(lmaxy, bmaxy)
337            
338            return (left, bottom, right, top)
339    
340    
341    if resource.has_gdal_support():
342        import gdal
343        from gdalconst import GA_ReadOnly
344    
345  class RasterLayer(BaseLayer):  class RasterLayer(BaseLayer):
346    
347      def __init__(self, title, filename, projection = None, visible = True):      MASK_NONE  = 0
348        MASK_BIT   = 1
349        MASK_ALPHA = 2
350    
351        def __init__(self, title, filename, projection = None,
352                     visible = True, opacity = 1, masktype = MASK_BIT):
353          """Initialize the Raster Layer.          """Initialize the Raster Layer.
354    
355          title -- title for the layer.          title -- title for the layer.
# Line 406  class RasterLayer(BaseLayer): Line 368  class RasterLayer(BaseLayer):
368          BaseLayer.__init__(self, title, visible = visible)          BaseLayer.__init__(self, title, visible = visible)
369    
370          self.projection = projection          self.projection = projection
371          self.filename = filename          self.filename = os.path.abspath(filename)
372    
373          self.bbox = -1          self.bbox = -1
374    
375          #          self.mask_type = masktype
376          # temporarily open the file so that GDAL can test if it's valid.          self.opacity = opacity
377          #  
378          dataset = gdal.Open(self.filename, GA_ReadOnly)          self.image_info = None
379    
380            if resource.has_gdal_support():
381                #
382                # temporarily open the file so that GDAL can test if it's valid.
383                #
384                dataset = gdal.Open(self.filename, GA_ReadOnly)
385    
386                if dataset is None:
387                    raise IOError()
388    
389          if dataset is None:              #
390              raise IOError()              # while we have the file, extract some basic information
391                # that we can display later
392                #
393                self.image_info = {}
394    
395                self.image_info["nBands"] = dataset.RasterCount
396                self.image_info["Size"] = (dataset.RasterXSize, dataset.RasterYSize)
397                self.image_info["Driver"] = dataset.GetDriver().ShortName
398    
399                # store some information about the individual bands
400                # [min_value, max_value]
401                a = self.image_info["BandData"] = []
402    
403                for i in range(1, dataset.RasterCount+1):
404                    band = dataset.GetRasterBand(i)
405                    a.append(band.ComputeRasterMinMax())
406    
407          self.UnsetModified()          self.UnsetModified()
408    
409      def BoundingBox(self):      def BoundingBox(self):
410          """Return the layer's bounding box in the intrinsic coordinate system.          """Return the layer's bounding box in the intrinsic coordinate system.
411    
412          If the layer has no shapes, return None.          If the there is no support for images, or the file cannot
413            be read, or there is no geographics information available, return None.
414          """          """
415            if not resource.has_gdal_support():
416                return None
417    
418          if self.bbox == -1:          if self.bbox == -1:
419              dataset = gdal.Open(self.filename, GA_ReadOnly)              dataset = gdal.Open(self.filename, GA_ReadOnly)
420              if dataset is None:              if dataset is None:
# Line 463  class RasterLayer(BaseLayer): Line 453  class RasterLayer(BaseLayer):
453          if bbox is None:          if bbox is None:
454              return None              return None
455    
         llx, lly, urx, ury = bbox  
456          if self.projection is not None:          if self.projection is not None:
457              llx, lly = self.projection.Inverse(llx, lly)              bbox = self.projection.InverseBBox(bbox)
             urx, ury = self.projection.Inverse(urx, ury)  
458    
459          return llx, lly, urx, ury          return bbox
460    
461        def Type(self):
462            return "Image"
463    
464      def GetImageFilename(self):      def GetImageFilename(self):
465          return self.filename          return self.filename
466    
467        def MaskType(self):
468            """Return True if the mask should be used when rendering the layer."""
469            return self.mask_type
470    
471        def SetMaskType(self, type):
472            """Set the type of mask to use.
473    
474            type can be one of MASK_NONE, MASK_BIT, MASK_ALPHA
475    
476            If the state changes, a LAYER_CHANGED message is sent.
477            """
478            if type not in (self.MASK_NONE, self.MASK_BIT, self.MASK_ALPHA):
479                raise ValueError("type is invalid")
480    
481            if type != self.mask_type:
482                self.mask_type = type
483                self.changed(LAYER_CHANGED, self)
484    
485        def Opacity(self):
486            """Return the level of opacity used in alpha blending.
487            """
488            return self.opacity
489    
490        def SetOpacity(self, op):
491            """Set the level of alpha opacity.
492    
493            0 <= op <= 1.
494    
495            The layer is fully opaque when op = 1.
496            """
497            if not (0 <= op <= 1):
498                raise ValueError("op out of range")
499    
500            if op != self.opacity:
501                self.opacity = op
502                self.changed(LAYER_CHANGED, self)
503    
504        def ImageInfo(self):
505            return self.image_info
506    
507      def TreeInfo(self):      def TreeInfo(self):
508          items = []          items = []
509    
510            items.append(_("Filename: %s") % self.GetImageFilename())
511    
512          if self.Visible():          if self.Visible():
513              items.append(_("Shown"))              items.append(_("Shown"))
514          else:          else:
515              items.append(_("Hidden"))              items.append(_("Hidden"))
         items.append(_("Shapes: %d") % self.NumShapes())  
516    
517          bbox = self.LatLongBoundingBox()          bbox = self.LatLongBoundingBox()
518          if bbox is not None:          if bbox is not None:
Legend:
Removed from v.1142  
changed lines
  Added in v.2614
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26