| 1 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
| 2 |
|
|
| 3 |
|
* Resources/XML/thuban-0.8.dtd: New DTD for the new file format |
| 4 |
|
version. |
| 5 |
|
|
| 6 |
|
* Thuban/Model/save.py (sort_data_stores): New. Make topological |
| 7 |
|
sort of the data sources so they can be written with sources that |
| 8 |
|
data sources that depend on other data sources come after the |
| 9 |
|
sources they depend on. |
| 10 |
|
(SessionSaver.__init__): Add idmap instance variable to map from |
| 11 |
|
objects to the ids used in the file. |
| 12 |
|
(SessionSaver.get_id, SessionSaver.define_id) |
| 13 |
|
(SessionSaver.has_id): New. Methods to manage the idmap |
| 14 |
|
(SessionSaver.write): Use thuban-0.8.dtd |
| 15 |
|
(SessionSaver.write_session): Add a namespace on the session and |
| 16 |
|
write out the data sources before the maps. |
| 17 |
|
(SessionSaver.write_data_containers): New. Write the data |
| 18 |
|
containers. |
| 19 |
|
(SessionSaver.write_layer): Layer elements now refer to a |
| 20 |
|
shapestore and don't contain filenames anymore. |
| 21 |
|
|
| 22 |
|
* Thuban/Model/load.py (LoadError): Exception class to raise when |
| 23 |
|
errors in the files are discovered |
| 24 |
|
(SessionLoader.__init__): Define dispatchers for elements with a |
| 25 |
|
thuban-0.8 namespace too. |
| 26 |
|
(SessionLoader.check_attrs): New helper method to check and |
| 27 |
|
convert attributes |
| 28 |
|
(AttrDesc): New. Helper class for SessionLoader.check_attrs |
| 29 |
|
(SessionLoader.start_fileshapesource) |
| 30 |
|
(SessionLoader.start_derivedshapesource) |
| 31 |
|
(SessionLoader.start_filetable, SessionLoader.start_jointable): |
| 32 |
|
Handlers for the new elements in the new fileformat |
| 33 |
|
(SessionLoader.start_layer): Handle the shapestore attribute in |
| 34 |
|
addition to filename. |
| 35 |
|
(SessionLoader.start_table, SessionLoader.end_table): Removed. |
| 36 |
|
They were never used in the old formats and aren't needed for the |
| 37 |
|
new. |
| 38 |
|
|
| 39 |
|
* Thuban/Model/session.py (Session.DataContainers): New method to |
| 40 |
|
return all "data containers", i.e. shapestores and tables |
| 41 |
|
|
| 42 |
|
* test/xmlsupport.py (SaxEventLister.__init__) |
| 43 |
|
(SaxEventLister.startElementNS, sax_eventlist): Add support to |
| 44 |
|
normalize IDs. |
| 45 |
|
|
| 46 |
|
* test/test_xmlsupport.py |
| 47 |
|
(TestEventList.test_even_list_id_normalization): New test case for |
| 48 |
|
id normalization |
| 49 |
|
|
| 50 |
|
* test/test_load.py (LoadSessionTest.check_format): Use ID |
| 51 |
|
normalization |
| 52 |
|
(LoadSessionTest.thubanids, LoadSessionTest.thubanidrefs): New |
| 53 |
|
class atrributes used for ID normalization |
| 54 |
|
(TestSingleLayer, TestLayerVisibility, TestLabels.test) |
| 55 |
|
(TestLayerProjection.test, TestRasterLayer.test): Adapt to new |
| 56 |
|
file format |
| 57 |
|
(TestJoinedTable): New test for loading sessions with joined |
| 58 |
|
tables. |
| 59 |
|
(TestLoadError): New. Test whether missing required attributes |
| 60 |
|
cause a LoadError. |
| 61 |
|
|
| 62 |
|
* test/test_save.py (SaveSessionTest.thubanids) |
| 63 |
|
(SaveSessionTest.thubanidrefs): New class attributes for ID |
| 64 |
|
normalization in .thuban files. |
| 65 |
|
(SaveSessionTest.compare_xml): Use id-normalization. |
| 66 |
|
(SaveSessionTest.testEmptySession) |
| 67 |
|
(SaveSessionTest.testLayerProjection) |
| 68 |
|
(SaveSessionTest.testRasterLayer) |
| 69 |
|
(SaveSessionTest.testClassifiedLayer): Adapt to new file format. |
| 70 |
|
(SaveSessionTest.testLayerProjection): The filename used was the |
| 71 |
|
same as for testSingleLayer. Use a different one. |
| 72 |
|
(SaveSessionTest.test_dbf_table) |
| 73 |
|
(SaveSessionTest.test_joined_table): New test cases for saving the |
| 74 |
|
new data sources structures. |
| 75 |
|
(TestStoreSort, MockDataStore): Classes to test the sorting of the |
| 76 |
|
data stores for writing. |
| 77 |
|
|
| 78 |
|
* test/runtests.py: Add CVS keywords |
| 79 |
|
|
| 80 |
|
2003-06-20 Jonathan Coles <[email protected]> |
| 81 |
|
|
| 82 |
|
* test/test_session.py |
| 83 |
|
(UnreferencedTablesTests.test_unreferenced_tables_with_joins): |
| 84 |
|
Use the cultural_landmark-point.dbf file for the store so that |
| 85 |
|
the table rows and shape count match. |
| 86 |
|
|
| 87 |
|
2003-06-20 Jonathan Coles <[email protected]> |
| 88 |
|
|
| 89 |
|
* Thuban/Model/data.py (DerivedShapeStore.__init__): Raise |
| 90 |
|
an exception if the number of shapes is different from the |
| 91 |
|
number of rows in the table. Address RTbug #1933. |
| 92 |
|
|
| 93 |
|
* test/test_layer.py (TestLayer.test_derived_store): Add |
| 94 |
|
a test for the new exception in DerivedShapeStore.__init__. |
| 95 |
|
|
| 96 |
|
* test/support.py (FloatTestCase): Removed since there is |
| 97 |
|
already FloatComparisonMixin. Fixes RTbug #1954. |
| 98 |
|
(FloatComparisonMixin.assertFloatEqual): Include test for |
| 99 |
|
infinity that was part of FloatTestCase. |
| 100 |
|
|
| 101 |
|
* test/test_range.py (RangeTest): Inherit from |
| 102 |
|
support.FloatComparisonMixin now that we don't have |
| 103 |
|
support.FloatTestCase. |
| 104 |
|
|
| 105 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
| 106 |
|
|
| 107 |
|
* test/test_save.py (SaxEventLister, sax_eventlist): Removed. Use |
| 108 |
|
the implementation in xmlsupport instead. |
| 109 |
|
(SaveSessionTest.compare_xml): sax_eventlist is now in xmlsupport |
| 110 |
|
|
| 111 |
|
* test/test_proj.py: Import sax_eventlist from xmlsupport instead |
| 112 |
|
of test_save |
| 113 |
|
|
| 114 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
| 115 |
|
|
| 116 |
|
* test/test_load.py (LoadSessionTest.check_format): New helper |
| 117 |
|
method to make sure the test files we load might have been written |
| 118 |
|
by the current thuban version. |
| 119 |
|
(ClassificationTest.TestLayers, TestSingleLayer.test) |
| 120 |
|
(TestLayerVisibility.test, TestClassification.test) |
| 121 |
|
(TestLabels.test, TestLayerProjection.test, TestRasterLayer.test): |
| 122 |
|
Add check_format() calls and fix the thuban data to match the data |
| 123 |
|
that would be written by saving the session loaded from it. |
| 124 |
|
|
| 125 |
|
* test/xmlsupport.py (SaxEventLister, sax_eventlist): Copies of |
| 126 |
|
the same class and function in test_save. |
| 127 |
|
|
| 128 |
|
* test/test_xmlsupport.py (TestEventList): New. test cases for |
| 129 |
|
sax_eventlist |
| 130 |
|
|
| 131 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
| 132 |
|
|
| 133 |
|
* Resources/XML/thuban.dtd: Add comment about which versions of |
| 134 |
|
Thuban are covered by this DTD |
| 135 |
|
(map): Fix content model for layers and raster layers. There can |
| 136 |
|
be any number or layers and raster layers in any order. |
| 137 |
|
|
| 138 |
|
2003-06-20 Jonathan Coles <[email protected]> |
| 139 |
|
|
| 140 |
|
This is mainly about fixing RTbug #1949. |
| 141 |
|
|
| 142 |
|
* Thuban/Model/classification.py: Remove "from __future__" |
| 143 |
|
import statement since python 2.2 is the earliest supported |
| 144 |
|
version. |
| 145 |
|
|
| 146 |
|
* Thuban/Model/proj.py (Projection.GetProjectedUnits): New. |
| 147 |
|
Currently returns PROJ_UNITS_METERS or PROJ_UNITS_DEGREES |
| 148 |
|
depending on the units this projection *forwards* into. |
| 149 |
|
|
| 150 |
|
* Thuban/Model/save.py (SessionSaver.write_classification): |
| 151 |
|
Remove unnecessary use of lambdas and nested functions. |
| 152 |
|
|
| 153 |
|
* Thuban/UI/legend.py (ScaleBarBitmap.__SetScale): Do scale |
| 154 |
|
adjustment here if the map projection uses degrees. |
| 155 |
|
|
| 156 |
|
* Thuban/UI/scalebar.py (ScaleBar.DrawScaleBar): Remove |
| 157 |
|
scale adjust code since it is now done before calling |
| 158 |
|
this method. Don't do anything if the map projection |
| 159 |
|
is None. |
| 160 |
|
|
| 161 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
| 162 |
|
|
| 163 |
|
Move version specific load tests to their own file. |
| 164 |
|
|
| 165 |
|
* test/test_load.py: Expand the doc-string to explain a bit how to |
| 166 |
|
handle file format changes. |
| 167 |
|
(TestClassification.test): Update the docstring as this test is |
| 168 |
|
not about Thuban 0.2 anymore. |
| 169 |
|
|
| 170 |
|
* test/test_load_0_2.py: New file with the load tests for thuban |
| 171 |
|
files created with Thuban 0.2 and earlier. |
| 172 |
|
|
| 173 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
| 174 |
|
|
| 175 |
|
Add XML validation to some of the tests. Validation will only be |
| 176 |
|
done if pyRXP is installed (http://reportlab.com/xml/pyrxp.html). |
| 177 |
|
To make the DTD available to the test cases it's moved into |
| 178 |
|
Resources/XML |
| 179 |
|
|
| 180 |
|
* Resources/XML/thuban.dtd: New. This is now the real Thuban DTD |
| 181 |
|
for versions up to and including 0.2. Two slight changes: added an |
| 182 |
|
encoding specification and fixed the comment which refered to |
| 183 |
|
GRASS, not Thuban |
| 184 |
|
|
| 185 |
|
* test/xmlsupport.py: New support module for tests involving XML. |
| 186 |
|
Currently there's a mix-in class for XML validation. |
| 187 |
|
|
| 188 |
|
* test/test_xmlsupport.py: New. Tests for the xmlsupport module |
| 189 |
|
|
| 190 |
|
* test/test_save.py (SaveSessionTest): Derive from ValidationTest |
| 191 |
|
so that we can validate the |
| 192 |
|
(SaveSessionTest.testEmptySession) |
| 193 |
|
(SaveSessionTest.testSingleLayer) |
| 194 |
|
(SaveSessionTest.testSingleLayer) |
| 195 |
|
(SaveSessionTest.testLayerProjection) |
| 196 |
|
(SaveSessionTest.testRasterLayer) |
| 197 |
|
(SaveSessionTest.testClassifiedLayer): Validate the generated XML |
| 198 |
|
|
| 199 |
|
* test/runtests.py (main): Call print_additional_summary instead |
| 200 |
|
of print_garbage_information |
| 201 |
|
|
| 202 |
|
* test/support.py (resource_dir): New function to return the |
| 203 |
|
"Resource" subdirectory |
| 204 |
|
(print_additional_summary): New function to combine several |
| 205 |
|
summary functions |
| 206 |
|
(run_tests): Use print_additional_summary instead of calling |
| 207 |
|
print_garbage_information directly |
| 208 |
|
|
| 209 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
| 210 |
|
|
| 211 |
|
* Doc/thuban.dtd (classification): Correct the content model of |
| 212 |
|
the classification element. |
| 213 |
|
(projection): Add the "name" attribute |
| 214 |
|
|
| 215 |
|
2003-06-19 Frank Koormann <[email protected]> |
| 216 |
|
|
| 217 |
|
MERGE from the greater-ms3 branch. |
| 218 |
|
|
| 219 |
|
* Thuban/UI/scalebar.py (ScaleBar.DrawScaleBar): Apply conversion to |
| 220 |
|
scale if projection is latlong to get better estimate. |
| 221 |
|
|
| 222 |
|
Fix problem of hidden properties dialog under windows after double |
| 223 |
|
click on layer tree: |
| 224 |
|
The tree control always gets an Expanded / Collapsed event after |
| 225 |
|
the ItemActivated on double click, which raises the main window again. We add a second ItemActivated event to the queue, which simply |
| 226 |
|
raises the already displayed window. |
| 227 |
|
|
| 228 |
|
* Thuban/UI/legend.py (LegendTree.__init__): Instance variable |
| 229 |
|
raiseProperties initialized to prevent endless loops |
| 230 |
|
(LegendTree._OnItemActivated): Depending on self.raiseProperties |
| 231 |
|
simply raise the properties or open the dialog and issue a second |
| 232 |
|
event. |
| 233 |
|
|
| 234 |
|
2003-06-18 Jonathan Coles <[email protected]> |
| 235 |
|
|
| 236 |
|
* setup.py: Fix a few problems that occured under Windows. |
| 237 |
|
|
| 238 |
|
2003-06-18 Jonathan Coles <[email protected]> |
| 239 |
|
|
| 240 |
|
When Thuban loaded the map was redrawn twice because the |
| 241 |
|
legend was being opened after the mainwindow was created |
| 242 |
|
and not during its creation. This meant the map was drawn |
| 243 |
|
initially and then had to be redrawn when the legend |
| 244 |
|
caused the display to change. Now the legend is opened |
| 245 |
|
in the mainwindow constructor which resolves this issue. |
| 246 |
|
|
| 247 |
|
Also, although we were checking for the existence of |
| 248 |
|
gdal and gdalwarp modules, the gdalwarp extension was |
| 249 |
|
still being compiled (which may fail if the system doesn't |
| 250 |
|
have gdal installed). the build_ext command to setup.py |
| 251 |
|
now accepts the flags --with-gdal and --without-gdal. |
| 252 |
|
If --without-gdal is specified setup.py will try to |
| 253 |
|
use the gdal parameters specified by gdal-config. Under |
| 254 |
|
windows, those parameters have to be set in setup.py |
| 255 |
|
as with proj4 an wxWindows. |
| 256 |
|
|
| 257 |
|
* setup.py: Use a list instead of seperate variables for |
| 258 |
|
extension parameters so we can create a generic function |
| 259 |
|
that runs an appropriate *-config script. |
| 260 |
|
(run_cs_script): Renamed from run_wx_script and modified |
| 261 |
|
to accept a second argument which is a list of lists to |
| 262 |
|
be filled in by the values returned from running the command. |
| 263 |
|
(thuban_build_ext): New. Extends the build_ext command and |
| 264 |
|
provides the options --with-gdal/--without-gdal which then |
| 265 |
|
optionally includes the gdalwarp extension. |
| 266 |
|
|
| 267 |
|
* Thuban/Model/resource.py: First check if we can import |
| 268 |
|
the gdalwarp Thuban extension before checking for gdal. |
| 269 |
|
Also added some comments. |
| 270 |
|
|
| 271 |
|
* Thuban/UI/legend.py (ScaleBarBitmap.__SetScale): Check if |
| 272 |
|
the map is None which may be the case if none has been loaded |
| 273 |
|
yet. |
| 274 |
|
|
| 275 |
|
* Thuban/UI/main.py (main): Remove call to ShowLegend. |
| 276 |
|
|
| 277 |
|
* Thuban/UI/mainwindow.py (MainWindow.__init__): Call ShowLegend(). |
| 278 |
|
|
| 279 |
|
* Thuban/UI/renderer.py: Check for gdal support before importing |
| 280 |
|
gdalwarp. |
| 281 |
|
(MapRenderer.render_map): Only try to optimize if we have gdal |
| 282 |
|
support otherwise nothing will get drawn. |
| 283 |
|
|
| 284 |
|
* Thuban/UI/view.py (MapCanvas.FitMapToWindow): This may be called |
| 285 |
|
during startup before a map has been created. Check if map is None |
| 286 |
|
before using it and do nothing if it is. |
| 287 |
|
|
| 288 |
|
2003-06-17 Jonathan Coles <[email protected]> |
| 289 |
|
|
| 290 |
|
Fix the problem with raster layers under Windows that caused |
| 291 |
|
Thuban to crash. The view should respond to layer projection |
| 292 |
|
changed events to update the display. Changes to a projection |
| 293 |
|
should not cause the map to be set to full extent. |
| 294 |
|
|
| 295 |
|
* Thuban/UI/view.py (MapCanvas.__init__): New instance variable |
| 296 |
|
current_map_proj to remember the current map projection so that |
| 297 |
|
when the projection changes we know what the previous projection |
| 298 |
|
was. |
| 299 |
|
(MapCanvas.SetMap): Unsubscribe and subscribe to |
| 300 |
|
LAYER_PROJECTION_CHANGED events. |
| 301 |
|
(MapCanvas.projection_changed): Split into two methods that respond |
| 302 |
|
to map and layer projection changes. |
| 303 |
|
(MapCanvas.map_projection_changed): New. Takes the current view and |
| 304 |
|
projects it using the new projection. This does not cause the |
| 305 |
|
map to be redrawn at full extent. |
| 306 |
|
(MapCanvas.layer_projection_changed): New. Cause a redraw which |
| 307 |
|
will draw each layer in its new projection. |
| 308 |
|
|
| 309 |
|
* extensions/thuban/bmpdataset.cpp (BMPDataset::Open): Call |
| 310 |
|
VSIFClose() not VSIFCloseL() to close the file. Fixes a crash |
| 311 |
|
under Windows. |
| 312 |
|
|
| 313 |
|
* extensions/thuban/gdalwarp.cpp (MFILENAME): Padding should be |
| 314 |
|
to twice sizeof(void*) because there are two digits for each |
| 315 |
|
hex byte. |
| 316 |
|
|
| 317 |
|
2003-06-16 Bernhard Herzog <[email protected]> |
| 318 |
|
|
| 319 |
|
Update to the layer interface: Direct access to the table, |
| 320 |
|
shapetable, shapefile and filename attributes is now actively |
| 321 |
|
deprecated by issuing deprecation warnings for all places where |
| 322 |
|
this happens. |
| 323 |
|
|
| 324 |
|
* Thuban/Model/layer.py (Layer.__getattr__): New. Implement access |
| 325 |
|
to the instance variables table, shapetable, shapefile and |
| 326 |
|
filename via __getattr__ so that we can issue a deprecation |
| 327 |
|
warning. |
| 328 |
|
(Layer.SetShapeStore): Don't set the deprecated instance variables |
| 329 |
|
any more |
| 330 |
|
(Layer.SetShapeStore): Don't use deprecated layer instance |
| 331 |
|
variables |
| 332 |
|
(Layer.Destroy): No need to explicitly remove the instance |
| 333 |
|
variables any more |
| 334 |
|
(Layer.GetFieldType, Layer.Shape): Don't use deprecated layer |
| 335 |
|
instance variables |
| 336 |
|
|
| 337 |
|
* Thuban/UI/classgen.py (ClassGenDialog.__init__) |
| 338 |
|
(GenUniformPanel._OnRetrieve, GenUniquePanel._OnRetrieve) |
| 339 |
|
(GenQuantilesPanel.GetList, GenQuantilesPanel.OnRetrieve): Don't |
| 340 |
|
use deprecated layer instance variables |
| 341 |
|
|
| 342 |
|
* Thuban/UI/classifier.py (Classifier.__init__): Don't use |
| 343 |
|
deprecated layer instance variables |
| 344 |
|
|
| 345 |
|
* Thuban/UI/identifyview.py (IdentifyListCtrl.selected_shape) |
| 346 |
|
(IdentifyGridCtrl.selected_shape): Don't set the deprecated layer |
| 347 |
|
instance variables |
| 348 |
|
|
| 349 |
|
* Thuban/UI/tableview.py (LayerTableGrid.select_shapes): Don't use |
| 350 |
|
deprecated layer instance variables |
| 351 |
|
|
| 352 |
|
* Thuban/UI/mainwindow.py (MainWindow.LayerShowTable): Don't use |
| 353 |
|
deprecated layer instance variables |
| 354 |
|
|
| 355 |
|
* Thuban/Model/save.py (SessionSaver.write_layer): Don't use |
| 356 |
|
deprecated layer instance variables |
| 357 |
|
|
| 358 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_shape_layer) |
| 359 |
|
(MapRenderer.polygon_render_param): Don't use deprecated layer instance |
| 360 |
|
variables |
| 361 |
|
|
| 362 |
|
* test/runtests.py (main): Turn Thuban's deprecation warnings into |
| 363 |
|
errors so that they're cought by the tests |
| 364 |
|
|
| 365 |
|
* test/test_load.py (TestSingleLayer.test): Don't use deprecated |
| 366 |
|
layer instance variables |
| 367 |
|
|
| 368 |
|
2003-06-16 Jonathan Coles <[email protected]> |
| 369 |
|
|
| 370 |
|
Fix a problem under Windows whereby if the user double-clicks on a |
| 371 |
|
layer in the legend that tree item will expand or collapse as well |
| 372 |
|
as open the layer properties dialog. The state of the tree item |
| 373 |
|
should not be affected. |
| 374 |
|
|
| 375 |
|
* Thuban/UI/legend.py (LegendTree.__init__): Add instance variable |
| 376 |
|
preventExpandCollapse and subscribe to expanding and collapsing |
| 377 |
|
events. |
| 378 |
|
(LegendTree.OnItemExpandCollapse): New. Responds to expanding and |
| 379 |
|
collapsing events and will veto the event if it has been triggered |
| 380 |
|
by the user double clicking on a layer. |
| 381 |
|
(LegendTree._OnItemActivated): Set preventExpandCollapse to indicate |
| 382 |
|
that an expanding/collapsing event should be vetoed. |
| 383 |
|
|
| 384 |
2003-06-13 Bernhard Herzog <[email protected]> |
2003-06-13 Bernhard Herzog <[email protected]> |
| 385 |
|
|
| 386 |
* Thuban/UI/classifier.py (Classifier.OnClose) |
* Thuban/UI/classifier.py (Classifier.OnClose) |
Parent Directory
| 
Revision Log
| 
Patch