/[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 638 by jonathan, Thu Apr 10 14:35:20 2003 UTC revision 1058 by frank, Tue May 27 11:30:29 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.range import Range
24    from Thuban.Model.classification import \
25        Classification, ClassGroupDefault, \
26        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
27        ClassGroupProperties
28    
29  from Thuban.Model.color import Color  from Thuban.Model.color import Color
30    
31  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
32        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
33    
34  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator
35    
36  from dialogs import NonModalDialog  from dialogs import NonModalNonParentDialog
37    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
38  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
39    
40    
# Line 65  class ClassGrid(wxGrid): Line 67  class ClassGrid(wxGrid):
67                   use for display.                   use for display.
68          """          """
69    
70          wxGrid.__init__(self, parent, ID_CLASS_TABLE)          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
71    
72          self.classifier = classifier          self.classifier = classifier
73    
# Line 87  class ClassGrid(wxGrid): Line 89  class ClassGrid(wxGrid):
89    
90          table = self.GetTable()          table = self.GetTable()
91          if table is None:          if table is None:
92              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
93              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
94                h = self.GetDefaultRowSize() * 4 \
95                    + self.GetDefaultColLabelSize()
96    
97              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
98              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
99              table = ClassTable(self)              table = ClassTable(self)
# Line 243  class ClassGrid(wxGrid): Line 248  class ClassGrid(wxGrid):
248    
249      def _OnCellResize(self, event):      def _OnCellResize(self, event):
250          self.FitInside()          self.FitInside()
251            event.Skip()
252    
253  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
254      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
# Line 397  class ClassTable(wxPyGridTableBase): Line 403  class ClassTable(wxPyGridTableBase):
403              if isinstance(group, ClassGroupMap):       return _("Map")              if isinstance(group, ClassGroupMap):       return _("Map")
404    
405          assert False # shouldn't get here          assert False # shouldn't get here
406          return _("")          return ""
407    
408      def GetNumberRows(self):      def GetNumberRows(self):
409          """Return the number of rows."""          """Return the number of rows."""
# Line 457  class ClassTable(wxPyGridTableBase): Line 463  class ClassTable(wxPyGridTableBase):
463          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
464              return group.GetValue()              return group.GetValue()
465          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
466              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
467    
468          assert(False) # shouldn't get here          assert False # shouldn't get here
469          return None          return None
470    
471      def __ParseInput(self, value):      def __ParseInput(self, value):
472          """Try to determine what kind of input value is          """Try to determine what kind of input value is
473             (string, number, or range)             (string, number, or range)
474    
475          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
476          value, or of length two if it is a range.          a singleton value, or 1 if is a range
477          """          """
478    
479          type = self.fieldType          type = self.fieldType
480    
481          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
482              return (value,)              return (0, value)
483          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
484              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
485                    # the float call allows the user to enter 1.0 for 1
486                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
487              else:              else:
488                  conv = lambda p: p                  conv = float
489    
490              #              #
491              # first try to take the input as a single number              # first try to take the input as a single number
492              # if there's an exception try to break it into              # if there's an exception try to break it into
493              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
494              # 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.  
495              #              #
496              try:              try:
497                  return (conv(Str2Num(value)),)                  return (0, conv(value))
498              except ValueError:              except ValueError:
499                  i = value.find('-')                  return (1, Range(value))
                 if i == 0:  
                     i = value.find('-', 1)  
   
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
500    
501          assert False  # shouldn't get here          assert False  # shouldn't get here
502          return (0,)          return (0,None)
               
503    
504      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
505          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 515  class ClassTable(wxPyGridTableBase): Line 513  class ClassTable(wxPyGridTableBase):
513          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
514          """          """
515    
516          assert col >= 0 and col < self.GetNumberCols()          assert 0 <= col < self.GetNumberCols()
517          assert row >= 0 and row < self.GetNumberRows()          assert 0 <= row < self.GetNumberRows()
518    
519          if row == 0:          if row == 0:
520              group = self.clazz.GetDefaultGroup()              group = self.clazz.GetDefaultGroup()
# Line 555  class ClassTable(wxPyGridTableBase): Line 553  class ClassTable(wxPyGridTableBase):
553                      # changing the underlying group type if the                      # changing the underlying group type if the
554                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
555                      #                      #
556                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
557                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
558                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
559                              changed = True                              changed = True
560                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
561                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
562                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
563                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
564                              changed = True                              changed = True
565                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
566                      else:                      else:
567                          assert False                          assert False
568                          pass                          pass
# Line 649  class ClassTable(wxPyGridTableBase): Line 647  class ClassTable(wxPyGridTableBase):
647              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
648    
649    
650  ID_CLASSIFY_OK = 4001  ID_PROPERTY_REVERT = 4002
651  ID_CLASSIFY_REVERT = 4002  ID_PROPERTY_ADD = 4003
652  ID_CLASSIFY_ADD = 4003  ID_PROPERTY_GENCLASS = 4004
653  ID_CLASSIFY_GENCLASS = 4004  ID_PROPERTY_REMOVE = 4005
654  ID_CLASSIFY_REMOVE = 4005  ID_PROPERTY_MOVEUP = 4006
655  ID_CLASSIFY_MOVEUP = 4006  ID_PROPERTY_MOVEDOWN = 4007
656  ID_CLASSIFY_MOVEDOWN = 4007  ID_PROPERTY_TRY = 4008
657  ID_CLASSIFY_TRY = 4008  ID_PROPERTY_EDITSYM = 4009
658  ID_CLASSIFY_EDITSYM = 4009  ID_PROPERTY_SELECT = 4011
659  ID_CLASSIFY_CLOSE = 4010  ID_PROPERTY_TITLE = 4012
660    ID_PROPERTY_FIELDTEXT = 4013
661    
662  BTN_ADD = 0  BTN_ADD = 0
663  BTN_EDIT = 1  BTN_EDIT = 1
# Line 667  BTN_UP = 3 Line 666  BTN_UP = 3
666  BTN_DOWN = 4  BTN_DOWN = 4
667  BTN_RM = 5  BTN_RM = 5
668    
669  class Classifier(NonModalDialog):  EB_LAYER_TITLE = 0
670    EB_SELECT_FIELD = 1
671    EB_GEN_CLASS = 2
672    
673    class Classifier(NonModalNonParentDialog):
674    
675      type2string = {None:             _("None"),      type2string = {None:             _("None"),
676                     FIELDTYPE_STRING: _("Text"),                     FIELDTYPE_STRING: _("Text"),
# Line 675  class Classifier(NonModalDialog): Line 678  class Classifier(NonModalDialog):
678                     FIELDTYPE_DOUBLE: _("Decimal")}                     FIELDTYPE_DOUBLE: _("Decimal")}
679    
680      def __init__(self, parent, name, layer, group = None):      def __init__(self, parent, name, layer, group = None):
681          NonModalDialog.__init__(self, parent, name,          NonModalNonParentDialog.__init__(self, parent, name, "")
                                 _("Classifier: %s") % layer.Title())  
682    
683          panel = wxPanel(self, -1, size=(100, 100))          self.__SetTitle(layer.Title())
684    
685          self.layer = layer          self.layer = layer
686    
         self.originalClass = self.layer.GetClassification()  
         field = self.originalClass.GetField()  
         fieldType = self.originalClass.GetFieldType()  
687    
688          self.genDlg = None          self.genDlg = None
689    
690          topBox = wxBoxSizer(wxVERTICAL)          ############################
691          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)  
   
   
         #  
         # make field combo box  
692          #          #
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
693    
694          self.num_cols = layer.table.field_count()          panel = wxPanel(self, -1)
         # 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)  
695    
696            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
697            self.fieldTypeText = wxStaticText(panel, -1, "")
698    
699          ###########          if layer.HasClassification():
700                self.originalClass = self.layer.GetClassification()
701                field = self.originalClass.GetField()
702                fieldType = self.originalClass.GetFieldType()
703    
704          self.fieldTypeText = wxStaticText(panel, -1, "")              #
705          panelBox.Add(self.fieldTypeText, 0,              # make field choice box
706                       wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)              #
707                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
708    
709          propertyBox = wxBoxSizer(wxHORIZONTAL)              self.num_cols = layer.table.NumColumns()
710          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              # just assume the first field in case one hasn't been
711              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
712          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              self.__cur_field = 0
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
713    
714          panelBox.Add(propertyBox, 0, wxGROW, 4)              self.fields.Append("<None>")
715    
716                if self.originalClass.GetFieldType() is None:
717                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
718                else:
719                    self.fields.SetClientData(0, None)
720    
721          #              for i in range(self.num_cols):
722          # Control Box                  name = layer.table.Column(i).name
723          #                  self.fields.Append(name)
724          controlBox = wxBoxSizer(wxHORIZONTAL)  
725                    if name == field:
726                        self.__cur_field = i + 1
727                        self.fields.SetClientData(i + 1,
728                                                copy.deepcopy(self.originalClass))
729                    else:
730                        self.fields.SetClientData(i + 1, None)
731    
732                button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
733                    _("Generate Class"))
734                button_add = wxButton(panel, ID_PROPERTY_ADD,
735                    _("Add"))
736                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
737                    _("Move Up"))
738                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
739                    _("Move Down"))
740                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
741                    _("Edit Symbol"))
742                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
743                    _("Remove"))
744    
745                self.classGrid = ClassGrid(panel, self)
746    
747                # calling __SelectField after creating the classGrid fills in the
748                # grid with the correct information
749                self.fields.SetSelection(self.__cur_field)
750                self.__SelectField(self.__cur_field, group = group)
751    
752            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
753            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
754            button_ok = wxButton(self, wxID_OK, _("OK"))
755            button_ok.SetDefault()
756            button_close = wxButton(self, wxID_CANCEL, _("Close"))
757    
758          ###########          ############################
759          #          # Layout the controls
         # Control buttons:  
760          #          #
         self.controlButtons = []  
   
         controlButtonBox = wxBoxSizer(wxVERTICAL)  
761    
762          button = wxButton(panel, ID_CLASSIFY_GENCLASS, _("Generate Class"))          topBox = wxBoxSizer(wxVERTICAL)
763          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          panelBox = wxBoxSizer(wxVERTICAL)
         self.controlButtons.append(button)  
764    
765          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          sizer = wxBoxSizer(wxHORIZONTAL)
766          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
767          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
768            sizer.Add(text_title, 1, wxGROW, 0)
769    
770          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
771    
772          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))          if isinstance(layer, RasterLayer):
773          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              type = "Image"
774          self.controlButtons.append(button)          else:
775                type = layer.ShapeType()
776    
777          button = wxButton(panel, ID_CLASSIFY_EDITSYM, _("Edit Symbol"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
778          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
         self.controlButtons.append(button)  
779    
780          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          if layer.HasClassification():
781    
782          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))              classBox = wxStaticBoxSizer(
783          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         self.controlButtons.append(button)  
784    
785    
786          ###########              sizer = wxBoxSizer(wxHORIZONTAL)
787          #              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
788          # Classification data table                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
789          #              sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
790    
791          self.classGrid = ClassGrid(panel, self)              classBox.Add(sizer, 0, wxGROW, 4)
 #       self.classGrid = wxGrid(panel, -1)  
 #       self.classGrid.SetDefaultRenderer(wxGridCellBoolRenderer())  
 #       self.classGrid.SetDefaultEditor(wxGridCellBoolEditor())  
         #self.classGrid.CreateGrid(5, 5)  
         #self.classGrid.SetCellEditor(0, 0, wxGridCellBoolEditor())  
         #self.classGrid.SetCellRenderer(0, 0, wxGridCellBoolRenderer())  
         #print self.classGrid.GetCellEditor(0, 0)  
         #print self.classGrid.GetCellRenderer(0, 0)  
         #self.classGrid = ClassGrid(panel, self)  
   
         # need these  
         self.__SetGridTable(self.__cur_field, group)  
         self.fields.SetSelection(self.__cur_field)  
         #self.classGrid.SetCellEditor(0, 0, wxGridCellBoolEditor())  
         #self.classGrid.SetCellRenderer(0, 0, wxGridCellBoolRenderer())  
   
         # calling __SelectField after creating the classGrid fills in the  
         # grid with the correct information  
         #self.fields.SetSelection(self.__cur_field)  
         #self.__SelectField(self.__cur_field, group = group)  
   
         #self.classGrid.SelectGroup(group)  
   
         controlBox.Add(self.classGrid, 1, wxGROW, 0)  
792    
793                classBox.Add(self.fieldTypeText, 0,
794                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
795    
796                controlBox = wxBoxSizer(wxHORIZONTAL)
797                controlButtonBox = wxBoxSizer(wxVERTICAL)
798    
799          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
800          panelBox.Add(controlBox, 1, wxGROW, 10)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
801                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
802          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
803          EVT_BUTTON(self, ID_CLASSIFY_EDITSYM, self._OnEditSymbol)              controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
804          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
805          EVT_BUTTON(self, ID_CLASSIFY_GENCLASS, self._OnGenClass)              controlButtonBox.Add(button_remove, 0,
806          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)                                   wxGROW|wxALL|wxALIGN_BOTTOM, 4)
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
807    
808          ###########              controlBox.Add(self.classGrid, 1, wxGROW, 0)
809                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
810    
811          buttonBox = wxBoxSizer(wxHORIZONTAL)              classBox.Add(controlBox, 1, wxGROW, 10)
812          buttonBox.Add(wxButton(panel, ID_CLASSIFY_TRY, _("Try")),              panelBox.Add(classBox, 1, wxGROW, 0)
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_REVERT, _("Revert")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CLOSE, _("Close")),  
                       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_TRY, self._OnTry)  
         EVT_BUTTON(self, ID_CLASSIFY_CLOSE, self._OnCloseBtn)  
         EVT_BUTTON(self, ID_CLASSIFY_REVERT, self._OnRevert)  
813    
         ###########  
814    
815            buttonBox = wxBoxSizer(wxHORIZONTAL)
816            buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
817            buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
818            buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
819            buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
820    
821          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
822          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
823            panelBox.Fit(panel)
824          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
825    
826          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
827          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
828    
829          self.SetAutoLayout(True)          self.SetAutoLayout(True)
830          self.SetSizer(topBox)          self.SetSizer(topBox)
831            topBox.Fit(self)
832            topBox.SetSizeHints(self)
833            self.Layout()
834    
835            ###########
836    
837            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
838            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
839            EVT_BUTTON(self, wxID_OK, self._OnOK)
840            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
841            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
842            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
843    
844            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
845            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
846            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
847            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
848            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
849            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
850    
         #self.Fit()  
851          ######################          ######################
852    
853            text_title.SetFocus()
854          self.haveApplied = False          self.haveApplied = False
855    
856      def EditSymbol(self, row):      def EditSymbol(self, row):
# Line 936  class Classifier(NonModalDialog): Line 928  class Classifier(NonModalDialog):
928    
929          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
930    
931          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
932    
933      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
934          """This method assumes that the current selection for the          """This method assumes that the current selection for the
# Line 951  class Classifier(NonModalDialog): Line 943  class Classifier(NonModalDialog):
943    
944          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
945    
946          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
947    
948          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
949    
950        def __SetTitle(self, title):
951            if title != "":
952                title = ": " + title
953    
954            self.SetTitle(_("Layer Properties") + title)
955    
956      def _OnEditSymbol(self, event):      def _OnEditSymbol(self, event):
957          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 975  class Classifier(NonModalDialog): Line 969  class Classifier(NonModalDialog):
969             it to the layer.             it to the layer.
970          """          """
971    
972          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
973                clazz = self.fields.GetClientData(self.__cur_field)
974    
975          #              #
976          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
977          # to begin with or it has been modified              # to begin with or it has been modified
978          #              #
979          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
980              clazz = self.__BuildClassification(self.__cur_field, True)              if clazz is None or self.classGrid.GetTable().IsModified():
981                    clazz = self.__BuildClassification(self.__cur_field, True)
982    
983          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
984    
985          self.haveApplied = True          self.haveApplied = True
986    
# Line 992  class Classifier(NonModalDialog): Line 988  class Classifier(NonModalDialog):
988          self._OnTry(event)          self._OnTry(event)
989          self.Close()          self.Close()
990    
991        def OnClose(self, event):
992            NonModalNonParentDialog.OnClose(self, event)
993    
994      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
995          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
996          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1015  class Classifier(NonModalDialog): Line 1014  class Classifier(NonModalDialog):
1014    
1015      def _OnGenClass(self, event):      def _OnGenClass(self, event):
1016    
         #if self.genDlg is None:  
1017          self.genDlg = ClassGenDialog(self, self.layer,          self.genDlg = ClassGenDialog(self, self.layer,
1018                            self.fields.GetString(self.__cur_field))                            self.fields.GetString(self.__cur_field))
1019    
1020          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1021    
1022          self.fields.Enable(False)          self.__EnableButtons(EB_GEN_CLASS, False)
         self.controlButtons[BTN_EDIT].Enable(False)  
         self.controlButtons[BTN_GEN].Enable(False)  
1023    
1024          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()  
1025    
1026      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1027          self.genDlg.Destroy()          self.genDlg.Destroy()
1028            self.__EnableButtons(EB_GEN_CLASS, True)
         self.fields.Enable(True)  
         self.controlButtons[BTN_EDIT].Enable(True)  
         self.controlButtons[BTN_GEN].Enable(True)  
1029    
1030      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1031          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1070  class Classifier(NonModalDialog): Line 1057  class Classifier(NonModalDialog):
1057                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1058                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1059    
1060        def _OnTitleChanged(self, event):
1061            obj = event.GetEventObject()
1062    
1063            self.layer.SetTitle(obj.GetValue())
1064            self.__SetTitle(self.layer.Title())
1065    
1066            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1067    
1068        def __EnableButtons(self, case, enable):
1069    
1070            if case == EB_LAYER_TITLE:  
1071                list = (wxID_OK,
1072                        wxID_CANCEL)
1073    
1074            elif case == EB_SELECT_FIELD:
1075                list = (ID_PROPERTY_GENCLASS,
1076                        ID_PROPERTY_ADD,
1077                        ID_PROPERTY_MOVEUP,
1078                        ID_PROPERTY_MOVEDOWN,
1079                        ID_PROPERTY_EDITSYM,
1080                        ID_PROPERTY_REMOVE)
1081    
1082            elif case == EB_GEN_CLASS:
1083                list = (ID_PROPERTY_SELECT,
1084                        ID_PROPERTY_FIELDTEXT,
1085                        ID_PROPERTY_GENCLASS,
1086                        ID_PROPERTY_EDITSYM)
1087    
1088            for id in list:
1089                self.FindWindowById(id).Enable(enable)
1090    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1091  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1092  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1093  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1111  class SelectPropertiesDialog(wxDialog): Line 1126  class SelectPropertiesDialog(wxDialog):
1126          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1127    
1128          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1129          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1130              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1131              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1132          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1133    
1134          lineColorBox.Add(          lineColorBox.Add(
# Line 1159  class SelectPropertiesDialog(wxDialog): Line 1174  class SelectPropertiesDialog(wxDialog):
1174          # Control buttons:          # Control buttons:
1175          #          #
1176          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1177          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1178                        0, wxALL, 4)          button_ok.SetDefault()
1179          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1180                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1181          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1182            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1183                                                                                                                                                                    
1184          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1185          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1186                                                                                                                                                                    
1187          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1188          self.SetSizer(topBox)          self.SetSizer(topBox)
1189          topBox.Fit(self)          topBox.Fit(self)
1190          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1191    
1192      def _OnOK(self, event):      def OnOK(self, event):
1193          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1194    
1195      def _OnCancel(self, event):      def OnCancel(self, event):
1196          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1197    
1198      def _OnSpin(self, event):      def _OnSpin(self, event):
Legend:
Removed from v.638  
changed lines
  Added in v.1058
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26