jonathan: thuban ChangeLog,1.783,1.784 setup.py,1.47,1.48

[cvs@intevation.de]

Author: jonathan

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

Modified Files:
	ChangeLog setup.py 
Log Message:
Further wxPython 2.5 changes using patches from Daniel Calvelo Aros
so that that wxproj doesn't crash. Added GUI support for selecting
alpha channel (opacity can't be selected yet).


Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -d -r1.783 -r1.784
--- ChangeLog	8 Feb 2005 20:34:29 -0000	1.783
+++ ChangeLog	16 Feb 2005 21:14:47 -0000	1.784
@@ -1,3 +1,67 @@
+2005-02-16  Jonathan Coles <jonathan at intevation.de>
+
+	Further wxPython 2.5 changes using patches from Daniel Calvelo Aros 
+	so that that wxproj doesn't crash. Added GUI support for selecting
+	alpha channel (opacity can't be selected yet).
+
+	NOTE: If wxPython.h is including in future distribution packages
+	then it will not be necessary to have the files swigPtrConvertHack.h
+	and wxPython_int.h included with Thuban. This is hopefully
+	a temporary workaround.
+
+	* setup.py (thuban_build_ext.finalize_options): gdalwarp needs
+	access to the macro wxCHECK_VERSION so that it will properly 
+	generate a bit mask. There was a problem between wx2.4 and wx2.5
+	that this works around.
+
+	* Thuban/Model/layer.py (RasterLayer.UseMask): Removed in favor
+	of RasterLayer.MaskType.
+	(RasterLayer.SetUseMask): Removed in favor of RasterLayer.SetMaskType
+	(RasterLayer.MaskType): New. Returns the type of mask to use. Can
+	specify none, a bitmap, or an alpha channel.
+	(RasterLayer.SetMaskType): New. Set what kind of mask to use.
+
+	* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer):
+	Set the raster warping options for the mask based on the value
+	of RasterLayer.MaskType.
+
+	* Thuban/UI/legend.py (LegendTree.__FillTreeLayer): Remove 
+	deprecated calls to SetItemSelectedImage in favor of SetItemImage
+	with wxTreeItemIcon_Selected.
+
+	* Thuban/UI/rasterlayerproperties.py: Support selecting to use
+	an alpha channel for the mask.
+
+	* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Use alpha
+	data if it is available and an alpha channel is supported under
+	the current version of wxPython.
+
+	* libraries/thuban/gdalwarp.cpp (GetImageData): Added compiler define
+	to select whether 1's or 0's select the desired portion of an image
+	in the bit mask. wx2.4 has a bug where the documentation is the opposite
+	from behavior.
+	(ProjectRasterFile): Only generate an alpha channel if the version
+	of wxPython is >= 2.5.3.
+
+	* libraries/thuban/wxproj.cpp: Applied patches from Daniel Calvelo Aros.
+	When wxPython >= 2.5.3 use the special swig functions to decode an
+	object's address.
+
+	* libraries/thuban/swigPtrConvertHack.h: Includes conditional code
+	based on the version of wxPython. If >= 2.5.3 use the special swig
+	functions from wxPython to decode wxPython objects, otherwise use
+	the old method of retrieving the address from the object __repr__ string.
+
+	* libraries/thuban/wxPython_int.h: Copied from wxPython source. 
+	Unnecessary code was removed to make it smaller. 
+
+	* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection):
+	Add tests for returning an alpha channel.
+
+	* test/test_layer.py (TestLayerModification.test_raster_layer): Fix
+	tests that used removed functions UseMask and SetUseMask
+
+
 2005-02-08  Bernhard Herzog  <bh at intevation.de>
 
 	More wxPython 2.5 changes.  This time taken from a patch from

Index: setup.py
===================================================================
RCS file: /thubanrepository/thuban/setup.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- setup.py	21 Jan 2005 14:01:25 -0000	1.47
+++ setup.py	16 Feb 2005 21:14:47 -0000	1.48
@@ -1093,8 +1093,10 @@
             self.extensions.append(Extension("Lib.gdalwarp",
                                 [ext_dir + "/thuban/gdalwarp.cpp"],
                                 include_dirs = gdal_cs_params[CS_INCDIRS] +
-                                               [ext_dir + "/thuban/"],
-                                define_macros = gdal_cs_params[CS_DEFS],
+                                               [ext_dir + "/thuban/"] +
+                                               wx_cs_params[CS_INCDIRS],
+                                define_macros = gdal_cs_params[CS_DEFS] +
+                                                wx_cs_params[CS_DEFS],
                                 library_dirs = gdal_cs_params[CS_LIBDIRS],
                                 libraries = gdal_cs_params[CS_LIBS]))