/[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 661 by jonathan, Mon Apr 14 14:16:00 2003 UTC revision 935 by jonathan, Tue May 20 15:24:17 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    
# Line 63  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 244  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 398  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 458  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 556  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 650  class ClassTable(wxPyGridTableBase): Line 647  class ClassTable(wxPyGridTableBase):
647              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
648    
649    
 ID_PROPERTY_OK = 4001  
650  ID_PROPERTY_REVERT = 4002  ID_PROPERTY_REVERT = 4002
651  ID_PROPERTY_ADD = 4003  ID_PROPERTY_ADD = 4003
652  ID_PROPERTY_GENCLASS = 4004  ID_PROPERTY_GENCLASS = 4004
# Line 659  ID_PROPERTY_MOVEUP = 4006 Line 655  ID_PROPERTY_MOVEUP = 4006
655  ID_PROPERTY_MOVEDOWN = 4007  ID_PROPERTY_MOVEDOWN = 4007
656  ID_PROPERTY_TRY = 4008  ID_PROPERTY_TRY = 4008
657  ID_PROPERTY_EDITSYM = 4009  ID_PROPERTY_EDITSYM = 4009
 ID_PROPERTY_CLOSE = 4010  
658  ID_PROPERTY_SELECT = 4011  ID_PROPERTY_SELECT = 4011
659  ID_PROPERTY_TITLE = 4012  ID_PROPERTY_TITLE = 4012
660  ID_PROPERTY_FIELDTEXT = 4013  ID_PROPERTY_FIELDTEXT = 4013
# Line 689  class Classifier(NonModalDialog): Line 684  class Classifier(NonModalDialog):
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            # Create the controls
692            #
693    
694          panel = wxPanel(self, -1, size=(100, 100))          panel = wxPanel(self, -1)
695    
696          panelBox = wxBoxSizer(wxVERTICAL)          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
697            self.fieldTypeText = wxStaticText(panel, -1, "")
698    
699          sizer = wxBoxSizer(wxHORIZONTAL)          if layer.HasClassification():
700          sizer.Add(wxStaticText(panel, -1, _("Title: ")),              self.originalClass = self.layer.GetClassification()
701              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)              field = self.originalClass.GetField()
702          sizer.Add(wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title()),              fieldType = self.originalClass.GetFieldType()
                   1, wxGROW | wxALL, 4)  
         EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)  
703    
704          panelBox.Add(sizer, 0, wxGROW, 4)              #
705                # make field choice box
706                #
707                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
708    
709          panelBox.Add(wxStaticText(panel, -1,              self.num_cols = layer.table.NumColumns()
710                                  _("Type: %s") % layer.ShapeType()),              # just assume the first field in case one hasn't been
711              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
712                self.__cur_field = 0
713    
714                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          #panelBox = wxBoxSizer(wxVERTICAL)              for i in range(self.num_cols):
722          classBox = wxStaticBoxSizer(                  name = layer.table.Column(i).name
723                      wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)                  self.fields.Append(name)
724    
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(panel, ID_PROPERTY_TRY, _("Try"))
753            button_revert = wxButton(panel, ID_PROPERTY_REVERT, _("Revert"))
754            button_ok = wxButton(panel, wxID_OK, _("OK"))
755            button_ok.SetDefault()
756            button_close = wxButton(panel, wxID_CANCEL, _("Close"))
757    
758            ############################
759            # Layout the controls
760          #          #
         # 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>")  
   
         if self.originalClass.GetFieldType() is None:  
             self.fields.SetClientData(0, copy.deepcopy(self.originalClass))  
         else:  
             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)  
   
   
         ###########  
761    
762            topBox = wxBoxSizer(wxVERTICAL)
763            panelBox = wxBoxSizer(wxVERTICAL)
764    
765          sizer = wxBoxSizer(wxHORIZONTAL)          sizer = wxBoxSizer(wxHORIZONTAL)
766          sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
767              0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
768          sizer.Add(self.fields, 1, wxGROW | wxALL, 4)          sizer.Add(text_title, 1, wxGROW, 0)
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
   
         classBox.Add(sizer, 0, wxGROW, 4)  
   
         self.fieldTypeText = wxStaticText(panel, -1, "")  
         classBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
   
   
         #  
         # Control Box  
         #  
         controlBox = wxBoxSizer(wxHORIZONTAL)  
   
769    
770          ###########          panelBox.Add(sizer, 0, wxGROW, 4)
         #  
         # Control buttons:  
         #  
         controlButtonBox = wxBoxSizer(wxVERTICAL)  
771    
772          button = wxButton(panel, ID_PROPERTY_GENCLASS, _("Generate Class"))          if isinstance(layer, RasterLayer):
773          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              type = "Image"
774            else:
775                type = layer.ShapeType()
776    
777          button = wxButton(panel, ID_PROPERTY_ADD, _("Add"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
778          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
779    
780          button = wxButton(panel, ID_PROPERTY_MOVEUP, _("Move Up"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
781    
782          button = wxButton(panel, ID_PROPERTY_MOVEDOWN, _("Move Down"))              classBox = wxStaticBoxSizer(
783          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
784    
         button = wxButton(panel, ID_PROPERTY_EDITSYM, _("Edit Symbol"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
785    
786          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              sizer = wxBoxSizer(wxHORIZONTAL)
787                sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
788                    0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
789                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
790    
791          button = wxButton(panel, ID_PROPERTY_REMOVE, _("Remove"))              classBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
792    
793                classBox.Add(self.fieldTypeText, 0,
794                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
795    
796          ###########              controlBox = wxBoxSizer(wxHORIZONTAL)
797          #              controlButtonBox = wxBoxSizer(wxVERTICAL)
         # Classification data table  
         #  
798    
799          self.classGrid = ClassGrid(panel, self)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
800                controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
801                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
802                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
803                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
804                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
805                controlButtonBox.Add(button_remove, 0,
806                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
807    
808          # calling __SelectField after creating the classGrid fills in the              controlBox.Add(self.classGrid, 1, wxGROW, 0)
809          # grid with the correct information              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
         self.fields.SetSelection(self.__cur_field)  
         self.__SelectField(self.__cur_field, group = group)  
810    
811          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox.Add(controlBox, 1, wxGROW, 10)
812          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              panelBox.Add(classBox, 1, wxGROW, 0)
813    
         classBox.Add(controlBox, 1, wxGROW, 10)  
         panelBox.Add(classBox, 1, wxGROW, 0)  
   
         EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)  
         EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)  
         EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)  
         EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)  
         EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)  
         EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)  
   
         ###########  
814    
815            buttonBox = wxBoxSizer(wxHORIZONTAL)
816            buttonBox.Add(button_try, 0, wxALL, 4)
817            buttonBox.Add(60, 20, 0, wxALL, 4)
818            buttonBox.Add(button_revert, 0, wxALL, 4)
819            buttonBox.Add(60, 20, 0, wxALL, 4)
820            buttonBox.Add(button_ok, 0, wxALL, 4)
821            buttonBox.Add(60, 20, 0, wxALL, 4)
822            buttonBox.Add(button_close, 0, wxALL, 4)
823            panelBox.Add(buttonBox, 0,
824                wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)
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 | wxALL, 4)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
832    
833          ###########          self.SetAutoLayout(True)
834            self.SetSizer(topBox)
835            topBox.Fit(self)
836            topBox.SetSizeHints(self)
837            self.Layout()
838    
839          buttonBox = wxBoxSizer(wxHORIZONTAL)          ###########
         buttonBox.Add(wxButton(self, ID_PROPERTY_TRY, _("Try")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(self, ID_PROPERTY_REVERT, _("Revert")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(self, ID_PROPERTY_OK, _("OK")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(self, ID_PROPERTY_CLOSE, _("Close")),  
                       0, wxALL, 4)  
         topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)  
840    
841          EVT_BUTTON(self, ID_PROPERTY_OK, self._OnOK)          EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
842            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
843            EVT_BUTTON(self, wxID_OK, self._OnOK)
844          EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)          EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
845          EVT_BUTTON(self, ID_PROPERTY_CLOSE, self._OnCloseBtn)          EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
846          EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)          EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
847    
848          ###########          EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
849            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
850          topBox.SetSizeHints(self)          EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
851          self.SetAutoLayout(True)          EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
852          self.SetSizer(topBox)          EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
853            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
854    
         #self.Fit()  
855          ######################          ######################
856    
857            text_title.SetFocus()
858          self.haveApplied = False          self.haveApplied = False
859    
860      def EditSymbol(self, row):      def EditSymbol(self, row):
# Line 983  class Classifier(NonModalDialog): Line 973  class Classifier(NonModalDialog):
973             it to the layer.             it to the layer.
974          """          """
975    
976          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
977                clazz = self.fields.GetClientData(self.__cur_field)
978    
979          #              #
980          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
981          # to begin with or it has been modified              # to begin with or it has been modified
982          #              #
983          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
984              clazz = self.__BuildClassification(self.__cur_field, True)              if clazz is None or self.classGrid.GetTable().IsModified():
985                    clazz = self.__BuildClassification(self.__cur_field, True)
986    
987          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
988    
989          self.haveApplied = True          self.haveApplied = True
990    
# Line 1000  class Classifier(NonModalDialog): Line 992  class Classifier(NonModalDialog):
992          self._OnTry(event)          self._OnTry(event)
993          self.Close()          self.Close()
994    
995        def OnClose(self, event):
996            NonModalDialog.OnClose(self, event)
997    
998      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
999          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
1000          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1077  class Classifier(NonModalDialog): Line 1072  class Classifier(NonModalDialog):
1072      def __EnableButtons(self, case, enable):      def __EnableButtons(self, case, enable):
1073    
1074          if case == EB_LAYER_TITLE:            if case == EB_LAYER_TITLE:  
1075              list = (ID_PROPERTY_OK,              list = (wxID_OK,
1076                      ID_PROPERTY_CLOSE)                      wxID_CANCEL)
1077    
1078          elif case == EB_SELECT_FIELD:          elif case == EB_SELECT_FIELD:
1079              list = (ID_PROPERTY_GENCLASS,              list = (ID_PROPERTY_GENCLASS,
# Line 1097  class Classifier(NonModalDialog): Line 1092  class Classifier(NonModalDialog):
1092          for id in list:          for id in list:
1093              self.FindWindowById(id).Enable(enable)              self.FindWindowById(id).Enable(enable)
1094    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1095  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1096  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1097  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1137  class SelectPropertiesDialog(wxDialog): Line 1130  class SelectPropertiesDialog(wxDialog):
1130          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1131    
1132          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1133          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1134              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1135              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1136          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1137    
1138          lineColorBox.Add(          lineColorBox.Add(
# Line 1185  class SelectPropertiesDialog(wxDialog): Line 1178  class SelectPropertiesDialog(wxDialog):
1178          # Control buttons:          # Control buttons:
1179          #          #
1180          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1181          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1182                        0, wxALL, 4)          button_ok.SetDefault()
1183          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxALL, 4)
1184            buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1185                        0, wxALL, 4)                        0, wxALL, 4)
1186          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)
1187                                                                                                                                                                    
1188          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1189          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1190                                                                                                                                                                    
1191          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1192          self.SetSizer(topBox)          self.SetSizer(topBox)
1193          topBox.Fit(self)          topBox.Fit(self)
1194          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1195    
1196      def _OnOK(self, event):      def OnOK(self, event):
1197          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1198    
1199      def _OnCancel(self, event):      def OnCancel(self, event):
1200          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1201    
1202      def _OnSpin(self, event):      def _OnSpin(self, event):
Legend:
Removed from v.661  
changed lines
  Added in v.935
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26