1 |
|
2003-08-15 Bernhard Herzog <[email protected]> |
2 |
|
|
3 |
|
Change the way shapes are returned by a shape store. The |
4 |
|
ShapesInRegion method returns an iterator over actual shape |
5 |
|
objects instead of a list of shape ids. |
6 |
|
|
7 |
|
* Thuban/Model/data.py (ShapefileShape.ShapeID): New. Return shape |
8 |
|
id. |
9 |
|
(ShapefileStore.ShapesInRegion): Return an iterator over the |
10 |
|
shapes which yields shape objects instead of returning a list of |
11 |
|
shape ids |
12 |
|
(ShapefileStore.AllShapes): New. Return an iterator over all |
13 |
|
shapes in the shape store |
14 |
|
(DerivedShapeStore.AllShapes): New. Like in ShapefileStore |
15 |
|
|
16 |
|
* Thuban/Model/layer.py (Layer.ShapesInRegion): Update |
17 |
|
doc-string. |
18 |
|
|
19 |
|
* Thuban/UI/baserenderer.py |
20 |
|
(BaseRenderer.layer_ids, BaseRenderer.layer_shapes): Rename to |
21 |
|
layer_shapes and make it return an iterator containg shapes |
22 |
|
instead of a list of ids. |
23 |
|
(BaseRenderer.draw_shape_layer): Update doc-string; Adapt to |
24 |
|
layer_shapes() change |
25 |
|
|
26 |
|
* Thuban/UI/renderer.py (ScreenRenderer.layer_ids) |
27 |
|
(ScreenRenderer.layer_shapes): Rename as in BaseRenderer |
28 |
|
|
29 |
|
* Thuban/UI/viewport.py (ViewPort._find_shape_in_layer): Adapt to |
30 |
|
changes in the ShapesInRegion return value. |
31 |
|
(ViewPort._get_hit_tester): Remove commented out code |
32 |
|
|
33 |
|
* test/mockgeo.py (SimpleShapeStore.ShapesInRegion): Adapt to the |
34 |
|
new return value. |
35 |
|
(SimpleShapeStore.AllShapes): New. Implement this method too. |
36 |
|
|
37 |
|
* test/test_layer.py (TestLayer.test_arc_layer) |
38 |
|
(TestLayer.test_polygon_layer, TestLayer.test_point_layer) |
39 |
|
(TestLayer.test_point_layer_with_projection) |
40 |
|
(TestLayer.test_derived_store): Adapt to changes in the |
41 |
|
ShapesInRegion return value. |
42 |
|
|
43 |
|
* test/test_shapefilestore.py |
44 |
|
(TestShapefileStoreArc.test_shapes_in_region) |
45 |
|
(TestShapefileStorePolygon.test_shapes_in_region) |
46 |
|
(TestShapefileStorePoint.test_shapes_in_region): Adapt to changes |
47 |
|
in the ShapesInRegion return value. |
48 |
|
(TestShapefileStorePoint.test_all_shapes) |
49 |
|
(TestShapefileStoreArc.test_shape_shapeid): New tests for the new |
50 |
|
methods |
51 |
|
|
52 |
|
* test/test_derivedshapestore.py |
53 |
|
(TestDerivedShapeStore.test_shapes_in_region): Adapt to changes in |
54 |
|
the ShapesInRegion return value. |
55 |
|
(TestDerivedShapeStore.test_all_shapes) |
56 |
|
(TestDerivedShapeStore.test_shape_shapeid): New tests for the new |
57 |
|
methods |
58 |
|
|
59 |
|
2003-08-15 Bernhard Herzog <[email protected]> |
60 |
|
|
61 |
|
Make the renderers deal correctly with raw vs. python level |
62 |
|
representation of shape geometries |
63 |
|
|
64 |
|
* Thuban/UI/baserenderer.py (BaseRenderer.low_level_renderer): |
65 |
|
Return a flag useraw in addition to the callable and the parameter |
66 |
|
to indicate whether the callable can deal with the raw shape data |
67 |
|
or uses the higher level python lists of coordinates. The callable |
68 |
|
now should accept either the raw data or the return value of the |
69 |
|
shape's Points() method. |
70 |
|
(BaseRenderer.draw_shape_layer): Adapt to the low_level_renderer |
71 |
|
change |
72 |
|
(BaseRenderer.projected_points): Instead of the shape id use the |
73 |
|
points list as parameter. |
74 |
|
(BaseRenderer.draw_polygon_shape, BaseRenderer.draw_arc_shape) |
75 |
|
(BaseRenderer.draw_point_shape): Adapt to projected_points() |
76 |
|
change and accept the points list as parameter instead of the |
77 |
|
shape id. |
78 |
|
|
79 |
|
* Thuban/UI/renderer.py (MapRenderer.low_level_renderer): Return |
80 |
|
the useraw flag as required by the BaseRenderer |
81 |
|
(ScreenRenderer.draw_shape_layer): Adapt to low-level renderer |
82 |
|
changes. |
83 |
|
|
84 |
|
* test/test_baserenderer.py |
85 |
|
(TestBaseRenderer.test_point_with_classification): New test for |
86 |
|
rendering a map with classifications. |
87 |
|
|
88 |
|
2003-08-15 Bernhard Herzog <[email protected]> |
89 |
|
|
90 |
|
* Thuban/UI/viewport.py (ViewPort.find_shape_at) |
91 |
|
(ViewPort._find_shape_in_layer, ViewPort._find_shape_in_layer) |
92 |
|
(ViewPort._get_hit_tester, ViewPort.projected_points) |
93 |
|
(ViewPort._hit_point, ViewPort._hit_arc, ViewPort._hit_polygon) |
94 |
|
(ViewPort._find_label_at): Split the find_shape_at method into |
95 |
|
several new methods and use the functions in the hit-test module. |
96 |
|
|
97 |
|
* Thuban/UI/hittest.py: New module with Python-level hit-testing |
98 |
|
functions |
99 |
|
|
100 |
|
* test/test_hittest.py: New. Test for the new hittest module |
101 |
|
|
102 |
|
2003-08-15 Bernhard Herzog <[email protected]> |
103 |
|
|
104 |
|
* Thuban/Model/layer.py (Layer.ShapesInRegion): Apply the layer |
105 |
|
projection to all corners of the bounding box to get a better |
106 |
|
approximation of the projected bounding box |
107 |
|
|
108 |
|
* test/test_layer.py (TestLayer.test_point_layer_with_projection): |
109 |
|
New. Test coordinate handling of a layer with a projection. |
110 |
|
Catches the bug fixed in Layer.ShapesInRegion |
111 |
|
|
112 |
|
2003-08-15 Bernhard Herzog <[email protected]> |
113 |
|
|
114 |
|
Move some of the mock objects in test_baserenderer into their own |
115 |
|
module so they can easily be used from other tests |
116 |
|
|
117 |
|
* test/mockgeo.py: New test helper module with some mock objects |
118 |
|
for geometry related things like shapes, shapestores and |
119 |
|
projections. |
120 |
|
|
121 |
|
* test/test_mockgeo.py: New. Tests for the new helper module |
122 |
|
|
123 |
|
* test/test_baserenderer.py: Some of the mock-objects are in |
124 |
|
mockgeo now. |
125 |
|
|
126 |
|
2003-08-12 Jan-Oliver Wagner <[email protected]> |
127 |
|
|
128 |
|
* Thuban/UI/about.py (About.__init__): Added Bj�rn Broscheit. |
129 |
|
|
130 |
|
2003-08-12 Bernhard Herzog <[email protected]> |
131 |
|
|
132 |
|
* po/de.po: New. German translations by Bjoern Broscheit |
133 |
|
|
134 |
|
2003-08-12 Bernhard Herzog <[email protected]> |
135 |
|
|
136 |
|
* Thuban/UI/projdialog.py (UnknownProjPanel._DoLayout): Translated |
137 |
|
strings have to be one string literal. |
138 |
|
|
139 |
|
2003-08-11 Bernhard Herzog <[email protected]> |
140 |
|
|
141 |
|
* test/support.py (FloatComparisonMixin.assertPointListEquals): |
142 |
|
New. This method was used in various derived classes, but it's |
143 |
|
better to have it here. |
144 |
|
|
145 |
|
* test/test_shapefilestore.py |
146 |
|
(ShapefileStoreTests.assertPointListEquals): Removed. It's now in |
147 |
|
FloatComparisonMixin |
148 |
|
|
149 |
|
* test/test_layer.py (TestLayer.assertPointListEquals): Removed. |
150 |
|
It's now in FloatComparisonMixin |
151 |
|
|
152 |
|
* test/test_derivedshapestore.py |
153 |
|
(TestDerivedShapeStore.assertPointListEquals): Removed. It's now |
154 |
|
in FloatComparisonMixin |
155 |
|
|
156 |
|
2003-08-11 Bernhard Herzog <[email protected]> |
157 |
|
|
158 |
|
* Thuban/UI/join.py (JoinDialog.OnJoin): Add missing space to |
159 |
|
error message |
160 |
|
|
161 |
|
2003-08-08 Jan-Oliver Wagner <[email protected]> |
162 |
|
|
163 |
|
* Doc/manual/thuban-manual.xml: Now use authorgroup. Added revhistory |
164 |
|
with version number. |
165 |
|
Changed title to reflect version number of Thuban. |
166 |
|
|
167 |
|
2003-08-08 Jan-Oliver Wagner <[email protected]> |
168 |
|
|
169 |
|
* Thuban/UI/about.py (About.__init__): Reworked the hall of fame. Now |
170 |
|
the list corresponds to the "About" web page. |
171 |
|
|
172 |
|
2003-08-08 Bernhard Herzog <[email protected]> |
173 |
|
|
174 |
|
* Thuban/UI/projdialog.py (UTMProposeZoneDialog.dialogLayout): |
175 |
|
Make sure translated strings are recognized as one string literal. |
176 |
|
|
177 |
|
* Thuban/UI/proj4dialog.py (UTMProposeZoneDialog.dialogLayout): |
178 |
|
Make sure translated strings are recognized as one string literal. |
179 |
|
|
180 |
|
* Thuban/UI/classgen.py (ClassGenDialog.OnOK): Make sure |
181 |
|
translated strings are recognized as one string literal. |
182 |
|
|
183 |
|
* Thuban/UI/application.py (ThubanApplication.OpenSession): Make |
184 |
|
sure translated strings are recognized as one string literal. |
185 |
|
|
186 |
|
2003-08-07 Bernhard Herzog <[email protected]> |
187 |
|
|
188 |
|
* Thuban/Model/data.py (DerivedShapeStore.RawShapeFormat): New. |
189 |
|
Simply delegates to the original shapestore. |
190 |
|
|
191 |
|
* test/test_derivedshapestore.py |
192 |
|
(TestDerivedShapeStore.test_raw_format): New. Test case for |
193 |
|
DerivedShapeStore.RawShapeFormat |
194 |
|
|
195 |
|
2003-08-07 Bernhard Herzog <[email protected]> |
196 |
|
|
197 |
|
Add raw data interface to shape objects. |
198 |
|
|
199 |
|
* Thuban/Model/data.py (ShapefileShape, Shape): Rname the shape |
200 |
|
class to ShapefileShape which now holds shapefile specific |
201 |
|
information. |
202 |
|
(ShapefileShape.compute_bbox): Simplified to not cache any |
203 |
|
information. The way this method is used that shouldn't matter |
204 |
|
performance wise. |
205 |
|
(ShapefileShape.RawData): New. Return the shapeid which is the raw |
206 |
|
data format for shapes from shapefiles. |
207 |
|
(ShapefileStore.RawShapeFormat): New. Return the raw datatype used |
208 |
|
in the shape objects returned by a shapestore. For a |
209 |
|
ShapefileStore this is always RAW_SHAPEFILE. |
210 |
|
(RAW_PYTHON, RAW_SHAPEFILE): Constants for the RawShapeFormat |
211 |
|
method. |
212 |
|
|
213 |
|
* test/test_shapefilestore.py |
214 |
|
(TestShapefileStore.test_raw_format): New test to test the raw |
215 |
|
format feature of shapes. |
216 |
|
|
217 |
|
* Thuban/Model/layer.py: Remove the unused import of Shape from |
218 |
|
data. It was only there for interface compatibility but it's not |
219 |
|
used inside of Thuban and the generic Shape class has gone away. |
220 |
|
|
221 |
|
* Thuban/UI/renderer.py (MapRenderer.low_level_renderer): Check |
222 |
|
the raw data format and only use an optimized version of its a |
223 |
|
shapefile. |
224 |
|
|
225 |
|
2003-08-07 Bernhard Herzog <[email protected]> |
226 |
|
|
227 |
|
* test/test_baserenderer.py (SimpleShape): Shape class for the |
228 |
|
tests. |
229 |
|
(SimpleShapeStore.Shape): Use SimpleShape instead of |
230 |
|
Thuban.Model.data.Shape to make the tests independed of the coming |
231 |
|
changes. |
232 |
|
|
233 |
|
2003-08-07 Bernhard Herzog <[email protected]> |
234 |
|
|
235 |
|
* test/support.py (SkipTest, ThubanTestResult, ThubanTestRunner) |
236 |
|
(ThubanTestProgram): New classes that extend the respective |
237 |
|
classes from unittest. These new version support skipping tests |
238 |
|
under certain expected conditions. In the Thuban test suite we |
239 |
|
uses this for tests that require the optional gdal support. |
240 |
|
(run_tests): Use ThubanTestProgram instead of the unittest.main() |
241 |
|
|
242 |
|
* test/runtests.py (main): Use the new ThubanTestRunner instead of |
243 |
|
the normal one from unittest |
244 |
|
|
245 |
|
* test/test_layer.py (TestLayer.test_raster_layer): If this test |
246 |
|
is not run because gdal support isn't available report this to the |
247 |
|
runner. |
248 |
|
|
249 |
|
* test/test_baserenderer.py |
250 |
|
(TestBaseRenderer.test_raster_no_projection): Do not run this test |
251 |
|
if gdal support isn't available and report this to the runner. |
252 |
|
|
253 |
|
2003-08-06 Bernhard Herzog <[email protected]> |
254 |
|
|
255 |
|
Rearrange the renderers a bit, partly in preparation for changes |
256 |
|
required for the postgis merge, partly to make it more testable. |
257 |
|
Also make the representation of coordinates in Shapes more |
258 |
|
consistent. |
259 |
|
|
260 |
|
* Thuban/UI/renderer.py (MapRenderer): Most of the code/methods in |
261 |
|
this class is now in BaseRenderer. This class is now practically |
262 |
|
only a specialization of BaseRenderer for rendering to an actual |
263 |
|
wx DC. |
264 |
|
(ScreenRenderer.draw_shape_layer): Use self.low_level_renderer() |
265 |
|
to get the shapetype specific rendering functions. |
266 |
|
|
267 |
|
* Thuban/UI/baserenderer.py: New file with the basic rendering |
268 |
|
logic. The code in this file is completely independend of wx. |
269 |
|
(BaseRenderer): Class with the basic rendering logic |
270 |
|
|
271 |
|
* test/test_baserenderer.py: New. Test cases for BaseRenderer |
272 |
|
|
273 |
|
* Thuban/UI/view.py (MapCanvas.__init__): New instance variable |
274 |
|
error_on_redraw to guard agains endless loops and stack overflows |
275 |
|
when there's a bug in the rendering code that raises exceptions. |
276 |
|
(MapCanvas.OnIdle, MapCanvas._do_redraw): Split the actual |
277 |
|
rendering into a separate method _do_redraw so that error handling |
278 |
|
is a bit easier. When an exception occurs, set error_on_redraw to |
279 |
|
true. When it's true on entry to OnIdle do nothing and return |
280 |
|
immediately. |
281 |
|
|
282 |
|
* Thuban/Model/data.py (ShapefileStore.Shape): For consistency, a |
283 |
|
Shape object will always have the coordinates as a list of list of |
284 |
|
coordinate pairs (tuples). |
285 |
|
(Shape.compute_bbox): Adapt to new representation. |
286 |
|
|
287 |
|
* Thuban/UI/viewport.py (ViewPort.find_shape_at) |
288 |
|
(ViewPort.LabelShapeAt): Adapt to new coordinate representation in |
289 |
|
Shape objects. |
290 |
|
|
291 |
|
* test/test_shapefilestore.py |
292 |
|
(ShapefileStoreTests.assertFloatTuplesEqual) |
293 |
|
(ShapefileStoreTests.assertPointListEquals): Rename to |
294 |
|
assertPointListEquals and change purpose to checking equality of |
295 |
|
the lists returned by Shape.Points(). |
296 |
|
(TestShapefileStoreArc.test_shape) |
297 |
|
(TestShapefileStorePolygon.test_shape) |
298 |
|
(TestShapefileStorePoint.test_shape): Use the new |
299 |
|
assertPointListEquals instead of assertFloatTuplesEqual |
300 |
|
|
301 |
|
* test/test_layer.py (TestLayer.assertFloatTuplesEqual) |
302 |
|
(TestLayer.assertPointListEquals): Rename to assertPointListEquals |
303 |
|
and change purpose to checking equality of the lists returned by |
304 |
|
Shape.Points(). |
305 |
|
(TestLayer.test_arc_layer, TestLayer.test_arc_layer) |
306 |
|
(TestLayer.test_polygon_layer, TestLayer.test_point_layer) |
307 |
|
(TestLayer.test_derived_store): Use the new assertPointListEquals |
308 |
|
instead of assertFloatTuplesEqual |
309 |
|
|
310 |
|
* test/test_derivedshapestore.py |
311 |
|
(TestDerivedShapeStore.assertFloatTuplesEqual) |
312 |
|
(TestDerivedShapeStore.assertPointListEquals): Rename to |
313 |
|
assertPointListEquals and change purpose to checking equality of |
314 |
|
the lists returned by Shape.Points(). |
315 |
|
(TestDerivedShapeStore.test_shape): Use the new |
316 |
|
assertPointListEquals instead of assertFloatTuplesEqual |
317 |
|
|
318 |
|
2003-08-06 Jan-Oliver Wagner <[email protected]> |
319 |
|
|
320 |
|
* Thuban/UI/projdialog.py (UTMPanel._OnPropose): Added test for |
321 |
|
a bounding box. A dialog is raised in case, no bounding box |
322 |
|
is found. This fixes bug #2043: |
323 |
|
https://intevation.de/rt/webrt?serial_num=2043 |
324 |
|
|
325 |
|
2003-08-05 Bernhard Herzog <[email protected]> |
326 |
|
|
327 |
|
* Thuban/Model/color.py (Color.__repr__): Make the repr of a color |
328 |
|
object look like a Color instantiation. Formerly it looked like a |
329 |
|
tuple. |
330 |
|
|
331 |
|
* test/test_color.py (TestColor.test_repr) |
332 |
|
(TestColor.test_equality, TestColor.test_inequality): New. test |
333 |
|
some more apects of the Color class |
334 |
|
(TestTransparent.test_repr, TestTransparent.test_hex) |
335 |
|
(TestTransparent.test_equality): New. Test cases for the |
336 |
|
Transparent object. |
337 |
|
|
338 |
|
2003-08-04 Jan-Oliver Wagner <[email protected]> |
339 |
|
|
340 |
|
* Doc/manual/thuban-manual.xml: a number of small improvements. |
341 |
|
The resulting file is the version submitted for GREAT-ER II. |
342 |
|
|
343 |
|
2003-08-01 Bernhard Herzog <[email protected]> |
344 |
|
|
345 |
|
* Thuban/UI/resource.py, Thuban/UI/projdialog.py, |
346 |
|
Thuban/UI/join.py, Thuban/UI/classgen.py, Thuban/UI/about.py, |
347 |
|
Thuban/Model/resource.py: Insert cvs keywords and doc-strings. |
348 |
|
|
349 |
|
* Thuban/UI/common.py: Insert cvs keywords and doc-strings. |
350 |
|
(Color2wxColour, wxColour2Color, ThubanBeginBusyCursor) |
351 |
|
(ThubanEndBusyCursor): Add doc-strings |
352 |
|
|
353 |
|
2003-08-01 Bernhard Herzog <[email protected]> |
354 |
|
|
355 |
|
First step towards PostGIS integration. More abstraction by movin |
356 |
|
more code from the layer to the shapestore. More methods of the |
357 |
|
layer are now simply delegated to the equivalent method of the |
358 |
|
shapestore. The SHAPETYPE_* constants are now in data not in |
359 |
|
layer. |
360 |
|
|
361 |
|
* Thuban/Model/data.py (SHAPETYPE_POLYGON, SHAPETYPE_ARC) |
362 |
|
(SHAPETYPE_POINT, Shape): Move these constants and classes from |
363 |
|
layer.py to data.py |
364 |
|
(ShapefileStore.__init__): More Initialization for the new methods |
365 |
|
and functionality. |
366 |
|
(ShapefileStore.ShapeType, ShapefileStore.NumShapes) |
367 |
|
(ShapefileStore.BoundingBox, ShapefileStore.ShapesInRegion) |
368 |
|
(ShapefileStore.Shape): New methods that were formerly implemented |
369 |
|
in the layer. |
370 |
|
(DerivedShapeStore.Shape, DerivedShapeStore.ShapesInRegion) |
371 |
|
(DerivedShapeStore.ShapeType, DerivedShapeStore.NumShapes) |
372 |
|
(DerivedShapeStore.BoundingBox): New. DerivedShapeStore |
373 |
|
equivalents of the new shape methods. These versions are simply |
374 |
|
delegated to the original shapstore. |
375 |
|
|
376 |
|
* Thuban/Model/layer.py (SHAPETYPE_POLYGON, SHAPETYPE_ARC) |
377 |
|
(SHAPETYPE_POINT, Shape): Removed. They're now in data.py |
378 |
|
(Layer.SetShapeStore): Removed the initializatin of instance |
379 |
|
variables that were needed for the stuff that's now in |
380 |
|
ShapefileStore |
381 |
|
(Layer.BoundingBox, Layer.NumShapes, Layer.ShapeType) |
382 |
|
(Layer.Shape, Layer.ShapesInRegion): Simply delegate to the |
383 |
|
shapestore. |
384 |
|
|
385 |
|
* Thuban/UI/classifier.py, Thuban/UI/renderer.py, |
386 |
|
Thuban/UI/viewport.py: Import the SHAPETYPE_* constants from data |
387 |
|
instead of layer. |
388 |
|
|
389 |
|
* test/test_shapefilestore.py: New. Tests for ShapefileStore. |
390 |
|
|
391 |
|
* test/test_derivedshapestore.py: New. Tests for DerivedShapeStore. |
392 |
|
|
393 |
|
* test/test_layer.py: Import the SHAPETYPE_* constants from data |
394 |
|
instead of layer. |
395 |
|
(TestLayer.test_derived_store): Remove the test for the exception |
396 |
|
when instantiating the DerivedShapeStore with an incompatible |
397 |
|
table which is now in test_derivedshapestore.py. Add some more |
398 |
|
tests of the layer methods to determine whether they work for a |
399 |
|
DerivedShapeStore as well. |
400 |
|
|
401 |
|
2003-07-31 Jonathan Coles <[email protected]> |
402 |
|
|
403 |
|
* Doc/manual/thuban-manual.xml: Fix the list of required packages |
404 |
|
by just listing the name and where they can be found. |
405 |
|
|
406 |
|
2003-07-31 Frank Koormann <[email protected]> |
407 |
|
|
408 |
|
* Doc/manual/thuban-manual.xml: |
409 |
|
Changed the screenshot elements to figure. |
410 |
|
Changed some variablelist elements to itemizedlist. |
411 |
|
Added section on GDAL formats. |
412 |
|
|
413 |
|
2003-07-31 Jonathan Coles <[email protected]> |
414 |
|
|
415 |
|
* Doc/manual/thuban-manual.xml: Added a few sentences about |
416 |
|
the Fix Border Color option when generating classes. |
417 |
|
|
418 |
|
2003-07-30 Jonathan Coles <[email protected]> |
419 |
|
|
420 |
|
* Thuban/Model/classgen.py: Add docstrings. Rename specific |
421 |
|
Ramp instances to use lower_case_style. |
422 |
|
|
423 |
|
* Thuban/UI/classgen.py: Use renamed Ramp instances. |
424 |
|
|
425 |
|
* Thuban/UI/classifier.py: Add docstrings. |
426 |
|
|
427 |
|
* Thuban/UI/dock.py: Add docstrings. |
428 |
|
|
429 |
|
* test/test_classgen.py: Use renamed Ramp instances. |
430 |
|
|
431 |
2003-07-30 Bernhard Herzog <[email protected]> |
2003-07-30 Bernhard Herzog <[email protected]> |
432 |
|
|
433 |
* Thuban/Lib/connector.py (QueueingPublisher): Removed. This class |
* Thuban/Lib/connector.py (QueueingPublisher): Removed. This class |