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

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

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

revision 1268 by bh, Fri Jun 20 16:10:12 2003 UTC revision 1354 by jonathan, Wed Jul 2 09:37:07 2003 UTC
# Line 24  from Thuban import _ Line 24  from Thuban import _
24  from Thuban.Model.table import FIELDTYPE_INT, FIELDTYPE_DOUBLE, \  from Thuban.Model.table import FIELDTYPE_INT, FIELDTYPE_DOUBLE, \
25       FIELDTYPE_STRING       FIELDTYPE_STRING
26    
27    from Thuban.Model.color import Color, Transparent
28    
29  from Thuban.Model.session import Session  from Thuban.Model.session import Session
30  from Thuban.Model.map import Map  from Thuban.Model.map import Map
31  from Thuban.Model.layer import Layer, RasterLayer  from Thuban.Model.layer import Layer, RasterLayer
 from Thuban.Model.color import Color  
32  from Thuban.Model.proj import Projection  from Thuban.Model.proj import Projection
33  from Thuban.Model.range import Range  from Thuban.Model.range import Range
34  from Thuban.Model.classification import Classification, \  from Thuban.Model.classification import Classification, \
# Line 51  def parse_color(color): Line 52  def parse_color(color):
52      """      """
53      color = string.strip(color)      color = string.strip(color)
54      if color == "None":      if color == "None":
55          result = Color.Transparent          result = Transparent
56      elif color[0] == '#':      elif color[0] == '#':
57          if len(color) == 7:          if len(color) == 7:
58              r = string.atoi(color[1:3], 16) / 255.0              r = string.atoi(color[1:3], 16) / 255.0
# Line 223  class SessionLoader(XMLReader): Line 224  class SessionLoader(XMLReader):
224                                    AttrDesc("shapesource", True,                                    AttrDesc("shapesource", True,
225                                             conversion = "shapesource"),                                             conversion = "shapesource"),
226                                    AttrDesc("table", True, conversion="table")])                                    AttrDesc("table", True, conversion="table")])
227          self.idmap[attrs["id"]] = DerivedShapeStore(attrs["shapesource"],          store = DerivedShapeStore(attrs["shapesource"], attrs["table"])
228                                                      attrs["table"])          self.theSession.AddShapeStore(store)
229            self.idmap[attrs["id"]] = store
230    
231      def start_filetable(self, name, qname, attrs):      def start_filetable(self, name, qname, attrs):
232          attrs = self.check_attrs(name, attrs,          attrs = self.check_attrs(name, attrs,
# Line 342  class SessionLoader(XMLReader): Line 344  class SessionLoader(XMLReader):
344          elif fieldType == FIELDTYPE_DOUBLE:          elif fieldType == FIELDTYPE_DOUBLE:
345              self.conv = float              self.conv = float
346    
347          self.aLayer.GetClassification().SetField(field)          self.aLayer.GetClassification().SetFieldInfo(field, fieldType)
348    
349      def end_classification(self, name, qname):      def end_classification(self, name, qname):
350          pass          pass
# Line 383  class SessionLoader(XMLReader): Line 385  class SessionLoader(XMLReader):
385              if range is not None:              if range is not None:
386                  self.cl_group = ClassGroupRange(Range(range))                  self.cl_group = ClassGroupRange(Range(range))
387              elif min is not None and max is not None:              elif min is not None and max is not None:
388                  self.cl_group = ClassGroupRange(self.conv(min), self.conv(max))                  self.cl_group = ClassGroupRange((self.conv(min),
389                                                     self.conv(max)))
390              else:              else:
391                  self.cl_group = ClassGroupRange(Range(None))                  self.cl_group = ClassGroupRange(Range(None))
392    
Legend:
Removed from v.1268  
changed lines
  Added in v.1354
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26