jonathan: thuban ChangeLog,1.774,1.775

[cvs@intevation.de]

Author: jonathan

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

Modified Files:
	ChangeLog 
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: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -d -r1.774 -r1.775
--- ChangeLog	27 Jan 2005 14:19:41 -0000	1.774
+++ ChangeLog	28 Jan 2005 15:54:00 -0000	1.775
@@ -1,3 +1,54 @@
+2005-01-28  Jonathan Coles <jonathan at intevation.de>
+
+	* Thuban/Model/layer.py (RasterLayer.__init__): Make use_mask
+	default to true.
+
+	* Thuban/Model/load.py (SessionLoader.start_rasterlayer): Remove 
+	code that loads the state of the layer's use_mask flag. Its 
+	usefulness is still being debated.
+
+	* Thuban/Model/save.py (SessionSaver.write_layer): Remove
+	code that saves the state of the layer's use_mask flag. Its 
+	usefulness is still being debated.
+
+	* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Pass
+	options to ProjectRasterFile based on the state of layer.UseMask().
+	Catch more exceptions from ProjectRasterFile so that Thuban doesn't
+	quit is there is a problem projecting.
+	(BaseRenderer.draw_raster_data): Change the documentation to 
+	describe the new format (XBM) that the mask data will be in.
+
+	* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): The mask
+	data is in XBM format when format='RAW' which means it doesn't 
+	need to be converted to a wxImage before being used as a mask
+	for a wxBitmap. Assume that if format != 'RAW' that the image
+	data and mask data are in the same format.
+
+	* libraries/thuban/gdalwarp.cpp (GetImageData): If alpha is enabled
+	and a mask is requested, convert the alpha band to a bit array in 
+	XBM format. if an alpha channel is requested, simply return the 
+	data in the alpha band. Provide better error handling by returning
+	python error messages (also fixes RT #2947).
+	(ProjectRasterFile): Support multiple mask options, rather than simply
+	a flag indicating that a mask should or should not be used. Provide 
+	better error handling by returning python error messages.
+
+	* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection):
+	Add mask data to test.
+
+	* test/test_layer.py (TestLayer.test_raster_layer): Test that a layer
+	should use the mask by default.
+	(TestLayerModificaton.test_raster_layer): Test that a layer should use 
+	the mask by default.
+
+	* test/test_load.py (TestRasterLayer.test): Remove testing for
+	use_mask flag in file.
+
+	* test/test_save.py (SaveSessionTest.testRasterLayer): Remove testing
+	for use_mask in file.
+
+	* test/test_load_1_0_1.py: Removed. Shouldn't have been checked in.
+	
 2005-01-26  Jonathan Coles <jonathan at intevation.de>
 
 	Add a new dialog box for raster layers. The dialog box allows