jonathan: thuban ChangeLog,1.773,1.774

[cvs@intevation.de]

Author: jonathan

Update of /thubanrepository/thuban
In directory doto:/tmp/cvs-serv16876

Modified Files:
	ChangeLog 
Log Message:
Add a new dialog box for raster layers. The dialog box allows
the user to toggle a mask that is generated by ProjectRasterFile
and is used to only draw the real parts of the projected image.


Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -d -r1.773 -r1.774
--- ChangeLog	26 Jan 2005 09:17:01 -0000	1.773
+++ ChangeLog	27 Jan 2005 14:19:41 -0000	1.774
@@ -1,3 +1,80 @@
+2005-01-26  Jonathan Coles <jonathan at intevation.de>
+
+	Add a new dialog box for raster layers. The dialog box allows
+	the user to toggle a mask that is generated by ProjectRasterFile
+	and is used to only draw the real parts of the projected image.
+
+	* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer):
+	Instruct the warping code to generate a mask if the raster layer 
+	requests one. 
+	(BaseRenderer.draw_raster_data): Removed obsolete optional mask argument.
+
+	* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Removed
+	obsolete optional mask argument.
+
+	* Thuban/UI/classifier.py (Classifier): Change the parent class
+	to LayerProperties and rework the code to support layout calls
+	from the parent.
+	(Classifier.dialog_layout): New. Layout the dialog box.
+	(Classifier.map_layers_removed): Removed. Moved to parent class.
+	(Classifier.map_replaced): Removed. Moved to parent class.
+	(Classifier._OnTry): Renamed to OnTry to support parent class.
+	(Classifier.OnClose): Removed. Supplied in parent class.
+	(Classifier._OnCloseBtn): Removed. Supplied in parent class as OnCloseBtn.
+	(Classifier._OnOK): Renamed to OnOK to support parent class.
+	(Classifier._OnRevert): Renamed to OnRevert to support parent class.
+
+	* Thuban/UI/layerproperties.py: New. Base class for layer properties
+	dialog boxes.
+
+	* Thuban/UI/rasterlayerproperties.py: New. Class for displaying
+	raster layer properties.
+
+	* libraries/thuban/gdalwarp.cpp: Replace the old gdalwarp.cpp code
+	with the non-simple version supplied with gdal. This allows added
+	features such as creating an alpha band.
+	(GetImageData): Generate a mask array from the alpha band that is 
+	generated by gdal if the user has selected it. Try to support images 
+	that have more than three bands, such as images with RGB plus an 
+	alpha band.
+	(ProjectRasterFile): Convert python argument for mask and tell
+	gdal to enable or disable an alpha band.
+
+	* Thuban/Model/layer.py (BaseLayer.Type): New. Returns a string
+	describing what kind of layer the class is. Defaults to "Unknown",
+	but should be overridden by subclasses.
+	(Layer.Type): New. Override base class method.
+	(RasterLayer.__init__): Create a flag for using a mask. Record extra 
+	data from gdal for display in the properties dialog.
+	(RasterLayer.Type): New. Override base class method.
+	(RasterLayer.UseMask): New. Returns True if the mask should be used.
+	(RasterLayer.SetUseMask): New. Set if the mask should be used.
+	(RasterLayer.ImageInfo): New. Return extra information about the image.
+
+	* Thuban/Model/load.py (SessionLoader.start_rasterlayer): Load
+	the mask information.
+
+	* Thuban/Model/save.py (SessionSaver.write_layer): Save mask information.
+
+	* Thuban/UI/mainwindow.py: Register the RasterLayerProperties and
+	Classifier classes as dialogs to use with the proper layer types.
+
+	* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection):
+	Fix test.
+
+	* test/test_layer.py (TestLayer.test_raster_layer): Test new methods.
+	(TestLayerModification.build_path): New. Support function.
+	(TestLayerModification.test_raster_layer): New. Test new methods.
+
+	* test/test_save.py (SaveSessionTest.testRasterLayer): Add tests for mask.
+
+	* test/test_load.py (TestRasterLayer): Add tests for mask.
+
+	* test/test_load_1_0_1.py: New. Copied from test_load.py.
+
+	* test/test_baserenderer.py (SimpleRenderer.draw_raster_data): Removed
+	obsolete optional mask argument.
+
 2005-01-26  Nina Hüffmeyer <nhueffme at intevation.de>
 
 	* Extensions/ogr/ogrshapes.py: Added two dictionaries to ShapeStore