1 |
|
2003-07-08 Bernhard Herzog <[email protected]> |
2 |
|
|
3 |
|
* Thuban/Model/transientdb.py (TransientTableBase.Width): The type |
4 |
|
constants in the column objects are the standard ones defined in |
5 |
|
the table module. |
6 |
|
|
7 |
|
* test/test_transientdb.py |
8 |
|
(TestTransientTable.test_transienttable_to_dbf): New. Test whether |
9 |
|
exporting transient tables as DBF works. This should catch the bug |
10 |
|
just fixed in TransientTableBase.Width. |
11 |
|
|
12 |
|
2003-07-08 Bernhard Herzog <[email protected]> |
13 |
|
|
14 |
|
* Thuban/Model/classgen.py (CustomRamp.GetProperties): Compute the |
15 |
|
interpolated colors correctly. |
16 |
|
|
17 |
|
* test/test_classgen.py (TestCustomRamp.test_color_interpolation): |
18 |
|
New. Test case for the fix in classgen.py |
19 |
|
|
20 |
|
2003-07-08 Bernhard Herzog <[email protected]> |
21 |
|
|
22 |
|
* test/runtests.py (main): Make the default output less verbose |
23 |
|
and add a verbosity option (-v) to get the old output |
24 |
|
|
25 |
|
2003-07-08 Bernhard Herzog <[email protected]> |
26 |
|
|
27 |
|
* Resources/XML/thuban-0.9.dtd: New. This will become the DTD for |
28 |
|
0.9. |
29 |
|
|
30 |
|
* Thuban/Model/transientdb.py (TransientJoinedTable.JoinType): |
31 |
|
New. Return the join type |
32 |
|
|
33 |
|
* Thuban/Model/save.py (SessionSaver.write_session): Use new 0.9 |
34 |
|
DTD |
35 |
|
(SessionSaver.write_data_containers): Save the join type for |
36 |
|
joined tables |
37 |
|
|
38 |
|
* Thuban/Model/load.py (SessionLoader.__init__): Add the new 0.9 |
39 |
|
namespace |
40 |
|
(SessionLoader.start_jointable): Handle the jointype attribute |
41 |
|
|
42 |
|
* test/test_load_0_8.py: New. Effectively a copy of test_load.py |
43 |
|
as of Thuban 0.8. These are now tests to determine whether Thuban |
44 |
|
can still read files generated by Thuban 0.8 |
45 |
|
|
46 |
|
* test/test_load.py (LoadSessionTest.dtd) |
47 |
|
(TestSingleLayer.file_contents) |
48 |
|
(TestLayerVisibility.file_contents, TestLabels.file_contents) |
49 |
|
(TestLayerProjection.file_contents) |
50 |
|
(TestRasterLayer.file_contents, TestJoinedTable.file_contents) |
51 |
|
(TestJoinedTable.file_contents) |
52 |
|
(TestLoadError.file_contents): Update for new DTD |
53 |
|
(TestJoinedTable.file_contents, TestJoinedTable.setUp): Add test |
54 |
|
for new join type attribute |
55 |
|
|
56 |
|
* test/test_save.py (SaveSessionTest.dtd) |
57 |
|
(SaveSessionTest.testEmptySession) |
58 |
|
(SaveSessionTest.testSingleLayer) |
59 |
|
(SaveSessionTest.testLayerProjection) |
60 |
|
(SaveSessionTest.testRasterLayer) |
61 |
|
(SaveSessionTest.testClassifiedLayer) |
62 |
|
(SaveSessionTest.test_dbf_table) |
63 |
|
(SaveSessionTest.test_joined_table): Update for new DTD |
64 |
|
(SaveSessionTest.test_joined_table): Add test for new join type |
65 |
|
attribute |
66 |
|
|
67 |
|
2003-07-04 Bernhard Herzog <[email protected]> |
68 |
|
|
69 |
|
* Thuban/Model/table.py (_find_dbf_column_names): New. Helper |
70 |
|
function for table_to_dbf |
71 |
|
(table_to_dbf): Deal with names longer than the 10 character limit |
72 |
|
|
73 |
|
* test/test_dbf_table.py (TestTableToDBF.test_table_to_dbf): Add |
74 |
|
doc-string |
75 |
|
(TestTableToDBF.test_table_to_dbf_long_col_names): New test for |
76 |
|
long column names |
77 |
|
|
78 |
|
2003-07-03 Bernhard Herzog <[email protected]> |
79 |
|
|
80 |
|
* Doc/manual/thuban-manual.xml: Fix the CVS Revision Tag syntax |
81 |
|
|
82 |
|
2003-07-03 Bernhard Herzog <[email protected]> |
83 |
|
|
84 |
|
* Doc/manual/thuban-manual.xml, Doc/manual/README: New. Skeleton |
85 |
|
for the Thuban manual and README with some basic information about |
86 |
|
the manual |
87 |
|
|
88 |
|
2003-07-03 Bernhard Herzog <[email protected]> |
89 |
|
|
90 |
|
* Thuban/Model/transientdb.py (TransientJoinedTable.__init__): |
91 |
|
Update doc-string |
92 |
|
(TransientJoinedTable.create): Do not modify the column objects of |
93 |
|
the input tables in place and copy all columns of the input tables |
94 |
|
into the joined table after all. |
95 |
|
|
96 |
|
* test/test_transientdb.py |
97 |
|
(TestTransientTable.test_transient_joined_table_same_column_name): |
98 |
|
Update to reflect the new behavior |
99 |
|
(TestTransientTable.test_transient_joined_table_with_equal_column_names): |
100 |
|
Update to reflect the new behavior |
101 |
|
(TestTransientTable.test_transient_joined_table_name_collisions_dont_modify_in_place): |
102 |
|
New test case for a bug which modified the column objects in place |
103 |
|
|
104 |
|
2003-07-02 Jonathan Coles <[email protected]> |
105 |
|
|
106 |
|
* Thuban/Model/classgen.py (generate_singletons, |
107 |
|
generate_uniform_distribution, generate_quantiles, |
108 |
|
GenQuantiles0): Make sure maxValue isn't less than |
109 |
|
one, otherwise we could divide by zero. |
110 |
|
|
111 |
|
* test/test_classgen.py (ClassGenTest.doClassRangeTest, |
112 |
|
ClassGenTest.doClassSingleTest): Call doBoundsTest to |
113 |
|
check the end classification groups against the |
114 |
|
proper property values. |
115 |
|
(ClassGenTest.doBoundsTest): New. Checks the first and |
116 |
|
last classification groups to make sure their properties |
117 |
|
are the correct upper and lower bounds for a color ramp. |
118 |
|
|
119 |
|
2003-07-02 Jonathan Coles <[email protected]> |
120 |
|
|
121 |
|
* Thuban/Model/classgen.py (generate_singletons, |
122 |
|
generate_uniform_distribution, generate_quantiles, |
123 |
|
GenQuantiles0): The denominator was one to high when |
124 |
|
calculating the index for the ramp causing the index |
125 |
|
to never to reach one. |
126 |
|
|
127 |
|
2003-07-02 Jonathan Coles <[email protected]> |
128 |
|
|
129 |
|
Changed the singature of ClassGroupRange.__init__ and |
130 |
|
ClassGroupRange.SetRange() so that the min/max values are |
131 |
|
passed as a tuple. This makes a better calling scheme for |
132 |
|
when a Range object is passed instead. |
133 |
|
|
134 |
|
* Thuban/Model/classgen.py: Fixed parameters to |
135 |
|
ClassGroupRange constructor. |
136 |
|
|
137 |
|
* Thuban/Model/classification.py (ClassGroupRange.__init__): |
138 |
|
Consolidate the min/max parameters into a single _range which |
139 |
|
can either be a tuple or a Range object. |
140 |
|
(ClassGroupRange.SetRange): Consolidate the min/max parameters |
141 |
|
into a single _range which can either be a tuple or a Range object. |
142 |
|
|
143 |
|
* Thuban/Model/load.py (SessionLoader.start_clrange): Fix |
144 |
|
call to ClassGroupRange constructor to use a tuple. |
145 |
|
|
146 |
|
* Thuban/Model/layer.py (Layer.SetClassification): Switch |
147 |
|
the classification instance variable to the new class |
148 |
|
before calling _set_layer otherwise subscribers to a |
149 |
|
LAYER_CHANGED event will not see any difference. |
150 |
|
|
151 |
|
* test/test_classification.py: Fix tests of ClassGroupRange |
152 |
|
so that they use the new signature. |
153 |
|
|
154 |
|
* test/test_load.py: Fix use of ClassGroupRange so that it |
155 |
|
uses the new signature. |
156 |
|
|
157 |
|
* test/test_load_0_2.py: Fix use of ClassGroupRange so that it |
158 |
|
uses the new signature. |
159 |
|
|
160 |
|
* test/test_save.py: Fix use of ClassGroupRange so that it |
161 |
|
uses the new signature. |
162 |
|
|
163 |
|
|
164 |
|
2003-07-01 Jonathan Coles <[email protected]> |
165 |
|
|
166 |
|
* Thuban/Model/classgen.py: Fixes RTbug #1972, 1971. |
167 |
|
Import used objects/class from color. |
168 |
|
(generate_singletons): We don't |
169 |
|
need the numGroups parameter anymore because we are using |
170 |
|
the new ramps with GetProperties(). |
171 |
|
(generate_uniform_distribution): Use new ramp method |
172 |
|
GetProperties(). |
173 |
|
(generate_quantiles, GenQuantiles0): Use new ramp method |
174 |
|
GetProperties(). |
175 |
|
(CustomRamp.SetNumGroups): Removed. The ramps now map |
176 |
|
a value from 0 to 1 to class properties so the number |
177 |
|
of groups is not needed ahead of time. |
178 |
|
(CustomRamp.next): Removed. CustomRamp does not support |
179 |
|
interation anymore. |
180 |
|
(CustomRamp.GetProperties): Returns a ClassGroupProperties |
181 |
|
object based on the index value from 0 to 1 that is |
182 |
|
passed to it. |
183 |
|
(GreyRamp, RedRamp, GreenRamp, BlueRamp, GreenToRedRamp): |
184 |
|
Made into instances of Monochromatic class instread of |
185 |
|
deriving from it. |
186 |
|
(HotToCold.SetNumGroups): Removed. See CustomRamp. |
187 |
|
(HotToCold.next): Removed. See CustomRamp. |
188 |
|
|
189 |
|
* Thuban/Model/classification.py: Fixes RTbug #1973, 1971. |
190 |
|
(Classification.SetField, Classification.SetFieldType): |
191 |
|
Replaced with SetFieldInfo. |
192 |
|
(Classification.SetFieldInfo): New. Does a better job of |
193 |
|
what SetField and SetFieldType used to do by combining |
194 |
|
their function since they should really always be done |
195 |
|
at the same time. |
196 |
|
(Classification.SetLayer): Renamed to _set_layer. |
197 |
|
(Classification._set_layer): Should only be called from |
198 |
|
Layer's SetClassification. This does not cause a recursive |
199 |
|
call as SetLayer did because we know that Layer knows about |
200 |
|
the classification. |
201 |
|
|
202 |
|
* Thuban/Model/color.py: Fixes RTbug #1971. |
203 |
|
(_Transparent): Renamed from Transparent so it doesn't |
204 |
|
conflict with the module variable. |
205 |
|
(Transparent, Black): Renamed from Color.Transparent, |
206 |
|
Color.Black so they are not class variables. |
207 |
|
|
208 |
|
* Thuban/Model/layer.py: Fixes RTbug #1971, 1973. |
209 |
|
(Layer.Destroy): We don't need to call SetClassification |
210 |
|
anymore to clear out the back reference in the classifcation |
211 |
|
to the layer. It's better to set it to None using _set_layer, |
212 |
|
and we won't be creating another clas object too. |
213 |
|
(Layer.SetClassification): Classification._set_layer is not |
214 |
|
recursive so remove all the locking variables. Also clean |
215 |
|
up the code so that it remains unchanged if something fails. |
216 |
|
|
217 |
|
* Thuban/Model/load.py: Fixes RTbug #1971. |
218 |
|
(SessionLoader.start_classification): Call |
219 |
|
Classification.SetFieldInfo(). |
220 |
|
|
221 |
|
* Thuban/Model/save.py: Removed import of Color which wasn't |
222 |
|
being used. |
223 |
|
|
224 |
|
* Thuban/UI/classgen.py: Fixes RTbug #1972. |
225 |
|
(ClassGenDialog.__init__): Color ramps are now instances |
226 |
|
already so we don't need to create any new objects. |
227 |
|
(ClassGenDialog.OnOK): Check for numGroups is no longer |
228 |
|
necessary because we never use it. |
229 |
|
|
230 |
|
* Thuban/UI/classifier.py: Fixes RTbug #1971. |
231 |
|
(Classifier.__BuildClassification, Classifier.__SetGridTable): |
232 |
|
Call Classification.SetFieldInfo() instead of SetFieldType. |
233 |
|
|
234 |
|
* Thuban/UI/renderer.py: Fixes RTbug #1971. |
235 |
|
|
236 |
|
* Thuban/UI/view.py: Fixes RTbug #1974, 1971. |
237 |
|
(MapCanvas.__init__): Subscribe to the idle time event. Set |
238 |
|
background color to white. |
239 |
|
(MapCanvas.OnPaint): Set a flag indicating that we should |
240 |
|
render the map during idle time. If we already have a bitmap |
241 |
|
just draw it now. |
242 |
|
(MapCanvas.OnIdle): New. Render the map only during idle time. |
243 |
|
This also fixes a problem with the busy cursor under gtk. |
244 |
|
|
245 |
|
* test/test_classgen.py (ClassGenTest.test_generate_singletons): |
246 |
|
Fix calls to generate_singletons because the signature changed. |
247 |
|
|
248 |
|
* test/test_classification.py: Fix color references and |
249 |
|
change calls to Classification.[SetField|SetFieldType] to |
250 |
|
SetFieldInfo. |
251 |
|
|
252 |
|
* test/test_load.py: Fix color references. |
253 |
|
|
254 |
|
* test/test_load_0_2.py: Fix color references. |
255 |
|
|
256 |
|
* test/test_save.py (SaveSessionTest.testClassifiedLayer): |
257 |
|
Change calls to Classification.[SetField|SetFieldType] to |
258 |
|
SetFieldInfo. |
259 |
|
|
260 |
|
2003-07-01 Frank Koormann <[email protected]> |
261 |
|
|
262 |
|
MERGE from the greater-ms3 branch. |
263 |
|
|
264 |
|
* test/test_transientdb.py |
265 |
|
(TestTransientTable.test_transient_joined_table_with_equal_column_names): |
266 |
|
New. Test join of two tables with partly equal column names. |
267 |
|
|
268 |
|
* Thuban/Model/transientdb.py (TransientJoinedTable.create): |
269 |
|
If duplicates in left and right tables column names are found, |
270 |
|
append '_' (underscores) to the name until it is unique. |
271 |
|
Create always new internal names for the resulting table and reference |
272 |
|
columns in the join statement with <table>.<column> |
273 |
|
|
274 |
|
2003-07-01 Bernhard Herzog <[email protected]> |
275 |
|
|
276 |
|
* test/test_transientdb.py |
277 |
|
(TestTransientTable.test_transient_joined_table_same_column_name): |
278 |
|
New. Test whether joining on columns with the same names in both |
279 |
|
tables works. |
280 |
|
|
281 |
|
* Thuban/Model/transientdb.py (TransientJoinedTable.create): Make |
282 |
|
sure to use the right internal names even when joining on field |
283 |
|
with the same names in both tables. Also, detect duplicate names |
284 |
|
in the joined table correctly. |
285 |
|
|
286 |
|
2003-07-01 Frank Koormann <[email protected]> |
287 |
|
|
288 |
|
* Thuban/UI/renderer.py (ExportRenderer.render_legend): |
289 |
|
Reverse List of layers to render in same order as in desktop legend. |
290 |
|
|
291 |
|
2003-06-30 Jonathan Coles <[email protected]> |
292 |
|
|
293 |
|
* Thuban/version.py (make_tuple): Takes a version string |
294 |
|
and splits it into a tuple of at most three integers. |
295 |
|
Used make_tuple() to make tuple versions of the version |
296 |
|
numbers. |
297 |
|
|
298 |
|
* Thuban/UI/about.py: Add Thuban email addresses. |
299 |
|
|
300 |
|
2003-06-30 Jonathan Coles <[email protected]> |
301 |
|
|
302 |
|
* Thuban/version.py: SQLite/PySQLite version dependencies |
303 |
|
were too high. |
304 |
|
|
305 |
|
2003-06-30 Jonathan Coles <[email protected]> |
306 |
|
|
307 |
|
* Thuban/version.py: Update version to 0.8.1 |
308 |
|
|
309 |
|
* MANIFEST.in: Added Projections so that default.proj is |
310 |
|
included. |
311 |
|
|
312 |
|
2003-06-26 Jonathan Coles <[email protected]> |
313 |
|
|
314 |
|
New About box with lots more information including library |
315 |
|
versions and credits. More/better version checking before |
316 |
|
Thuban starts. |
317 |
|
|
318 |
|
* Thuban/UI/about.py: New. New About box that displays |
319 |
|
library version information and credits. |
320 |
|
|
321 |
|
* Thuban/version.py: Added new 'versions' dictionary which |
322 |
|
contains the verions of various libraries which are checked |
323 |
|
when the module loads. |
324 |
|
(verify_versions): Check all version numbers and returns |
325 |
|
a list of errors. |
326 |
|
|
327 |
|
* Thuban/UI/classifier.py (Classifier.__EnableButtons): |
328 |
|
Reset the status of the buttons as the situation warrants, |
329 |
|
but in a better more reliable way by not relying on the |
330 |
|
current status to determine what needs to change. |
331 |
|
|
332 |
|
* Thuban/UI/main.py (wxCHECK_VERSION): Removed. Not needed. |
333 |
|
(verify_versions): Remove most of the code since it is |
334 |
|
now in Thuban.version.verify_versions.o |
335 |
|
|
336 |
|
* Thuban/UI/mainwindow.py (MainWindow.About): Call new |
337 |
|
About box in Thuban.UI.about. |
338 |
|
|
339 |
|
* extensions/thuban/gdalwarp.cpp (get_gdal_version): New. |
340 |
|
Returns the version of gdal library being used as a string. |
341 |
|
|
342 |
|
* extensions/thuban/wxproj.cpp (check_version, check_version_gtk): |
343 |
|
Removed. |
344 |
|
(get_proj_version): Return the version of PROJ that the file |
345 |
|
was compiled with. |
346 |
|
(get_gtk_version): Return th version of GTK that the file |
347 |
|
was compiled with. |
348 |
|
|
349 |
|
2003-06-25 Jonathan Coles <[email protected]> |
350 |
|
|
351 |
|
* Thuban/UI/classifier.py (Classifier.EditSymbol): The parent |
352 |
|
of the SelectPropertiesDialog should be self so the window |
353 |
|
appears on top. |
354 |
|
(ClassGroupPropertiesCtrl.DoEdit): The parent |
355 |
|
of the SelectPropertiesDialog should be self so the window |
356 |
|
appears on top. |
357 |
|
|
358 |
|
* Thuban/UI/resource.py: Cleaned up how we determine file |
359 |
|
extensions. |
360 |
|
(GetImageResource): Return an wxImage from our Resources. |
361 |
|
|
362 |
|
2003-06-24 Jonathan Coles <[email protected]> |
363 |
|
|
364 |
|
* Thuban/UI/renderer.py (ExportRenderer.render_legend): |
365 |
|
Check that a layer has a classification before trying |
366 |
|
to get it. Raster layers don't have classifications. |
367 |
|
|
368 |
|
2003-06-23 Jonathan Coles <[email protected]> |
369 |
|
|
370 |
|
* setup.py: Add Resources/XML to resource list. |
371 |
|
|
372 |
|
2003-06-23 Jonathan Coles <[email protected]> |
373 |
|
|
374 |
|
* setup.cfg: Fix copyright dates |
375 |
|
|
376 |
|
2003-06-23 Jonathan Coles <[email protected]> |
377 |
|
|
378 |
|
* MANIFEST.in: Update with Resources/XML |
379 |
|
|
380 |
|
* setup.py: Don't include Locale resources yet as we don't |
381 |
|
have any and it causes problems building the distribution |
382 |
|
for Windows. Update version to 0.8.0. |
383 |
|
|
384 |
|
* Doc/thuban.dtd: Removed since it is now in Resources/XML. |
385 |
|
|
386 |
|
* Thuban/UI/mainwindow.py: Add blank line at the end because |
387 |
|
file was not being read correctly building the Windows |
388 |
|
distribution. |
389 |
|
|
390 |
|
2003-06-23 Jonathan Coles <[email protected]> |
391 |
|
|
392 |
|
* Thuban/UI/mainwindow.py (MainWindow.About): Fix text. |
393 |
|
|
394 |
|
* Thuban/version.py: Temporarily update longversion for |
395 |
|
the 0.8 release so that it doesn't have the cvs revision. |
396 |
|
|
397 |
|
2003-06-23 Jonathan Coles <[email protected]> |
398 |
|
|
399 |
|
* Thuban/UI/common.py (ThubanBeginBusyCursor): Call wxSafeYield |
400 |
|
to make sure that we don't create reentrant possibilities with |
401 |
|
wxYield. |
402 |
|
|
403 |
|
* Thuban/UI/view.py (MapCanvas.OnPaint): Call wxBeginBusyCursor() |
404 |
|
directly to avoid the wxSafeYield() call which generates an |
405 |
|
OnPaint event causing infinite recursion. Don't try to catch |
406 |
|
exception anymore. This was for before there were limits on map |
407 |
|
scaling. |
408 |
|
|
409 |
|
2003-06-23 Bernhard Herzog <[email protected]> |
410 |
|
|
411 |
|
Bug fix for RT #1961: |
412 |
|
|
413 |
|
* Thuban/Model/load.py (SessionLoader.start_derivedshapesource): |
414 |
|
Register DerivedShapestores with the session |
415 |
|
|
416 |
|
* Thuban/Model/session.py (Session.Tables): Make sure each table |
417 |
|
is only listed once. |
418 |
|
|
419 |
|
* test/test_load.py (TestJoinedTable.test): Add check_format call. |
420 |
|
Update file contents to match the one written out. |
421 |
|
|
422 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
423 |
|
|
424 |
|
* test/xmlsupport.py (SaxEventLister.startElementNS) |
425 |
|
(SaxEventLister.endElementNS): Do not include the qname. Python |
426 |
|
2.2.1 and 2.2.2 and 2.2.3 differ in this regard. In 2.2.1 qname it |
427 |
|
is (presumably incorrectly) None, whereas it's a string with the |
428 |
|
element name in the later versions. |
429 |
|
|
430 |
|
* test/test_xmlsupport.py (TestEventList.test_even_list_simple) |
431 |
|
(TestEventList.test_even_list_namespace): Update tests to reflect |
432 |
|
the new behaviour |
433 |
|
(TestEventList.test_even_list_id_normalization): Fix doc-string |
434 |
|
|
435 |
|
2003-06-20 Jonathan Coles <[email protected]> |
436 |
|
|
437 |
|
* Thuban/Model/layer.py (BaseLayer.HasShapes): New. Overridden |
438 |
|
by deriving classes to determine if that layer supports shapes. |
439 |
|
(Layer): Override HasShapes and return true. |
440 |
|
|
441 |
|
* Thuban/UI/classgen.py: Use Thuban[Begin|End]BusyCursor() |
442 |
|
instead of a direct call to wx[Begin|End]CusyCursor(). |
443 |
|
(GenUniquePanel._OnRetrieve): Set busy cursor while retrieving |
444 |
|
table data. |
445 |
|
|
446 |
|
* Thuban/UI/common.py (ThubanBeginBusyCursor, ThubanEndBusyCursor): |
447 |
|
New. Wrappers around the wxWindows functions that allow us to |
448 |
|
make additional calls such as wxYield which gives the native |
449 |
|
system a chance to update the cursor correctly. |
450 |
|
|
451 |
|
* Thuban/UI/tableview.py: Use Thuban[Begin|End]BusyCursor() |
452 |
|
instead of a direct call to wx[Begin|End]CusyCursor(). |
453 |
|
|
454 |
|
* Thuban/UI/view.py: Use Thuban[Begin|End]BusyCursor() |
455 |
|
instead of a direct call to wx[Begin|End]CusyCursor(). |
456 |
|
(MapCanvas.find_shape_at): Check if the current search layer |
457 |
|
support shapes, otherwise go on to the next layer. |
458 |
|
|
459 |
|
* test/test_layer.py: Add tests in each type of layer for |
460 |
|
HasClassification() and HasShapes() |
461 |
|
|
462 |
|
2003-06-20 Jonathan Coles <[email protected]> |
463 |
|
|
464 |
|
* Thuban/UI/view.py (MapCanvas.OnPaint): Call wxYield after |
465 |
|
turning on the busy cursor to allow the system to change the |
466 |
|
cursor before we begin painting. This fixes a problem that |
467 |
|
was occuring only under GTK. Fixes RTbug #1840. |
468 |
|
|
469 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
470 |
|
|
471 |
|
* Resources/XML/thuban-0.8.dtd: New DTD for the new file format |
472 |
|
version. |
473 |
|
|
474 |
|
* Thuban/Model/save.py (sort_data_stores): New. Make topological |
475 |
|
sort of the data sources so they can be written with sources that |
476 |
|
data sources that depend on other data sources come after the |
477 |
|
sources they depend on. |
478 |
|
(SessionSaver.__init__): Add idmap instance variable to map from |
479 |
|
objects to the ids used in the file. |
480 |
|
(SessionSaver.get_id, SessionSaver.define_id) |
481 |
|
(SessionSaver.has_id): New. Methods to manage the idmap |
482 |
|
(SessionSaver.write): Use thuban-0.8.dtd |
483 |
|
(SessionSaver.write_session): Add a namespace on the session and |
484 |
|
write out the data sources before the maps. |
485 |
|
(SessionSaver.write_data_containers): New. Write the data |
486 |
|
containers. |
487 |
|
(SessionSaver.write_layer): Layer elements now refer to a |
488 |
|
shapestore and don't contain filenames anymore. |
489 |
|
|
490 |
|
* Thuban/Model/load.py (LoadError): Exception class to raise when |
491 |
|
errors in the files are discovered |
492 |
|
(SessionLoader.__init__): Define dispatchers for elements with a |
493 |
|
thuban-0.8 namespace too. |
494 |
|
(SessionLoader.check_attrs): New helper method to check and |
495 |
|
convert attributes |
496 |
|
(AttrDesc): New. Helper class for SessionLoader.check_attrs |
497 |
|
(SessionLoader.start_fileshapesource) |
498 |
|
(SessionLoader.start_derivedshapesource) |
499 |
|
(SessionLoader.start_filetable, SessionLoader.start_jointable): |
500 |
|
Handlers for the new elements in the new fileformat |
501 |
|
(SessionLoader.start_layer): Handle the shapestore attribute in |
502 |
|
addition to filename. |
503 |
|
(SessionLoader.start_table, SessionLoader.end_table): Removed. |
504 |
|
They were never used in the old formats and aren't needed for the |
505 |
|
new. |
506 |
|
|
507 |
|
* Thuban/Model/session.py (Session.DataContainers): New method to |
508 |
|
return all "data containers", i.e. shapestores and tables |
509 |
|
|
510 |
|
* test/xmlsupport.py (SaxEventLister.__init__) |
511 |
|
(SaxEventLister.startElementNS, sax_eventlist): Add support to |
512 |
|
normalize IDs. |
513 |
|
|
514 |
|
* test/test_xmlsupport.py |
515 |
|
(TestEventList.test_even_list_id_normalization): New test case for |
516 |
|
id normalization |
517 |
|
|
518 |
|
* test/test_load.py (LoadSessionTest.check_format): Use ID |
519 |
|
normalization |
520 |
|
(LoadSessionTest.thubanids, LoadSessionTest.thubanidrefs): New |
521 |
|
class atrributes used for ID normalization |
522 |
|
(TestSingleLayer, TestLayerVisibility, TestLabels.test) |
523 |
|
(TestLayerProjection.test, TestRasterLayer.test): Adapt to new |
524 |
|
file format |
525 |
|
(TestJoinedTable): New test for loading sessions with joined |
526 |
|
tables. |
527 |
|
(TestLoadError): New. Test whether missing required attributes |
528 |
|
cause a LoadError. |
529 |
|
|
530 |
|
* test/test_save.py (SaveSessionTest.thubanids) |
531 |
|
(SaveSessionTest.thubanidrefs): New class attributes for ID |
532 |
|
normalization in .thuban files. |
533 |
|
(SaveSessionTest.compare_xml): Use id-normalization. |
534 |
|
(SaveSessionTest.testEmptySession) |
535 |
|
(SaveSessionTest.testLayerProjection) |
536 |
|
(SaveSessionTest.testRasterLayer) |
537 |
|
(SaveSessionTest.testClassifiedLayer): Adapt to new file format. |
538 |
|
(SaveSessionTest.testLayerProjection): The filename used was the |
539 |
|
same as for testSingleLayer. Use a different one. |
540 |
|
(SaveSessionTest.test_dbf_table) |
541 |
|
(SaveSessionTest.test_joined_table): New test cases for saving the |
542 |
|
new data sources structures. |
543 |
|
(TestStoreSort, MockDataStore): Classes to test the sorting of the |
544 |
|
data stores for writing. |
545 |
|
|
546 |
|
* test/runtests.py: Add CVS keywords |
547 |
|
|
548 |
|
2003-06-20 Jonathan Coles <[email protected]> |
549 |
|
|
550 |
|
* test/test_session.py |
551 |
|
(UnreferencedTablesTests.test_unreferenced_tables_with_joins): |
552 |
|
Use the cultural_landmark-point.dbf file for the store so that |
553 |
|
the table rows and shape count match. |
554 |
|
|
555 |
|
2003-06-20 Jonathan Coles <[email protected]> |
556 |
|
|
557 |
|
* Thuban/Model/data.py (DerivedShapeStore.__init__): Raise |
558 |
|
an exception if the number of shapes is different from the |
559 |
|
number of rows in the table. Address RTbug #1933. |
560 |
|
|
561 |
|
* test/test_layer.py (TestLayer.test_derived_store): Add |
562 |
|
a test for the new exception in DerivedShapeStore.__init__. |
563 |
|
|
564 |
|
* test/support.py (FloatTestCase): Removed since there is |
565 |
|
already FloatComparisonMixin. Fixes RTbug #1954. |
566 |
|
(FloatComparisonMixin.assertFloatEqual): Include test for |
567 |
|
infinity that was part of FloatTestCase. |
568 |
|
|
569 |
|
* test/test_range.py (RangeTest): Inherit from |
570 |
|
support.FloatComparisonMixin now that we don't have |
571 |
|
support.FloatTestCase. |
572 |
|
|
573 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
574 |
|
|
575 |
|
* test/test_save.py (SaxEventLister, sax_eventlist): Removed. Use |
576 |
|
the implementation in xmlsupport instead. |
577 |
|
(SaveSessionTest.compare_xml): sax_eventlist is now in xmlsupport |
578 |
|
|
579 |
|
* test/test_proj.py: Import sax_eventlist from xmlsupport instead |
580 |
|
of test_save |
581 |
|
|
582 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
583 |
|
|
584 |
|
* test/test_load.py (LoadSessionTest.check_format): New helper |
585 |
|
method to make sure the test files we load might have been written |
586 |
|
by the current thuban version. |
587 |
|
(ClassificationTest.TestLayers, TestSingleLayer.test) |
588 |
|
(TestLayerVisibility.test, TestClassification.test) |
589 |
|
(TestLabels.test, TestLayerProjection.test, TestRasterLayer.test): |
590 |
|
Add check_format() calls and fix the thuban data to match the data |
591 |
|
that would be written by saving the session loaded from it. |
592 |
|
|
593 |
|
* test/xmlsupport.py (SaxEventLister, sax_eventlist): Copies of |
594 |
|
the same class and function in test_save. |
595 |
|
|
596 |
|
* test/test_xmlsupport.py (TestEventList): New. test cases for |
597 |
|
sax_eventlist |
598 |
|
|
599 |
|
2003-06-20 Bernhard Herzog <[email protected]> |
600 |
|
|
601 |
|
* Resources/XML/thuban.dtd: Add comment about which versions of |
602 |
|
Thuban are covered by this DTD |
603 |
|
(map): Fix content model for layers and raster layers. There can |
604 |
|
be any number or layers and raster layers in any order. |
605 |
|
|
606 |
|
2003-06-20 Jonathan Coles <[email protected]> |
607 |
|
|
608 |
|
This is mainly about fixing RTbug #1949. |
609 |
|
|
610 |
|
* Thuban/Model/classification.py: Remove "from __future__" |
611 |
|
import statement since python 2.2 is the earliest supported |
612 |
|
version. |
613 |
|
|
614 |
|
* Thuban/Model/proj.py (Projection.GetProjectedUnits): New. |
615 |
|
Currently returns PROJ_UNITS_METERS or PROJ_UNITS_DEGREES |
616 |
|
depending on the units this projection *forwards* into. |
617 |
|
|
618 |
|
* Thuban/Model/save.py (SessionSaver.write_classification): |
619 |
|
Remove unnecessary use of lambdas and nested functions. |
620 |
|
|
621 |
|
* Thuban/UI/legend.py (ScaleBarBitmap.__SetScale): Do scale |
622 |
|
adjustment here if the map projection uses degrees. |
623 |
|
|
624 |
|
* Thuban/UI/scalebar.py (ScaleBar.DrawScaleBar): Remove |
625 |
|
scale adjust code since it is now done before calling |
626 |
|
this method. Don't do anything if the map projection |
627 |
|
is None. |
628 |
|
|
629 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
630 |
|
|
631 |
|
Move version specific load tests to their own file. |
632 |
|
|
633 |
|
* test/test_load.py: Expand the doc-string to explain a bit how to |
634 |
|
handle file format changes. |
635 |
|
(TestClassification.test): Update the docstring as this test is |
636 |
|
not about Thuban 0.2 anymore. |
637 |
|
|
638 |
|
* test/test_load_0_2.py: New file with the load tests for thuban |
639 |
|
files created with Thuban 0.2 and earlier. |
640 |
|
|
641 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
642 |
|
|
643 |
|
Add XML validation to some of the tests. Validation will only be |
644 |
|
done if pyRXP is installed (http://reportlab.com/xml/pyrxp.html). |
645 |
|
To make the DTD available to the test cases it's moved into |
646 |
|
Resources/XML |
647 |
|
|
648 |
|
* Resources/XML/thuban.dtd: New. This is now the real Thuban DTD |
649 |
|
for versions up to and including 0.2. Two slight changes: added an |
650 |
|
encoding specification and fixed the comment which refered to |
651 |
|
GRASS, not Thuban |
652 |
|
|
653 |
|
* test/xmlsupport.py: New support module for tests involving XML. |
654 |
|
Currently there's a mix-in class for XML validation. |
655 |
|
|
656 |
|
* test/test_xmlsupport.py: New. Tests for the xmlsupport module |
657 |
|
|
658 |
|
* test/test_save.py (SaveSessionTest): Derive from ValidationTest |
659 |
|
so that we can validate the |
660 |
|
(SaveSessionTest.testEmptySession) |
661 |
|
(SaveSessionTest.testSingleLayer) |
662 |
|
(SaveSessionTest.testSingleLayer) |
663 |
|
(SaveSessionTest.testLayerProjection) |
664 |
|
(SaveSessionTest.testRasterLayer) |
665 |
|
(SaveSessionTest.testClassifiedLayer): Validate the generated XML |
666 |
|
|
667 |
|
* test/runtests.py (main): Call print_additional_summary instead |
668 |
|
of print_garbage_information |
669 |
|
|
670 |
|
* test/support.py (resource_dir): New function to return the |
671 |
|
"Resource" subdirectory |
672 |
|
(print_additional_summary): New function to combine several |
673 |
|
summary functions |
674 |
|
(run_tests): Use print_additional_summary instead of calling |
675 |
|
print_garbage_information directly |
676 |
|
|
677 |
|
2003-06-19 Bernhard Herzog <[email protected]> |
678 |
|
|
679 |
|
* Doc/thuban.dtd (classification): Correct the content model of |
680 |
|
the classification element. |
681 |
|
(projection): Add the "name" attribute |
682 |
|
|
683 |
2003-06-19 Frank Koormann <[email protected]> |
2003-06-19 Frank Koormann <[email protected]> |
684 |
|
|
685 |
MERGE from the greater-ms3 branch. |
MERGE from the greater-ms3 branch. |