| 1 |
|
2005-05-12 Jonathan Coles <[email protected]> |
| 2 |
|
|
| 3 |
|
* Thuban/UI/projdialog.py: Add missing import, which led to an |
| 4 |
|
exception when opening a layer's projection. |
| 5 |
|
|
| 6 |
|
2005-05-09 Bernhard Herzog <[email protected]> |
| 7 |
|
|
| 8 |
|
* test/support.py (FileLoadTestCase.filename): Fix doc-string. |
| 9 |
|
|
| 10 |
|
2005-05-09 Bernhard Herzog <[email protected]> |
| 11 |
|
|
| 12 |
|
* Thuban/Model/postgisdb.py (PostGISConnection.connect): Set the |
| 13 |
|
connection to autoconnect. Fixes RT#3148. |
| 14 |
|
|
| 15 |
|
* test/test_postgis_db.py |
| 16 |
|
(TestPostGISSpecialCases.test_simple_error_handling): New test |
| 17 |
|
that attempts to reproduce RT#3148. |
| 18 |
|
|
| 19 |
|
2005-05-06 Jonathan Coles <[email protected]> |
| 20 |
|
|
| 21 |
|
Add support for saving and loading the opacity and mask type |
| 22 |
|
properties of RasterLayers. Also add support for proper use |
| 23 |
|
of alpha information while drawing images not in 'RAW' format. |
| 24 |
|
If transparency in an image format (e.g, PNG) is supported by |
| 25 |
|
wxWidgets then the image would previously have been draw with |
| 26 |
|
transparent regions, but the opaque regions would have been |
| 27 |
|
unaffected by a change in the layer's opacity. This patch |
| 28 |
|
corrects the problem. |
| 29 |
|
|
| 30 |
|
* Thuban/Model/layer.py (RasterLayer): Added opacity and |
| 31 |
|
masktype parameters to the constructor, and set the |
| 32 |
|
appropriate variables to those values. |
| 33 |
|
|
| 34 |
|
* Thuban/Model/load.py (SessionLoader.start_rasterlayer): Added |
| 35 |
|
code to read the opacity and mask type of the layer and construct |
| 36 |
|
a new layer with the additional parameters. |
| 37 |
|
|
| 38 |
|
* Thuban/Model/save.py (SessionSaver.write_layer): Added code |
| 39 |
|
to save the opacity and mask type of a layer. |
| 40 |
|
|
| 41 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Pass |
| 42 |
|
the opacity of the layer to draw_raster_data rather than the layer. |
| 43 |
|
(BaseRenderer.draw_raster_data): Remove the layer parameter because |
| 44 |
|
the function doesn't need to know about the layer. Add the optional |
| 45 |
|
opacity parameter whose default is 1.0. Add 'PNG' as a supported |
| 46 |
|
graphics format. |
| 47 |
|
|
| 48 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Fixed |
| 49 |
|
signature to match that in BaseRenderer. Use the new opacity argument |
| 50 |
|
in place of calling layer.Opacity(). In the case where the |
| 51 |
|
format is not 'RAW', alpha_data is None and the loaded image has |
| 52 |
|
alpha information, use the file's alpha information. This is |
| 53 |
|
still subject to the layer's opacity setting. |
| 54 |
|
|
| 55 |
|
* test/test_baserenderer.py (SimpleRenderer.draw_raster_data): |
| 56 |
|
Fixed signature to match that in BaseRenderer. |
| 57 |
|
|
| 58 |
|
* test/test_load.py (TestRasterLayer): Change file_contents to |
| 59 |
|
include opacity and masktype variables. |
| 60 |
|
(TestRasterLayer.test): Include tests for opacity and masktype |
| 61 |
|
changes. |
| 62 |
|
|
| 63 |
|
* test/test_save.py (SaveSessionTest.testRasterLayer): Restructure |
| 64 |
|
test to cover a variety of combinations of masktype and opacity |
| 65 |
|
settings. |
| 66 |
|
|
| 67 |
|
2005-05-02 Jan-Oliver Wagner <[email protected]> |
| 68 |
|
|
| 69 |
|
* debian/rules: add --use-wx-python-swig-hack |
| 70 |
|
to the build command. |
| 71 |
|
Thanks to Moritz Lennert for pointing this out. |
| 72 |
|
|
| 73 |
|
2005-04-28 Jan-Oliver Wagner <[email protected]> |
| 74 |
|
|
| 75 |
|
Introduce OGRFileShapeStore in ogr extension. |
| 76 |
|
This allows at least that loaded shapefile shape stores |
| 77 |
|
can be saved correctly in the thuban session file |
| 78 |
|
and reloaded again (reload is via core shapefile |
| 79 |
|
routine, not OGR). For other types, .thuban files |
| 80 |
|
can not be reloaded for the time being. |
| 81 |
|
|
| 82 |
|
* Extensions/ogr/ogrshapes.py (OGRFileShapeStore): New. This |
| 83 |
|
class ist to be used for any file-based shape stores |
| 84 |
|
accessed through OGR. |
| 85 |
|
|
| 86 |
|
* Extensions/ogr/ogrstart.py (open_with_ogr): Added |
| 87 |
|
forgotten _ for i18n. Adapted call OpenFileShapestore |
| 88 |
|
regarding new parameter. |
| 89 |
|
(OpenFileShapestore): Use OGRFileShapeStore instead of |
| 90 |
|
OGRShapeStore. Fix return value (None instead of null). |
| 91 |
|
Add new parameter "mainwindow" to avoid accessing global |
| 92 |
|
context. |
| 93 |
|
|
| 94 |
|
2005-04-27 Jan-Oliver Wagner <[email protected]> |
| 95 |
|
|
| 96 |
|
Introduce FileShapeStore as generalization for |
| 97 |
|
file-based shape stores. In a first instance |
| 98 |
|
this allows additional modules to handle shapefile |
| 99 |
|
format as well, namely the OGR extension. |
| 100 |
|
|
| 101 |
|
* Thuban/Model/data.py: Various small fixes in doc-strings. |
| 102 |
|
(FileShapeStore): New class. |
| 103 |
|
(ShapefileStore): Derive from FileShapeStore. |
| 104 |
|
(ShapefileStore.__init__): Call __init__ of FileShapeStore, |
| 105 |
|
rename self.table to self._table, initialize self._bbox |
| 106 |
|
(ShapefileStore._open_shapefile): Use self._bbox instead of self.bbox |
| 107 |
|
and self.FileName() instead of self.filename. |
| 108 |
|
(ShapefileStore.Table): Use self._table instead of self.table. |
| 109 |
|
(ShapefileStore.FileName): Removed (moved to FileShapeStore). |
| 110 |
|
(ShapefileStore.BoundingBox): Use self._bbox instead of self.bbox. |
| 111 |
|
|
| 112 |
|
* Thuban/Model/save.py: Replace ShapefileStore by FileShapeStore. |
| 113 |
|
(SessionSaver.write_data_containers): Only use methods of the |
| 114 |
|
base class FileShapeStore. |
| 115 |
|
|
| 116 |
|
2005-04-26 Martin Schulze <[email protected]> |
| 117 |
|
|
| 118 |
|
* Extensions/wms/wms.py (render_wms_layer): Adjusted the render |
| 119 |
|
function to the modified render engine |
| 120 |
|
|
| 121 |
|
2005-04-25 Martin Schulze <[email protected]> |
| 122 |
|
|
| 123 |
|
* Thuban/UI/renderer.py (MapRenderer.projected_raster_layer): |
| 124 |
|
Added a description according to the CVS log message |
| 125 |
|
|
| 126 |
|
2005-04-23 Martin Schulze <[email protected]> |
| 127 |
|
|
| 128 |
|
* Thuban/UI/renderer.py: Added a missing import |
| 129 |
|
|
| 130 |
|
2005-04-23 Russell Nelson <[email protected]> |
| 131 |
|
|
| 132 |
|
* Thuban/UI/view.py (MapCanvas.OnMiddle{Up,Down}): Changed the |
| 133 |
|
way the previous tool is remembered, so that middle-button |
| 134 |
|
panning works even if you haven't selected a tool. |
| 135 |
|
|
| 136 |
|
2005-04-11 Bernhard Herzog <[email protected]> |
| 137 |
|
|
| 138 |
|
* libraries/thuban/wxproj.cpp: Move the compatibility code that |
| 139 |
|
deals with the wxPython 2.4 version of wxPython.h into the #ifdef |
| 140 |
|
branch that includes wxPython.h because it's only needed when |
| 141 |
|
wxPython.h is used. Also, it won't compile when |
| 142 |
|
USE_WX_PYTHON_SWIG_HACK is set otherwise. |
| 143 |
|
|
| 144 |
|
2005-04-07 Bernhard Herzog <[email protected]> |
| 145 |
|
|
| 146 |
|
* Thuban/UI/classifier.py (ClassGrid.__init__): Use -1 as the ID. |
| 147 |
|
(ID_CLASS_TABLE): Removed. It wasn't used anywhere except in |
| 148 |
|
ClassGrid.__init__ and it's value is outside of the valid |
| 149 |
|
range (must be < 32768). wxPython 2.5 complains about it with an |
| 150 |
|
exception. |
| 151 |
|
|
| 152 |
|
2005-04-05 Jan-Oliver Wagner <[email protected]> |
| 153 |
|
|
| 154 |
|
* Doc/manual/thuban-manual-de.xml: More translations. |
| 155 |
|
|
| 156 |
|
2005-04-05 Bernhard Herzog <[email protected]> |
| 157 |
|
|
| 158 |
|
* libraries/thuban/wxproj.cpp: Make it work with a wxPython.h from |
| 159 |
|
wxPython 2.4 as well. Also, remove a now obsolete comment. |
| 160 |
|
|
| 161 |
|
2005-04-05 Bernhard Herzog <[email protected]> |
| 162 |
|
|
| 163 |
|
Use wxPython.h by default but provide a workaround when it isn't |
| 164 |
|
available. |
| 165 |
|
|
| 166 |
|
* setup.py (wxproj_extension): New variable. Assign the Extension |
| 167 |
|
instance for Lib.wxproj to this variable instead of putting it |
| 168 |
|
directly into the listso that it can be accessed by other code |
| 169 |
|
later. |
| 170 |
|
(thuban_build_ext.user_options): Added boolean option |
| 171 |
|
--use-wx-python-swig-hack. |
| 172 |
|
(thuban_build_ext.initialize_options): Initialize the new option |
| 173 |
|
to False. |
| 174 |
|
(thuban_build_ext.finalize_options): If the new option was given, |
| 175 |
|
define the preprocesser macro USE_WX_PYTHON_SWIG_HACK. |
| 176 |
|
(thuban_build_ext): Update the doc-string |
| 177 |
|
|
| 178 |
|
* libraries/thuban/wxproj.cpp: Normally we use |
| 179 |
|
wx/wxPython/wxPython.h now. Only if USE_WX_PYTHON_SWIG_HACK is |
| 180 |
|
defined, use swigPtrConvertHack.h instead. |
| 181 |
|
|
| 182 |
|
* libraries/thuban/swigPtrConvertHack.h: Remove the code that was |
| 183 |
|
copied over from wxPython.h. |
| 184 |
|
(decode_pointer_new): New. Equivalent of decode_pointer for |
| 185 |
|
wxPython 2.5. |
| 186 |
|
(wxPyConvertSwigPtr): Modified to cope with wxPython 2.5 as well. |
| 187 |
|
|
| 188 |
|
* README: Add section on potential build problems which explains |
| 189 |
|
how the work-around for a missing wxPython.h is activated. |
| 190 |
|
|
| 191 |
|
2005-03-29 Bernhard Herzog <[email protected]> |
| 192 |
|
|
| 193 |
|
* test/postgissupport.py (find_postgis_sql): Added yet another |
| 194 |
|
potential location for (lw)postgis.sql because the file has moved |
| 195 |
|
again in postgis 1.0.0 rc4. |
| 196 |
|
|
| 197 |
|
2005-03-29 Bernhard Herzog <[email protected]> |
| 198 |
|
|
| 199 |
|
* Thuban/UI/legend.py (BMP_SIZE_W, BMP_SIZE_H): Set both to 16 to |
| 200 |
|
match the site of the legend_icon_layer icon. Otherwise wxpython |
| 201 |
|
2.5 complains when the legend is created with the error: |
| 202 |
|
|
| 203 |
|
PyAssertionError: C++ assertion "(bitmap.GetWidth() == m_width && |
| 204 |
|
bitmap.GetHeight() == m_height) || (m_width == 0 && m_height == |
| 205 |
|
0)" failed in ./src/generic/imaglist.cpp(81): invalid bitmap size |
| 206 |
|
in wxImageList: this might work on this platform but definitely |
| 207 |
|
won't under Windows. |
| 208 |
|
|
| 209 |
|
2005-03-23 Jonathan Coles <[email protected]> |
| 210 |
|
|
| 211 |
|
These changes add support for adjusting the opacity of a raster layer. |
| 212 |
|
|
| 213 |
|
* Thuban/Model/layer.py (RasterLayer.Opacity): Replaces AlphaOpacity. |
| 214 |
|
(RasterLayer.SetOpacity): Replaces SetAlphaOpacity. Also triggers |
| 215 |
|
a LAYER_CHANGED event if the opacity actually changes. |
| 216 |
|
|
| 217 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_data): Added |
| 218 |
|
layer parameter needed in the implementation of this method in |
| 219 |
|
renderer.py. |
| 220 |
|
|
| 221 |
|
* Thuban/UI/layerproperties.py (LayerProperties.dialog_layout): Fixed |
| 222 |
|
typo 00 -> 0. |
| 223 |
|
|
| 224 |
|
* Thuban/UI/rasterlayerproperties.py (RasterLayerProperties): Added |
| 225 |
|
control to adjust opacity. |
| 226 |
|
|
| 227 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Scale the |
| 228 |
|
alpha data based on the opacity level of the layer. |
| 229 |
|
|
| 230 |
|
* test/test_baserenderer.py (SimpleRenderer.draw_raster_data): Now |
| 231 |
|
accepts a layer parameter. |
| 232 |
|
|
| 233 |
|
* test/test_layer.py (TestLayerModification.test_raster_layer): |
| 234 |
|
Rename opacity method calls and add test for LAYER_CHANGED. |
| 235 |
|
|
| 236 |
|
2005-03-16 Bernhard Herzog <[email protected]> |
| 237 |
|
|
| 238 |
|
* test/test_connector.py (DeletionTestMixin.check_deletions) |
| 239 |
|
(DeletionTestMixin.check_deletetions): renamed to check_deletions. |
| 240 |
|
update the callers. |
| 241 |
|
|
| 242 |
|
2005-03-14 Jan-Oliver Wagner <[email protected]> |
| 243 |
|
|
| 244 |
|
* Doc/manual/thuban-manual-de.xml: More translations. |
| 245 |
|
|
| 246 |
|
2005-03-10 Jan-Oliver Wagner <[email protected]> |
| 247 |
|
|
| 248 |
|
Introducing initialization callbacks for extensions. |
| 249 |
|
|
| 250 |
|
* Thuban/UI/extensionregistry.py (ExtensionDesc.__init__): Added |
| 251 |
|
optional parameter init_callback. |
| 252 |
|
(ExtensionDesc.init_ext): New. Executes the callback and sets |
| 253 |
|
a status. |
| 254 |
|
|
| 255 |
|
* Thuban/UI/application.py (ThubanApplication.OnInit): Add the |
| 256 |
|
initialization of the extensions. |
| 257 |
|
(ThubanApplication.init_extensions): Init all extensions. |
| 258 |
|
|
| 259 |
|
* Thuban/UI/about.py (About.__init__): Added status of the extensions |
| 260 |
|
to the about text. |
| 261 |
|
|
| 262 |
|
* Extensions/gns2shp/__init__.py: Added init method for Extension |
| 263 |
|
description. |
| 264 |
|
(init): New. Contains the initialization of the module. |
| 265 |
|
|
| 266 |
|
2005-03-04 Nina H�ffmeyer <[email protected]> |
| 267 |
|
|
| 268 |
|
* Extensions/ogr/ogrdialog.py: Added a dialog, which asks for |
| 269 |
|
OGRConnection to open a datasource. Removed dialog to display all |
| 270 |
|
available drivers. Added some doc strings. |
| 271 |
|
|
| 272 |
|
* Extensions/ogr/ogrstart.py: Added menu entry for opening an |
| 273 |
|
OGRDatasource with a string. Added two opening methods which return an |
| 274 |
|
OGRDatasource (either data from file or from DB). |
| 275 |
|
|
| 276 |
|
* Extensions/ogr/ogrshapes.py: Added class OGRGeometry, which |
| 277 |
|
represents a geometry reference of an OGRFeature. OGRShape now has a |
| 278 |
|
list of referenced geometry objects (important for geometry |
| 279 |
|
collections). |
| 280 |
|
For OGRShapeStores loaded from a DB an ID column can be specified now. |
| 281 |
|
|
| 282 |
|
2005-02-22 Jan-Oliver Wagner <[email protected]> |
| 283 |
|
|
| 284 |
|
* test/test_map.py (TestMapWithContents.test_tree_info): |
| 285 |
|
Added label layer for comparison. |
| 286 |
|
|
| 287 |
|
2005-02-18 Jonathan Coles <[email protected]> |
| 288 |
|
|
| 289 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): Optimize the loop |
| 290 |
|
which builds a mask. Handle the majority of an image in a loop, |
| 291 |
|
creating 8 bits at a time. Later, handle the edge case where less |
| 292 |
|
than 8 bits are packed. |
| 293 |
|
|
| 294 |
|
2005-02-18 Bernhard Herzog <[email protected]> |
| 295 |
|
|
| 296 |
|
* test/test_baserenderer.py (TestBaseRenderer.setUp): Fix |
| 297 |
|
doc-string |
| 298 |
|
|
| 299 |
|
2005-02-18 Jonathan Coles <[email protected]> |
| 300 |
|
|
| 301 |
|
* setup.py: Remove wx_cs_params from gdal compile options. |
| 302 |
|
|
| 303 |
|
2005-02-18 Jonathan Coles <[email protected]> |
| 304 |
|
|
| 305 |
|
Refactored baserenderer.py and renderer.py to remove baserenderer.py's |
| 306 |
|
dependencies on wxPython. Added a new method projected_raster_layer() |
| 307 |
|
that returns a raster layer image in projected space. This must be |
| 308 |
|
implemented in classes derived from BaseRenderer. This also eliminates |
| 309 |
|
the dependency on gdal in baserenderer.py. |
| 310 |
|
|
| 311 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Call |
| 312 |
|
new projected_raster_layer() to get projected raster image instead |
| 313 |
|
of directly calling ProjectRasterFile(). |
| 314 |
|
(BaseRenderer.projected_raster_layer): New. This must be implemented |
| 315 |
|
by derived classes. It takes almost the same arguments as ProjectRasterFile |
| 316 |
|
did and returns a projected image with mask and alpha data (if requested). |
| 317 |
|
(BaseRenderer.render_map_incrementally): Remove the check for gdal since |
| 318 |
|
that check will be done in MapRenderer.projected_raster_layer(). This |
| 319 |
|
also allows other implementations to use different projection code. |
| 320 |
|
|
| 321 |
|
* Thuban/UI/renderer.py (MapRenderer.projected_raster_layer): |
| 322 |
|
Implementation of BaseRenderer.projected_raster_layer. Checks for |
| 323 |
|
gdal support and wxPython version. Also handles exceptions from |
| 324 |
|
ProjectRasterFile. |
| 325 |
|
|
| 326 |
|
* libraries/thuban/gdalwarp.cpp: Removed checks for wxPython versions |
| 327 |
|
and added a variable which can be set through the options argument |
| 328 |
|
of ProjectRasterFile. |
| 329 |
|
|
| 330 |
|
* test/test_baserenderer.py (SimpleRenderer.projected_raster_layer): New. |
| 331 |
|
Calls ProjectRasterFile and returns the result. |
| 332 |
|
(TestBaseRenderer.test_projected_raster_layer): New. Tests the results |
| 333 |
|
of calling projected_raster_layer() with different options. |
| 334 |
|
(TestBaseRenderer.test_raster_no_projection): Removed tests based on |
| 335 |
|
wxPython version and all tests of masks and alpha channels. These are |
| 336 |
|
now in test_projected_raster_layer(). |
| 337 |
|
|
| 338 |
|
2005-02-17 Jan-Oliver Wagner <[email protected]> |
| 339 |
|
|
| 340 |
|
* Thuban/Model/map.py, Thuban/Model/label.py: Fixed |
| 341 |
|
doc-strings to comply with coding_guidelines. |
| 342 |
|
|
| 343 |
|
2005-02-17 Jan-Oliver Wagner <[email protected]> |
| 344 |
|
|
| 345 |
|
Docstring improvements and minor fixes for labellayer. |
| 346 |
|
|
| 347 |
|
* Thuban/Model/map.py: |
| 348 |
|
(Map, Map.Destroy, Map.RemoveLayer, Map.ClearLayers, |
| 349 |
|
Map.Layers, Map.HasLayers, Map.MoveLayerToTop, |
| 350 |
|
Map.RaiseLayer, Map.LowerLayer, Map.MoveLayerToBottom, |
| 351 |
|
Map.ProjectedBoundingBox, Map.GetProjection): Improved/added |
| 352 |
|
doc string. |
| 353 |
|
(Map.BoundingBox): Removed superfluous test for label_layer |
| 354 |
|
and improved doc string. |
| 355 |
|
(Map.TreeInfo): Added label_layer and improved sdo string. |
| 356 |
|
|
| 357 |
|
* Thuban/Model/label.py: Added import of _. |
| 358 |
|
(Label, Label.__init__): Improved/added doc string. |
| 359 |
|
(LabelLayer, LabelLayer.__init__, LabelLayer.Labels, |
| 360 |
|
LabelLayer.RemoveLabel, LabelLayer.ClearLabels): |
| 361 |
|
Improved/added doc string. |
| 362 |
|
(LabelLayer.AddLabel): Use already defined names for |
| 363 |
|
align strings and improved doc string. |
| 364 |
|
(LabelLayer.TreeInfo): New. Return the object data for |
| 365 |
|
the tree view. |
| 366 |
|
|
| 367 |
|
2005-02-16 Jonathan Coles <[email protected]> |
| 368 |
|
|
| 369 |
|
Further wxPython 2.5 changes using patches from Daniel Calvelo Aros |
| 370 |
|
so that that wxproj doesn't crash. Added GUI support for selecting |
| 371 |
|
alpha channel (opacity can't be selected yet). |
| 372 |
|
|
| 373 |
|
NOTE: If wxPython.h is including in future distribution packages |
| 374 |
|
then it will not be necessary to have the files swigPtrConvertHack.h |
| 375 |
|
and wxPython_int.h included with Thuban. This is hopefully |
| 376 |
|
a temporary workaround. |
| 377 |
|
|
| 378 |
|
* setup.py (thuban_build_ext.finalize_options): gdalwarp needs |
| 379 |
|
access to the macro wxCHECK_VERSION so that it will properly |
| 380 |
|
generate a bit mask. There was a problem between wx2.4 and wx2.5 |
| 381 |
|
that this works around. |
| 382 |
|
|
| 383 |
|
* Thuban/Model/layer.py (RasterLayer.UseMask): Removed in favor |
| 384 |
|
of RasterLayer.MaskType. |
| 385 |
|
(RasterLayer.SetUseMask): Removed in favor of RasterLayer.SetMaskType |
| 386 |
|
(RasterLayer.MaskType): New. Returns the type of mask to use. Can |
| 387 |
|
specify none, a bitmap, or an alpha channel. |
| 388 |
|
(RasterLayer.SetMaskType): New. Set what kind of mask to use. |
| 389 |
|
|
| 390 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): |
| 391 |
|
Set the raster warping options for the mask based on the value |
| 392 |
|
of RasterLayer.MaskType. |
| 393 |
|
|
| 394 |
|
* Thuban/UI/legend.py (LegendTree.__FillTreeLayer): Remove |
| 395 |
|
deprecated calls to SetItemSelectedImage in favor of SetItemImage |
| 396 |
|
with wxTreeItemIcon_Selected. |
| 397 |
|
|
| 398 |
|
* Thuban/UI/rasterlayerproperties.py: Support selecting to use |
| 399 |
|
an alpha channel for the mask. |
| 400 |
|
|
| 401 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Use alpha |
| 402 |
|
data if it is available and an alpha channel is supported under |
| 403 |
|
the current version of wxPython. |
| 404 |
|
|
| 405 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): Added compiler define |
| 406 |
|
to select whether 1's or 0's select the desired portion of an image |
| 407 |
|
in the bit mask. wx2.4 has a bug where the documentation is the opposite |
| 408 |
|
from behavior. |
| 409 |
|
(ProjectRasterFile): Only generate an alpha channel if the version |
| 410 |
|
of wxPython is >= 2.5.3. |
| 411 |
|
|
| 412 |
|
* libraries/thuban/wxproj.cpp: Applied patches from Daniel Calvelo Aros. |
| 413 |
|
When wxPython >= 2.5.3 use the special swig functions to decode an |
| 414 |
|
object's address. |
| 415 |
|
|
| 416 |
|
* libraries/thuban/swigPtrConvertHack.h: Includes conditional code |
| 417 |
|
based on the version of wxPython. If >= 2.5.3 use the special swig |
| 418 |
|
functions from wxPython to decode wxPython objects, otherwise use |
| 419 |
|
the old method of retrieving the address from the object __repr__ string. |
| 420 |
|
|
| 421 |
|
* libraries/thuban/wxPython_int.h: Copied from wxPython source. |
| 422 |
|
Unnecessary code was removed to make it smaller. |
| 423 |
|
|
| 424 |
|
* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection): |
| 425 |
|
Add tests for returning an alpha channel. |
| 426 |
|
|
| 427 |
|
* test/test_layer.py (TestLayerModification.test_raster_layer): Fix |
| 428 |
|
tests that used removed functions UseMask and SetUseMask |
| 429 |
|
|
| 430 |
|
|
| 431 |
|
2005-02-08 Bernhard Herzog <[email protected]> |
| 432 |
|
|
| 433 |
|
More wxPython 2.5 changes. This time taken from a patch from |
| 434 |
|
Daniel Calvelo Aros. |
| 435 |
|
|
| 436 |
|
* Thuban/UI/tableview.py (QueryTableFrame.__init__) |
| 437 |
|
(QueryTableFrame.__init__): Pass the size of a spacer as a single |
| 438 |
|
item. |
| 439 |
|
|
| 440 |
|
* Thuban/UI/projdialog.py (ProjFrame.build_dialog) |
| 441 |
|
(ProjFrame.build_dialog): Pass the size of a spacer as a single |
| 442 |
|
item. |
| 443 |
|
|
| 444 |
|
* Thuban/UI/dbdialog.py (ChooseDBTableDialog.__init__): Pass the |
| 445 |
|
size of a spacer as a single item. |
| 446 |
|
|
| 447 |
|
* Thuban/UI/classifier.py (Classifier.dialog_layout): Pass the |
| 448 |
|
size of a spacer as a single item. |
| 449 |
|
|
| 450 |
|
2005-02-08 Bernhard Herzog <[email protected]> |
| 451 |
|
|
| 452 |
|
Compatibility with wxPython 2.5. The changes should make it work |
| 453 |
|
better with 2.5 while still keeping compatibility with 2.4. There |
| 454 |
|
are still problems with 2.5, though. |
| 455 |
|
|
| 456 |
|
* Thuban/UI/dock.py (DockableWindow.__CreateBorder): Pass the size |
| 457 |
|
of a spacer as a single item. |
| 458 |
|
|
| 459 |
|
* Thuban/UI/classifier.py (ClassGroupPropertiesCtrl): Derive only |
| 460 |
|
from wxControl |
| 461 |
|
|
| 462 |
|
* Thuban/UI/legend.py (LegendTree): When running with wxPython < |
| 463 |
|
2.5, add an implementation of the GetFirstChild method that does |
| 464 |
|
not require the second parameter. |
| 465 |
|
(LegendTree.find_layer, LegendTree._OnMsgMapLayersAdded) |
| 466 |
|
(LegendTree._OnMsgMapLayersRemoved, LegendTree.DeleteAllItems) |
| 467 |
|
(LegendTree.DeleteChildren, LegendTree.__ShowHideLayer): Do not |
| 468 |
|
pass the second parameter to GetFirstChild |
| 469 |
|
|
| 470 |
|
2005-02-08 Nina H�ffmeyer <[email protected]> |
| 471 |
|
|
| 472 |
|
* Extensions/ogr/ogrshapes.py: Removed some print commands. |
| 473 |
|
|
| 474 |
|
* Extensions/ogr/ogrstart.py: Changed the GUI. OGR is no longer an |
| 475 |
|
additional menu but appears as a possibility in the menu Map. |
| 476 |
|
|
| 477 |
|
2005-02-07 Jonathan Coles <[email protected]> |
| 478 |
|
* libraries/thuban/gdalwarp.cpp: Removed the macros PYTHON_ERR |
| 479 |
|
and PYTHON_ERRF since they were no longer necessary. |
| 480 |
|
|
| 481 |
|
2005-02-07 Bernhard Reiter <[email protected]> |
| 482 |
|
* Thuban/UI/classifier.py (ClassGrid.DeleteSelectedRows): |
| 483 |
|
Enable translation for message string. |
| 484 |
|
|
| 485 |
|
2005-02-06 Martin Schulze <[email protected]> |
| 486 |
|
|
| 487 |
|
* Extensions/wms/infodialog.py (wmsInfoDialog.__init__): Adjusted |
| 488 |
|
the arguments of the contstructor to fit the global scheme |
| 489 |
|
|
| 490 |
|
2005-01-31 Nina H�ffmeyer <[email protected]> |
| 491 |
|
|
| 492 |
|
* Extensions/ogr/ogrdialog.py: Added class ogrdialog.py, which provides |
| 493 |
|
some dialogs needed to start ogr. |
| 494 |
|
|
| 495 |
|
* Extensions/ogr/__init__.py: Changed comments to avoid encoding |
| 496 |
|
warnings. |
| 497 |
|
|
| 498 |
|
* Extensions/ogr/test/test_OGRShapestore.py: Changed comments to avoid |
| 499 |
|
encoding warnings. |
| 500 |
|
|
| 501 |
|
2005-01-28 Jonathan Coles <[email protected]> |
| 502 |
|
|
| 503 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): Recode how the |
| 504 |
|
mask is packed into a bit array. It's now slightly faster. |
| 505 |
|
|
| 506 |
|
2005-01-28 Jonathan Coles <[email protected]> |
| 507 |
|
|
| 508 |
|
* Thuban/Model/layer.py (RasterLayer.__init__): Make use_mask |
| 509 |
|
default to true. |
| 510 |
|
|
| 511 |
|
* Thuban/Model/load.py (SessionLoader.start_rasterlayer): Remove |
| 512 |
|
code that loads the state of the layer's use_mask flag. Its |
| 513 |
|
usefulness is still being debated. |
| 514 |
|
|
| 515 |
|
* Thuban/Model/save.py (SessionSaver.write_layer): Remove |
| 516 |
|
code that saves the state of the layer's use_mask flag. Its |
| 517 |
|
usefulness is still being debated. |
| 518 |
|
|
| 519 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): Pass |
| 520 |
|
options to ProjectRasterFile based on the state of layer.UseMask(). |
| 521 |
|
Catch more exceptions from ProjectRasterFile so that Thuban doesn't |
| 522 |
|
quit is there is a problem projecting. |
| 523 |
|
(BaseRenderer.draw_raster_data): Change the documentation to |
| 524 |
|
describe the new format (XBM) that the mask data will be in. |
| 525 |
|
|
| 526 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): The mask |
| 527 |
|
data is in XBM format when format='RAW' which means it doesn't |
| 528 |
|
need to be converted to a wxImage before being used as a mask |
| 529 |
|
for a wxBitmap. Assume that if format != 'RAW' that the image |
| 530 |
|
data and mask data are in the same format. |
| 531 |
|
|
| 532 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): If alpha is enabled |
| 533 |
|
and a mask is requested, convert the alpha band to a bit array in |
| 534 |
|
XBM format. if an alpha channel is requested, simply return the |
| 535 |
|
data in the alpha band. Provide better error handling by returning |
| 536 |
|
python error messages (also fixes RT #2947). |
| 537 |
|
(ProjectRasterFile): Support multiple mask options, rather than simply |
| 538 |
|
a flag indicating that a mask should or should not be used. Provide |
| 539 |
|
better error handling by returning python error messages. |
| 540 |
|
|
| 541 |
|
* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection): |
| 542 |
|
Add mask data to test. |
| 543 |
|
|
| 544 |
|
* test/test_layer.py (TestLayer.test_raster_layer): Test that a layer |
| 545 |
|
should use the mask by default. |
| 546 |
|
(TestLayerModificaton.test_raster_layer): Test that a layer should use |
| 547 |
|
the mask by default. |
| 548 |
|
|
| 549 |
|
* test/test_load.py (TestRasterLayer.test): Remove testing for |
| 550 |
|
use_mask flag in file. |
| 551 |
|
|
| 552 |
|
* test/test_save.py (SaveSessionTest.testRasterLayer): Remove testing |
| 553 |
|
for use_mask in file. |
| 554 |
|
|
| 555 |
|
* test/test_load_1_0_1.py: Removed. Shouldn't have been checked in. |
| 556 |
|
|
| 557 |
|
2005-01-26 Jonathan Coles <[email protected]> |
| 558 |
|
|
| 559 |
|
Add a new dialog box for raster layers. The dialog box allows |
| 560 |
|
the user to toggle a mask that is generated by ProjectRasterFile |
| 561 |
|
and is used to only draw the real parts of the projected image. |
| 562 |
|
|
| 563 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.draw_raster_layer): |
| 564 |
|
Instruct the warping code to generate a mask if the raster layer |
| 565 |
|
requests one. |
| 566 |
|
(BaseRenderer.draw_raster_data): Removed obsolete optional mask argument. |
| 567 |
|
|
| 568 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Removed |
| 569 |
|
obsolete optional mask argument. |
| 570 |
|
|
| 571 |
|
* Thuban/UI/classifier.py (Classifier): Change the parent class |
| 572 |
|
to LayerProperties and rework the code to support layout calls |
| 573 |
|
from the parent. |
| 574 |
|
(Classifier.dialog_layout): New. Layout the dialog box. |
| 575 |
|
(Classifier.map_layers_removed): Removed. Moved to parent class. |
| 576 |
|
(Classifier.map_replaced): Removed. Moved to parent class. |
| 577 |
|
(Classifier._OnTry): Renamed to OnTry to support parent class. |
| 578 |
|
(Classifier.OnClose): Removed. Supplied in parent class. |
| 579 |
|
(Classifier._OnCloseBtn): Removed. Supplied in parent class as OnCloseBtn. |
| 580 |
|
(Classifier._OnOK): Renamed to OnOK to support parent class. |
| 581 |
|
(Classifier._OnRevert): Renamed to OnRevert to support parent class. |
| 582 |
|
|
| 583 |
|
* Thuban/UI/layerproperties.py: New. Base class for layer properties |
| 584 |
|
dialog boxes. |
| 585 |
|
|
| 586 |
|
* Thuban/UI/rasterlayerproperties.py: New. Class for displaying |
| 587 |
|
raster layer properties. |
| 588 |
|
|
| 589 |
|
* libraries/thuban/gdalwarp.cpp: Replace the old gdalwarp.cpp code |
| 590 |
|
with the non-simple version supplied with gdal. This allows added |
| 591 |
|
features such as creating an alpha band. |
| 592 |
|
(GetImageData): Generate a mask array from the alpha band that is |
| 593 |
|
generated by gdal if the user has selected it. Try to support images |
| 594 |
|
that have more than three bands, such as images with RGB plus an |
| 595 |
|
alpha band. |
| 596 |
|
(ProjectRasterFile): Convert python argument for mask and tell |
| 597 |
|
gdal to enable or disable an alpha band. |
| 598 |
|
|
| 599 |
|
* Thuban/Model/layer.py (BaseLayer.Type): New. Returns a string |
| 600 |
|
describing what kind of layer the class is. Defaults to "Unknown", |
| 601 |
|
but should be overridden by subclasses. |
| 602 |
|
(Layer.Type): New. Override base class method. |
| 603 |
|
(RasterLayer.__init__): Create a flag for using a mask. Record extra |
| 604 |
|
data from gdal for display in the properties dialog. |
| 605 |
|
(RasterLayer.Type): New. Override base class method. |
| 606 |
|
(RasterLayer.UseMask): New. Returns True if the mask should be used. |
| 607 |
|
(RasterLayer.SetUseMask): New. Set if the mask should be used. |
| 608 |
|
(RasterLayer.ImageInfo): New. Return extra information about the image. |
| 609 |
|
|
| 610 |
|
* Thuban/Model/load.py (SessionLoader.start_rasterlayer): Load |
| 611 |
|
the mask information. |
| 612 |
|
|
| 613 |
|
* Thuban/Model/save.py (SessionSaver.write_layer): Save mask information. |
| 614 |
|
|
| 615 |
|
* Thuban/UI/mainwindow.py: Register the RasterLayerProperties and |
| 616 |
|
Classifier classes as dialogs to use with the proper layer types. |
| 617 |
|
|
| 618 |
|
* test/test_baserenderer.py (TestBaseRenderer.test_raster_no_projection): |
| 619 |
|
Fix test. |
| 620 |
|
|
| 621 |
|
* test/test_layer.py (TestLayer.test_raster_layer): Test new methods. |
| 622 |
|
(TestLayerModification.build_path): New. Support function. |
| 623 |
|
(TestLayerModification.test_raster_layer): New. Test new methods. |
| 624 |
|
|
| 625 |
|
* test/test_save.py (SaveSessionTest.testRasterLayer): Add tests for mask. |
| 626 |
|
|
| 627 |
|
* test/test_load.py (TestRasterLayer): Add tests for mask. |
| 628 |
|
|
| 629 |
|
* test/test_load_1_0_1.py: New. Copied from test_load.py. |
| 630 |
|
|
| 631 |
|
* test/test_baserenderer.py (SimpleRenderer.draw_raster_data): Removed |
| 632 |
|
obsolete optional mask argument. |
| 633 |
|
|
| 634 |
|
2005-01-26 Nina H�ffmeyer <[email protected]> |
| 635 |
|
|
| 636 |
|
* Extensions/ogr/ogrshapes.py: Added two dictionaries to ShapeStore |
| 637 |
|
which maps the ids and the ordinals. Fixed RowIdToOrdinal(), |
| 638 |
|
RowOrdinalToId() and ReadRowAsDict(). |
| 639 |
|
|
| 640 |
|
* Extensions/ogr/ogrstart.py: Added menu item which opens database |
| 641 |
|
layers for existing database connections. |
| 642 |
|
|
| 643 |
|
* Extensions/ogr/test/test_OGRShapestore.py: Fixed a message string. |
| 644 |
|
|
| 645 |
|
|
| 646 |
|
2005-01-26 Jan-Oliver Wagner <[email protected]> |
| 647 |
|
|
| 648 |
|
* Doc/manual/thuban-manual-de.xml: More translations. |
| 649 |
|
|
| 650 |
|
2005-01-24 Bernhard Herzog <[email protected]> |
| 651 |
|
|
| 652 |
|
Rework the status bar updates a bit to make sure the message about |
| 653 |
|
the projections is produced at the right times. |
| 654 |
|
|
| 655 |
|
* Thuban/UI/mainwindow.py (MainWindow.update_status_bar_messages): |
| 656 |
|
New class variable with messages that may require a status bar |
| 657 |
|
update. |
| 658 |
|
(MainWindow.view_position_changed) |
| 659 |
|
(MainWindow.update_status_bar): Rename from view_position_changed |
| 660 |
|
to update_status_bar. It's meaning has changed now that it may |
| 661 |
|
also generate messages about problems with projection settings. |
| 662 |
|
(MainWindow.__init__): Use the new update_status_bar_messages |
| 663 |
|
class variable to subscribe update_status_bar |
| 664 |
|
(MainWindow.set_position_text): Update doc-string. This method |
| 665 |
|
has to be renamed at some point. See doc-string and comments. |
| 666 |
|
(MainWindow.OnClose): Unsubscribe update_status_bar from all |
| 667 |
|
messages in update_status_bar_messages |
| 668 |
|
|
| 669 |
|
* Thuban/UI/viewport.py (ViewPort.forwarded_map_messages): New |
| 670 |
|
class attribute. map messages to be forwarded by the viewport. |
| 671 |
|
(ViewPort._subscribe_map, ViewPort._unsubscribe_map): (un)subscribe |
| 672 |
|
the messages in forwarded_map_messages |
| 673 |
|
|
| 674 |
|
2005-01-21 Bernhard Herzog <[email protected]> |
| 675 |
|
|
| 676 |
|
* test/postgissupport.py (PostGISDatabase.__init__): Tweak |
| 677 |
|
doc-string |
| 678 |
|
(find_postgis_sql): Update for postgis-1.0.0-rc1, which uses a |
| 679 |
|
different name for the initialization SQL file. |
| 680 |
|
|
| 681 |
|
2005-01-21 Jonathan Coles <[email protected]> |
| 682 |
|
|
| 683 |
|
* Thuban/UI/baserenderer.py (proj_params_to_str): New. Takes |
| 684 |
|
a projection and returns a formatted string representing the |
| 685 |
|
parameters to feed to gdalwarp. This function eliminates |
| 686 |
|
redundancy in draw_raster_layer(). |
| 687 |
|
(BaseRenderer.render_map_incrementally): Removed the optimization which |
| 688 |
|
drew the top most raster layer first and then only those vector- |
| 689 |
|
based layers that are above it. With the support for transparency |
| 690 |
|
this optimization breaks correct behaviour. |
| 691 |
|
(BaseRenderer.draw_raster_layer): Reorganize code to support possible |
| 692 |
|
future enhancements to raster layer bounding box. The old behaviour has |
| 693 |
|
not changed. Also, change calling parameters to draw_raster_data() |
| 694 |
|
to specify new RAW data format and mask. |
| 695 |
|
(BaseRenderer.draw_raster_data): Change signature to include an optional |
| 696 |
|
parameter for mask information. Change documentation to mention |
| 697 |
|
support for new parameter and added option for RAW data format. |
| 698 |
|
The data argument is now a list of [width, height, data]. |
| 699 |
|
|
| 700 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_raster_data): Add new optional |
| 701 |
|
mask parameter. Add new condition for RAW format, which |
| 702 |
|
significantly reduces rendering time. Add condition for |
| 703 |
|
mask parameter. |
| 704 |
|
|
| 705 |
|
* libraries/thuban/gdalwarp.cpp (GetImageData): New. Creates a |
| 706 |
|
data array of RGB values from the projected image returned from |
| 707 |
|
the gdal warping functions. In the case of palette based images, it |
| 708 |
|
converts the NO_DATA index to the mask color. |
| 709 |
|
(ProjectRasterFile): Removed all custom memory driver references |
| 710 |
|
and replaced it with the standard in-memory dataset provided |
| 711 |
|
by gdal. The return data is no longer a BMP file, but an array |
| 712 |
|
of RGB values, one set triple per pixel. |
| 713 |
|
|
| 714 |
|
* libraries/thuban/bmpdataset.cpp: Removed. Unnecessary. |
| 715 |
|
* libraries/thuban/cpl_mfile.h: Removed. Unnecessary. |
| 716 |
|
* libraries/thuban/cpl_mfile.cpp: Removed. Unnecessary. |
| 717 |
|
|
| 718 |
|
* setup.py (thuban_build_ext.finalize_options): Removed mention |
| 719 |
|
of cpl_mfile.cpp and bmpdataset.cpp files in the list of source |
| 720 |
|
files. These are obsolete with the new version of gdalwarp.cpp |
| 721 |
|
|
| 722 |
|
* test/test_baserenderer.py (SimpleRenderer.draw_raster_data): |
| 723 |
|
Updated signature. |
| 724 |
|
(TestBaseRenderer.test_raster_no_projection): Changed the test |
| 725 |
|
data to be data in the uncompressed RAW format returned from |
| 726 |
|
ProjectRasterFile. |
| 727 |
|
|
| 728 |
|
2005-01-21 Jan-Oliver Wagner <[email protected]> |
| 729 |
|
|
| 730 |
|
* Thuban/UI/mainwindow.py (MainWindow.view_position_changed): Made |
| 731 |
|
string available for i18n. |
| 732 |
|
|
| 733 |
|
2005-01-20 Russell Nelson <[email protected]> |
| 734 |
|
|
| 735 |
|
* Resources/Projections/defaults.proj: Ruin the speling of the |
| 736 |
|
Lambert-93 projection so it doesn't run into the wx UTF-8 bug. |
| 737 |
|
It's the wrong thing to do in the long run, but it's necessary for |
| 738 |
|
those users until that bug is fixed. Otherwise the projection |
| 739 |
|
dialog segfaults. Better to annoy some Lambert-93 users with a |
| 740 |
|
spelling mistake than every Fedora Core 3 user of Thuban-CVS. |
| 741 |
|
|
| 742 |
2005-01-20 Bernhard Reiter <[email protected]> |
2005-01-20 Bernhard Reiter <[email protected]> |
| 743 |
|
|
| 744 |
* Thuban/UI/mainwindow.py(view_position_changed): Added docstring |
* Thuban/UI/mainwindow.py (MainWindow.view_position_changed): Added |
| 745 |
and comment that the warning code here is a hack. |
docstring and comment that the warning code here is a hack. |
| 746 |
|
|
| 747 |
2005-01-20 Russell Nelson <[email protected]> |
2005-01-20 Russell Nelson <[email protected]> |
| 748 |
|
|
| 749 |
* Thuban/UI/mainwindow.py(view_position_changed): Warn user about |
* Thuban/UI/mainwindow.py (MainWindow.view_position_changed): Warn |
| 750 |
misprojected layers when their lat/lon bounding |
user about misprojected layers when their lat/lon bounding |
| 751 |
box exceeds rational lat/lon values. |
box exceeds rational lat/lon values. |
| 752 |
|
|
| 753 |
2005-01-20 Bernhard Reiter <[email protected]> |
2005-01-20 Bernhard Reiter <[email protected]> |
| 754 |
|
|
| 755 |
* Thuban/UI/about.py (unicodeToLocale()): Improved: |
* Thuban/UI/about.py (unicodeToLocale): Improved: |
| 756 |
Use 'ascii' and then 'replace' for other characters |
Use 'ascii' and then 'replace' for other characters |
| 757 |
when getdefaultlocale returns None. Thanks to Bernhard H. . |
when getdefaultlocale returns None. Thanks to Bernhard H. . |
| 758 |
|
|
| 759 |
2005-01-20 Bernhard Reiter <[email protected]> |
2005-01-20 Bernhard Reiter <[email protected]> |
| 760 |
|
|
| 761 |
* Thuban/UI/classgen.py (OnRetrieve()): Added a comment |
* Thuban/UI/classgen.py (GenQuantilesPanel.OnRetrieve): Added a comment |
| 762 |
that OnRangeText might be called twice and using None as argument. |
that OnRangeText might be called twice and using None as argument. |
| 763 |
|
|
| 764 |
2005-01-20 Bernhard Reiter <[email protected]> |
2005-01-20 Bernhard Reiter <[email protected]> |
| 765 |
|
|
| 766 |
* Thuban/UI/classgen.py (OnRetrieve()): Add a OnRangeText(0) |
* Thuban/UI/classgen.py (GenQuantilesPanel.OnRetrieve): Add a |
| 767 |
to work around a different in wx Behaviour noticed on MacOSX, |
OnRangeText(0) to work around a different in wx Behaviour noticed |
| 768 |
thanks to Lorenzo Moretti and Daniel Calvelo for the fix. |
on MacOSX, thanks to Lorenzo Moretti and Daniel Calvelo for the fix. |
| 769 |
|
|
| 770 |
2005-01-20 Bernhard Reiter <[email protected]> |
2005-01-20 Bernhard Reiter <[email protected]> |
| 771 |
|
|
| 772 |
* Thuban/UI/about.py: take iso-8859-15 when getdefaultlocale returns |
* Thuban/UI/about.py: take iso-8859-15 when getdefaultlocale returns |
Parent Directory
| 
Revision Log
| 
Patch