1 |
2003-08-15 Bernhard Herzog <[email protected]> |
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 |
Make the renderers deal correctly with raw vs. python level |
62 |
representation of shape geometries |
representation of shape geometries |
63 |
|
|