1 |
|
2003-04-24 Bernhard Herzog <[email protected]> |
2 |
|
|
3 |
|
First step towards table management. Introduce a simple data |
4 |
|
abstraction so that we replace the data a layer uses more easily |
5 |
|
in the next step. |
6 |
|
|
7 |
|
* Thuban/Model/data.py: New file with a simple data abstraction |
8 |
|
that bundles shapefile and dbffile into one object. |
9 |
|
|
10 |
|
* Thuban/Model/session.py (Session.OpenShapefile): New method to |
11 |
|
open shapefiles and return a shape store object |
12 |
|
|
13 |
|
* Thuban/Model/layer.py (Layer.__init__): Pass the data as a store |
14 |
|
object instead of a shapefile filename. This introduces a new |
15 |
|
instance variable store holding the datastore. For intermediate |
16 |
|
backwards compatibility keep the old instance variables. |
17 |
|
(open_shapefile): Removed. No longer needed with the shape store. |
18 |
|
(Layer.SetShapeStore, Layer.ShapeStore): New methods to set and |
19 |
|
get the shape store used by a layer. |
20 |
|
(Layer.Destroy): No need to explicitly destroy the shapefile or |
21 |
|
table anymore. |
22 |
|
|
23 |
|
* Thuban/UI/mainwindow.py (MainWindow.AddLayer) |
24 |
|
(MainWindow.AddLayer): Use the session's OpenShapefile method to |
25 |
|
open shapefiles |
26 |
|
|
27 |
|
* Thuban/Model/load.py (ProcessSession.start_layer): Use the |
28 |
|
session's OpenShapefile method to open shapefiles |
29 |
|
|
30 |
|
* test/test_classification.py |
31 |
|
(TestClassification.test_classification): Use the session's |
32 |
|
OpenShapefile method to open shapefiles and build the filename in |
33 |
|
a more platform independed way |
34 |
|
|
35 |
|
* test/test_layer.py (TestLayer.setUp, TestLayer.tearDown): |
36 |
|
Implement to have a session to use in the tests |
37 |
|
(TestLayer.test_arc_layer, TestLayer.test_polygon_layer) |
38 |
|
(TestLayer.test_point_layer, TestLayer.test_empty_layer): Use the |
39 |
|
session's OpenShapefile method to open shapefiles |
40 |
|
(TestLayerLegend.setUp): Instantiate a session so that we can use |
41 |
|
it to open shapefiles. |
42 |
|
(TestLayerLegend.tearDown): Make sure that all references to |
43 |
|
layers and session are removed otherwise we may get a resource |
44 |
|
leak |
45 |
|
|
46 |
|
* test/test_map.py (TestMapAddLayer.test_add_layer) |
47 |
|
(TestMapWithContents.setUp): Instantiate a session so that we can |
48 |
|
use it to open shapefiles. |
49 |
|
(TestMapWithContents.tearDown): Make sure that all references to |
50 |
|
layers, maps and sessions are removed otherwise we may get a |
51 |
|
resource leak |
52 |
|
("__main__"): use support.run_tests() so that more info about |
53 |
|
uncollected garbage is printed |
54 |
|
|
55 |
|
* test/test_save.py (SaveSessionTest.testSingleLayer): Use the |
56 |
|
session's OpenShapefile method to open shapefiles |
57 |
|
("__main__"): use support.run_tests() so that more info about |
58 |
|
uncollected garbage is printed |
59 |
|
|
60 |
|
* test/test_selection.py (TestSelection.tearDown): Make sure that |
61 |
|
all references to the session and the selection are removed |
62 |
|
otherwise we may get a resource leak |
63 |
|
(TestSelection.get_layer): Instantiate a session so that we can |
64 |
|
use it to open shapefiles. |
65 |
|
("__main__"): use support.run_tests() so that more info about |
66 |
|
uncollected garbage is printed |
67 |
|
|
68 |
|
* test/test_session.py (TestSessionBase.tearDown) |
69 |
|
(TestSessionWithContent.tearDown): Make sure that all references |
70 |
|
to the session and layers are removed otherwise we may get a |
71 |
|
resource leak |
72 |
|
(TestSessionWithContent.setUp): Use the session's OpenShapefile |
73 |
|
method to open shapefiles |
74 |
|
|
75 |
2003-04-24 Jonathan Coles <[email protected]> |
2003-04-24 Jonathan Coles <[email protected]> |
76 |
|
|
77 |
* Thuban/Model/load.py (XMLReader.read): Should have been checking |
* Thuban/Model/load.py (XMLReader.read): Should have been checking |