| 1 |
|
2003-04-09 Jonathan Coles <[email protected]> |
| 2 |
|
|
| 3 |
|
* Thuban/UI/classgen.py: Modifications to allow simple |
| 4 |
|
addition and selection of new color schemes. |
| 5 |
|
(MonochromaticRamp): New. Generates a ramp between two colors. |
| 6 |
|
(RedRamp): New. Generates a ramp of all red. |
| 7 |
|
(GreenRamp): New. Generates a ramp of all green. |
| 8 |
|
(BlueRamp): New. Generates a ramp of all blue. |
| 9 |
|
|
| 10 |
|
2003-04-09 Jonathan Coles <[email protected]> |
| 11 |
|
|
| 12 |
|
* Thuban/Model/classification.py (Classification.__deepcopy__): |
| 13 |
|
Need to copy over field and fieldType attributes. |
| 14 |
|
|
| 15 |
|
* Thuban/Model/table.py (Table.field_range): New. Retrive the |
| 16 |
|
maximum and minimum values over the entire table for a given |
| 17 |
|
field. |
| 18 |
|
(Table.GetUniqueValues): New. Retrieve all the unique values |
| 19 |
|
in the table for a given field. |
| 20 |
|
|
| 21 |
|
* Thuban/UI/classgen.py: Renamed GenRangePanel to GenUniformPanel. |
| 22 |
|
(GenUniquePanel): New. Controls to allow the user to select |
| 23 |
|
which unique field values they would like in the classification. |
| 24 |
|
(CustomRampPanel): Code that was in ClassGenDialog that allows |
| 25 |
|
the user to select the properties for a custom ramp. |
| 26 |
|
(ClassGenerator.GenUniformDistribution): Was called GenerateRanges. |
| 27 |
|
|
| 28 |
|
* Thuban/UI/classifier.py: Removed a lot of debugging code. |
| 29 |
|
(Classifier._SetClassification): Callback method so that the |
| 30 |
|
class generator can set the classification in the grid. |
| 31 |
|
(ClassGroupPropertiesCtrl): New. Encapsulates the drawing and |
| 32 |
|
editing of a group properties class into a wxWindows control. |
| 33 |
|
|
| 34 |
|
* Thuban/UI/dock.py: It was decided that if the user closes |
| 35 |
|
a dockable window the window should simply hide itself. That |
| 36 |
|
way if the user wants to show the dock again it appears in the |
| 37 |
|
same place as it was when it was closed. |
| 38 |
|
(DockableWindow.Destroy): Call renamed method OnDockDestroy(). |
| 39 |
|
(DockableWindow._OnButtonClose): Hide the window instead of |
| 40 |
|
destroying it. |
| 41 |
|
(DockableWindow._OnClose): Hide the window instead of |
| 42 |
|
destroying it. |
| 43 |
|
|
| 44 |
|
* Thuban/UI/legend.py (LegendTree): Use a private method to |
| 45 |
|
consistently set the font and style of the text. Fixes RTbug #1786. |
| 46 |
|
|
| 47 |
|
* Thuban/UI/mainwindow.py: Import just the Classifier class. |
| 48 |
|
|
| 49 |
|
2003-04-07 Bernhard Herzog <[email protected]> |
| 50 |
|
|
| 51 |
|
* Thuban/UI/mainwindow.py (main_menu): Move the toggle_legend item |
| 52 |
|
to the map module |
| 53 |
|
|
| 54 |
|
2003-04-07 Bernhard Herzog <[email protected]> |
| 55 |
|
|
| 56 |
|
* Thuban/UI/mainwindow.py (MainWindow.ShowSessionTree): Removed in |
| 57 |
|
favor of ToggleSessionTree |
| 58 |
|
(MainWindow.ToggleSessionTree): New method to toggle visibility of |
| 59 |
|
the session tree. |
| 60 |
|
(MainWindow.SessionTreeShown): New method to return whether the |
| 61 |
|
session tree is currently shown. |
| 62 |
|
(MainWindow.ToggleLegend): New method to toggle visibility of the |
| 63 |
|
legend |
| 64 |
|
(MainWindow.ShowLegend): Implement in terms of ToggleLegend and |
| 65 |
|
LegendShown |
| 66 |
|
(MainWindow.LegendShown): New method to return whether the legend |
| 67 |
|
is currently shown. |
| 68 |
|
(_method_command): Add checked parameter so we can define check |
| 69 |
|
menu items |
| 70 |
|
(_has_tree_window_shown, _has_legend_shown): Use the appropriate |
| 71 |
|
mainwindow methods. |
| 72 |
|
(show_session_tree, show_legend commands): Removed. |
| 73 |
|
(toggle_session_tree, toggle_legend commands): New commands to |
| 74 |
|
toggle the visibility of the dialogs |
| 75 |
|
|
| 76 |
|
2003-04-07 Jonathan Coles <[email protected]> |
| 77 |
|
|
| 78 |
|
* Thuban/UI/classgen.py: Fix Windows problem. |
| 79 |
|
|
| 80 |
|
* Thuban/UI/dock.py: Fix Windows problem. |
| 81 |
|
|
| 82 |
|
* Thuban/UI/mainwindow.py: Use False instead of false. |
| 83 |
|
(MainWindow.ShowLegend): Remove unnecessary switch parameter. |
| 84 |
|
|
| 85 |
|
2003-04-07 Jonathan Coles <[email protected]> |
| 86 |
|
|
| 87 |
|
Since we now say that the order of the groups in a classification |
| 88 |
|
matters, it makes sense to be able to manipulate that order. Most |
| 89 |
|
of the changes to Thuban/Model/classification.py are to that end. |
| 90 |
|
|
| 91 |
|
* Thuban/Model/classification.py (Classification.AppendGroup, |
| 92 |
|
Classification.InsertGroup, Classification.ReplaceGroup, |
| 93 |
|
Classification.RemoveGroup, Classification.GetGroup): Do as the |
| 94 |
|
names imply. |
| 95 |
|
(Classification.FindGroup): This was called GetGroup, but GetGroup |
| 96 |
|
takes an index, while FindGroup takes a value. |
| 97 |
|
(Classification.__deepcopy__): Copy all the groups, BUT NOT THE LAYER |
| 98 |
|
REFERENCE. Currently there is a cyclic reference between the layer |
| 99 |
|
and its classification. If the classification doesn't need to know |
| 100 |
|
its owning layer we can change this, since it may make sense to be |
| 101 |
|
able to use the same classification with different layers. |
| 102 |
|
|
| 103 |
|
* Thuban/Model/load.py: Use Classification.AppendGroup(), not AddGroup() |
| 104 |
|
|
| 105 |
|
* Thuban/UI/classgen.py: Use Classification.AppendGroup(), |
| 106 |
|
not AddGroup() |
| 107 |
|
|
| 108 |
|
* Thuban/UI/classifier.py: Now that we can depend on the order in |
| 109 |
|
a Classification and have methods to manipulate that order we don't |
| 110 |
|
need to use our own data structures in the grid. We can simply make |
| 111 |
|
the grid/table access the information they need from a copy of |
| 112 |
|
the classification object. |
| 113 |
|
(Classifier._OnCloseBtn): Event handler for when the user clicks |
| 114 |
|
'Close'. This is needed so if the user applies changes and then |
| 115 |
|
continues to change the table the user has the option of discarding |
| 116 |
|
the most recent changes and keeping what they applied. |
| 117 |
|
|
| 118 |
|
* Thuban/UI/mainwindow.py: Put "Show Legend" and "Show Session Tree" |
| 119 |
|
into the same group. |
| 120 |
|
|
| 121 |
|
* extensions/thuban/wxproj.cpp (check_version): If Thuban is compiled |
| 122 |
|
with a really old version of proj, PJ_VERSION won't even be defined. |
| 123 |
|
If it isn't defined then just compile so that the function always |
| 124 |
|
returns Py_False. |
| 125 |
|
|
| 126 |
|
* test/test_classification.py: Fix tests to use the renamed methods. |
| 127 |
|
Still need to write tests for the new methods. |
| 128 |
|
|
| 129 |
|
2003-04-04 Jonathan Coles <[email protected]> |
| 130 |
|
|
| 131 |
|
* Thuban/UI/classifier.py (Classifier.__SelectField): Move the |
| 132 |
|
call to SetSelection out of the method and before the call |
| 133 |
|
to __SelectField in __init__. This prevents a recursion of events |
| 134 |
|
when _OnFieldSelect is triggered by the user. |
| 135 |
|
|
| 136 |
|
2003-04-04 Jonathan Coles <[email protected]> |
| 137 |
|
|
| 138 |
|
* Thuban/Model/classification.py: Rename Color.None to |
| 139 |
|
Color.Transparent. |
| 140 |
|
(ClassGroupProperties.SetLineColori, ClassGroupProperties.SetFill): |
| 141 |
|
Don't bother copying the color, since Colors are immutable. |
| 142 |
|
|
| 143 |
|
* Thuban/Model/color.py, Thuban/Model/layer.py, Thuban/Model/load.py, |
| 144 |
|
Thuban/UI/classifier.py, Thuban/UI/mainwindow.py, |
| 145 |
|
Thuban/UI/renderer.py, Thuban/UI/view.py: |
| 146 |
|
Rename Color.None to Color.Transparent. |
| 147 |
|
|
| 148 |
|
* test/test_classification.py, test/test_load.py: Rename Color.None |
| 149 |
|
to Color.Transparent. |
| 150 |
|
|
| 151 |
|
2003-04-04 Jonathan Coles <[email protected]> |
| 152 |
|
|
| 153 |
|
* Thuban/Model/classification.py: Fix assert calls. |
| 154 |
|
(ClassGroupProperties.SetLineColor, ClassGroupProperties.SetFill): |
| 155 |
|
Copy the color parameter rather than hold onto a reference. |
| 156 |
|
|
| 157 |
|
* Thuban/Model/color.py (Color.__copy__, Color.__deepcopy): Copy |
| 158 |
|
the color object. |
| 159 |
|
(NoColor.__copy__, NoColor.__deepcopy): Return 'self' so that we |
| 160 |
|
are sure there exists only one refernce to Color.None in the system. |
| 161 |
|
This allows us to use 'is' rather than the comparision functions. |
| 162 |
|
|
| 163 |
|
* Thuban/Model/save.py: Fix assert calls. |
| 164 |
|
|
| 165 |
|
* Thuban/UI/classifier.py: Fix assert calls. |
| 166 |
|
(ClassGrid._OnCellDClick): Call up to the classifier to open the |
| 167 |
|
dialog to edit the groups properties. |
| 168 |
|
(ClassGrid._OnCellResize): Make sure that the scollbars are drawn |
| 169 |
|
correctly if a cell is resized. |
| 170 |
|
(ClassTable.SetClassification): New. Changes the classification |
| 171 |
|
that is in the table. |
| 172 |
|
(ClassTable.__SetRow): Allow groups to be prepended. |
| 173 |
|
(Classifier): New code for opening the EditProperties and |
| 174 |
|
GenerateRanges dialogs. |
| 175 |
|
(SelectPropertiesDialog.__GetColor): Only set the color in the |
| 176 |
|
color dialog if the current color is not None. |
| 177 |
|
|
| 178 |
|
* Thuban/UI/dock.py: Fix assert calls. |
| 179 |
|
|
| 180 |
|
* Thuban/UI/legend.py: Fix assert calls. |
| 181 |
|
|
| 182 |
|
* Thuban/UI/renderer.py: Fix assert calls. |
| 183 |
|
|
| 184 |
|
* Thuban/UI/classgen.py (ClassGenDialog): Dialog for generating |
| 185 |
|
classifications. |
| 186 |
|
(GenRangePanel): Panel specific to range generation. |
| 187 |
|
(GenSingletonPanel): Panel specific to singleton generation. |
| 188 |
|
(ClassGenerator): Class responsible for actually generating |
| 189 |
|
the classification from the data gathered in the dialog box. |
| 190 |
|
(PropertyRamp): Generates properties whose values range from |
| 191 |
|
a starting property to an ending property. |
| 192 |
|
|
| 193 |
|
2003-04-03 Bernhard Herzog <[email protected]> |
| 194 |
|
|
| 195 |
|
* test/support.py (print_garbage_information): New function that |
| 196 |
|
prints information about still connected messages and memory |
| 197 |
|
leaks. |
| 198 |
|
(run_suite): Removed. |
| 199 |
|
(run_tests): New function for use as a replacement of |
| 200 |
|
unittest.main in the test_* files. This one calls |
| 201 |
|
print_garbage_information at the end. |
| 202 |
|
|
| 203 |
|
* test/runtests.py (main): Use support.print_garbage_information |
| 204 |
|
|
| 205 |
|
* test/test_layer.py: Use support.run_tests instead of |
| 206 |
|
unittest.main so we get memory leak information |
| 207 |
|
(TestLayer.test_arc_layer, TestLayer.test_polygon_layer) |
| 208 |
|
(TestLayer.test_point_layer, TestLayer.test_empty_layer) |
| 209 |
|
(TestLayerLegend.test_visibility): Call the layer's Destroy method |
| 210 |
|
to fix a memory leak. |
| 211 |
|
|
| 212 |
|
* test/test_classification.py: Use support.run_tests instead of |
| 213 |
|
unittest.main so we get memory leak information |
| 214 |
|
(TestClassification.test_classification): Call the layer's Destroy |
| 215 |
|
method to fix a memory leak. |
| 216 |
|
|
| 217 |
|
2003-04-02 Bernhard Herzog <[email protected]> |
| 218 |
|
|
| 219 |
|
* extensions/thuban/wxproj.cpp (check_version, check_version_gtk): |
| 220 |
|
Handle the reference counts of the return value and errors in |
| 221 |
|
PyArg_ParseTuple correctly. |
| 222 |
|
|
| 223 |
|
* Thuban/UI/application.py (ThubanApplication.OpenSession): Make |
| 224 |
|
sure the filename is absolute to avoid problems when saving the |
| 225 |
|
session again |
| 226 |
|
|
| 227 |
|
* Thuban/Model/table.py: Remove unnecessary import. Fix a typo. |
| 228 |
|
|
| 229 |
|
2003-04-01 Jonathan Coles <[email protected]> |
| 230 |
|
|
| 231 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_point_shape): Check |
| 232 |
|
that there actually are points in the returned list of points |
| 233 |
|
before trying to index into the list. The list may be empty if |
| 234 |
|
the shape is a Null Shape. |
| 235 |
|
|
| 236 |
|
2003-04-01 Bernhard Herzog <[email protected]> |
| 237 |
|
|
| 238 |
|
* test/test_map.py: Don't use from <module> import * |
| 239 |
|
|
| 240 |
|
2003-04-01 Jonathan Coles <[email protected]> |
| 241 |
|
|
| 242 |
|
* Thuban/Model/session.py: Use LAYER_CHANGED instead of |
| 243 |
|
LAYER_LEGEND_CHANGED |
| 244 |
|
|
| 245 |
|
* Thuban/UI/dock.py (DockableWindow._OnButtonClose): Call |
| 246 |
|
self.Destroy() to close the window after yesterday's changes. |
| 247 |
|
|
| 248 |
|
* test/test_map.py, test/test_session.py: Fix messages that |
| 249 |
|
are sent from maps and layers. |
| 250 |
|
|
| 251 |
|
2003-03-31 Jonathan Coles <[email protected]> |
| 252 |
|
|
| 253 |
|
* Thuban/UI/classifier.py: Commented out some debugging statements. |
| 254 |
|
(ClassDataPreviewer.Draw): Draw rectangles for polygon layers per |
| 255 |
|
RTbug #1769. |
| 256 |
|
|
| 257 |
|
* Thuban/UI/dock.py (DockableWindow.UnDock): Restore size and |
| 258 |
|
position (although position doesn't work yet under GTK). |
| 259 |
|
(DockableWindow.Destroy): New. Called when the window must be |
| 260 |
|
closed. Namely needed when the DockFrame closes and must close |
| 261 |
|
its children. |
| 262 |
|
(DockFrame): Listen for EVT_CLOSE and destroy all children. |
| 263 |
|
|
| 264 |
|
* Thuban/UI/legend.py (LegendPanel.Destroy): New. Cleans up |
| 265 |
|
when then window is told to close. |
| 266 |
|
(LegendTree._OnMsgLayerChanged): Fixes a seg fault bug. See |
| 267 |
|
comment in source for more info. |
| 268 |
|
|
| 269 |
|
* Thuban/UI/main.py: Show the legend by default when Thuban starts. |
| 270 |
|
|
| 271 |
|
* Thuban/UI/mainwindow.py: Renamed OnClose to _OnClose for |
| 272 |
|
symmetry with other such methods. |
| 273 |
|
(MainWindow.ShowLegend): Show the legend docked by default. |
| 274 |
|
|
| 275 |
|
2003-03-28 Jonathan Coles <[email protected]> |
| 276 |
|
|
| 277 |
|
* Thuban/UI/classifier.py: Support for highlighting a specific |
| 278 |
|
group within the grid when the classification dialog is opened. |
| 279 |
|
Also contains a lot of debugging printouts which will later |
| 280 |
|
be removed. |
| 281 |
|
|
| 282 |
|
* Thuban/UI/dock.py: Complete rework on the dock code so that |
| 283 |
|
that it is fairly removed from the rest of the Thuban application. |
| 284 |
|
It is easy to add new docks which the rest of the program having |
| 285 |
|
to be aware of them. |
| 286 |
|
|
| 287 |
|
* Thuban/UI/legend.py: Modifications to support selecting a |
| 288 |
|
specific group in the classification dialog. Changed how layers |
| 289 |
|
are drawn when the layer is visible/invisible. |
| 290 |
|
|
| 291 |
|
* Thuban/UI/mainwindow.py: Removed legend specific code and |
| 292 |
|
replaced it with calls to the new dock code. |
| 293 |
|
|
| 294 |
|
* Thuban/UI/renderer.py (MapRenderer.__init__): Added assert |
| 295 |
|
to check if scale > 0. Trying to track down a divide by zero. |
| 296 |
|
|
| 297 |
|
2003-03-26 Jonathan Coles <[email protected]> |
| 298 |
|
|
| 299 |
|
* Thuban/UI/legend.py: Removed unnecessary LegendDialog class. |
| 300 |
|
(LegendPanel): Removed _OnDock()/_OnUnDock() methods which are |
| 301 |
|
now part of DockableWindow. |
| 302 |
|
(LegendPanel.DoOnSelChanged): Select the current layer in the |
| 303 |
|
map. |
| 304 |
|
(LegendTree._OnSelChanged): Call LegendPanel.DoOnSelChanged() |
| 305 |
|
with the selected layer and/or group. |
| 306 |
|
|
| 307 |
|
2003-03-26 Jonathan Coles <[email protected]> |
| 308 |
|
|
| 309 |
|
This putback contains the code for dockable windows. There is |
| 310 |
|
no support in wxWindows as of this date for windows that can |
| 311 |
|
attach themselves to other windows. |
| 312 |
|
|
| 313 |
|
The current model contains a DockableWindow which has a parent |
| 314 |
|
window for when it is detached and a dock window that it puts |
| 315 |
|
its contents in when it is docked. The contents of a DockableWindow |
| 316 |
|
must be a DockPanel. DockPanel itself derives from wxPanel. |
| 317 |
|
|
| 318 |
|
* Thuban/Model/layer.py (Layer.ClassChanged): Send a LAYER_CHANGED |
| 319 |
|
message, not a LAYER_LEGEND_CHANGED message. |
| 320 |
|
|
| 321 |
|
* Thuban/Model/map.py (Map): Forward LAYER_CHANGED messages. |
| 322 |
|
|
| 323 |
|
* Thuban/UI/classifier.py (Classifier.__init__): Use wxADJUST_MINSIZE |
| 324 |
|
as one of the style properties for the fieldTypeText item to |
| 325 |
|
be sure that its size is correct when the text changes. |
| 326 |
|
|
| 327 |
|
* Thuban/UI/dock.py: New. Classes for the DockPanel and |
| 328 |
|
DockableWindow. |
| 329 |
|
|
| 330 |
|
* Thuban/UI/legend.py: Added some more buttons and made the |
| 331 |
|
LegendPanel a DockPanel. |
| 332 |
|
|
| 333 |
|
* Thuban/UI/mainwindow.py: Added sash windows to the main window |
| 334 |
|
and supporting functions for manipulating the sashes. |
| 335 |
|
(MainWindow.ShowLegend): Create a DockableWindow with the |
| 336 |
|
LegendPanel as the contents. |
| 337 |
|
|
| 338 |
|
* Thuban/UI/messages.py: Added DOCKABLE_* messages |
| 339 |
|
|
| 340 |
|
* Thuban/UI/view.py (MapCanves.SetMap): Listen for LAYER_CHANGED, |
| 341 |
|
not LAYER_LEGEND_CHANGED, messages. |
| 342 |
|
|
| 343 |
|
2003-03-25 Jonathan Coles <[email protected]> |
| 344 |
|
|
| 345 |
|
* setup.py: Added custom script bdist_rpm_build_script so that |
| 346 |
|
when the rpm is built the path to wx-config is correct. |
| 347 |
|
|
| 348 |
|
* setup.cfg: Added line saying to use the custom build script |
| 349 |
|
|
| 350 |
|
2003-03-20 Jonathan Coles <[email protected]> |
| 351 |
|
|
| 352 |
|
Initial implementation of the Legend. |
| 353 |
|
|
| 354 |
|
* Thuban/UI/legend.py: New. Creates a window that shows the map's |
| 355 |
|
Legend information and allows the user to add/modify classifications |
| 356 |
|
and how the layers are drawn on the map. |
| 357 |
|
|
| 358 |
|
* setup.py: New command 'build_docs' which currently uses |
| 359 |
|
happydoc to generate html documentation for Thuban. |
| 360 |
|
|
| 361 |
|
* Thuban/Model/classification.py (ClassGroup.GetDisplayText): New. |
| 362 |
|
Returns a string which is appropriately describes the group. |
| 363 |
|
|
| 364 |
|
* Thuban/Model/layer.py (Layer.SetClassification): Generate a |
| 365 |
|
LAYER_CHANGED event instead of a LAYER_LEGEND_CHANGED event. |
| 366 |
|
|
| 367 |
|
* Thuban/Model/map.py (Map): Rename messages and use new, more |
| 368 |
|
specific, messages. |
| 369 |
|
|
| 370 |
|
* Thuban/Model/messages.py: New message to indicate that a layer's |
| 371 |
|
data has changed (LAYER_CHANGED). New map messages to indicate |
| 372 |
|
when layers have been added/removed/changed or if the stacking order |
| 373 |
|
of the layers has changed. |
| 374 |
|
|
| 375 |
|
* Thuban/Model/session.py: Rename and use new messages. |
| 376 |
|
|
| 377 |
|
* Thuban/UI/classifier.py: Remember if any changes have actually |
| 378 |
|
been applied so that if the dialog is cancelled without an application |
| 379 |
|
of changes we don't have to set a new classification. |
| 380 |
|
(ClassDataPreviewer): Pulled out the window specific code and put it |
| 381 |
|
ClassDataPreviewWindow. ClassDataPreviewer can then be used to draw |
| 382 |
|
symbols on any DC. |
| 383 |
|
|
| 384 |
|
* Thuban/UI/mainwindow.py: New code to open the legend. |
| 385 |
|
|
| 386 |
|
* Thuban/UI/view.py: Use new message names. |
| 387 |
|
|
| 388 |
|
2003-03-19 Jonathan Coles <[email protected]> |
| 389 |
|
|
| 390 |
|
* Thuban/UI/main.py (verify_versions): New. Checks the versions |
| 391 |
|
of Python, wxPython, and some other libraries. |
| 392 |
|
|
| 393 |
|
* extensions/thuban/wxproj.cpp (check_version): Checks the given |
| 394 |
|
version against what wxproj was compiled with. |
| 395 |
|
(check_version_gtk): If wxproj was compiled with gtk then check |
| 396 |
|
the given version against the version of the gtk library |
| 397 |
|
currently being used. |
| 398 |
|
|
| 399 |
|
2003-03-14 Bernhard Herzog <[email protected]> |
| 400 |
|
|
| 401 |
|
* test/test_command.py: Run the tests when the module is run as a |
| 402 |
|
script |
| 403 |
|
|
| 404 |
|
2003-03-14 Bernhard Herzog <[email protected]> |
| 405 |
|
|
| 406 |
|
Implement selection of multiple selected shapes in the same layer: |
| 407 |
|
|
| 408 |
|
- Introduce a new class to hold the selection. This basically |
| 409 |
|
replaces the interactor which was nothing more than the |
| 410 |
|
selection anyway. A major difference is of course that the new |
| 411 |
|
selection class supports multiple selected shapes in one layer |
| 412 |
|
|
| 413 |
|
- Move the object that represents the selection from the |
| 414 |
|
application to the canvas. The canvas is a better place than the |
| 415 |
|
application because the selection represents which shapes and |
| 416 |
|
layer of the map displayed by the canvas are selected and |
| 417 |
|
affects how the map is drawn. |
| 418 |
|
|
| 419 |
|
- Make the selection and its messages publicly available through |
| 420 |
|
the mainwindow. |
| 421 |
|
|
| 422 |
|
- The non-modal dialogs do not get a reference to the interactor |
| 423 |
|
anymore as they can simply refer to their parent, the |
| 424 |
|
mainwindow, for the what the interactor had to offer. |
| 425 |
|
|
| 426 |
|
* Thuban/UI/selection.py: New module with a class to represent the |
| 427 |
|
selection. |
| 428 |
|
|
| 429 |
|
* Thuban/UI/messages.py (SELECTED_TABLE, SELECTED_MAP): Remove |
| 430 |
|
these unused messages |
| 431 |
|
|
| 432 |
|
* Thuban/UI/application.py (ThubanApplication.OnInit) |
| 433 |
|
(ThubanApplication.OnExit, ThubanApplication.SetSession): The |
| 434 |
|
interactor is gone now. |
| 435 |
|
(ThubanApplication.CreateMainWindow): There is no interactor |
| 436 |
|
anymore so we pass None as the interactor argument for now for |
| 437 |
|
compatibility. |
| 438 |
|
|
| 439 |
|
* Thuban/UI/view.py (MapCanvas.delegated_messages) |
| 440 |
|
(MapCanvas.Subscribe, MapCanvas.Unsubscribe): In Subscribe and |
| 441 |
|
Unsubscribe, delegate messages according to the delegated_messages |
| 442 |
|
class variable. |
| 443 |
|
(MapCanvas.__getattr__, MapCanvas.delegated_methods): Get some |
| 444 |
|
attributes from instance variables as described with the |
| 445 |
|
delegated_methods class variable. |
| 446 |
|
(MapCanvas.__init__): New instance variable selection holding the |
| 447 |
|
current selection |
| 448 |
|
(MapCanvas.do_redraw): Deal with multiple selected shapes. Simply |
| 449 |
|
pass them on to the renderer |
| 450 |
|
(MapCanvas.SetMap): Clear the selection when a different map is |
| 451 |
|
selected. |
| 452 |
|
(MapCanvas.shape_selected): Simple force a complete redraw. The |
| 453 |
|
selection class now takes care of only issueing SHAPES_SELECTED |
| 454 |
|
messages when the set of selected shapes actually does change. |
| 455 |
|
(MapCanvas.SelectShapeAt): The selection is now managed in |
| 456 |
|
self.selection |
| 457 |
|
|
| 458 |
|
* Thuban/UI/mainwindow.py (MainWindow.delegated_messages) |
| 459 |
|
(MainWindow.Subscribe, MainWindow.Unsubscribe): In Subscribe and |
| 460 |
|
Unsubscribe, delegate messages according to the delegated_messages |
| 461 |
|
class variable. |
| 462 |
|
(MainWindow.delegated_methods, MainWindow.__getattr__): Get some |
| 463 |
|
attributes from instance variables as described with the |
| 464 |
|
delegated_methods class variable. |
| 465 |
|
(MainWindow.__init__): The interactor as ivar is gone. The |
| 466 |
|
parameter is still there for compatibility. The selection messages |
| 467 |
|
now come from the canvas. |
| 468 |
|
(MainWindow.current_layer, MainWindow.has_selected_layer): |
| 469 |
|
Delegate to the the canvas. |
| 470 |
|
(MainWindow.LayerShowTable, MainWindow.Classify) |
| 471 |
|
(MainWindow.identify_view_on_demand): The dialogs don't need the |
| 472 |
|
interactor parameter anymore. |
| 473 |
|
|
| 474 |
|
* Thuban/UI/tableview.py (TableFrame.__init__) |
| 475 |
|
(LayerTableFrame.__init__, LayerTableFrame.OnClose) |
| 476 |
|
(LayerTableFrame.row_selected): The interactor is gone. It's job |
| 477 |
|
from the dialog's point of view is now done by the mainwindow, |
| 478 |
|
i.e. the parent. Subscribe to SHAPES_SELECTED instead |
| 479 |
|
of SELECTED_SHAPE |
| 480 |
|
|
| 481 |
|
* Thuban/UI/dialogs.py (NonModalDialog.__init__): The interactor |
| 482 |
|
is gone. It's job from the dialog's point of view is now done by |
| 483 |
|
the mainwindow, i.e. the parent. |
| 484 |
|
|
| 485 |
|
* Thuban/UI/classifier.py (Classifier.__init__): The interactor is |
| 486 |
|
gone. It's job from the dialog's point of view is now done by the |
| 487 |
|
mainwindow, i.e. the parent. |
| 488 |
|
|
| 489 |
|
* Thuban/UI/tree.py (SessionTreeView.__init__): The interactor is |
| 490 |
|
gone. It's job from the dialog's point of view is now done by the |
| 491 |
|
mainwindow, i.e. the parent. |
| 492 |
|
(SessionTreeCtrl.__init__): New parameter mainwindow which is |
| 493 |
|
stored as self.mainwindow. The mainwindow is need so that the tree |
| 494 |
|
can still subscribe to the selection messages. |
| 495 |
|
(SessionTreeCtrl.__init__, SessionTreeCtrl.unsubscribe_all) |
| 496 |
|
(SessionTreeCtrl.update_tree, SessionTreeCtrl.OnSelChanged): The |
| 497 |
|
selection is now accessible through the mainwindow. Subscribe to |
| 498 |
|
SHAPES_SELECTED instead of SELECTED_SHAPE |
| 499 |
|
|
| 500 |
|
* Thuban/UI/identifyview.py (IdentifyView.__init__): Use the |
| 501 |
|
SHAPES_SELECTED message now. |
| 502 |
|
(IdentifyView.selected_shape): Now subscribed to SHAPES_SELECTED, |
| 503 |
|
so deal with multiple shapes |
| 504 |
|
(IdentifyView.__init__, IdentifyView.OnClose): The interactor is |
| 505 |
|
gone. It's job from the dialog's point of view is now done by the |
| 506 |
|
mainwindow, i.e. the parent. |
| 507 |
|
|
| 508 |
|
* Thuban/UI/controls.py (RecordListCtrl.fill_list): The second |
| 509 |
|
parameter is now a list of shape ids. |
| 510 |
|
(RecordTable.SetTable): The second parameter is now a list of |
| 511 |
|
indices. |
| 512 |
|
|
| 513 |
|
* Thuban/UI/renderer.py (ScreenRenderer.RenderMap): Rename the |
| 514 |
|
selected_shape parameter and ivar to selected_shapes. It's now a |
| 515 |
|
list of shape ids. |
| 516 |
|
(MapRenderer.draw_label_layer): Deal with multiple selected |
| 517 |
|
shapes. Rearrange the code a bit so that the setup and shape type |
| 518 |
|
distinctions are only executed once. |
| 519 |
|
|
| 520 |
|
* test/test_selection.py: Test cases for the selection class |
| 521 |
|
|
| 522 |
|
2003-03-11 Jonathan Coles <[email protected]> |
| 523 |
|
|
| 524 |
|
* Thuban/Model/load.py: Temporary fix so that the xml reader |
| 525 |
|
doesn't cause Thuban to crash. |
| 526 |
|
|
| 527 |
|
* Thuban/Model/layer.py: Handle the cyclic references between |
| 528 |
|
a layer and its classification better, and be sure to disconnect |
| 529 |
|
the classification from the layer when the layer is destroyed |
| 530 |
|
so that we don't maintain a cyclic reference that may not be |
| 531 |
|
garbage collected. |
| 532 |
|
|
| 533 |
|
* Thuban/Model/classification.py: See comment for layer.py. |
| 534 |
|
|
| 535 |
|
2003-03-12 Jan-Oliver Wagner <[email protected]> |
| 536 |
|
|
| 537 |
|
* HOWTO-Release: New. Information on the steps for releasing |
| 538 |
|
a new version of Thuban. |
| 539 |
|
|
| 540 |
|
2003-03-11 Jonathan Coles <[email protected]> |
| 541 |
|
|
| 542 |
|
* Thuban/UI/classifier.py: Add normal border to SelectPropertiesDialog. |
| 543 |
|
Use True instead of true. |
| 544 |
|
(Classifier): Should have a single panel in which all the controls lie. |
| 545 |
|
|
| 546 |
|
* Thuban/UI/proj4dialog.py: Add normal border. |
| 547 |
|
|
| 548 |
|
* Thuban/UI/tree.py: Fixed problem with bad item images under Windows. |
| 549 |
|
|
| 550 |
|
* Thuban/UI/mainwindow.py: Use True instead of true. |
| 551 |
|
|
| 552 |
|
* setup.py: Update some definitions to use wxWindows2.4 files |
| 553 |
|
|
| 554 |
|
* Data/iceland_sample_class.thuban: Fixed file so that the |
| 555 |
|
field_type information is present. |
| 556 |
|
|
| 557 |
|
2003-03-10 Jonathan Coles <[email protected]> |
| 558 |
|
|
| 559 |
|
* Thuban/UI/classifier.py (Classifier.__init__): Make the |
| 560 |
|
field type label grow so that when the text changes the |
| 561 |
|
size is updated correctly. This may be a wxWindows bug. |
| 562 |
|
|
| 563 |
|
2003-03-10 Jonathan Coles <[email protected]> |
| 564 |
|
|
| 565 |
|
* Thuban/UI/application.py: Changed SESSION_CHANGED to |
| 566 |
|
SESSION_REPLACED. |
| 567 |
|
|
| 568 |
|
* Thuban/UI/classifier.py: Wrap text with _(). |
| 569 |
|
(ClassGrid.CreateTable): Set dimensions and size hints here, |
| 570 |
|
instead of in Reset, so we only set the size once. |
| 571 |
|
|
| 572 |
|
* Thuban/UI/dialogs.py: Don't need Shutdown(); just use Close()! |
| 573 |
|
|
| 574 |
|
* Thuban/UI/mainwindow.py (MainWindow.prepare_new_session): |
| 575 |
|
Call Close() instead of Shutdown(). |
| 576 |
|
|
| 577 |
|
* Thuban/UI/messages.py: Changed SESSION_CHANGED to SESSION_REPLACED. |
| 578 |
|
|
| 579 |
|
* Thuban/UI/tree.py: Changed SESSION_CHANGED to SESSION_REPLACED. |
| 580 |
|
Go back to using OnClose() instead of Shutdown(). |
| 581 |
|
|
| 582 |
|
2003-03-10 Jonathan Coles <[email protected]> |
| 583 |
|
|
| 584 |
|
* Thuban/UI/classifier.py (Classifier): SelectField() needed |
| 585 |
|
to know the old field index as well as the new one. |
| 586 |
|
|
| 587 |
|
2003-03-10 Jonathan Coles <[email protected]> |
| 588 |
|
|
| 589 |
|
* Thuban/UI/classifier.py (Classifier): Use __SelectField() |
| 590 |
|
to correctly set the table information and call this from |
| 591 |
|
__init__ and from _OnFieldSelect so that all the information |
| 592 |
|
is up to date when the dialog opens and when a field is changed. |
| 593 |
|
|
| 594 |
|
2003-03-10 Jonathan Coles <[email protected]> |
| 595 |
|
|
| 596 |
|
* Thuban/Model/classification.py (Classification): Don't use |
| 597 |
|
layer's message function directly, use the ClassChanged() method |
| 598 |
|
when then classification changes. SetField/SetFieldType/SetLayer |
| 599 |
|
must keep the information about field name and field type in |
| 600 |
|
sync when an owning layer is set or removed. |
| 601 |
|
|
| 602 |
|
* Thuban/Model/layer.py: Added ClassChanged() so that the |
| 603 |
|
classification can tell the layer when its data has changed. |
| 604 |
|
(Layer.SetClassification): Accepts None as an arguement to |
| 605 |
|
remove the current classification and correctly handles |
| 606 |
|
adding a new classification. |
| 607 |
|
|
| 608 |
|
* Thuban/Model/load.py: Comment out print statement |
| 609 |
|
|
| 610 |
|
* test/test_classification.py, test/test_save.py: New and |
| 611 |
|
improved tests. |
| 612 |
|
|
| 613 |
|
2003-03-07 Jonathan Coles <[email protected]> |
| 614 |
|
|
| 615 |
|
* Thuban/Model/classification.py: Implemented __copy__ and |
| 616 |
|
__deepcopy__ for ClassGroup* and ClassGroupProperites so |
| 617 |
|
they can easily be copied by the classifier dialog. |
| 618 |
|
(ClassGroupProperites.__init__): The default line color should |
| 619 |
|
have been Color.Black. |
| 620 |
|
|
| 621 |
|
* Thuban/UI/classifier.py: Setting and Getting table values now |
| 622 |
|
uses a consistent set of functions. |
| 623 |
|
(Classifier): Now non-modal. Has field type label which changes |
| 624 |
|
as the field changes. Keep track of buttons in a list so that |
| 625 |
|
we can enable/disable the buttons when the None field is selected. |
| 626 |
|
(SelectPropertiesDialog): Add buttons to make the colors transparent. |
| 627 |
|
|
| 628 |
|
* Thuban/UI/dialogs.py (NonModalDialog.Shutdown): New method which |
| 629 |
|
does what OnClose did, but can be called by the application to |
| 630 |
|
close a window. Needed when a session changes, and we have to |
| 631 |
|
close the classifier windows. |
| 632 |
|
|
| 633 |
|
* Thuban/UI/mainwindow.py (MainWindow.prepare_new_session): |
| 634 |
|
Shuts down open dialogs. Used when a new session is created |
| 635 |
|
or a session is opened. |
| 636 |
|
(MainWindow.SaveSession): Should only call application.SaveSession() |
| 637 |
|
if we don't call SaveSessionAs first. |
| 638 |
|
(MainWindow.Classify): Allow different classifier dialogs for |
| 639 |
|
different layers. |
| 640 |
|
|
| 641 |
|
* Thuban/UI/tree.py (SessionTreeView): Remove OnClose and let |
| 642 |
|
the parent class handle it. Add Shutdown() to unsubscibe from |
| 643 |
|
event notification and call the parent Shutdown(). This was |
| 644 |
|
necessary so the application can close the tree window. |
| 645 |
|
|
| 646 |
|
2003-03-06 Jonathan Coles <[email protected]> |
| 647 |
|
|
| 648 |
|
* Thuban/Model/classification.py: Minor documentation changes, |
| 649 |
|
Addition of __eq__ and __ne__ methods. |
| 650 |
|
(Classification.SetLayer): prevent recursion between this method |
| 651 |
|
and Layer.SetClassification(). |
| 652 |
|
|
| 653 |
|
* Thuban/Model/color.py: Addition of __eq__ and __ne__ methods. |
| 654 |
|
|
| 655 |
|
* Thuban/Model/layer.py (SetClassification): prevent recursion |
| 656 |
|
between this method and Classification.SetLayer(). |
| 657 |
|
|
| 658 |
|
* test/test_classification.py, test/test_load.py, |
| 659 |
|
test/test_session.py: Fixed and added tests for the classification |
| 660 |
|
classes. |
| 661 |
|
|
| 662 |
|
2003-03-06 Bernhard Herzog <[email protected]> |
| 663 |
|
|
| 664 |
|
* Thuban/UI/classifier.py (ClassGrid.__init__) |
| 665 |
|
(ClassGrid.CreateTable): Move the SetSelectionMode call to |
| 666 |
|
CreateTable because otherwise it triggers an assertion in |
| 667 |
|
wxPython/wxGTK 2.4. |
| 668 |
|
|
| 669 |
2003-03-05 Jonathan Coles <[email protected]> |
2003-03-05 Jonathan Coles <[email protected]> |
| 670 |
|
|
| 671 |
* Thuban/common.py: Move FIELDTYPE constants back to table.py. |
* Thuban/common.py: Move FIELDTYPE constants back to table.py. |
Parent Directory
| 
Revision Log
| 
Patch