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

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

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

revision 2552 by jonathan, Fri Jan 28 15:54:00 2005 UTC revision 2659 by jan, Wed Jul 27 21:51:31 2005 UTC
# Line 1  Line 1 
1  # Copyright (c) 2001-2004 by Intevation GmbH  # Copyright (c) 2001-2005 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]> (2004)  # Jan-Oliver Wagner <[email protected]> (2004-2005)
4  # Bernhard Herzog <[email protected]> (2001-2004)  # Bernhard Herzog <[email protected]> (2001-2004)
5  # Jonathan Coles <[email protected]> (2003)  # Jonathan Coles <[email protected]> (2003)
6  # Frank Koormann <[email protected]> (2003)  # Frank Koormann <[email protected]> (2003)
# Line 26  from Thuban.Model.classification import Line 26  from Thuban.Model.classification import
26      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap
27  from Thuban.Model.transientdb import AutoTransientTable, TransientJoinedTable  from Thuban.Model.transientdb import AutoTransientTable, TransientJoinedTable
28  from Thuban.Model.table import DBFTable, FIELDTYPE_STRING  from Thuban.Model.table import DBFTable, FIELDTYPE_STRING
29  from Thuban.Model.data import DerivedShapeStore, ShapefileStore, \  from Thuban.Model.data import DerivedShapeStore, FileShapeStore, \
30                                SHAPETYPE_POINT                                SHAPETYPE_POINT
31    
32  from Thuban.Model.xmlwriter import XMLWriter  from Thuban.Model.xmlwriter import XMLWriter
# Line 201  class SessionSaver(XMLWriter): Line 201  class SessionSaver(XMLWriter):
201                  continue                  continue
202    
203              idvalue = self.define_id(container)              idvalue = self.define_id(container)
204              if isinstance(container, ShapefileStore):              if isinstance(container, FileShapeStore):
205                  self.define_id(container.Table(), idvalue)                  self.define_id(container.Table(), idvalue)
206                  filename = self.prepare_filename(container.FileName())                  filename = self.prepare_filename(container.FileName())
207                  self.write_element("fileshapesource",                  self.write_element("fileshapesource",
208                                     {"id": idvalue, "filename": filename,                                     {"id": idvalue, "filename": filename,
209                                      "filetype": "shapefile"})                                      "filetype": container.FileType()})
210              elif isinstance(container, DerivedShapeStore):              elif isinstance(container, DerivedShapeStore):
211                  shapesource, table = container.Dependencies()                  shapesource, table = container.Dependencies()
212                  self.write_element("derivedshapesource",                  self.write_element("derivedshapesource",
# Line 291  class SessionSaver(XMLWriter): Line 291  class SessionSaver(XMLWriter):
291    
292          if isinstance(layer, Layer):          if isinstance(layer, Layer):
293              attrs["shapestore"]   = self.get_id(layer.ShapeStore())              attrs["shapestore"]   = self.get_id(layer.ShapeStore())
   
             lc = layer.GetClassification()  
             attrs["stroke"] = lc.GetDefaultLineColor().hex()  
             attrs["stroke_width"] = str(lc.GetDefaultLineWidth())  
             attrs["fill"] = lc.GetDefaultFill().hex()  
   
294              self.open_element("layer", attrs)              self.open_element("layer", attrs)
295              self.write_projection(layer.GetProjection())              self.write_projection(layer.GetProjection())
296              self.write_classification(layer)              self.write_classification(layer)
297              self.close_element("layer")              self.close_element("layer")
298          elif isinstance(layer, RasterLayer):          elif isinstance(layer, RasterLayer):
299              attrs["filename"] = self.prepare_filename(layer.filename)              attrs["filename"] = self.prepare_filename(layer.filename)
300    
301                masknames = ["none", "bit", "alpha"]
302    
303                if layer.MaskType() != layer.MASK_BIT:
304                    attrs["masktype"] = masknames[layer.MaskType()]
305    
306                if layer.Opacity() != 1:
307                    attrs["opacity"] = str(layer.Opacity())
308    
309              self.open_element("rasterlayer", attrs)              self.open_element("rasterlayer", attrs)
310              self.write_projection(layer.GetProjection())              self.write_projection(layer.GetProjection())
311              self.close_element("rasterlayer")              self.close_element("rasterlayer")
# Line 317  class SessionSaver(XMLWriter): Line 320  class SessionSaver(XMLWriter):
320    
321          field = layer.GetClassificationColumn()          field = layer.GetClassificationColumn()
322    
323          #          if field is not None:
324          # there isn't a classification of anything so do nothing              attrs["field"] = field
325          #              attrs["field_type"] = str(layer.GetFieldType(field))
         if field is None: return  
326    
         attrs["field"] = field  
         attrs["field_type"] = str(layer.GetFieldType(field))  
327          self.open_element("classification", attrs)          self.open_element("classification", attrs)
328    
329          for g in lc:          for g in lc:
Legend:
Removed from v.2552  
changed lines
  Added in v.2659
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26