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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 630 by jonathan, Wed Apr 9 10:10:06 2003 UTC revision 1142 by bh, Tue Jun 10 09:41:57 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Color
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator  from Thuban.UI.classgen import ClassGenDialog
36    
37  from dialogs import NonModalDialog  from dialogs import NonModalNonParentDialog
38    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
39  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
40    
41    
42  # table columns  # table columns
43  COL_SYMBOL = 0  COL_VISIBLE = 0
44  COL_VALUE  = 1  COL_SYMBOL  = 1
45  COL_LABEL  = 2  COL_VALUE   = 2
46    COL_LABEL   = 3
47    NUM_COLS    = 4
48    
49  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
50  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 63  class ClassGrid(wxGrid): Line 68  class ClassGrid(wxGrid):
68                   use for display.                   use for display.
69          """          """
70    
71          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
         wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
         #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)  
72    
73          self.classifier = classifier          self.classifier = classifier
74    
# Line 77  class ClassGrid(wxGrid): Line 80  class ClassGrid(wxGrid):
80          EVT_GRID_COL_SIZE(self, self._OnCellResize)          EVT_GRID_COL_SIZE(self, self._OnCellResize)
81          EVT_GRID_ROW_SIZE(self, self._OnCellResize)          EVT_GRID_ROW_SIZE(self, self._OnCellResize)
82    
83        #def GetCellAttr(self, row, col):
84            #print "GetCellAttr ", row, col
85            #wxGrid.GetCellAttr(self, row, col)
86    
87      def CreateTable(self, clazz, shapeType, group = None):      def CreateTable(self, clazz, shapeType, group = None):
88    
89          assert isinstance(clazz, Classification)          assert isinstance(clazz, Classification)
90    
91          table = self.GetTable()          table = self.GetTable()
92          if table is None:          if table is None:
93              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
94              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
95                h = self.GetDefaultRowSize() * 4 \
96                    + self.GetDefaultColLabelSize()
97    
98              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
99              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
100              table = ClassTable(self)              table = ClassTable(self)
# Line 106  class ClassGrid(wxGrid): Line 116  class ClassGrid(wxGrid):
116      def GetSelectedRows(self):      def GetSelectedRows(self):
117          return self.GetCurrentSelection()          return self.GetCurrentSelection()
118    
119      def SetCellRenderer(self, row, col):      #def SetCellRenderer(self, row, col, renderer):
120          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
121    
122      #      #
123      # [Set|Get]Table is taken from http://wiki.wxpython.org      # [Set|Get]Table is taken from http://wiki.wxpython.org
# Line 202  class ClassGrid(wxGrid): Line 212  class ClassGrid(wxGrid):
212  #                                  sel = False))  #                                  sel = False))
213    
214      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
215          """Handle a double on a cell."""          """Handle a double click on a cell."""
216    
217          r = event.GetRow()          r = event.GetRow()
218          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             self.classifier.EditGroupProperties(r)  
219    
220            if c == COL_SYMBOL:
221                self.classifier.EditSymbol(r)
222            else:
223                event.Skip()
224    
225      #      #
226      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 237  class ClassGrid(wxGrid): Line 249  class ClassGrid(wxGrid):
249    
250      def _OnCellResize(self, event):      def _OnCellResize(self, event):
251          self.FitInside()          self.FitInside()
252            event.Skip()
253    
254  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
255      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
256    
257      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
   
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
258    
259    
260      def __init__(self, view = None):      def __init__(self, view = None):
# Line 257  class ClassTable(wxPyGridTableBase): Line 268  class ClassTable(wxPyGridTableBase):
268    
269          wxPyGridTableBase.__init__(self)          wxPyGridTableBase.__init__(self)
270    
271          self.SetView(view)          assert len(ClassTable.__col_labels) == NUM_COLS
272    
273          self.clazz = None          self.clazz = None
274            self.__colAttr = {}
275    
276          #self.Reset(clazz, shapeType)          self.SetView(view)
277    
278      def Reset(self, clazz, shapeType, group = None):      def Reset(self, clazz, shapeType, group = None):
279          """Reset the table with the given data.          """Reset the table with the given data.
# Line 286  class ClassTable(wxPyGridTableBase): Line 299  class ClassTable(wxPyGridTableBase):
299          self.SetClassification(clazz, group)          self.SetClassification(clazz, group)
300          self.__Modified(-1)          self.__Modified(-1)
301    
302            self.__colAttr = {}
303    
304            attr = wxGridCellAttr()
305            attr.SetEditor(wxGridCellBoolEditor())
306            attr.SetRenderer(wxGridCellBoolRenderer())
307            attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER)
308            self.__colAttr[COL_VISIBLE] = attr
309    
310            attr = wxGridCellAttr()
311            attr.SetRenderer(ClassRenderer(self.shapeType))
312            attr.SetReadOnly()
313            self.__colAttr[COL_SYMBOL] = attr
314    
315          self.GetView().EndBatch()          self.GetView().EndBatch()
316          self.GetView().FitInside()          self.GetView().FitInside()
317    
# Line 298  class ClassTable(wxPyGridTableBase): Line 324  class ClassTable(wxPyGridTableBase):
324    
325          old_len = self.GetNumberRows()          old_len = self.GetNumberRows()
326    
         #  
         # copy the data out of the classification and into our  
         # array  
         #  
327          row = -1          row = -1
 #       for g in clazz:  
 #           ng = copy.deepcopy(g)  
 #           self.__SetRow(None, ng)  
 #           if g is group:  
 #               row = self.GetNumberRows() - 1  
 #               #print "selecting row..."  
   
   
         #self.clazz = copy.deepcopy(clazz)  
328          self.clazz = clazz          self.clazz = clazz
329    
330          self.__NotifyRowChanges(old_len, self.GetNumberRows())          self.__NotifyRowChanges(old_len, self.GetNumberRows())
331    
332            #
333            # XXX: this is dead code at the moment
334            #
335          if row > -1:          if row > -1:
336              self.GetView().ClearSelection()              self.GetView().ClearSelection()
337              self.GetView().SelectRow(row)              self.GetView().SelectRow(row)
# Line 323  class ClassTable(wxPyGridTableBase): Line 339  class ClassTable(wxPyGridTableBase):
339    
340          self.__Modified()          self.__Modified()
341    
342    
343          self.GetView().EndBatch()          self.GetView().EndBatch()
344          self.GetView().FitInside()          self.GetView().FitInside()
345    
# Line 387  class ClassTable(wxPyGridTableBase): Line 404  class ClassTable(wxPyGridTableBase):
404              if isinstance(group, ClassGroupMap):       return _("Map")              if isinstance(group, ClassGroupMap):       return _("Map")
405    
406          assert False # shouldn't get here          assert False # shouldn't get here
407          return _("")          return ""
408    
409      def GetNumberRows(self):      def GetNumberRows(self):
410          """Return the number of rows."""          """Return the number of rows."""
# Line 398  class ClassTable(wxPyGridTableBase): Line 415  class ClassTable(wxPyGridTableBase):
415    
416      def GetNumberCols(self):      def GetNumberCols(self):
417          """Return the number of columns."""          """Return the number of columns."""
418          return self.NUM_COLS          return NUM_COLS
419    
420      def IsEmptyCell(self, row, col):      def IsEmptyCell(self, row, col):
421          """Determine if a cell is empty. This is always false."""          """Determine if a cell is empty. This is always false."""
# Line 416  class ClassTable(wxPyGridTableBase): Line 433  class ClassTable(wxPyGridTableBase):
433          """          """
434    
435          self.SetValueAsCustom(row, col, None, value)          self.SetValueAsCustom(row, col, None, value)
         self.__Modified()  
436                
437      def GetValueAsCustom(self, row, col, typeName):      def GetValueAsCustom(self, row, col, typeName):
438          """Return the object that is used to represent the given          """Return the object that is used to represent the given
# Line 431  class ClassTable(wxPyGridTableBase): Line 447  class ClassTable(wxPyGridTableBase):
447              group = self.clazz.GetGroup(row - 1)              group = self.clazz.GetGroup(row - 1)
448    
449    
450            if col == COL_VISIBLE:
451                return group.IsVisible()
452    
453          if col == COL_SYMBOL:          if col == COL_SYMBOL:
454              return group.GetProperties()              return group.GetProperties()
455    
# Line 445  class ClassTable(wxPyGridTableBase): Line 464  class ClassTable(wxPyGridTableBase):
464          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
465              return group.GetValue()              return group.GetValue()
466          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
467              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
468    
469          assert(False) # shouldn't get here          assert False # shouldn't get here
470          return None          return None
471    
472      def __ParseInput(self, value):      def __ParseInput(self, value):
473          """Try to determine what kind of input value is          """Try to determine what kind of input value is
474             (string, number, or range)             (string, number, or range)
475    
476          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
477          value, or of length two if it is a range.          a singleton value, or 1 if is a range
478          """          """
479    
480          type = self.fieldType          type = self.fieldType
481    
482          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
483              return (value,)              return (0, value)
484          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
485              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
486                    # the float call allows the user to enter 1.0 for 1
487                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
488              else:              else:
489                  conv = lambda p: p                  conv = float
490    
491              #              #
492              # first try to take the input as a single number              # first try to take the input as a single number
493              # if there's an exception try to break it into              # if there's an exception try to break it into
494              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
495              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
496              #              #
497              try:              try:
498                  return (conv(Str2Num(value)),)                  return (0, conv(value))
499              except ValueError:              except ValueError:
500                  i = value.find('-')                  return (1, Range(value))
                 if i == 0:  
                     i = value.find('-', 1)  
   
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
501    
502          assert False  # shouldn't get here          assert False  # shouldn't get here
503          return (0,)          return (0,None)
               
504    
505      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
506          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 503  class ClassTable(wxPyGridTableBase): Line 514  class ClassTable(wxPyGridTableBase):
514          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
515          """          """
516    
517          assert col >= 0 and col < self.GetNumberCols()          assert 0 <= col < self.GetNumberCols()
518          assert row >= 0 and row < self.GetNumberRows()          assert 0 <= row < self.GetNumberRows()
519    
520          if row == 0:          if row == 0:
521              group = self.clazz.GetDefaultGroup()              group = self.clazz.GetDefaultGroup()
# Line 513  class ClassTable(wxPyGridTableBase): Line 524  class ClassTable(wxPyGridTableBase):
524    
525          mod = True # assume the data will change          mod = True # assume the data will change
526    
527          if col == COL_SYMBOL:          if col == COL_VISIBLE:
528                group.SetVisible(value)
529            elif col == COL_SYMBOL:
530              group.SetProperties(value)              group.SetProperties(value)
531          elif col == COL_LABEL:          elif col == COL_LABEL:
532              group.SetLabel(value)              group.SetLabel(value)
# Line 541  class ClassTable(wxPyGridTableBase): Line 554  class ClassTable(wxPyGridTableBase):
554                      # changing the underlying group type if the                      # changing the underlying group type if the
555                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
556                      #                      #
557                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
558                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
559                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
560                              changed = True                              changed = True
561                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
562                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
563                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
564                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
565                              changed = True                              changed = True
566                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
567                      else:                      else:
568                          assert False                          assert False
569                          pass                          pass
# Line 569  class ClassTable(wxPyGridTableBase): Line 582  class ClassTable(wxPyGridTableBase):
582      def GetAttr(self, row, col, someExtraParameter):      def GetAttr(self, row, col, someExtraParameter):
583          """Returns the cell attributes"""          """Returns the cell attributes"""
584    
585          attr = wxGridCellAttr()          return self.__colAttr.get(col, wxGridCellAttr()).Clone()
         #attr = wxPyGridTableBase.GetAttr(self, row, col, someExtraParameter)  
   
         if col == COL_SYMBOL:  
             # we need to create a new renderer each time, because  
             # SetRenderer takes control of the parameter  
             attr.SetRenderer(ClassRenderer(self.shapeType))  
             attr.SetReadOnly()  
   
         return attr  
586    
587      def GetClassGroup(self, row):      def GetClassGroup(self, row):
588          """Return the ClassGroup object representing row 'row'."""          """Return the ClassGroup object representing row 'row'."""
# Line 644  class ClassTable(wxPyGridTableBase): Line 648  class ClassTable(wxPyGridTableBase):
648              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
649    
650    
651  ID_CLASSIFY_OK = 4001  ID_PROPERTY_REVERT = 4002
652  ID_CLASSIFY_CANCEL = 4002  ID_PROPERTY_ADD = 4003
653  ID_CLASSIFY_ADD = 4003  ID_PROPERTY_GENCLASS = 4004
654  ID_CLASSIFY_GENCLASS = 4004  ID_PROPERTY_REMOVE = 4005
655  ID_CLASSIFY_REMOVE = 4005  ID_PROPERTY_MOVEUP = 4006
656  ID_CLASSIFY_MOVEUP = 4006  ID_PROPERTY_MOVEDOWN = 4007
657  ID_CLASSIFY_MOVEDOWN = 4007  ID_PROPERTY_TRY = 4008
658  ID_CLASSIFY_APPLY = 4008  ID_PROPERTY_EDITSYM = 4009
659  ID_CLASSIFY_EDITPROPS = 4009  ID_PROPERTY_SELECT = 4011
660  ID_CLASSIFY_CLOSE = 4010  ID_PROPERTY_TITLE = 4012
661    ID_PROPERTY_FIELDTEXT = 4013
662    
663  BTN_ADD = 0  BTN_ADD = 0
664  BTN_EDIT = 1  BTN_EDIT = 1
# Line 662  BTN_UP = 3 Line 667  BTN_UP = 3
667  BTN_DOWN = 4  BTN_DOWN = 4
668  BTN_RM = 5  BTN_RM = 5
669    
670  class Classifier(NonModalDialog):  EB_LAYER_TITLE = 0
671    EB_SELECT_FIELD = 1
672    EB_GEN_CLASS = 2
673    
674    class Classifier(NonModalNonParentDialog):
675    
676      type2string = {None:             _("None"),      type2string = {None:             _("None"),
677                     FIELDTYPE_STRING: _("Text"),                     FIELDTYPE_STRING: _("Text"),
678                     FIELDTYPE_INT:    _("Integer"),                     FIELDTYPE_INT:    _("Integer"),
679                     FIELDTYPE_DOUBLE: _("Decimal")}                     FIELDTYPE_DOUBLE: _("Decimal")}
680    
681      def __init__(self, parent, name, layer, group = None):      def __init__(self, parent, name, map, layer, group = None):
682          NonModalDialog.__init__(self, parent, name,          NonModalNonParentDialog.__init__(self, parent, name, "")
                                 _("Classifier: %s") % layer.Title())  
683    
684          panel = wxPanel(self, -1, size=(100, 100))          self.__SetTitle(layer.Title())
685    
686          self.layer = layer          self.layer = layer
687            self.map = map
688    
689          self.originalClass = self.layer.GetClassification()          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
690          field = self.originalClass.GetField()          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
691          fieldType = self.originalClass.GetFieldType()                               self.layer_shapestore_replaced)
692    
693          self.genDlg = None          self.genDlg = None
694    
695          topBox = wxBoxSizer(wxVERTICAL)          ############################
696          panelBox = wxBoxSizer(wxVERTICAL)          # Create the controls
   
         #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),  
             #0, wxALIGN_LEFT | wxALL, 4)  
         panelBox.Add(wxStaticText(panel, -1,  
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
   
   
697          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
   
         self.num_cols = layer.table.field_count()  
         # just assume the first field in case one hasn't been  
         # specified in the file.  
         self.__cur_field = 0  
   
         self.fields.Append("<None>")  
         self.fields.SetClientData(0, None)  
   
         for i in range(self.num_cols):  
             type, name, len, decc = layer.table.field_info(i)  
             self.fields.Append(name)  
   
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1,  
                                           copy.deepcopy(self.originalClass))  
             else:  
                 self.fields.SetClientData(i + 1, None)  
698    
699            panel = wxPanel(self, -1)
700    
701          ###########          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
   
702          self.fieldTypeText = wxStaticText(panel, -1, "")          self.fieldTypeText = wxStaticText(panel, -1, "")
         panelBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
703    
704          propertyBox = wxBoxSizer(wxHORIZONTAL)          if layer.HasClassification():
705          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              self.originalClass = self.layer.GetClassification()
706              0, wxALIGN_LEFT | wxALL, 4)              field = self.originalClass.GetField()
707          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              fieldType = self.originalClass.GetFieldType()
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
   
         panelBox.Add(propertyBox, 0, wxGROW, 4)  
708    
709                #
710                # make field choice box
711                #
712                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
713    
714          #              self.num_cols = layer.table.NumColumns()
715          # Control Box              # just assume the first field in case one hasn't been
716          #              # specified in the file.
717          controlBox = wxBoxSizer(wxHORIZONTAL)              self.__cur_field = 0
718    
719                self.fields.Append("<None>")
720    
721          ###########              if self.originalClass.GetFieldType() is None:
722          #                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
723          # Control buttons:              else:
724          #                  self.fields.SetClientData(0, None)
         self.controlButtons = []  
725    
726          controlButtonBox = wxBoxSizer(wxVERTICAL)              for i in range(self.num_cols):
727                    name = layer.table.Column(i).name
728                    self.fields.Append(name)
729    
730                    if name == field:
731                        self.__cur_field = i + 1
732                        self.fields.SetClientData(i + 1,
733                                                copy.deepcopy(self.originalClass))
734                    else:
735                        self.fields.SetClientData(i + 1, None)
736    
737          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))              button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
738          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                  _("Generate Class"))
739          self.controlButtons.append(button)              button_add = wxButton(panel, ID_PROPERTY_ADD,
740                    _("Add"))
741                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
742                    _("Move Up"))
743                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
744                    _("Move Down"))
745                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
746                    _("Edit Symbol"))
747                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
748                    _("Remove"))
749    
750                self.classGrid = ClassGrid(panel, self)
751    
752                # calling __SelectField after creating the classGrid fills in the
753                # grid with the correct information
754                self.fields.SetSelection(self.__cur_field)
755                self.__SelectField(self.__cur_field, group = group)
756    
757            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
758            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
759            button_ok = wxButton(self, wxID_OK, _("OK"))
760            button_ok.SetDefault()
761            button_close = wxButton(self, wxID_CANCEL, _("Close"))
762    
763          button = wxButton(panel, ID_CLASSIFY_EDITPROPS, _("Edit Properties"))          ############################
764          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          # Layout the controls
765          self.controlButtons.append(button)          #
766    
767          button = wxButton(panel, ID_CLASSIFY_GENCLASS, _("Generate Class"))          topBox = wxBoxSizer(wxVERTICAL)
768          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          panelBox = wxBoxSizer(wxVERTICAL)
         self.controlButtons.append(button)  
769    
770          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          sizer = wxBoxSizer(wxHORIZONTAL)
771          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
772          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
773            sizer.Add(text_title, 1, wxGROW, 0)
774    
775          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
776    
777          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          if isinstance(layer, RasterLayer):
778                type = "Image"
779            else:
780                type = layer.ShapeType()
781    
782          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
783          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              0, wxALIGN_LEFT | wxALL, 4)
         self.controlButtons.append(button)  
784    
785            if layer.HasClassification():
786    
787          ###########              classBox = wxStaticBoxSizer(
788          #                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         # Classification data table  
         #  
789    
         self.classGrid = ClassGrid(panel, self)  
         #self.__SetGridTable(self.__cur_field, group)  
         #self.fields.SetSelection(self.__cur_field)  
790    
791          # calling __SelectField after creating the classGrid fills in the              sizer = wxBoxSizer(wxHORIZONTAL)
792          # grid with the correct information              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
793          self.fields.SetSelection(self.__cur_field)                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
794          self.__SelectField(self.__cur_field, group = group)              sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
795    
796          #self.classGrid.SelectGroup(group)              classBox.Add(sizer, 0, wxGROW, 4)
797    
798          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox.Add(self.fieldTypeText, 0,
799                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
800    
801                controlBox = wxBoxSizer(wxHORIZONTAL)
802                controlButtonBox = wxBoxSizer(wxVERTICAL)
803    
804                controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
805                controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
806                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
807                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
808                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
809                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
810                controlButtonBox.Add(button_remove, 0,
811                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
812    
813          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox.Add(self.classGrid, 1, wxGROW, 0)
814          panelBox.Add(controlBox, 1, wxGROW, 10)              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
815    
816          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              classBox.Add(controlBox, 1, wxGROW, 10)
817          EVT_BUTTON(self, ID_CLASSIFY_EDITPROPS, self._OnEditGroupProperties)              panelBox.Add(classBox, 1, wxGROW, 0)
         EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)  
         EVT_BUTTON(self, ID_CLASSIFY_GENCLASS, self._OnGenClass)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
818    
         ###########  
819    
820          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
821          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
822                        0, wxALL, 4)          buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
823          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
824          buttonBox.Add(wxButton(panel, ID_CLASSIFY_APPLY, _("Apply")),          buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CLOSE, _("Close")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CANCEL, _("Cancel")),  
                       0, wxALL, 4)  
         panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)  
   
         EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)  
         EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)  
         EVT_BUTTON(self, ID_CLASSIFY_CLOSE, self._OnCloseBtn)  
         EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)  
   
         ###########  
   
825    
826          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
827          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
828            panelBox.Fit(panel)
829          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
830    
831          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
832          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
833    
834          self.SetAutoLayout(True)          self.SetAutoLayout(True)
835          self.SetSizer(topBox)          self.SetSizer(topBox)
836            topBox.Fit(self)
837            topBox.SetSizeHints(self)
838            self.Layout()
839    
840            ###########
841    
842            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
843            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
844            EVT_BUTTON(self, wxID_OK, self._OnOK)
845            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
846            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
847            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
848    
849            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
850            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
851            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
852            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
853            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
854            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
855    
         #self.Fit()  
856          ######################          ######################
857    
858            text_title.SetFocus()
859          self.haveApplied = False          self.haveApplied = False
860    
861      def EditGroupProperties(self, row):      def unsubscribe_messages(self):
862            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
863            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
864                                   self.layer_shapestore_replaced)
865    
866        def map_layers_removed(self, map):
867            if self.layer not in self.map.Layers():
868                self.unsubscribe_messages()
869                self.Close()
870    
871        def layer_shapestore_replaced(self, *args):
872            self.unsubscribe_messages()
873            self.Close()
874    
875        def EditSymbol(self, row):
876          table = self.classGrid.GetTable()          table = self.classGrid.GetTable()
877          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
878    
# Line 918  class Classifier(NonModalDialog): Line 947  class Classifier(NonModalDialog):
947    
948          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
949    
950          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
951    
952      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
953          """This method assumes that the current selection for the          """This method assumes that the current selection for the
# Line 933  class Classifier(NonModalDialog): Line 962  class Classifier(NonModalDialog):
962    
963          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
964    
965          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
966    
967          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
968    
969        def __SetTitle(self, title):
970            if title != "":
971                title = ": " + title
972    
973            self.SetTitle(_("Layer Properties") + title)
974    
975      def _OnEditGroupProperties(self, event):      def _OnEditSymbol(self, event):
976          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
977    
978          if len(sel) == 1:          if len(sel) == 1:
979              self.EditGroupProperties(sel[0])              self.EditSymbol(sel[0])
980    
981      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
982          index = self.fields.GetSelection()          index = self.fields.GetSelection()
983          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
984          self.__cur_field = index          self.__cur_field = index
985    
986      def _OnApply(self, event):      def _OnTry(self, event):
987          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
988             it to the layer.             it to the layer.
989          """          """
990    
991          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
992                clazz = self.fields.GetClientData(self.__cur_field)
993    
994          #              #
995          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
996          # to begin with or it has been modified              # to begin with or it has been modified
997          #              #
998          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
999              clazz = self.__BuildClassification(self.__cur_field, True)              if clazz is None or self.classGrid.GetTable().IsModified():
1000                    clazz = self.__BuildClassification(self.__cur_field, True)
1001    
1002          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
1003    
1004          self.haveApplied = True          self.haveApplied = True
1005    
1006      def _OnOK(self, event):      def _OnOK(self, event):
1007          self._OnApply(event)          self._OnTry(event)
1008          self.Close()          self.Close()
1009    
1010        def OnClose(self, event):
1011            NonModalNonParentDialog.OnClose(self, event)
1012    
1013      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
1014          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
1015          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 982  class Classifier(NonModalDialog): Line 1018  class Classifier(NonModalDialog):
1018    
1019          self.Close()          self.Close()
1020    
1021      def _OnCancel(self, event):      def _OnRevert(self, event):
1022          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1023          if self.haveApplied:          if self.haveApplied:
1024              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1025    
1026          self.Close()          #self.Close()
1027    
1028      def _OnAdd(self, event):      def _OnAdd(self, event):
1029          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 997  class Classifier(NonModalDialog): Line 1033  class Classifier(NonModalDialog):
1033    
1034      def _OnGenClass(self, event):      def _OnGenClass(self, event):
1035    
         #if self.genDlg is None:  
1036          self.genDlg = ClassGenDialog(self, self.layer,          self.genDlg = ClassGenDialog(self, self.layer,
1037                            self.fields.GetString(self.__cur_field))                            self.fields.GetString(self.__cur_field))
1038    
1039          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1040    
1041          self.fields.Enable(False)          self.__EnableButtons(EB_GEN_CLASS, False)
         self.controlButtons[BTN_EDIT].Enable(False)  
         self.controlButtons[BTN_GEN].Enable(False)  
1042    
1043          self.genDlg.Show()          self.genDlg.Show()
         #if self.genDlg.ShowModal() == wxID_OK:  
         #    clazz = self.genDlg.GetClassification()  
         #    self.fields.SetClientData(self.__cur_field, clazz)  
         #    self.classGrid.GetTable().SetClassification(clazz)  
         #self.Enable(True)  
         #self.genDlg.Destroy()  
1044    
1045      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1046          self.genDlg.Destroy()          self.genDlg.Destroy()
1047            self.__EnableButtons(EB_GEN_CLASS, True)
         self.fields.Enable(True)  
         self.controlButtons[BTN_EDIT].Enable(True)  
         self.controlButtons[BTN_GEN].Enable(True)  
1048    
1049      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1050          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1052  class Classifier(NonModalDialog): Line 1076  class Classifier(NonModalDialog):
1076                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1077                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1078    
1079        def _OnTitleChanged(self, event):
1080            obj = event.GetEventObject()
1081    
1082            self.layer.SetTitle(obj.GetValue())
1083            self.__SetTitle(self.layer.Title())
1084    
1085            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1086    
1087        def __EnableButtons(self, case, enable):
1088    
1089            if case == EB_LAYER_TITLE:  
1090                list = (wxID_OK,
1091                        wxID_CANCEL)
1092    
1093            elif case == EB_SELECT_FIELD:
1094                list = (ID_PROPERTY_GENCLASS,
1095                        ID_PROPERTY_ADD,
1096                        ID_PROPERTY_MOVEUP,
1097                        ID_PROPERTY_MOVEDOWN,
1098                        ID_PROPERTY_EDITSYM,
1099                        ID_PROPERTY_REMOVE)
1100    
1101            elif case == EB_GEN_CLASS:
1102                list = (ID_PROPERTY_SELECT,
1103                        ID_PROPERTY_FIELDTEXT,
1104                        ID_PROPERTY_GENCLASS,
1105                        ID_PROPERTY_EDITSYM)
1106    
1107            for id in list:
1108                self.FindWindowById(id).Enable(enable)
1109    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1110  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1111  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1112  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1093  class SelectPropertiesDialog(wxDialog): Line 1145  class SelectPropertiesDialog(wxDialog):
1145          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1146    
1147          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1148          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1149              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1150              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1151          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1152    
1153          lineColorBox.Add(          lineColorBox.Add(
# Line 1141  class SelectPropertiesDialog(wxDialog): Line 1193  class SelectPropertiesDialog(wxDialog):
1193          # Control buttons:          # Control buttons:
1194          #          #
1195          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1196          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1197                        0, wxALL, 4)          button_ok.SetDefault()
1198          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1199                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1200          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1201            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1202                                                                                                                                                                    
1203          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1204          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1205                                                                                                                                                                    
1206          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1207          self.SetSizer(topBox)          self.SetSizer(topBox)
1208          topBox.Fit(self)          topBox.Fit(self)
1209          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1210    
1211      def _OnOK(self, event):      def OnOK(self, event):
1212          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1213    
1214      def _OnCancel(self, event):      def OnCancel(self, event):
1215          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1216    
1217      def _OnSpin(self, event):      def _OnSpin(self, event):
Legend:
Removed from v.630  
changed lines
  Added in v.1142
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26