/[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 878 by jonathan, Fri May 9 16:32:31 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, \
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 NonModalDialog
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    EB_LAYER_TITLE = 0
670    EB_SELECT_FIELD = 1
671    EB_GEN_CLASS = 2
672    
673  class Classifier(NonModalDialog):  class Classifier(NonModalDialog):
674    
675      type2string = {None:             _("None"),      type2string = {None:             _("None"),
# 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,          NonModalDialog.__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    
# Line 688  class Classifier(NonModalDialog): Line 690  class Classifier(NonModalDialog):
690    
691          self.genDlg = None          self.genDlg = None
692    
693          topBox = wxBoxSizer(wxVERTICAL)          ############################
694          panelBox = wxBoxSizer(wxVERTICAL)          # Create the controls
695            #
         #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)  
696    
697            panel = wxPanel(self, -1)
698    
699            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
700          #          #
701          # make field combo box          # make field choice box
702          #          #
703          self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",          self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
                                      style = wxCB_READONLY)  
704    
705          self.num_cols = layer.table.field_count()          self.num_cols = layer.table.NumColumns()
706          # just assume the first field in case one hasn't been          # just assume the first field in case one hasn't been
707          # specified in the file.          # specified in the file.
708          self.__cur_field = 0          self.__cur_field = 0
709    
710          self.fields.Append("<None>")          self.fields.Append("<None>")
711          self.fields.SetClientData(0, None)  
712            if self.originalClass.GetFieldType() is None:
713                self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
714            else:
715                self.fields.SetClientData(0, None)
716    
717          for i in range(self.num_cols):          for i in range(self.num_cols):
718              type, name, len, decc = layer.table.field_info(i)              name = layer.table.Column(i).name
719              self.fields.Append(name)              self.fields.Append(name)
720    
721              if name == field:              if name == field:
# Line 724  class Classifier(NonModalDialog): Line 726  class Classifier(NonModalDialog):
726                  self.fields.SetClientData(i + 1, None)                  self.fields.SetClientData(i + 1, None)
727    
728    
         ###########  
   
729          self.fieldTypeText = wxStaticText(panel, -1, "")          self.fieldTypeText = wxStaticText(panel, -1, "")
         panelBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
730    
731          propertyBox = wxBoxSizer(wxHORIZONTAL)          button_gen = wxButton(panel, ID_PROPERTY_GENCLASS, _("Generate Class"))
         propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),  
             0, wxALIGN_LEFT | wxALL, 4)  
         propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)  
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
732    
733          panelBox.Add(propertyBox, 0, wxGROW, 4)          button_add = wxButton(panel, ID_PROPERTY_ADD, _("Add"))
734            button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP, _("Move Up"))
735            button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN, _("Move Down"))
736            button_edit = wxButton(panel, ID_PROPERTY_EDITSYM, _("Edit Symbol"))
737            button_remove = wxButton(panel, ID_PROPERTY_REMOVE, _("Remove"))
738    
739    
740          #          button_try = wxButton(panel, ID_PROPERTY_TRY, _("Try"))
741          # Control Box          button_revert = wxButton(panel, ID_PROPERTY_REVERT, _("Revert"))
742          #          button_ok = wxButton(panel, wxID_OK, _("OK"))
743          controlBox = wxBoxSizer(wxHORIZONTAL)          button_ok.SetDefault()
744            button_close = wxButton(panel, wxID_CANCEL, _("Close"))
745    
746            self.classGrid = ClassGrid(panel, self)
747    
748          ###########          # calling __SelectField after creating the classGrid fills in the
749          #          # grid with the correct information
750          # Control buttons:          self.fields.SetSelection(self.__cur_field)
751            self.__SelectField(self.__cur_field, group = group)
752    
753            ############################
754            # Layout the controls
755          #          #
         self.controlButtons = []  
756    
757          controlButtonBox = wxBoxSizer(wxVERTICAL)          topBox = wxBoxSizer(wxVERTICAL)
758            panelBox = wxBoxSizer(wxVERTICAL)
759    
760          button = wxButton(panel, ID_CLASSIFY_GENCLASS, _("Generate Class"))          sizer = wxBoxSizer(wxHORIZONTAL)
761          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
762          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
763            sizer.Add(text_title, 1, wxGROW, 0)
         button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         button = wxButton(panel, ID_CLASSIFY_EDITSYM, _("Edit Symbol"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
   
         button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
         self.controlButtons.append(button)  
764    
765            panelBox.Add(sizer, 0, wxGROW, 4)
766    
767          ###########          panelBox.Add(wxStaticText(panel, -1,
768          #                                  _("Type: %s") % layer.ShapeType()),
769          # Classification data table              0, wxALIGN_LEFT | wxALL, 4)
         #  
770    
771          self.classGrid = ClassGrid(panel, self)          classBox = wxStaticBoxSizer(
772  #       self.classGrid = wxGrid(panel, -1)                      wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
 #       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)  
773    
         # 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())  
774    
775          # calling __SelectField after creating the classGrid fills in the          sizer = wxBoxSizer(wxHORIZONTAL)
776          # grid with the correct information          sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
777          #self.fields.SetSelection(self.__cur_field)              0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
778          #self.__SelectField(self.__cur_field, group = group)          sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
779    
780          #self.classGrid.SelectGroup(group)          classBox.Add(sizer, 0, wxGROW, 4)
781    
782          controlBox.Add(self.classGrid, 1, wxGROW, 0)          classBox.Add(self.fieldTypeText, 0,
783                         wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
784    
785            controlBox = wxBoxSizer(wxHORIZONTAL)
786            controlButtonBox = wxBoxSizer(wxVERTICAL)
787    
788            controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
789            controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
790            controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
791            controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
792            controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
793            controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
794            controlButtonBox.Add(button_remove, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
795    
796            controlBox.Add(self.classGrid, 1, wxGROW, 0)
797          controlBox.Add(controlButtonBox, 0, wxGROW, 10)          controlBox.Add(controlButtonBox, 0, wxGROW, 10)
         panelBox.Add(controlBox, 1, wxGROW, 10)  
798    
799          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)          classBox.Add(controlBox, 1, wxGROW, 10)
800          EVT_BUTTON(self, ID_CLASSIFY_EDITSYM, self._OnEditSymbol)          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)  
801    
         ###########  
802    
803          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
804          buttonBox.Add(wxButton(panel, ID_CLASSIFY_TRY, _("Try")),          buttonBox.Add(button_try, 0, wxALL, 4)
                       0, wxALL, 4)  
805          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
806          buttonBox.Add(wxButton(panel, ID_CLASSIFY_REVERT, _("Revert")),          buttonBox.Add(button_revert, 0, wxALL, 4)
                       0, wxALL, 4)  
807          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
808          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_ok, 0, wxALL, 4)
                       0, wxALL, 4)  
809          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
810          buttonBox.Add(wxButton(panel, ID_CLASSIFY_CLOSE, _("Close")),          buttonBox.Add(button_close, 0, wxALL, 4)
811                        0, wxALL, 4)          panelBox.Add(buttonBox, 0,
812          panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)              wxALL|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          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
815          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
816            panelBox.Fit(panel)
817          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
818    
819          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
820          panelBox.SetSizeHints(self)  
821          self.SetAutoLayout(True)          self.SetAutoLayout(True)
822          self.SetSizer(topBox)          self.SetSizer(topBox)
823            topBox.Fit(self)
824            topBox.SetSizeHints(self)
825            self.Layout()
826    
827            ###########
828    
829            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
830            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
831            EVT_BUTTON(self, wxID_OK, self._OnOK)
832            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
833            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
834            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
835    
836            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
837            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
838            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
839            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
840            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
841            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
842    
         #self.Fit()  
843          ######################          ######################
844    
845            self.fields.SetFocus()
846          self.haveApplied = False          self.haveApplied = False
847    
848      def EditSymbol(self, row):      def EditSymbol(self, row):
# Line 936  class Classifier(NonModalDialog): Line 920  class Classifier(NonModalDialog):
920    
921          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
922    
923          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
924    
925      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
926          """This method assumes that the current selection for the          """This method assumes that the current selection for the
# Line 951  class Classifier(NonModalDialog): Line 935  class Classifier(NonModalDialog):
935    
936          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
937    
938          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
939    
940          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
941    
942        def __SetTitle(self, title):
943            if title != "":
944                title = ": " + title
945    
946            self.SetTitle(_("Layer Properties") + title)
947    
948      def _OnEditSymbol(self, event):      def _OnEditSymbol(self, event):
949          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 981  class Classifier(NonModalDialog): Line 967  class Classifier(NonModalDialog):
967          # only build the classification if there wasn't one to          # only build the classification if there wasn't one to
968          # to begin with or it has been modified          # to begin with or it has been modified
969          #          #
970            self.classGrid.SaveEditControlValue()
971          if clazz is None or self.classGrid.GetTable().IsModified():          if clazz is None or self.classGrid.GetTable().IsModified():
972              clazz = self.__BuildClassification(self.__cur_field, True)              clazz = self.__BuildClassification(self.__cur_field, True)
973    
# Line 992  class Classifier(NonModalDialog): Line 979  class Classifier(NonModalDialog):
979          self._OnTry(event)          self._OnTry(event)
980          self.Close()          self.Close()
981    
982        def OnClose(self, event):
983            NonModalDialog.OnClose(self, event)
984    
985      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
986          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
987          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1015  class Classifier(NonModalDialog): Line 1005  class Classifier(NonModalDialog):
1005    
1006      def _OnGenClass(self, event):      def _OnGenClass(self, event):
1007    
         #if self.genDlg is None:  
1008          self.genDlg = ClassGenDialog(self, self.layer,          self.genDlg = ClassGenDialog(self, self.layer,
1009                            self.fields.GetString(self.__cur_field))                            self.fields.GetString(self.__cur_field))
1010    
1011          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1012    
1013          self.fields.Enable(False)          self.__EnableButtons(EB_GEN_CLASS, False)
         self.controlButtons[BTN_EDIT].Enable(False)  
         self.controlButtons[BTN_GEN].Enable(False)  
1014    
1015          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()  
1016    
1017      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1018          self.genDlg.Destroy()          self.genDlg.Destroy()
1019            self.__EnableButtons(EB_GEN_CLASS, True)
         self.fields.Enable(True)  
         self.controlButtons[BTN_EDIT].Enable(True)  
         self.controlButtons[BTN_GEN].Enable(True)  
1020    
1021      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1022          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1070  class Classifier(NonModalDialog): Line 1048  class Classifier(NonModalDialog):
1048                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1049                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1050    
1051        def _OnTitleChanged(self, event):
1052            obj = event.GetEventObject()
1053    
1054            self.layer.SetTitle(obj.GetValue())
1055            self.__SetTitle(self.layer.Title())
1056    
1057            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1058    
1059        def __EnableButtons(self, case, enable):
1060    
1061            if case == EB_LAYER_TITLE:  
1062                list = (wxID_OK,
1063                        wxID_CANCEL)
1064    
1065            elif case == EB_SELECT_FIELD:
1066                list = (ID_PROPERTY_GENCLASS,
1067                        ID_PROPERTY_ADD,
1068                        ID_PROPERTY_MOVEUP,
1069                        ID_PROPERTY_MOVEDOWN,
1070                        ID_PROPERTY_EDITSYM,
1071                        ID_PROPERTY_REMOVE)
1072    
1073            elif case == EB_GEN_CLASS:
1074                list = (ID_PROPERTY_SELECT,
1075                        ID_PROPERTY_FIELDTEXT,
1076                        ID_PROPERTY_GENCLASS,
1077                        ID_PROPERTY_EDITSYM)
1078    
1079            for id in list:
1080                self.FindWindowById(id).Enable(enable)
1081    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1082  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1083  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1084  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1111  class SelectPropertiesDialog(wxDialog): Line 1117  class SelectPropertiesDialog(wxDialog):
1117          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1118    
1119          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1120          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1121              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1122              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1123          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1124    
1125          lineColorBox.Add(          lineColorBox.Add(
# Line 1159  class SelectPropertiesDialog(wxDialog): Line 1165  class SelectPropertiesDialog(wxDialog):
1165          # Control buttons:          # Control buttons:
1166          #          #
1167          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1168          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1169                        0, wxALL, 4)          button_ok.SetDefault()
1170          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxALL, 4)
1171            buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1172                        0, wxALL, 4)                        0, wxALL, 4)
1173          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)
1174                                                                                                                                                                    
1175          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1176          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1177                                                                                                                                                                    
1178          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1179          self.SetSizer(topBox)          self.SetSizer(topBox)
1180          topBox.Fit(self)          topBox.Fit(self)
1181          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1182    
1183      def _OnOK(self, event):      def OnOK(self, event):
1184          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1185    
1186      def _OnCancel(self, event):      def OnCancel(self, event):
1187          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1188    
1189      def _OnSpin(self, event):      def _OnSpin(self, event):
Legend:
Removed from v.638  
changed lines
  Added in v.878
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26