| 1 |
|
2003-04-11 Jonathan Coles <[email protected]> |
| 2 |
|
|
| 3 |
|
* Resources/Bitmaps/close_12.xpm, Resources/Bitmaps/dock_12.xpm, |
| 4 |
|
Resources/Bitmaps/group_use.xpm, Resources/Bitmaps/group_use_all.xpm, |
| 5 |
|
Resources/Bitmaps/group_use_none.xpm, Resources/Bitmaps/group_use_not.xpm, |
| 6 |
|
Resources/Bitmaps/hide_layer.xpm, Resources/Bitmaps/layer_properties.xpm, |
| 7 |
|
Resources/Bitmaps/lower_layer.xpm, Resources/Bitmaps/raise_layer.xpm, |
| 8 |
|
Resources/Bitmaps/show_layer.xpm, Resources/Bitmaps/undock_12.xpm: |
| 9 |
|
New. |
| 10 |
|
|
| 11 |
|
2003-04-10 Jonathan Coles <[email protected]> |
| 12 |
|
|
| 13 |
|
* Thuban/Model/classification.py: (ClassGroupRange.__init__): |
| 14 |
|
Should pass group to ClassGroup constructor. |
| 15 |
|
|
| 16 |
|
2003-04-10 Jonathan Coles <[email protected]> |
| 17 |
|
|
| 18 |
|
* Thuban/Model/classification.py: (ClassGroup): Move all the common |
| 19 |
|
methods of the derived classes ([Set|Get]Properties(), __eq__, __ne__) |
| 20 |
|
here. Implement SetVisible(), IsVisible(). |
| 21 |
|
(ClassGroup.__init__): Add group parameter which acts as a copy |
| 22 |
|
constructor. |
| 23 |
|
|
| 24 |
|
* Thuban/UI/classifier.py (ClassTable): Add a new column for the |
| 25 |
|
"Visible" check boxes. |
| 26 |
|
(Classifier): Rename the buttons and refactor the code to match |
| 27 |
|
the new labels. |
| 28 |
|
|
| 29 |
|
* Thuban/UI/legend.py: Classify button is now called "Properties". |
| 30 |
|
Refactored the code to change variable names. |
| 31 |
|
(LegendTree.__FillTreeLayer): Only list a group if it is visible. |
| 32 |
|
|
| 33 |
|
* Thuban/UI/mainwindow.py: MainWindow.OpenClassifier renamed to |
| 34 |
|
MainWindow.OpenLayerProperties. MainWindow.LayerEditProperties |
| 35 |
|
renamed to MainWindow.LayerEditProperties. |
| 36 |
|
(MainWindow.ToggleLegend): Don't include map name in legend title. |
| 37 |
|
(MainWindow.SetMap): Added the map name to the window title. |
| 38 |
|
(MainWindow.LayerFillColor, MainWindow.LayerTransparentFill, |
| 39 |
|
MainWindow.LayerOutlineColor, MainWindow.LayerNoOutline): Removed. |
| 40 |
|
Functionality is found in the layer properties dialog. |
| 41 |
|
|
| 42 |
|
* Thuban/UI/renderer.py (MapRenderer.draw_shape_layer): Only |
| 43 |
|
draw visible groups. |
| 44 |
|
|
| 45 |
|
2003-04-09 Jonathan Coles <[email protected]> |
| 46 |
|
|
| 47 |
|
* Thuban/UI/classgen.py: Modifications to allow simple |
| 48 |
|
addition and selection of new color schemes. |
| 49 |
|
(MonochromaticRamp): New. Generates a ramp between two colors. |
| 50 |
|
(RedRamp): New. Generates a ramp of all red. |
| 51 |
|
(GreenRamp): New. Generates a ramp of all green. |
| 52 |
|
(BlueRamp): New. Generates a ramp of all blue. |
| 53 |
|
|
| 54 |
|
2003-04-09 Jonathan Coles <[email protected]> |
| 55 |
|
|
| 56 |
|
* Thuban/Model/classification.py (Classification.__deepcopy__): |
| 57 |
|
Need to copy over field and fieldType attributes. |
| 58 |
|
|
| 59 |
|
* Thuban/Model/table.py (Table.field_range): New. Retrive the |
| 60 |
|
maximum and minimum values over the entire table for a given |
| 61 |
|
field. |
| 62 |
|
(Table.GetUniqueValues): New. Retrieve all the unique values |
| 63 |
|
in the table for a given field. |
| 64 |
|
|
| 65 |
|
* Thuban/UI/classgen.py: Renamed GenRangePanel to GenUniformPanel. |
| 66 |
|
(GenUniquePanel): New. Controls to allow the user to select |
| 67 |
|
which unique field values they would like in the classification. |
| 68 |
|
(CustomRampPanel): Code that was in ClassGenDialog that allows |
| 69 |
|
the user to select the properties for a custom ramp. |
| 70 |
|
(ClassGenerator.GenUniformDistribution): Was called GenerateRanges. |
| 71 |
|
|
| 72 |
|
* Thuban/UI/classifier.py: Removed a lot of debugging code. |
| 73 |
|
(Classifier._SetClassification): Callback method so that the |
| 74 |
|
class generator can set the classification in the grid. |
| 75 |
|
(ClassGroupPropertiesCtrl): New. Encapsulates the drawing and |
| 76 |
|
editing of a group properties class into a wxWindows control. |
| 77 |
|
|
| 78 |
|
* Thuban/UI/dock.py: It was decided that if the user closes |
| 79 |
|
a dockable window the window should simply hide itself. That |
| 80 |
|
way if the user wants to show the dock again it appears in the |
| 81 |
|
same place as it was when it was closed. |
| 82 |
|
(DockableWindow.Destroy): Call renamed method OnDockDestroy(). |
| 83 |
|
(DockableWindow._OnButtonClose): Hide the window instead of |
| 84 |
|
destroying it. |
| 85 |
|
(DockableWindow._OnClose): Hide the window instead of |
| 86 |
|
destroying it. |
| 87 |
|
|
| 88 |
|
* Thuban/UI/legend.py (LegendTree): Use a private method to |
| 89 |
|
consistently set the font and style of the text. Fixes RTbug #1786. |
| 90 |
|
|
| 91 |
|
* Thuban/UI/mainwindow.py: Import just the Classifier class. |
| 92 |
|
|
| 93 |
|
2003-04-07 Bernhard Herzog <[email protected]> |
| 94 |
|
|
| 95 |
|
* Thuban/UI/mainwindow.py (main_menu): Move the toggle_legend item |
| 96 |
|
to the map module |
| 97 |
|
|
| 98 |
|
2003-04-07 Bernhard Herzog <[email protected]> |
| 99 |
|
|
| 100 |
|
* Thuban/UI/mainwindow.py (MainWindow.ShowSessionTree): Removed in |
| 101 |
|
favor of ToggleSessionTree |
| 102 |
|
(MainWindow.ToggleSessionTree): New method to toggle visibility of |
| 103 |
|
the session tree. |
| 104 |
|
(MainWindow.SessionTreeShown): New method to return whether the |
| 105 |
|
session tree is currently shown. |
| 106 |
|
(MainWindow.ToggleLegend): New method to toggle visibility of the |
| 107 |
|
legend |
| 108 |
|
(MainWindow.ShowLegend): Implement in terms of ToggleLegend and |
| 109 |
|
LegendShown |
| 110 |
|
(MainWindow.LegendShown): New method to return whether the legend |
| 111 |
|
is currently shown. |
| 112 |
|
(_method_command): Add checked parameter so we can define check |
| 113 |
|
menu items |
| 114 |
|
(_has_tree_window_shown, _has_legend_shown): Use the appropriate |
| 115 |
|
mainwindow methods. |
| 116 |
|
(show_session_tree, show_legend commands): Removed. |
| 117 |
|
(toggle_session_tree, toggle_legend commands): New commands to |
| 118 |
|
toggle the visibility of the dialogs |
| 119 |
|
|
| 120 |
|
2003-04-07 Jonathan Coles <[email protected]> |
| 121 |
|
|
| 122 |
|
* Thuban/UI/classgen.py: Fix Windows problem. |
| 123 |
|
|
| 124 |
|
* Thuban/UI/dock.py: Fix Windows problem. |
| 125 |
|
|
| 126 |
|
* Thuban/UI/mainwindow.py: Use False instead of false. |
| 127 |
|
(MainWindow.ShowLegend): Remove unnecessary switch parameter. |
| 128 |
|
|
| 129 |
|
2003-04-07 Jonathan Coles <[email protected]> |
| 130 |
|
|
| 131 |
|
Since we now say that the order of the groups in a classification |
| 132 |
|
matters, it makes sense to be able to manipulate that order. Most |
| 133 |
|
of the changes to Thuban/Model/classification.py are to that end. |
| 134 |
|
|
| 135 |
|
* Thuban/Model/classification.py (Classification.AppendGroup, |
| 136 |
|
Classification.InsertGroup, Classification.ReplaceGroup, |
| 137 |
|
Classification.RemoveGroup, Classification.GetGroup): Do as the |
| 138 |
|
names imply. |
| 139 |
|
(Classification.FindGroup): This was called GetGroup, but GetGroup |
| 140 |
|
takes an index, while FindGroup takes a value. |
| 141 |
|
(Classification.__deepcopy__): Copy all the groups, BUT NOT THE LAYER |
| 142 |
|
REFERENCE. Currently there is a cyclic reference between the layer |
| 143 |
|
and its classification. If the classification doesn't need to know |
| 144 |
|
its owning layer we can change this, since it may make sense to be |
| 145 |
|
able to use the same classification with different layers. |
| 146 |
|
|
| 147 |
|
* Thuban/Model/load.py: Use Classification.AppendGroup(), not AddGroup() |
| 148 |
|
|
| 149 |
|
* Thuban/UI/classgen.py: Use Classification.AppendGroup(), |
| 150 |
|
not AddGroup() |
| 151 |
|
|
| 152 |
|
* Thuban/UI/classifier.py: Now that we can depend on the order in |
| 153 |
|
a Classification and have methods to manipulate that order we don't |
| 154 |
|
need to use our own data structures in the grid. We can simply make |
| 155 |
|
the grid/table access the information they need from a copy of |
| 156 |
|
the classification object. |
| 157 |
|
(Classifier._OnCloseBtn): Event handler for when the user clicks |
| 158 |
|
'Close'. This is needed so if the user applies changes and then |
| 159 |
|
continues to change the table the user has the option of discarding |
| 160 |
|
the most recent changes and keeping what they applied. |
| 161 |
|
|
| 162 |
|
* Thuban/UI/mainwindow.py: Put "Show Legend" and "Show Session Tree" |
| 163 |
|
into the same group. |
| 164 |
|
|
| 165 |
|
* extensions/thuban/wxproj.cpp (check_version): If Thuban is compiled |
| 166 |
|
with a really old version of proj, PJ_VERSION won't even be defined. |
| 167 |
|
If it isn't defined then just compile so that the function always |
| 168 |
|
returns Py_False. |
| 169 |
|
|
| 170 |
|
* test/test_classification.py: Fix tests to use the renamed methods. |
| 171 |
|
Still need to write tests for the new methods. |
| 172 |
|
|
| 173 |
|
2003-04-04 Jonathan Coles <[email protected]> |
| 174 |
|
|
| 175 |
|
* Thuban/UI/classifier.py (Classifier.__SelectField): Move the |
| 176 |
|
call to SetSelection out of the method and before the call |
| 177 |
|
to __SelectField in __init__. This prevents a recursion of events |
| 178 |
|
when _OnFieldSelect is triggered by the user. |
| 179 |
|
|
| 180 |
2003-04-04 Jonathan Coles <[email protected]> |
2003-04-04 Jonathan Coles <[email protected]> |
| 181 |
|
|
| 182 |
* Thuban/Model/classification.py: Fix assert calls. |
* Thuban/Model/classification.py: Rename Color.None to |
| 183 |
(ClassGroupProperties.SetLineColor, ClassGroupProperties.SetFill): |
Color.Transparent. |
| 184 |
Copy the color parameter rather than hold onto a reference. |
(ClassGroupProperties.SetLineColori, ClassGroupProperties.SetFill): |
| 185 |
|
Don't bother copying the color, since Colors are immutable. |
| 186 |
* Thuban/Model/color.py (Color.__copy__, Color.__deepcopy): Copy |
|
| 187 |
the color object. |
* Thuban/Model/color.py, Thuban/Model/layer.py, Thuban/Model/load.py, |
| 188 |
(NoColor.__copy__, NoColor.__deepcopy): Return 'self' so that we |
Thuban/UI/classifier.py, Thuban/UI/mainwindow.py, |
| 189 |
are sure there exists only one refernce to Color.None in the system. |
Thuban/UI/renderer.py, Thuban/UI/view.py: |
| 190 |
This allows us to use 'is' rather than the comparision functions. |
Rename Color.None to Color.Transparent. |
| 191 |
|
|
| 192 |
* Thuban/Model/save.py: Fix assert calls. |
* test/test_classification.py, test/test_load.py: Rename Color.None |
| 193 |
|
to Color.Transparent. |
| 194 |
* Thuban/UI/classifier.py: Fix assert calls. |
|
| 195 |
(ClassGrid._OnCellDClick): Call up to the classifier to open the |
2003-04-04 Jonathan Coles <[email protected]> |
| 196 |
dialog to edit the groups properties. |
|
| 197 |
(ClassGrid._OnCellResize): Make sure that the scollbars are drawn |
* Thuban/Model/classification.py: Fix assert calls. |
| 198 |
correctly if a cell is resized. |
(ClassGroupProperties.SetLineColor, ClassGroupProperties.SetFill): |
| 199 |
(ClassTable.SetClassification): New. Changes the classification |
Copy the color parameter rather than hold onto a reference. |
| 200 |
that is in the table. |
|
| 201 |
(ClassTable.__SetRow): Allow groups to be prepended. |
* Thuban/Model/color.py (Color.__copy__, Color.__deepcopy): Copy |
| 202 |
(Classifier): New code for opening the EditProperties and |
the color object. |
| 203 |
GenerateRanges dialogs. |
(NoColor.__copy__, NoColor.__deepcopy): Return 'self' so that we |
| 204 |
(SelectPropertiesDialog.__GetColor): Only set the color in the |
are sure there exists only one refernce to Color.None in the system. |
| 205 |
color dialog if the current color is not None. |
This allows us to use 'is' rather than the comparision functions. |
| 206 |
|
|
| 207 |
* Thuban/UI/dock.py: Fix assert calls. |
* Thuban/Model/save.py: Fix assert calls. |
| 208 |
|
|
| 209 |
* Thuban/UI/legend.py: Fix assert calls. |
* Thuban/UI/classifier.py: Fix assert calls. |
| 210 |
|
(ClassGrid._OnCellDClick): Call up to the classifier to open the |
| 211 |
* Thuban/UI/renderer.py: Fix assert calls. |
dialog to edit the groups properties. |
| 212 |
|
(ClassGrid._OnCellResize): Make sure that the scollbars are drawn |
| 213 |
* Thuban/UI/classgen.py (ClassGenDialog): Dialog for generating |
correctly if a cell is resized. |
| 214 |
classifications. |
(ClassTable.SetClassification): New. Changes the classification |
| 215 |
(GenRangePanel): Panel specific to range generation. |
that is in the table. |
| 216 |
(GenSingletonPanel): Panel specific to singleton generation. |
(ClassTable.__SetRow): Allow groups to be prepended. |
| 217 |
(ClassGenerator): Class responsible for actually generating |
(Classifier): New code for opening the EditProperties and |
| 218 |
the classification from the data gathered in the dialog box. |
GenerateRanges dialogs. |
| 219 |
(PropertyRamp): Generates properties whose values range from |
(SelectPropertiesDialog.__GetColor): Only set the color in the |
| 220 |
a starting property to an ending property. |
color dialog if the current color is not None. |
| 221 |
|
|
| 222 |
|
* Thuban/UI/dock.py: Fix assert calls. |
| 223 |
|
|
| 224 |
|
* Thuban/UI/legend.py: Fix assert calls. |
| 225 |
|
|
| 226 |
|
* Thuban/UI/renderer.py: Fix assert calls. |
| 227 |
|
|
| 228 |
|
* Thuban/UI/classgen.py (ClassGenDialog): Dialog for generating |
| 229 |
|
classifications. |
| 230 |
|
(GenRangePanel): Panel specific to range generation. |
| 231 |
|
(GenSingletonPanel): Panel specific to singleton generation. |
| 232 |
|
(ClassGenerator): Class responsible for actually generating |
| 233 |
|
the classification from the data gathered in the dialog box. |
| 234 |
|
(PropertyRamp): Generates properties whose values range from |
| 235 |
|
a starting property to an ending property. |
| 236 |
|
|
| 237 |
2003-04-03 Bernhard Herzog <[email protected]> |
2003-04-03 Bernhard Herzog <[email protected]> |
| 238 |
|
|
Parent Directory
| 
Revision Log
| 
Patch