/[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 783 by jonathan, Tue Apr 29 17:29:32 2003 UTC revision 1219 by bh, Mon Jun 16 17:42:54 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.UI.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Color
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator  from Thuban.UI.classgen import ClassGenDialog
36    
37  from dialogs import NonModalDialog  from dialogs import NonModalNonParentDialog
38    
39  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
40    
# Line 62  class ClassGrid(wxGrid): Line 68  class ClassGrid(wxGrid):
68                   use for display.                   use for display.
69          """          """
70    
71          wxGrid.__init__(self, parent, ID_CLASS_TABLE)          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
72    
73          self.classifier = classifier          self.classifier = classifier
74    
# Line 243  class ClassGrid(wxGrid): Line 249  class ClassGrid(wxGrid):
249    
250      def _OnCellResize(self, event):      def _OnCellResize(self, event):
251          self.FitInside()          self.FitInside()
252            event.Skip()
253    
254  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
255      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
# Line 457  class ClassTable(wxPyGridTableBase): Line 464  class ClassTable(wxPyGridTableBase):
464          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
465              return group.GetValue()              return group.GetValue()
466          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
467              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
468    
469          assert(False) # shouldn't get here          assert False # shouldn't get here
470          return None          return None
471    
472      def __ParseInput(self, value):      def __ParseInput(self, value):
473          """Try to determine what kind of input value is          """Try to determine what kind of input value is
474             (string, number, or range)             (string, number, or range)
475    
476          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
477          value, or of length two if it is a range.          a singleton value, or 1 if is a range
478          """          """
479    
480          type = self.fieldType          type = self.fieldType
481    
482          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
483              return (value,)              return (0, value)
484          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
485              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
486                  # the float call allows the user to enter 1.0 for 1                  # the float call allows the user to enter 1.0 for 1
487                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
488              else:              else:
489                  conv = lambda p: p                  conv = float
490    
491              #              #
492              # first try to take the input as a single number              # first try to take the input as a single number
493              # if there's an exception try to break it into              # if there's an exception try to break it into
494              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
495              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
496              #              #
497              try:              try:
498                  return (conv(value),)                  return (0, conv(value))
499              except ValueError:              except ValueError:
500                  i = value.find('-')                  return (1, Range(value))
                 if i == 0:  
                     i = value.find('-', 1)  
   
                 return (conv(value[:i]), conv(value[i+1:]))  
501    
502          assert False  # shouldn't get here          assert False  # shouldn't get here
503          return (0,)          return (0,None)
               
504    
505      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
506          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 556  class ClassTable(wxPyGridTableBase): Line 554  class ClassTable(wxPyGridTableBase):
554                      # changing the underlying group type if the                      # changing the underlying group type if the
555                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
556                      #                      #
557                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
558                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
559                              ngroup = ClassGroupSingleton(props = props)                              ngroup = ClassGroupSingleton(props = props)
560                              changed = True                              changed = True
561                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
562                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
563                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
564                              ngroup = ClassGroupRange(props = props)                              ngroup = ClassGroupRange(props = props)
565                              changed = True                              changed = True
566                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
567                      else:                      else:
568                          assert False                          assert False
569                          pass                          pass
# Line 650  class ClassTable(wxPyGridTableBase): Line 648  class ClassTable(wxPyGridTableBase):
648              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
649    
650    
 ID_PROPERTY_OK = 4001  
651  ID_PROPERTY_REVERT = 4002  ID_PROPERTY_REVERT = 4002
652  ID_PROPERTY_ADD = 4003  ID_PROPERTY_ADD = 4003
653  ID_PROPERTY_GENCLASS = 4004  ID_PROPERTY_GENCLASS = 4004
# Line 659  ID_PROPERTY_MOVEUP = 4006 Line 656  ID_PROPERTY_MOVEUP = 4006
656  ID_PROPERTY_MOVEDOWN = 4007  ID_PROPERTY_MOVEDOWN = 4007
657  ID_PROPERTY_TRY = 4008  ID_PROPERTY_TRY = 4008
658  ID_PROPERTY_EDITSYM = 4009  ID_PROPERTY_EDITSYM = 4009
 ID_PROPERTY_CLOSE = 4010  
659  ID_PROPERTY_SELECT = 4011  ID_PROPERTY_SELECT = 4011
660  ID_PROPERTY_TITLE = 4012  ID_PROPERTY_TITLE = 4012
661  ID_PROPERTY_FIELDTEXT = 4013  ID_PROPERTY_FIELDTEXT = 4013
# Line 675  EB_LAYER_TITLE = 0 Line 671  EB_LAYER_TITLE = 0
671  EB_SELECT_FIELD = 1  EB_SELECT_FIELD = 1
672  EB_GEN_CLASS = 2  EB_GEN_CLASS = 2
673    
674  class Classifier(NonModalDialog):  class Classifier(NonModalNonParentDialog):
675    
676      type2string = {None:             _("None"),      type2string = {None:             _("None"),
677                     FIELDTYPE_STRING: _("Text"),                     FIELDTYPE_STRING: _("Text"),
678                     FIELDTYPE_INT:    _("Integer"),                     FIELDTYPE_INT:    _("Integer"),
679                     FIELDTYPE_DOUBLE: _("Decimal")}                     FIELDTYPE_DOUBLE: _("Decimal")}
680    
681      def __init__(self, parent, name, layer, group = None):      def __init__(self, parent, name, map, layer, group = None):
682          NonModalDialog.__init__(self, parent, name, "")          NonModalNonParentDialog.__init__(self, parent, name, "")
683    
684          self.__SetTitle(layer.Title())          self.__SetTitle(layer.Title())
685    
686          self.layer = layer          self.layer = layer
687            self.map = map
688    
689          self.originalClass = self.layer.GetClassification()          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
690          field = self.originalClass.GetField()          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
691          fieldType = self.originalClass.GetFieldType()                               self.layer_shapestore_replaced)
692    
693          self.genDlg = None          self.genDlg = None
694    
695          topBox = wxBoxSizer(wxVERTICAL)          ############################
696            # Create the controls
         panel = wxPanel(self, -1, size=(100, 100))  
   
         panelBox = wxBoxSizer(wxVERTICAL)  
   
         sizer = wxBoxSizer(wxHORIZONTAL)  
         sizer.Add(wxStaticText(panel, -1, _("Title: ")),  
             0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)  
         sizer.Add(wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title()),  
                   1, wxGROW | wxALL, 4)  
         EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)  
   
         panelBox.Add(sizer, 0, wxGROW, 4)  
   
         panelBox.Add(wxStaticText(panel, -1,  
                                 _("Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
   
   
         #####################  
   
         #panelBox = wxBoxSizer(wxVERTICAL)  
         classBox = wxStaticBoxSizer(  
                     wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)  
   
   
697          #          #
         # make field choice box  
         #  
         self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)  
         #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  
698    
699          self.fields.Append("<None>")          panel = wxPanel(self, -1)
700    
701          if self.originalClass.GetFieldType() is None:          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
702              self.fields.SetClientData(0, copy.deepcopy(self.originalClass))          self.fieldTypeText = wxStaticText(panel, -1, "")
         else:  
             self.fields.SetClientData(0, None)  
703    
704          for i in range(self.num_cols):          if layer.HasClassification():
705              type, name, len, decc = layer.table.field_info(i)              self.originalClass = self.layer.GetClassification()
706              self.fields.Append(name)              field = self.originalClass.GetField()
707                fieldType = self.originalClass.GetFieldType()
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1,  
                                           copy.deepcopy(self.originalClass))  
             else:  
                 self.fields.SetClientData(i + 1, None)  
708    
709                table = layer.ShapeStore().Table()
710                #
711                # make field choice box
712                #
713                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
714    
715          ###########              self.num_cols = table.NumColumns()
716                # just assume the first field in case one hasn't been
717                # specified in the file.
718                self.__cur_field = 0
719    
720                self.fields.Append("<None>")
721    
722          sizer = wxBoxSizer(wxHORIZONTAL)              if self.originalClass.GetFieldType() is None:
723          sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
724              0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)              else:
725          sizer.Add(self.fields, 1, wxGROW | wxALL, 4)                  self.fields.SetClientData(0, None)
         EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
         #EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
   
         classBox.Add(sizer, 0, wxGROW, 4)  
726    
727          self.fieldTypeText = wxStaticText(panel, -1, "")              for i in range(self.num_cols):
728          classBox.Add(self.fieldTypeText, 0,                  name = table.Column(i).name
729                       wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)                  self.fields.Append(name)
730    
731                    if name == field:
732                        self.__cur_field = i + 1
733                        self.fields.SetClientData(i + 1,
734                                                copy.deepcopy(self.originalClass))
735                    else:
736                        self.fields.SetClientData(i + 1, None)
737    
738                button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
739                    _("Generate Class"))
740                button_add = wxButton(panel, ID_PROPERTY_ADD,
741                    _("Add"))
742                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
743                    _("Move Up"))
744                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
745                    _("Move Down"))
746                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
747                    _("Edit Symbol"))
748                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
749                    _("Remove"))
750    
751                self.classGrid = ClassGrid(panel, self)
752    
753                # calling __SelectField after creating the classGrid fills in the
754                # grid with the correct information
755                self.fields.SetSelection(self.__cur_field)
756                self.__SelectField(self.__cur_field, group = group)
757    
758            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
759            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
760            button_ok = wxButton(self, wxID_OK, _("OK"))
761            button_ok.SetDefault()
762            button_close = wxButton(self, wxID_CANCEL, _("Close"))
763    
764            ############################
765            # Layout the controls
766          #          #
         # Control Box  
         #  
         controlBox = wxBoxSizer(wxHORIZONTAL)  
   
767    
768          ###########          topBox = wxBoxSizer(wxVERTICAL)
769          #          panelBox = wxBoxSizer(wxVERTICAL)
         # Control buttons:  
         #  
         controlButtonBox = wxBoxSizer(wxVERTICAL)  
770    
771          button = wxButton(panel, ID_PROPERTY_GENCLASS, _("Generate Class"))          sizer = wxBoxSizer(wxHORIZONTAL)
772          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
773                0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
774            sizer.Add(text_title, 1, wxGROW, 0)
775    
776          button = wxButton(panel, ID_PROPERTY_ADD, _("Add"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
777    
778          button = wxButton(panel, ID_PROPERTY_MOVEUP, _("Move Up"))          if isinstance(layer, RasterLayer):
779          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              type = "Image"
780            else:
781                type = layer.ShapeType()
782    
783          button = wxButton(panel, ID_PROPERTY_MOVEDOWN, _("Move Down"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
784          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
785    
786          button = wxButton(panel, ID_PROPERTY_EDITSYM, _("Edit Symbol"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
787    
788          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              classBox = wxStaticBoxSizer(
789                            wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
790    
         button = wxButton(panel, ID_PROPERTY_REMOVE, _("Remove"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
791    
792                sizer = wxBoxSizer(wxHORIZONTAL)
793                sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
794                    0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
795                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
796    
797          ###########              classBox.Add(sizer, 0, wxGROW, 4)
         #  
         # Classification data table  
         #  
798    
799          self.classGrid = ClassGrid(panel, self)              classBox.Add(self.fieldTypeText, 0,
800                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
801    
802          # calling __SelectField after creating the classGrid fills in the              controlBox = wxBoxSizer(wxHORIZONTAL)
803          # grid with the correct information              controlButtonBox = wxBoxSizer(wxVERTICAL)
         self.fields.SetSelection(self.__cur_field)  
         self.__SelectField(self.__cur_field, group = group)  
804    
805          controlBox.Add(self.classGrid, 1, wxGROW, 0)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
806          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
807                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
808                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
809                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
810                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
811                controlButtonBox.Add(button_remove, 0,
812                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
813    
814          classBox.Add(controlBox, 1, wxGROW, 10)              controlBox.Add(self.classGrid, 1, wxGROW, 0)
815          panelBox.Add(classBox, 1, wxGROW, 0)              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
816    
817          EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)              classBox.Add(controlBox, 1, wxGROW, 10)
818          EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)              panelBox.Add(classBox, 1, wxGROW, 0)
         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)  
819    
         ###########  
820    
821            buttonBox = wxBoxSizer(wxHORIZONTAL)
822            buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
823            buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
824            buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
825            buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
826    
827          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
828          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
829            panelBox.Fit(panel)
830          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
831    
832          topBox.Add(panel, 1, wxGROW | wxALL, 4)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
833            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
834    
835          ###########          self.SetAutoLayout(True)
836            self.SetSizer(topBox)
837            topBox.Fit(self)
838            topBox.SetSizeHints(self)
839            self.Layout()
840    
841          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)  
842    
843          EVT_BUTTON(self, ID_PROPERTY_OK, self._OnOK)          EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
844            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
845            EVT_BUTTON(self, wxID_OK, self._OnOK)
846          EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)          EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
847          EVT_BUTTON(self, ID_PROPERTY_CLOSE, self._OnCloseBtn)          EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
848          EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)          EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
849    
850          ###########          EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
851            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
852          topBox.SetSizeHints(self)          EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
853          self.SetAutoLayout(True)          EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
854          self.SetSizer(topBox)          EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
855            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
856    
         #self.Fit()  
857          ######################          ######################
858    
859            text_title.SetFocus()
860          self.haveApplied = False          self.haveApplied = False
861    
862        def unsubscribe_messages(self):
863            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
864            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
865                                   self.layer_shapestore_replaced)
866    
867        def map_layers_removed(self, map):
868            if self.layer not in self.map.Layers():
869                self.Close()
870    
871        def layer_shapestore_replaced(self, *args):
872            self.Close()
873    
874      def EditSymbol(self, row):      def EditSymbol(self, row):
875          table = self.classGrid.GetTable()          table = self.classGrid.GetTable()
876          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
# Line 985  class Classifier(NonModalDialog): Line 987  class Classifier(NonModalDialog):
987             it to the layer.             it to the layer.
988          """          """
989    
990          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
991                clazz = self.fields.GetClientData(self.__cur_field)
992    
993          #              #
994          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
995          # to begin with or it has been modified              # to begin with or it has been modified
996          #              #
997          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
998              clazz = self.__BuildClassification(self.__cur_field, True)              if clazz is None or self.classGrid.GetTable().IsModified():
999                    clazz = self.__BuildClassification(self.__cur_field, True)
1000    
1001          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
1002    
1003          self.haveApplied = True          self.haveApplied = True
1004    
# Line 1002  class Classifier(NonModalDialog): Line 1006  class Classifier(NonModalDialog):
1006          self._OnTry(event)          self._OnTry(event)
1007          self.Close()          self.Close()
1008    
1009        def OnClose(self, event):
1010            self.unsubscribe_messages()
1011            NonModalNonParentDialog.OnClose(self, event)
1012    
1013      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
1014          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
1015          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1079  class Classifier(NonModalDialog): Line 1087  class Classifier(NonModalDialog):
1087      def __EnableButtons(self, case, enable):      def __EnableButtons(self, case, enable):
1088    
1089          if case == EB_LAYER_TITLE:            if case == EB_LAYER_TITLE:  
1090              list = (ID_PROPERTY_OK,              list = (wxID_OK,
1091                      ID_PROPERTY_CLOSE)                      wxID_CANCEL)
1092    
1093          elif case == EB_SELECT_FIELD:          elif case == EB_SELECT_FIELD:
1094              list = (ID_PROPERTY_GENCLASS,              list = (ID_PROPERTY_GENCLASS,
# Line 1099  class Classifier(NonModalDialog): Line 1107  class Classifier(NonModalDialog):
1107          for id in list:          for id in list:
1108              self.FindWindowById(id).Enable(enable)              self.FindWindowById(id).Enable(enable)
1109    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1110  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1111  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1112  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1139  class SelectPropertiesDialog(wxDialog): Line 1145  class SelectPropertiesDialog(wxDialog):
1145          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1146    
1147          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1148          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1149              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1150              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1151          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1152    
1153          lineColorBox.Add(          lineColorBox.Add(
# Line 1187  class SelectPropertiesDialog(wxDialog): Line 1193  class SelectPropertiesDialog(wxDialog):
1193          # Control buttons:          # Control buttons:
1194          #          #
1195          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1196          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1197                        0, wxALL, 4)          button_ok.SetDefault()
1198          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1199                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1200          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1201            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1202                                                                                                                                                                    
1203          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1204          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1205                                                                                                                                                                    
1206          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1207          self.SetSizer(topBox)          self.SetSizer(topBox)
1208          topBox.Fit(self)          topBox.Fit(self)
1209          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1210    
1211      def _OnOK(self, event):      def OnOK(self, event):
1212          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1213    
1214      def _OnCancel(self, event):      def OnCancel(self, event):
1215          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1216    
1217      def _OnSpin(self, event):      def _OnSpin(self, event):
Legend:
Removed from v.783  
changed lines
  Added in v.1219
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26