jonathan: thuban/Thuban/Model layer.py, 1.61, 1.62 load.py, 1.53, 1.54 save.py, 1.42, 1.43

[cvs@intevation.de]

Author: jonathan

Update of /thubanrepository/thuban/Thuban/Model
In directory doto:/tmp/cvs-serv8849/Thuban/Model

Modified Files:
	layer.py load.py save.py 
Log Message:
Make layer's use_mask flag default to true. Support a bit array describing
the mask to use. Improve error handling in ProjectRasterFile (also addresses
RT #2947).


Index: layer.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/Model/layer.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- layer.py	27 Jan 2005 14:19:41 -0000	1.61
+++ layer.py	28 Jan 2005 15:54:00 -0000	1.62
@@ -367,7 +367,7 @@
 
         self.bbox = -1
 
-        self.use_mask = False
+        self.use_mask = True
 
         self.image_info = None
 

Index: load.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/Model/load.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- load.py	27 Jan 2005 14:19:41 -0000	1.53
+++ load.py	28 Jan 2005 15:54:00 -0000	1.54
@@ -508,11 +508,8 @@
         filename = os.path.join(self.GetDirectory(), filename)
         filename = self.encode(filename)
         visible  = self.encode(attrs.get((None, 'visible'), "true")) != "false"
-        useMask = self.encode(attrs.get((None, 'use_mask'), "false")) != "false"
 
         self.aLayer = layer_class(title, filename, visible = visible)
-
-        self.aLayer.SetUseMask(useMask)
 
     def end_rasterlayer(self, name, qname):
         self.aMap.AddLayer(self.aLayer)

Index: save.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/Model/save.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- save.py	27 Jan 2005 14:19:41 -0000	1.42
+++ save.py	28 Jan 2005 15:54:00 -0000	1.43
@@ -303,9 +303,6 @@
             self.close_element("layer")
         elif isinstance(layer, RasterLayer):
             attrs["filename"] = self.prepare_filename(layer.filename)
-            if layer.UseMask():
-                attrs["use_mask"] = "true"
-
             self.open_element("rasterlayer", attrs)
             self.write_projection(layer.GetProjection())
             self.close_element("rasterlayer")