jonathan: thuban ChangeLog,1.786,1.787

cvs at intevation.de cvs at intevation.de
Fri Feb 18 15:54:19 CET 2005


Author: jonathan

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

Modified Files:
	ChangeLog 
Log Message:
Refactored baserenderer.py and renderer.py to remove baserenderer.py's
dependencies on wxPython. Added a new method projected_raster_layer()
that returns a raster layer image in projected space. This must be
implemented in classes derived from BaseRenderer. This also eliminates
the dependency on gdal in baserenderer.py.


Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -d -r1.786 -r1.787
--- ChangeLog	17 Feb 2005 11:02:46 -0000	1.786
+++ ChangeLog	18 Feb 2005 14:54:17 -0000	1.787
@@ -1,3 +1,38 @@
+2005-02-18  Jonathan Coles <jonathan at intevation.de>
+
+	Refactored baserenderer.py and renderer.py to remove baserenderer.py's
+	dependencies on wxPython. Added a new method projected_raster_layer()
+	that returns a raster layer image in projected space. This must be
+	implemented in classes derived from BaseRenderer. This also eliminates
+	the dependency on gdal in baserenderer.py.
+
+	* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Call
+	new projected_raster_layer() to get projected raster image instead
+	of directly calling ProjectRasterFile().
+	(BaseRenderer.projected_raster_layer): New. This must be implemented
+	by derived classes. It takes almost the same arguments as ProjectRasterFile
+	did and returns a projected image with mask and alpha data (if requested).
+	(BaseRenderer.render_map_incrementally): Remove the check for gdal since
+	that check will be done in MapRenderer.projected_raster_layer(). This
+	also allows other implementations to use different projection code.
+
+	* Thuban/UI/renderer.py (MapRenderer.projected_raster_layer):
+	Implementation of BaseRenderer.projected_raster_layer. Checks for 
+	gdal support and wxPython version. Also handles exceptions from
+	ProjectRasterFile.
+
+	* libraries/thuban/gdalwarp.cpp: Removed checks for wxPython versions
+	and added a variable which can be set through the options argument
+	of ProjectRasterFile.
+
+	* test/test_baserenderer.py (SimpleRenderer.projected_raster_layer): New.
+	Calls ProjectRasterFile and returns the result.
+	(TestBaseRenderer.test_projected_raster_layer): New. Tests the results
+	of calling projected_raster_layer() with different options.
+	(TestBaseRenderer.test_raster_no_projection): Removed tests based on
+	wxPython version and all tests of masks and alpha channels. These are
+	now in test_projected_raster_layer().
+
 2005-02-17  Jan-Oliver Wagner <jan at intevation.de>
 
 	* Thuban/Model/map.py, Thuban/Model/label.py: Fixed




More information about the Thuban-devel mailing list