jonathan: thuban ChangeLog,1.767,1.768 setup.py,1.46,1.47

[cvs@intevation.de]

Author: jonathan

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

Modified Files:
	ChangeLog setup.py 
Log Message:
Improved rendering raster layers by changing the return format of
the ProjectRasterFile function.


Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -d -r1.767 -r1.768
--- ChangeLog	21 Jan 2005 08:31:43 -0000	1.767
+++ ChangeLog	21 Jan 2005 14:01:25 -0000	1.768
@@ -1,3 +1,48 @@
+2005-01-21  Jonathan Coles <jonathan at intevation.de>
+ 
+ 	* Thuban/UI/baserenderer.py (proj_params_to_str): New. Takes
+ 	a projection and returns a formatted string representing the 
+ 	parameters to feed to gdalwarp. This function eliminates
+ 	redundancy in draw_raster_layer().
+ 	(render_map_incrementally): Removed the optimization which
+ 	drew the top most raster layer first and then only those vector-
+ 	based layers that are above it. With the support for transparency
+ 	this optimization breaks correct behaviour.
+ 	(draw_raster_layer): Reorganize code to support possible future
+ 	enhancements to raster layer bounding box. The old behaviour has not 
+ 	changed. Also, change calling parameters to draw_raster_data()
+ 	to specify new RAW data format and mask.
+ 	(draw_raster_data): Change signature to include an optional
+ 	parameter for mask information. Change documentation to mention
+ 	support for new parameter and added option for RAW data format.
+ 	The data argument is now a list of [width, height, data].
+ 
+ 	* Thuban/UI/renderer.py (draw_raster_data): Add new optional
+ 	mask parameter. Add new condition for RAW format, which 
+ 	significantly reduces rendering time. Add condition for 
+ 	mask parameter.
+ 
+ 	* libraries/thuban/gdalwarp.cpp (GetImageData): New. Creates a 
+	data array of RGB values from the projected image returned from 
+	the gdal warping functions. In the case of palette based images, it
+ 	converts the NO_DATA index to the mask color.
+ 	(ProjectRasterFile): Removed all custom memory driver references
+ 	and replaced it with the standard in-memory dataset provided
+ 	by gdal. The return data is no longer a BMP file, but an array
+ 	of RGB values, one set triple per pixel.
+
+	* libraries/thuban/bmpdataset.cpp: Removed. Unnecessary.
+	* libraries/thuban/cpl_mfile.h: Removed. Unnecessary.
+	* libraries/thuban/cpl_mfile.cpp: Removed. Unnecessary.
+ 
+ 	* setup.py (thuban_build_ext.finalize_options): Removed mention
+ 	of cpl_mfile.cpp and bmpdataset.cpp files in the list of source
+ 	files. These are obsolete with the new version of gdalwarp.cpp
+ 
+ 	* test/test_baserenderer.py (draw_raster_data): Updated signature.
+ 	(test_raster_no_projection): Changed the test data to be data
+ 	in the uncompressed RAW format returned from ProjectRasterFile.
+
 2005-01-21  Jan-Oliver Wagner <jan at intevation.de>
 
 	* Thuban/UI/mainwindow.py (view_position_changed): Made string

Index: setup.py
===================================================================
RCS file: /thubanrepository/thuban/setup.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- setup.py	17 Dec 2004 18:48:49 -0000	1.46
+++ setup.py	21 Jan 2005 14:01:25 -0000	1.47
@@ -1091,9 +1091,7 @@
         build_ext.finalize_options(self)
         if self.with_gdal and include_gdal:
             self.extensions.append(Extension("Lib.gdalwarp",
-                                [ext_dir + "/thuban/gdalwarp.cpp",
-                                ext_dir + "/thuban/cpl_mfile.cpp",
-                                ext_dir + "/thuban/bmpdataset.cpp"],
+                                [ext_dir + "/thuban/gdalwarp.cpp"],
                                 include_dirs = gdal_cs_params[CS_INCDIRS] +
                                                [ext_dir + "/thuban/"],
                                 define_macros = gdal_cs_params[CS_DEFS],