Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
Compatibility with wxPython 2.5. The changes should make it work better with 2.5 while still keeping compatibility with 2.4. There are still problems with 2.5, though. * Thuban/UI/dock.py (DockableWindow.__CreateBorder): Pass the size of a spacer as a single item. * Thuban/UI/classifier.py (ClassGroupPropertiesCtrl): Derive only from wxControl * Thuban/UI/legend.py (LegendTree): When running with wxPython < 2.5, add an implementation of the GetFirstChild method that does not require the second parameter. (LegendTree.find_layer, LegendTree._OnMsgMapLayersAdded) (LegendTree._OnMsgMapLayersRemoved, LegendTree.DeleteAllItems) (LegendTree.DeleteChildren, LegendTree.__ShowHideLayer): Do not pass the second parameter to GetFirstChild
* Thuban/UI/classifier.py (ClassGrid.DeleteSelectedRows): Enable translation for message string.
Add a new dialog box for raster layers. The dialog box allows the user to toggle a mask that is generated by ProjectRasterFile and is used to only draw the real parts of the projected image.
(ID_SELPROP_SPINCTRL): Renamed to ID_SELPROP_SPINCTRL_LINEWIDTH. (ID_SELPROP_SPINCTRL_LINEWIDTH): New Id replaces ID_SELPROP_SPINCTRL. (ID_SELPROP_SPINCTRL_SIZE): New Id. (SelectPropertiesDialog.__init__): Added a second spin control for the size in case the corresponding layer is of point type. (SelectPropertiesDialog._OnSpin): Renamed to _OnSpinLineWidth. (SelectPropertiesDialog._OnSpinLineWidth): New. Former _OnSpin. (SelectPropertiesDialog._OnSpinSize): New. Set size of property and refresh preview.
(ClassDataPreviewer.Draw): Added doc-string. Also, now there is a return value that indicates whether the drawing size exceeded the given rect extent and if so the new extent. Finally, point objects are drawn depending on the size. If either the width or height is exceeded, the new extent is returned. (ClassRenderer.Draw): Now when calling the previewer drawing function, evaluate the return value and, if not None, adapt the grid widget size accordingly and redraw again.
Register properties dialog classes for both provided layer classes/types
Unify arguments for general use through properties-dialog selector, the map can be retrieved through the parent and doesn't require an argument of its own.
(SelectPropertiesDialog.__GetColor): Now calls the abstract ColorDialog instead of wxColourDialog. This also removed the dependency to Color class conversion from this function.
Import the SHAPETYPE_* constants from data instead of layer.
Add docstrings.
* Thuban/UI/messages.py (MAP_REPLACED): New message. * Thuban/UI/viewport.py (ViewPort.SetMap): Issue MAP_REPLACED after the new map has been assigned * Thuban/UI/mainwindow.py (MainWindow.delegated_messages): Delegate MAP_REPLACED to the canvas too (MainWindow.prepare_new_session): Removed. Thanks to the new MAP_REPLACED message it's no longer needed (MainWindow.OpenSession, MainWindow.NewSession): prepare_new_session has been removed. * Thuban/UI/classifier.py (Classifier.__init__): Subscribe to MAP_REPLACED so that we can close the dialog if a new map is set. (Classifier.unsubscribe_messages): Unsubscribe from MAP_REPLACED (Classifier.map_replaced): Handle MAP_REPLACED by closing the dialog * test/test_viewport.py (SimpleViewPortTest) (SimpleViewPortTest.test_default_size): Add doc-strings (ViewPortTest.setUp): Bind map to self.map so we can use it in tests. Subscribe to MAP_REPLACED messages too. (ViewPortTest.tearDown): No need to explicitly unsubscribe (ViewPortTest.test_set_map): New test for the SetMap method.
* Thuban/Model/layer.py (Layer.__init__): Rename classificationField to classificatin_column and init it here so that it can be used in SetClassificationColumn (Layer.GetClassificationColumn, Layer.GetClassificationField): Rename to GetClassificationColumn. (Layer.SetClassificationColumn, Layer.SetClassificationField): Rename to SetClassificationColumn and issue a LAYER_CHANGED message if the column changes. (Layer._classification_changed, Layer.ClassChanged): Rename to _classification_changed. Update the callers. (Layer.SetShapeStore): Further field->column renames. * Thuban/Model/load.py (SessionLoader.start_classification) (SessionLoader.start_clpoint): Updates because of field->column method name changes in the Layer class * Thuban/Model/save.py (SessionSaver.write_classification): Updates because of field->column method name changes in the Layer class * Thuban/UI/classifier.py (Classifier.__init__) (Classifier._OnTry, Classifier._OnRevert): Updates because of field->column method name changes in the Layer class * Thuban/UI/renderer.py (MapRenderer.draw_shape_layer): Updates because of field->column method name changes in the Layer class * Thuban/UI/viewport.py (ViewPort.find_shape_at): Updates because of field->column method name changes in the Layer class * test/test_save.py (SaveSessionTest.testClassifiedLayer) (SaveSessionTest.testClassifiedLayer): Update because of field->column method name changes in the Layer class * test/test_layer.py (SetShapeStoreTests.setUp) (SetShapeStoreTests.test_sanity): Update because of field->column method name changes in the Layer class (TestLayerModification.setUp): Subscribe to LAYER_CHANGED as well (TestLayerModification.test_sanity) (TestLayerModification.test_initial_settings): remove unsued code and rename to test_sanity. (TestLayerModification.test_set_classification): New test for SetClassification and SetClassificationField.
(Classifier.__BuildClassification):
Return both the new class and the field name.
(ClassGrid.CreateTable): Add fieldType parameter.
(ClassTable.Reset): Add fieldType parameter and use it, rather
than asking the classification.
(Classifier.__init__): Remember the original class's field
and ask the layer for the field type, rather than the classification.
(Classifier.__SetGridTable): Retrieve the field and field type
for the table because they are not in the classification.
(Classifier._OnTry, Classifier._OnRevert): Set the classification
field on the layer in addition to the classification itself.
Fixes RTbug #1971.
(Classifier.__BuildClassification, Classifier.__SetGridTable):
Call Classification.SetFieldInfo() instead of SetFieldType.
(Classifier.__EnableButtons):
Reset the status of the buttons as the situation warrants,
but in a better more reliable way by not relying on the
current status to determine what needs to change.
(Classifier.EditSymbol): The parent
of the SelectPropertiesDialog should be self so the window
appears on top.
(ClassGroupPropertiesCtrl.DoEdit): The parent
of the SelectPropertiesDialog should be self so the window
appears on top.
Update to the layer interface: Direct access to the table, shapetable, shapefile and filename attributes is now actively deprecated by issuing deprecation warnings for all places where this happens. * Thuban/Model/layer.py (Layer.__getattr__): New. Implement access to the instance variables table, shapetable, shapefile and filename via __getattr__ so that we can issue a deprecation warning. (Layer.SetShapeStore): Don't set the deprecated instance variables any more (Layer.SetShapeStore): Don't use deprecated layer instance variables (Layer.Destroy): No need to explicitly remove the instance variables any more (Layer.GetFieldType, Layer.Shape): Don't use deprecated layer instance variables * Thuban/UI/classgen.py (ClassGenDialog.__init__) (GenUniformPanel._OnRetrieve, GenUniquePanel._OnRetrieve) (GenQuantilesPanel.GetList, GenQuantilesPanel.OnRetrieve): Don't use deprecated layer instance variables * Thuban/UI/classifier.py (Classifier.__init__): Don't use deprecated layer instance variables * Thuban/UI/identifyview.py (IdentifyListCtrl.selected_shape) (IdentifyGridCtrl.selected_shape): Don't set the deprecated layer instance variables * Thuban/UI/tableview.py (LayerTableGrid.select_shapes): Don't use deprecated layer instance variables * Thuban/UI/mainwindow.py (MainWindow.LayerShowTable): Don't use deprecated layer instance variables * Thuban/Model/save.py (SessionSaver.write_layer): Don't use deprecated layer instance variables * Thuban/UI/renderer.py (MapRenderer.draw_shape_layer) (MapRenderer.polygon_render_param): Don't use deprecated layer instance variables * test/runtests.py (main): Turn Thuban's deprecation warnings into errors so that they're cought by the tests * test/test_load.py (TestSingleLayer.test): Don't use deprecated layer instance variables
(Classifier.OnClose) (Classifier.map_layers_removed) (Classifier.layer_shapestore_replaced): Unsubscribe the messages in OnClose and not in map_layers_removed or layer_shapestore_replaced to make sure it always happens when the dialog is closed
* Thuban/Model/messages.py (LAYER_SHAPESTORE_REPLACED): New message. * Thuban/Model/layer.py (Layer.SetShapeStore): Send LAYER_SHAPESTORE_REPLACED when the shapestore changes. A LAYER_CHANGED will still be sent if the classification changes. * Thuban/UI/classifier.py (Classifier.__init__): Add the map as parameter so we can subscribe to some of its messages (Classifier.__init__): Subscribe to the map's MAP_LAYERS_REMOVED and the layer's LAYER_SHAPESTORE_REPLACED (Classifier.unsubscribe_messages): New. Unsubscribe from message subscribed to in __init__ (Classifier.map_layers_removed) (Classifier.layer_shapestore_replaced): receivers for the messages subscribed to in __init__. Unsubscribe and close the dialog * Thuban/UI/mainwindow.py (MainWindow.OpenLayerProperties): Pass the map to the Classifier dialog * test/test_layer.py (SetShapeStoreTests): Derive from SubscriberMixin as well so we can test messages (SetShapeStoreTests.setUp): Subscribe to some of the layer's messages (SetShapeStoreTests.tearDown): Clear the messages again (SetShapeStoreTests.test_sanity): Expand the doc-string and check for the modified flag too (SetShapeStoreTests.test_set_shape_store_modified_flag): New test to check whether SetShapeStore sets the modified flag (SetShapeStoreTests.test_set_shape_store_different_field_name) (SetShapeStoreTests.test_set_shape_store_same_field) (SetShapeStoreTests.test_set_shape_store_same_field_different_type): Add tests for the messages. This checks both the new LAYER_SHAPESTORE_REPLACED and the older LAYER_CHANGED
Remove unused import of ClassGenerator.
Dialog derived from NonModalNonParentDialog
(Classifier.__init__, SelectPropertiesDialog.__init__) UI polishing updates: Place main buttons (OK, Cancel, etc) in the lower right corner, center labels for selections, initialize controls in reasonable order for keyboard navigation.
(Classifier.__init__): Rearrange how
the dialog is constructed so that we can support layers that
do not have classifications.
(Classifier._OnTry): Only build a classification if the layer supports one.
Explicit imports. (ClassTable.GetValueAsCust, ClassTable.__ParseInput, ClassTable.SetValueAsCustom): Reworked to use new Range class.
(Classifier.__init__) (Classifier.__init__): Adapt to new table interface
(Classifier.__init__): Rearrange the
order that the controls are created so that tabbing works correctly.
(SelectPropertiesDialog.__init__): Rearrange the order that the
controls are created so that tabbing works correctly.
Remove Thuban.common import.
Remove all uses of Str2Num.
(ClassTable.SetValueAsCustom): Rename keyword argument in
ClassGroup* constructors to match argument name.
(Classifier.__init__): Use a wxChoice control instead of a wxComboBox.
* Thuban/__init__.py (_): Implement the translation function for real using the python gettext module. * Thuban/UI/classifier.py (ClassTable.GetRowLabelValue): Don't translate empty strings. * Thuban/UI/application.py (ThubanApplication.read_startup_files): Add a missing space to a warning message * po/README: New. Notes about the management of the translation files. * po/Makefile: New. Makefile to help manage the translation files. * po/es.po: New. Spanish translation by Daniel Calvelo Aros * MANIFEST.in: Include the *.mo files in Resources/Locale and the translations and support files in po/ * setup.py (data_files): Add the *.mo files to the data_files too * README: Add note about the translations when building from CVS
(Classifier.__init__): Add a top level panel to the dialog so that the background colors are consistent under Windows.
Refactored ID's from ID_CLASSIFY_* to ID_PROPERTY_*.
(Classifier.__init__): Minor changes to the layout.
(Classifier._OnTitleChanged): Listen for when the user edits the
title and update the dialog's title and the layer's title.
(ClassTable): Add a new column for the "Visible" check boxes. (Classifier): Rename the buttons and refactor the code to match the new labels.
Removed a lot of debugging code.
(Classifier._SetClassification): Callback method so that the
class generator can set the classification in the grid.
(ClassGroupPropertiesCtrl): New. Encapsulates the drawing and
editing of a group properties class into a wxWindows control.
Now that we can depend on the order in
a Classification and have methods to manipulate that order we don't
need to use our own data structures in the grid. We can simply make
the grid/table access the information they need from a copy of
the classification object.
(Classifier._OnCloseBtn): Event handler for when the user clicks
'Close'. This is needed so if the user applies changes and then
continues to change the table the user has the option of discarding
the most recent changes and keeping what they applied.
(Classifier.__SelectField): Move the
call to SetSelection out of the method and before the call
to __SelectField in __init__. This prevents a recursion of events
when _OnFieldSelect is triggered by the user.
Rename Color.None to Color.Transparent.
Fix assert calls.
(ClassGrid._OnCellDClick): Call up to the classifier to open the
dialog to edit the groups properties.
(ClassGrid._OnCellResize): Make sure that the scollbars are drawn
correctly if a cell is resized.
(ClassTable.SetClassification): New. Changes the classification
that is in the table.
(ClassTable.__SetRow): Allow groups to be prepended.
(Classifier): New code for opening the EditProperties and
GenerateRanges dialogs.
(SelectPropertiesDialog.__GetColor): Only set the color in the
color dialog if the current color is not None.
Commented out some debugging statements.
(ClassDataPreviewer.Draw): Draw rectangles for polygon layers per
RTbug #1769.
Support for highlighting a specific
group within the grid when the classification dialog is opened.
Also contains a lot of debugging printouts which will later
be removed.
(Classifier.__init__): Use wxADJUST_MINSIZE
as one of the style properties for the fieldTypeText item to
be sure that its size is correct when the text changes.
Remember if any changes have actually
been applied so that if the dialog is cancelled without an application
of changes we don't have to set a new classification.
(ClassDataPreviewer): Pulled out the window specific code and put it
ClassDataPreviewWindow. ClassDataPreviewer can then be used to draw
symbols on any DC.
Implement multiple selected shapes * Thuban/UI/selection.py: New module with a class to represent the selection. * Thuban/UI/messages.py (SELECTED_TABLE, SELECTED_MAP): Remove these unused messages * Thuban/UI/application.py (ThubanApplication.OnInit) (ThubanApplication.OnExit, ThubanApplication.SetSession): The interactor is gone now. (ThubanApplication.CreateMainWindow): There is no interactor anymore so we pass None as the interactor argument for now for compatibility. * Thuban/UI/view.py (MapCanvas.delegated_messages) (MapCanvas.Subscribe, MapCanvas.Unsubscribe): In Subscribe and Unsubscribe, delegate messages according to the delegated_messages class variable. (MapCanvas.__getattr__, MapCanvas.delegated_methods): Get some attributes from instance variables as described with the delegated_methods class variable. (MapCanvas.__init__): New instance variable selection holding the current selection (MapCanvas.do_redraw): Deal with multiple selected shapes. Simply pass them on to the renderer (MapCanvas.SetMap): Clear the selection when a different map is selected. (MapCanvas.shape_selected): Simple force a complete redraw. The selection class now takes care of only issueing SHAPES_SELECTED messages when the set of selected shapes actually does change. (MapCanvas.SelectShapeAt): The selection is now managed in self.selection * Thuban/UI/mainwindow.py (MainWindow.delegated_messages) (MainWindow.Subscribe, MainWindow.Unsubscribe): In Subscribe and Unsubscribe, delegate messages according to the delegated_messages class variable. (MainWindow.delegated_methods, MainWindow.__getattr__): Get some attributes from instance variables as described with the delegated_methods class variable. (MainWindow.__init__): The interactor as ivar is gone. The parameter is still there for compatibility. The selection messages now come from the canvas. (MainWindow.current_layer, MainWindow.has_selected_layer): Delegate to the the canvas. (MainWindow.LayerShowTable, MainWindow.Classify) (MainWindow.identify_view_on_demand): The dialogs don't need the interactor parameter anymore. * Thuban/UI/tableview.py (TableFrame.__init__) (LayerTableFrame.__init__, LayerTableFrame.OnClose) (LayerTableFrame.row_selected): The interactor is gone. It's job from the dialog's point of view is now done by the mainwindow, i.e. the parent. Subscribe to SHAPES_SELECTED instead of SELECTED_SHAPE * Thuban/UI/dialogs.py (NonModalDialog.__init__): The interactor is gone. It's job from the dialog's point of view is now done by the mainwindow, i.e. the parent. * Thuban/UI/classifier.py (Classifier.__init__): The interactor is gone. It's job from the dialog's point of view is now done by the mainwindow, i.e. the parent. * Thuban/UI/tree.py (SessionTreeView.__init__): The interactor is gone. It's job from the dialog's point of view is now done by the mainwindow, i.e. the parent. (SessionTreeCtrl.__init__): New parameter mainwindow which is stored as self.mainwindow. The mainwindow is need so that the tree can still subscribe to the selection messages. (SessionTreeCtrl.__init__, SessionTreeCtrl.unsubscribe_all) (SessionTreeCtrl.update_tree, SessionTreeCtrl.OnSelChanged): The selection is now accessible through the mainwindow. Subscribe to SHAPES_SELECTED instead of SELECTED_SHAPE * Thuban/UI/identifyview.py (IdentifyView.__init__): Use the SHAPES_SELECTED message now. (IdentifyView.selected_shape): Now subscribed to SHAPES_SELECTED, so deal with multiple shapes (IdentifyView.__init__, IdentifyView.OnClose): The interactor is gone. It's job from the dialog's point of view is now done by the mainwindow, i.e. the parent. * Thuban/UI/renderer.py (ScreenRenderer.RenderMap): Rename the selected_shape parameter and ivar to selected_shapes. It's now a list of shape ids. (MapRenderer.draw_label_layer): Deal with multiple selected shapes. Rearrange the code a bit so that the setup and shape type distinctions are only executed once.
Undo last changes so that we now need wxWindows2.4
Quick fix so that the ClassGrid works on wxWindows 2.3.
More work with the classifier panel.
Working to get wxPanel to behave correctly.
Add normal border to SelectPropertiesDialog.
(Classifier.__init__): Make the
field type label grow so that when the text changes the
size is updated correctly. This may be a wxWindows bug.
Wrap text with _().
(ClassGrid.CreateTable): Set dimensions and size hints here,
instead of in Reset, so we only set the size once.
(Classifier): SelectField() needed
to know the old field index as well as the new one.
(Classifier): Use __SelectField()
to correctly set the table information and call this from
__init__ and from _OnFieldSelect so that all the information
is up to date when the dialog opens and when a field is changed.
removed print statement
Setting and Getting table values now
uses a consistent set of functions.
(Classifier): Now non-modal. Has field type label which changes
as the field changes. Keep track of buttons in a list so that
we can enable/disable the buttons when the None field is selected.
(SelectPropertiesDialog): Add buttons to make the colors transparent.
(ClassGrid.__init__) (ClassGrid.CreateTable): Move the SetSelectionMode call to CreateTable because otherwise it triggers an assertion in wxPython/wxGTK 2.4.
import FIELDTYPE constants from table
Added class documentation.
Fixed RTbug #1713, #1714. Added Move[Up|Down] buttons.
Store just the groups in the table and generate the other
column information when it is requested. Add "None" field
to pull-down to select no classification.
(ClassGrid.__init__): Set the table before the selection mode. Doing it the other way round triggers an assertion in wxWindows.
(ClassGrid): Moved OnCellDClick() from
Classifier to ClassGrid. Added support for removing selected rows,
which including code for keeping track of when cells are selected,
and deselected.
(ClassTable): Support for added/removing rows. Fixed a problem
with __ParseInput whereby it would not allow strings (only numbers)
to be entered.
(Classifier): Added button and supporting code for removing selected rows.
Fix to create a tuple with a single value instead of simply returning the value.
Changes to use new Classification and Group functions.
(SelectPropertiesDialog): Support
for changing the stroke and fill colors and previewing the
changes.
(ClassGrid): New class to represent a
custom grid.
(ClassTable): Support for editing Values and Labels and for
changing what type (point or range) of data is stored in each
property based on how the user enters the data.
(Classifier): Support for saving the new classifications and
launching the dialog to edit a property.
(SelectPropertiesDialog): New class for editing the visual
properties of a classification (stroke color, width, and fill color)
(ClassPreviewer): Took the Draw method from ClassRenderer and
made most of it into this new class. Intend to use this class in
the SelectPropertiesDialog for previewing changes.
typo fix
* Thuban/UI/classifier.py (ClassTable): Didn't need to hang
onto the clinfo parameter, so removed the deepcopy().
* Thuban/UI/classifier.py (ClassRenderer): New class to
draw the classifications in the dialog box's table.
(Classifier): Modified to use the ClassRenderer class.
added i18n wrapper _() to text
fixed a missed conflict
fix i18n merge conflict
Replace user string by _() for i18n.
Dialog box for modifying classification information
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| [email protected] | ViewVC Help |
| Powered by ViewVC 1.1.26 |