/[thuban]/trunk/thuban/Thuban/UI/classifier.py
ViewVC logotype

Log of /trunk/thuban/Thuban/UI/classifier.py

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 712 - (view) (annotate) - [select for diffs]
Modified Wed Apr 23 08:46:40 2003 UTC (21 years, 10 months ago) by jonathan
File length: 44673 byte(s)
Diff to previous 671 , to selected 511
(Classifier.__init__): Use a wxChoice control instead of a wxComboBox.


Revision 671 - (view) (annotate) - [select for diffs]
Modified Tue Apr 15 18:09:47 2003 UTC (21 years, 10 months ago) by bh
File length: 44544 byte(s)
Diff to previous 661 , to selected 511
* 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


Revision 661 - (view) (annotate) - [select for diffs]
Modified Mon Apr 14 14:16:00 2003 UTC (21 years, 10 months ago) by jonathan
File length: 44547 byte(s)
Diff to previous 650 , to selected 511
(Classifier.__init__): Add a top level panel to the dialog so that the
background colors are consistent under Windows.


Revision 650 - (view) (annotate) - [select for diffs]
Modified Fri Apr 11 14:27:41 2003 UTC (21 years, 10 months ago) by jonathan
File length: 44450 byte(s)
Diff to previous 638 , to selected 511
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.


Revision 638 - (view) (annotate) - [select for diffs]
Modified Thu Apr 10 14:35:20 2003 UTC (21 years, 10 months ago) by jonathan
File length: 44305 byte(s)
Diff to previous 630 , to selected 511
(ClassTable): Add a new column for the "Visible" check boxes.
(Classifier): Rename the buttons and refactor the code to match the new labels.


Revision 630 - (view) (annotate) - [select for diffs]
Modified Wed Apr 9 10:10:06 2003 UTC (21 years, 11 months ago) by jonathan
File length: 43670 byte(s)
Diff to previous 615 , to selected 511
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.


Revision 615 - (view) (annotate) - [select for diffs]
Modified Mon Apr 7 08:57:20 2003 UTC (21 years, 11 months ago) by jonathan
File length: 42348 byte(s)
Diff to previous 611 , to selected 511
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.


Revision 611 - (view) (annotate) - [select for diffs]
Modified Fri Apr 4 16:34:46 2003 UTC (21 years, 11 months ago) by jonathan
File length: 40941 byte(s)
Diff to previous 610 , to selected 511
(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.


Revision 610 - (view) (annotate) - [select for diffs]
Modified Fri Apr 4 13:56:59 2003 UTC (21 years, 11 months ago) by jonathan
File length: 40792 byte(s)
Diff to previous 606 , to selected 511
Rename Color.None to Color.Transparent.


Revision 606 - (view) (annotate) - [select for diffs]
Modified Fri Apr 4 12:16:39 2003 UTC (21 years, 11 months ago) by jonathan
File length: 40757 byte(s)
Diff to previous 576 , to selected 511
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.


Revision 576 - (view) (annotate) - [select for diffs]
Modified Mon Mar 31 18:31:17 2003 UTC (21 years, 11 months ago) by jonathan
File length: 39193 byte(s)
Diff to previous 570 , to selected 511
Commented out some debugging statements.
(ClassDataPreviewer.Draw): Draw rectangles for polygon layers per
        RTbug #1769.


Revision 570 - (view) (annotate) - [select for diffs]
Modified Fri Mar 28 17:06:26 2003 UTC (21 years, 11 months ago) by jonathan
File length: 39125 byte(s)
Diff to previous 560 , to selected 511
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.


Revision 560 - (view) (annotate) - [select for diffs]
Modified Wed Mar 26 11:05:47 2003 UTC (21 years, 11 months ago) by jonathan
File length: 36558 byte(s)
Diff to previous 549 , to selected 511
(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.


Revision 549 - (view) (annotate) - [select for diffs]
Modified Thu Mar 20 09:45:07 2003 UTC (21 years, 11 months ago) by jonathan
File length: 36517 byte(s)
Diff to previous 535 , to selected 511
 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.


Revision 535 - (view) (annotate) - [select for diffs]
Modified Fri Mar 14 20:42:18 2003 UTC (21 years, 11 months ago) by bh
File length: 36105 byte(s)
Diff to previous 519 , to selected 511
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.


Revision 519 - (view) (annotate) - [select for diffs]
Modified Tue Mar 11 22:27:35 2003 UTC (21 years, 11 months ago) by jonathan
File length: 36134 byte(s)
Diff to previous 513 , to selected 511
Undo last changes so that we now need wxWindows2.4


Revision 513 - (view) (annotate) - [select for diffs]
Modified Tue Mar 11 16:42:38 2003 UTC (21 years, 11 months ago) by jonathan
File length: 36196 byte(s)
Diff to previous 511
Quick fix so that the ClassGrid works on wxWindows 2.3.


Revision 511 - (view) (annotate) - [selected]
Modified Tue Mar 11 16:27:52 2003 UTC (21 years, 11 months ago) by jonathan
File length: 36134 byte(s)
Diff to previous 509
More work with the classifier panel.


Revision 509 - (view) (annotate) - [select for diffs]
Modified Tue Mar 11 09:45:59 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35928 byte(s)
Diff to previous 507 , to selected 511
Working to get wxPanel to behave correctly.


Revision 507 - (view) (annotate) - [select for diffs]
Modified Mon Mar 10 17:36:42 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35751 byte(s)
Diff to previous 506 , to selected 511
Add normal border to SelectPropertiesDialog.


Revision 506 - (view) (annotate) - [select for diffs]
Modified Mon Mar 10 15:49:22 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35726 byte(s)
Diff to previous 500 , to selected 511
(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.


Revision 500 - (view) (annotate) - [select for diffs]
Modified Mon Mar 10 15:11:24 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35820 byte(s)
Diff to previous 498 , to selected 511
Wrap text with _().
(ClassGrid.CreateTable): Set dimensions and size hints here,
        instead of in Reset, so we only set the size once.


Revision 498 - (view) (annotate) - [select for diffs]
Modified Mon Mar 10 11:03:22 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35810 byte(s)
Diff to previous 496 , to selected 511
(Classifier): SelectField() needed
        to know the old field index as well as the new one.


Revision 496 - (view) (annotate) - [select for diffs]
Modified Mon Mar 10 10:54:50 2003 UTC (21 years, 11 months ago) by jonathan
File length: 35710 byte(s)
Diff to previous 489 , to selected 511
(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.


Revision 489 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 18:22:47 2003 UTC (22 years ago) by jonathan
File length: 35552 byte(s)
Diff to previous 485 , to selected 511
removed print statement


Revision 485 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 18:20:31 2003 UTC (22 years ago) by jonathan
File length: 35596 byte(s)
Diff to previous 476 , to selected 511
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.


Revision 476 - (view) (annotate) - [select for diffs]
Modified Thu Mar 6 15:03:37 2003 UTC (22 years ago) by bh
File length: 31261 byte(s)
Diff to previous 473 , to selected 511
(ClassGrid.__init__)
(ClassGrid.CreateTable): Move the SetSelectionMode call to
CreateTable because otherwise it triggers an assertion in
wxPython/wxGTK 2.4.


Revision 473 - (view) (annotate) - [select for diffs]
Modified Wed Mar 5 18:39:45 2003 UTC (22 years ago) by jonathan
File length: 31255 byte(s)
Diff to previous 460 , to selected 511
import FIELDTYPE constants from table


Revision 460 - (view) (annotate) - [select for diffs]
Modified Wed Mar 5 18:16:28 2003 UTC (22 years ago) by jonathan
File length: 31165 byte(s)
Diff to previous 455 , to selected 511
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.


Revision 455 - (view) (annotate) - [select for diffs]
Modified Tue Mar 4 11:32:20 2003 UTC (22 years ago) by bh
File length: 24703 byte(s)
Diff to previous 451 , to selected 511
(ClassGrid.__init__): Set the table
before the selection mode. Doing it the other way round triggers
an assertion in wxWindows.


Revision 451 - (view) (annotate) - [select for diffs]
Modified Tue Mar 4 10:33:56 2003 UTC (22 years ago) by jonathan
File length: 24703 byte(s)
Diff to previous 444 , to selected 511
(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.


Revision 444 - (view) (annotate) - [select for diffs]
Modified Thu Feb 27 16:02:59 2003 UTC (22 years ago) by jonathan
File length: 20635 byte(s)
Diff to previous 441 , to selected 511
Fix to create a tuple with a single value instead of simply returning the value.


Revision 441 - (view) (annotate) - [select for diffs]
Modified Thu Feb 27 15:55:00 2003 UTC (22 years ago) by jonathan
File length: 20597 byte(s)
Diff to previous 430 , to selected 511
Changes to use new Classification and Group functions.


Revision 430 - (view) (annotate) - [select for diffs]
Modified Mon Feb 24 18:47:06 2003 UTC (22 years ago) by jonathan
File length: 19705 byte(s)
Diff to previous 415 , to selected 511
(SelectPropertiesDialog): Support
        for changing the stroke and fill colors and previewing the
        changes.


Revision 415 - (view) (annotate) - [select for diffs]
Modified Wed Feb 19 16:52:51 2003 UTC (22 years ago) by jonathan
File length: 17811 byte(s)
Diff to previous 400 , to selected 511
(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.


Revision 400 - (view) (annotate) - [select for diffs]
Modified Tue Feb 11 14:29:09 2003 UTC (22 years ago) by jonathan
File length: 5974 byte(s)
Diff to previous 398 , to selected 511
typo fix


Revision 398 - (view) (annotate) - [select for diffs]
Modified Tue Feb 11 14:23:45 2003 UTC (22 years ago) by jonathan
File length: 5979 byte(s)
Diff to previous 392 , to selected 511
* Thuban/UI/classifier.py (ClassTable): Didn't need to hang
        onto the clinfo parameter, so removed the deepcopy().


Revision 392 - (view) (annotate) - [select for diffs]
Modified Mon Feb 10 15:26:30 2003 UTC (22 years ago) by jonathan
File length: 6033 byte(s)
Diff to previous 379 , to selected 511
* Thuban/UI/classifier.py (ClassRenderer): New class to
        draw the classifications in the dialog box's table.
        (Classifier): Modified to use the ClassRenderer class.


Revision 379 - (view) (annotate) - [select for diffs]
Modified Tue Jan 28 12:54:01 2003 UTC (22 years, 1 month ago) by jonathan
File length: 3315 byte(s)
Diff to previous 377 , to selected 511
added i18n wrapper _() to text


Revision 377 - (view) (annotate) - [select for diffs]
Modified Tue Jan 28 12:09:56 2003 UTC (22 years, 1 month ago) by jonathan
File length: 3312 byte(s)
Diff to previous 376 , to selected 511
fixed a missed conflict


Revision 376 - (view) (annotate) - [select for diffs]
Modified Tue Jan 28 12:01:38 2003 UTC (22 years, 1 month ago) by jonathan
File length: 3784 byte(s)
Diff to previous 374 , to selected 511
fix i18n merge conflict


Revision 374 - (view) (annotate) - [select for diffs]
Modified Mon Jan 27 14:20:02 2003 UTC (22 years, 1 month ago) by jan
File length: 2813 byte(s)
Diff to previous 372 , to selected 511
Replace user string by _() for i18n.


Revision 372 - (view) (annotate) - [select for diffs]
Added Mon Jan 27 13:50:58 2003 UTC (22 years, 1 month ago) by jonathan
File length: 2764 byte(s)
Diff to selected 511
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.

  Diffs between and
  Type of Diff should be a

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26