/[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 524 by jonathan, Wed Mar 12 18:26:55 2003 UTC revision 1642 by bh, Mon Aug 25 10:54:31 2003 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]>  # Jan-Oliver Wagner <[email protected]>
4  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
# Line 13  Parser for thuban session files. Line 13  Parser for thuban session files.
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    
16  import sys, string, os  import string, os
17    
18  import xml.sax  import xml.sax
19  import xml.sax.handler  import xml.sax.handler
20  from xml.sax import make_parser, ErrorHandler  from xml.sax import make_parser, ErrorHandler, SAXNotRecognizedException
21    
22  from Thuban import _  from Thuban import _
 from Thuban.common import *  
23    
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  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
34  from Thuban.Model.classification import Classification, \  from Thuban.Model.classification import Classification, \
35      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
36      ClassGroupProperties      ClassGroupProperties
37    from Thuban.Model.data import DerivedShapeStore, ShapefileStore
38    from Thuban.Model.table import DBFTable
39    from Thuban.Model.transientdb import TransientJoinedTable
40    
41    class LoadError(Exception):
42        pass
43    
44    from Thuban.Model.xmlreader import XMLReader
45    import resource
46    
47  def parse_color(color):  def parse_color(color):
48      """Return the color object for the string color.      """Return the color object for the string color.
# Line 43  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.None          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 57  def parse_color(color): Line 66  def parse_color(color):
66          raise ValueError(_("Invalid color specification %s") % color)          raise ValueError(_("Invalid color specification %s") % color)
67      return result      return result
68    
69    class AttrDesc:
70    
71  class ProcessSession(xml.sax.handler.ContentHandler):      def __init__(self, name, required = False, default = "",
72                     conversion = None):
73            if not isinstance(name, tuple):
74                fullname = (None, name)
75            else:
76                fullname = name
77                name = name[1]
78            self.name = name
79            self.fullname = fullname
80            self.required = required
81            self.default = default
82            self.conversion = conversion
83    
84            # set by the SessionLoader's check_attrs method
85            self.value = None
86    
87    
88    class SessionLoader(XMLReader):
89    
90        def __init__(self):
91            """Inititialize the Sax handler."""
92            XMLReader.__init__(self)
93    
     # Dictionary mapping element names (or (URI, element name) pairs for  
     # documents using namespaces) to method names. The methods should  
     # accept the same parameters as the startElement (or startElementNS)  
     # methods. The start_dispatcher is used by the default startElement  
     # and startElementNS methods to call a method for the open tag of an  
     # element.  
     start_dispatcher = {}  
   
     # end_dispatcher works just like start_dispatcher but it's used by  
     # endElement and endElementNS. The method whose names it maps to  
     # should accept the same parameters as endElement and endElementNS.  
     end_dispatcher = {}  
   
   
     def __init__(self, directory):  
         """Inititialize the Sax handler.  
   
         The directory parameter should be the directory containing the  
         session file. It's needed to interpret embedded relative  
         filenames.  
         """  
         self.directory = directory  
         self.chars = ''  
94          self.theSession = None          self.theSession = None
95          self.aMap = None          self.aMap = None
96          self.aLayer = None          self.aLayer = None
97    
98      def startElementNS(self, name, qname, attrs):          # Map ids used in the thuban file to the corresponding objects
99          """Call the method given for name in self.start_dispatcher          # in the session
100          """          self.idmap = {}
101          if name[0] is None:  
102              method_name = self.start_dispatcher.get(name[1])          dispatchers = {
103          else:              'session'       : ("start_session",        "end_session"),
104              # Dispatch with namespace              'fileshapesource': ("start_fileshapesource", None),
105              method_name = self.start_dispatcher.get(name)              'derivedshapesource': ("start_derivedshapesource", None),
106          if method_name is not None:              'filetable': ("start_filetable", None),
107              getattr(self, method_name)(name, qname, attrs)              'jointable': ("start_jointable", None),
108    
109                'map'           : ("start_map",            "end_map"),
110                'projection'    : ("start_projection",     "end_projection"),
111                'parameter'     : ("start_parameter",      None),
112                'layer'         : ("start_layer",          "end_layer"),
113                'rasterlayer'   : ("start_rasterlayer",    "end_rasterlayer"),
114                'classification': ("start_classification", "end_classification"),
115                'clnull'        : ("start_clnull",         "end_clnull"),
116                'clpoint'       : ("start_clpoint",        "end_clpoint"),
117                'clrange'       : ("start_clrange",        "end_clrange"),
118                'cldata'        : ("start_cldata",         "end_cldata"),
119                'table'         : ("start_table",          "end_table"),
120                'labellayer'    : ("start_labellayer",     None),
121                'label'         : ("start_label",          None)}
122    
123            # all dispatchers should be used for the 0.8 and 0.9 namespaces too
124            for xmlns in ("http://thuban.intevation.org/dtds/thuban-0.8.dtd",
125                          "http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd"):
126                for key, value in dispatchers.items():
127                    dispatchers[(xmlns, key)] = value
128    
129      def endElementNS(self, name, qname):          XMLReader.AddDispatchers(self, dispatchers)
         """Call the method given for name in self.end_dispatcher  
         """  
         if name[0] is None:  
             method_name = self.end_dispatcher.get(name[1])  
         else:  
             # Dispatch with namespace  
             method_name = self.end_dispatcher.get(name)  
         if method_name is not None:  
             getattr(self, method_name)(name, qname)  
130    
131      def start_session(self, name, qname, attrs):      def start_session(self, name, qname, attrs):
132          self.theSession = Session(attrs.get((None, 'title'), None))          self.theSession = Session(self.encode(attrs.get((None, 'title'),
133      start_dispatcher['session'] = "start_session"                                                          None)))
134    
135      def end_session(self, name, qname):      def end_session(self, name, qname):
136          pass          pass
137      end_dispatcher['session'] = "end_session"  
138        def check_attrs(self, element, attrs, descr):
139            """Check and convert some of the attributes of an element
140    
141            Parameters:
142               element -- The element name
143               attrs -- The attrs mapping as passed to the start_* methods
144               descr -- Sequence of attribute descriptions (AttrDesc instances)
145    
146            Return a dictionary containig normalized versions of the
147            attributes described in descr. The keys of that dictionary are
148            the name attributes of the attribute descriptions. The attrs
149            dictionary will not be modified.
150    
151            If the attribute is required, i.e. the 'required' attribute of
152            the descrtiption is true, but it is not in attrs, raise a
153            LoadError.
154    
155            If the attribute has a default value and it is not present in
156            attrs, use that default value as the value in the returned dict.
157    
158            If a conversion is specified, convert the value before putting
159            it into the returned dict. The following conversions are
160            available:
161    
162               'filename' -- The attribute is a filename.
163    
164                             If the filename is a relative name, interpret
165                             it relative to the directory containing the
166                             .thuban file and make it an absolute name
167    
168               'shapestore' -- The attribute is the ID of a shapestore
169                               defined earlier in the .thuban file. Look it
170                               up self.idmap
171    
172               'table' -- The attribute is the ID of a table or shapestore
173                          defined earlier in the .thuban file. Look it up
174                          self.idmap. If it's the ID of a shapestore the
175                          value will be the table of the shapestore.
176            """
177            normalized = {}
178    
179            for d in descr:
180                if d.required and not attrs.has_key(d.fullname):
181                    raise LoadError("Element %s requires an attribute %r"
182                                    % (element, d.name))
183                value = attrs.get(d.fullname, d.default)
184    
185                if d.conversion == "shapesource":
186                    if value in self.idmap:
187                        value = self.idmap[value]
188                    else:
189                        raise LoadError("Element %s requires an already defined ID"
190                                        " in attribute %r"
191                                        % (element, d.name))
192                elif d.conversion == "table":
193                    if value in self.idmap:
194                        value = self.idmap[value]
195                        if isinstance(value, ShapefileStore):
196                            value = value.Table()
197                    else:
198                        raise LoadError("Element %s requires an already defined ID"
199                                        " in attribute %r"
200                                        % (element, d.name))
201                elif d.conversion == "filename":
202                    value = os.path.abspath(os.path.join(self.GetDirectory(),
203                                                         value))
204    
205                normalized[d.name] = value
206            return normalized
207    
208        def start_fileshapesource(self, name, qname, attrs):
209            attrs = self.check_attrs(name, attrs,
210                                      [AttrDesc("id", True),
211                                       AttrDesc("filename", True,
212                                                conversion = "filename"),
213                                       AttrDesc("filetype", True)])
214            ID = attrs["id"]
215            filename = attrs["filename"]
216            filetype = attrs["filetype"]
217            if filetype != "shapefile":
218                raise LoadError("shapesource filetype %r not supported" % filetype)
219            self.idmap[ID] = self.theSession.OpenShapefile(filename)
220    
221        def start_derivedshapesource(self, name, qname, attrs):
222            attrs = self.check_attrs(name, attrs,
223                                     [AttrDesc("id", True),
224                                      AttrDesc("shapesource", True,
225                                               conversion = "shapesource"),
226                                      AttrDesc("table", True, conversion="table")])
227            store = DerivedShapeStore(attrs["shapesource"], attrs["table"])
228            self.theSession.AddShapeStore(store)
229            self.idmap[attrs["id"]] = store
230    
231        def start_filetable(self, name, qname, attrs):
232            attrs = self.check_attrs(name, attrs,
233                                     [AttrDesc("id", True),
234                                      AttrDesc("title", True),
235                                      AttrDesc("filename", True,
236                                               conversion = "filename"),
237                                      AttrDesc("filetype")])
238            filetype = attrs["filetype"]
239            if filetype != "DBF":
240                raise LoadError("shapesource filetype %r not supported" % filetype)
241            table = DBFTable(attrs["filename"])
242            table.SetTitle(attrs["title"])
243            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
244    
245        def start_jointable(self, name, qname, attrs):
246            attrs = self.check_attrs(name, attrs,
247                                     [AttrDesc("id", True),
248                                      AttrDesc("title", True),
249                                      AttrDesc("left", True, conversion="table"),
250                                      AttrDesc("leftcolumn", True),
251                                      AttrDesc("right", True, conversion="table"),
252                                      AttrDesc("rightcolumn", True),
253    
254                                      # jointype is required for file
255                                      # version 0.9 but this attribute
256                                      # wasn't in the 0.8 version because of
257                                      # an oversight so we assume it's
258                                      # optional since we want to handle
259                                      # both file format versions here.
260                                      AttrDesc("jointype", False,
261                                               default="INNER")])
262    
263            jointype = attrs["jointype"]
264            if jointype == "LEFT OUTER":
265                outer_join = True
266            elif jointype == "INNER":
267                outer_join = False
268            else:
269                raise LoadError("jointype %r not supported" % jointype )
270            table = TransientJoinedTable(self.theSession.TransientDB(),
271                                         attrs["left"], attrs["leftcolumn"],
272                                         attrs["right"], attrs["rightcolumn"],
273                                         outer_join = outer_join)
274            table.SetTitle(attrs["title"])
275            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
276    
277      def start_map(self, name, qname, attrs):      def start_map(self, name, qname, attrs):
278          """Start a map."""          """Start a map."""
279          self.aMap = Map(attrs.get((None, 'title'), None))          self.aMap = Map(self.encode(attrs.get((None, 'title'), None)))
     start_dispatcher['map'] = "start_map"  
280    
281      def end_map(self, name, qname):      def end_map(self, name, qname):
282          self.theSession.AddMap(self.aMap)          self.theSession.AddMap(self.aMap)
283      end_dispatcher['map'] = "end_map"          self.aMap = None
284    
285      def start_projection(self, name, qname, attrs):      def start_projection(self, name, qname, attrs):
286            self.ProjectionName = self.encode(attrs.get((None, 'name'), None))
287          self.ProjectionParams = [ ]          self.ProjectionParams = [ ]
     start_dispatcher['projection'] = "start_projection"  
288    
289      def end_projection(self, name, qname):      def end_projection(self, name, qname):
290          self.aMap.SetProjection(Projection(self.ProjectionParams))          if self.aLayer is not None:
291      end_dispatcher['projection'] = "end_projection"              obj = self.aLayer
292            elif self.aMap is not None:
293                obj = self.aMap
294            else:
295                assert False, "projection tag out of context"
296                pass
297    
298            obj.SetProjection(
299                Projection(self.ProjectionParams, self.ProjectionName))
300    
301      def start_parameter(self, name, qname, attrs):      def start_parameter(self, name, qname, attrs):
302          s = attrs.get((None, 'value'))          s = attrs.get((None, 'value'))
303          s = str(s) # we can't handle unicode in proj          s = str(s) # we can't handle unicode in proj
304          self.ProjectionParams.append(s)          self.ProjectionParams.append(s)
     start_dispatcher['parameter'] = "start_parameter"  
305    
306      def start_layer(self, name, qname, attrs, layer_class = Layer):      def start_layer(self, name, qname, attrs, layer_class = Layer):
307          """Start a layer          """Start a layer
# Line 147  class ProcessSession(xml.sax.handler.Con Line 310  class ProcessSession(xml.sax.handler.Con
310          attrs which may be a dictionary as well as the normal SAX attrs          attrs which may be a dictionary as well as the normal SAX attrs
311          object and bind it to self.aLayer.          object and bind it to self.aLayer.
312          """          """
313          title = attrs.get((None, 'title'), "")          title = self.encode(attrs.get((None, 'title'), ""))
314          filename = attrs.get((None, 'filename'), "")          filename = attrs.get((None, 'filename'), "")
315          filename = os.path.join(self.directory, filename)          filename = os.path.join(self.GetDirectory(), filename)
316            filename = self.encode(filename)
317            visible  = self.encode(attrs.get((None, 'visible'), "true")) != "false"
318          fill = parse_color(attrs.get((None, 'fill'), "None"))          fill = parse_color(attrs.get((None, 'fill'), "None"))
319          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))
320          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))
321          self.aLayer = layer_class(title, filename, fill = fill,          if attrs.has_key((None, "shapestore")):
322                                    stroke = stroke, lineWidth = stroke_width)              store = self.idmap[attrs[(None, "shapestore")]]
323      start_dispatcher['layer'] = "start_layer"          else:
324                store = self.theSession.OpenShapefile(filename)
325            self.aLayer = layer_class(title, store,
326                                      fill = fill, stroke = stroke,
327                                      lineWidth = stroke_width,
328                                      visible = visible)
329    
330      def end_layer(self, name, qname):      def end_layer(self, name, qname):
331          self.aMap.AddLayer(self.aLayer)          self.aMap.AddLayer(self.aLayer)
332      end_dispatcher['layer'] = "end_layer"          self.aLayer = None
333    
334        def start_rasterlayer(self, name, qname, attrs, layer_class = RasterLayer):
335            title = self.encode(attrs.get((None, 'title'), ""))
336            filename = attrs.get((None, 'filename'), "")
337            filename = os.path.join(self.GetDirectory(), filename)
338            filename = self.encode(filename)
339            visible  = self.encode(attrs.get((None, 'visible'), "true")) != "false"
340    
341            self.aLayer = layer_class(title, filename, visible = visible)
342    
343        def end_rasterlayer(self, name, qname):
344            self.aMap.AddLayer(self.aLayer)
345            self.aLayer = None
346    
347      def start_classification(self, name, qname, attrs):      def start_classification(self, name, qname, attrs):
348          field = attrs.get((None, 'field'), None)          field = attrs.get((None, 'field'), None)
# Line 179  class ProcessSession(xml.sax.handler.Con Line 362  class ProcessSession(xml.sax.handler.Con
362          elif fieldType == FIELDTYPE_DOUBLE:          elif fieldType == FIELDTYPE_DOUBLE:
363              self.conv = float              self.conv = float
364    
365          self.aLayer.GetClassification().SetField(field)          self.aLayer.SetClassificationColumn(field)
   
     start_dispatcher['classification'] = "start_classification"  
366    
367      def end_classification(self, name, qname):      def end_classification(self, name, qname):
368          pass          pass
     end_dispatcher['classification'] = "end_classification"  
369    
370      def start_clnull(self, name, qname, attrs):      def start_clnull(self, name, qname, attrs):
371          self.cl_group = ClassGroupDefault()          self.cl_group = ClassGroupDefault()
372          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))
373          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
     start_dispatcher['clnull'] = "start_clnull"  
374    
375      def end_clnull(self, name, qname):      def end_clnull(self, name, qname):
376          self.cl_group.SetProperties(self.cl_prop)          self.cl_group.SetProperties(self.cl_prop)
377          self.aLayer.GetClassification().SetDefaultGroup(self.cl_group)          self.aLayer.GetClassification().SetDefaultGroup(self.cl_group)
378          del self.cl_group, self.cl_prop          del self.cl_group, self.cl_prop
     end_dispatcher['clnull'] = "end_clnull"  
379    
380      def start_clpoint(self, name, qname, attrs):      def start_clpoint(self, name, qname, attrs):
381          attrib_value = attrs.get((None, 'value'), "0")          attrib_value = attrs.get((None, 'value'), "0")
382    
383          #try:          field = self.aLayer.GetClassificationColumn()
384              #value  = Str2Num(attrib_value)          if self.aLayer.GetFieldType(field) == FIELDTYPE_STRING:
385          #except:              value = self.encode(attrib_value)
386              #value  = attrib_value          else:
387                value = self.conv(attrib_value)
         value = self.conv(attrib_value)  
   
388          self.cl_group = ClassGroupSingleton(value)          self.cl_group = ClassGroupSingleton(value)
389          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))
390          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
391    
     start_dispatcher['clpoint'] = "start_clpoint"  
392    
393      def end_clpoint(self, name, qname):      def end_clpoint(self, name, qname):
394          self.cl_group.SetProperties(self.cl_prop)          self.cl_group.SetProperties(self.cl_prop)
395          self.aLayer.GetClassification().AddGroup(self.cl_group)          self.aLayer.GetClassification().AppendGroup(self.cl_group)
396          del self.cl_group, self.cl_prop          del self.cl_group, self.cl_prop
     end_dispatcher['clpoint'] = "end_clpoint"  
397    
398      def start_clrange(self, name, qname, attrs):      def start_clrange(self, name, qname, attrs):
399    
400            range = attrs.get((None, 'range'), None)
401            # for backward compatibility (min/max are not saved)
402            min   = attrs.get((None, 'min'), None)
403            max   = attrs.get((None, 'max'), None)
404    
405          try:          try:
406              min = self.conv(attrs.get((None, 'min'), "0"))              if range is not None:
407              max = self.conv(attrs.get((None, 'max'), "0"))                  self.cl_group = ClassGroupRange(Range(range))
408              #min = Str2Num(attrs.get((None, 'min'), "0"))              elif min is not None and max is not None:
409              #max = Str2Num(attrs.get((None, 'max'), "0"))                  self.cl_group = ClassGroupRange((self.conv(min),
410                                                     self.conv(max)))
411                else:
412                    self.cl_group = ClassGroupRange(Range(None))
413    
414          except ValueError:          except ValueError:
415              raise ValueError(_("Classification range is not a number!"))              raise ValueError(_("Classification range is not a number!"))
416    
         self.cl_group = ClassGroupRange(min, max)  
417          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))
418          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
419    
     start_dispatcher['clrange'] = "start_clrange"  
420    
421      def end_clrange(self, name, qname):      def end_clrange(self, name, qname):
422          self.cl_group.SetProperties(self.cl_prop)          self.cl_group.SetProperties(self.cl_prop)
423          self.aLayer.GetClassification().AddGroup(self.cl_group)          self.aLayer.GetClassification().AppendGroup(self.cl_group)
424          del self.cl_group, self.cl_prop          del self.cl_group, self.cl_prop
     end_dispatcher['clrange'] = "end_clrange"  
425    
426      def start_cldata(self, name, qname, attrs):      def start_cldata(self, name, qname, attrs):
427          self.cl_prop.SetLineColor(          self.cl_prop.SetLineColor(
# Line 249  class ProcessSession(xml.sax.handler.Con Line 429  class ProcessSession(xml.sax.handler.Con
429          self.cl_prop.SetLineWidth(          self.cl_prop.SetLineWidth(
430              int(attrs.get((None, 'stroke_width'), "0")))              int(attrs.get((None, 'stroke_width'), "0")))
431          self.cl_prop.SetFill(parse_color(attrs.get((None, 'fill'), "None")))          self.cl_prop.SetFill(parse_color(attrs.get((None, 'fill'), "None")))
     start_dispatcher['cldata'] = "start_cldata"  
432    
433      def end_cldata(self, name, qname):      def end_cldata(self, name, qname):
434          pass          pass
     end_dispatcher['cldata'] = "end_cldata"  
   
     def start_table(self, name, qname, attrs):  
         #print "table title: %s" % attrs.get('title', None)  
         pass  
     start_dispatcher['table'] = "start_table"  
   
     def end_table(self, name, qname):  
         pass  
     end_dispatcher['table'] = "end_table"  
435    
436      def start_labellayer(self, name, qname, attrs):      def start_labellayer(self, name, qname, attrs):
437          self.aLayer = self.aMap.LabelLayer()          self.aLayer = self.aMap.LabelLayer()
     start_dispatcher['labellayer'] = "start_labellayer"  
438    
439      def start_label(self, name, qname, attrs):      def start_label(self, name, qname, attrs):
440          x = float(attrs[(None, 'x')])          x = float(attrs[(None, 'x')])
441          y = float(attrs[(None, 'y')])          y = float(attrs[(None, 'y')])
442          text = attrs[(None, 'text')]          text = self.encode(attrs[(None, 'text')])
443          halign = attrs[(None, 'halign')]          halign = attrs[(None, 'halign')]
444          valign = attrs[(None, 'valign')]          valign = attrs[(None, 'valign')]
445          self.aLayer.AddLabel(x, y, text, halign = halign, valign = valign)          self.aLayer.AddLabel(x, y, text, halign = halign, valign = valign)
     start_dispatcher['label'] = "start_label"  
446    
447      def characters(self, chars):      def characters(self, chars):
448          pass          pass
# Line 283  class ProcessSession(xml.sax.handler.Con Line 450  class ProcessSession(xml.sax.handler.Con
450    
451  def load_session(filename):  def load_session(filename):
452      """Load a Thuban session from the file object file"""      """Load a Thuban session from the file object file"""
453      dir = os.path.dirname(filename)  
454      file = open(filename)      handler = SessionLoader()
455      handler = ProcessSession(dir)      handler.read(filename)
   
     parser = make_parser()  
     parser.setContentHandler(handler)  
     parser.setErrorHandler(ErrorHandler())  
     parser.setFeature(xml.sax.handler.feature_namespaces, 1)  
     parser.setFeature(xml.sax.handler.feature_validation, 0)  
     parser.setFeature(xml.sax.handler.feature_external_ges, 0)  
     parser.setFeature(xml.sax.handler.feature_external_pes, 0)  
     parser.parse(file)  
456    
457      session = handler.theSession      session = handler.theSession
458      # Newly loaded session aren't modified      # Newly loaded session aren't modified
Legend:
Removed from v.524  
changed lines
  Added in v.1642
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26