/[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 1302 by jonathan, Wed Jun 25 09:39:33 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Color
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator  from Thuban.UI.classgen import ClassGenDialog
36    
37  from dialogs import NonModalDialog  from dialogs import NonModalNonParentDialog
38    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
39  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
40    
41    
# Line 65  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 87  class ClassGrid(wxGrid): Line 90  class ClassGrid(wxGrid):
90    
91          table = self.GetTable()          table = self.GetTable()
92          if table is None:          if table is None:
93              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
94              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
95                h = self.GetDefaultRowSize() * 4 \
96                    + self.GetDefaultColLabelSize()
97    
98              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
99              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
100              table = ClassTable(self)              table = ClassTable(self)
# Line 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 397  class ClassTable(wxPyGridTableBase): Line 404  class ClassTable(wxPyGridTableBase):
404              if isinstance(group, ClassGroupMap):       return _("Map")              if isinstance(group, ClassGroupMap):       return _("Map")
405    
406          assert False # shouldn't get here          assert False # shouldn't get here
407          return _("")          return ""
408    
409      def GetNumberRows(self):      def GetNumberRows(self):
410          """Return the number of rows."""          """Return the number of rows."""
# Line 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
487                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
488              else:              else:
489                  conv = lambda p: p                  conv = float
490    
491              #              #
492              # first try to take the input as a single number              # first try to take the input as a single number
493              # if there's an exception try to break it into              # if there's an exception try to break it into
494              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
495              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
496              #              #
497              try:              try:
498                  return (conv(Str2Num(value)),)                  return (0, conv(value))
499              except ValueError:              except ValueError:
500                  i = value.find('-')                  return (1, Range(value))
                 if i == 0:  
                     i = value.find('-', 1)  
   
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
501    
502          assert False  # shouldn't get here          assert False  # shouldn't get here
503          return (0,)          return (0,None)
               
504    
505      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
506          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 515  class ClassTable(wxPyGridTableBase): Line 514  class ClassTable(wxPyGridTableBase):
514          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
515          """          """
516    
517          assert col >= 0 and col < self.GetNumberCols()          assert 0 <= col < self.GetNumberCols()
518          assert row >= 0 and row < self.GetNumberRows()          assert 0 <= row < self.GetNumberRows()
519    
520          if row == 0:          if row == 0:
521              group = self.clazz.GetDefaultGroup()              group = self.clazz.GetDefaultGroup()
# Line 555  class ClassTable(wxPyGridTableBase): Line 554  class ClassTable(wxPyGridTableBase):
554                      # changing the underlying group type if the                      # changing the underlying group type if the
555                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
556                      #                      #
557                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
558                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
559                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
560                              changed = True                              changed = True
561                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
562                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
563                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
564                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
565                              changed = True                              changed = True
566                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
567                      else:                      else:
568                          assert False                          assert False
569                          pass                          pass
# Line 649  class ClassTable(wxPyGridTableBase): Line 648  class ClassTable(wxPyGridTableBase):
648              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
649    
650    
651  ID_CLASSIFY_OK = 4001  ID_PROPERTY_REVERT = 4002
652  ID_CLASSIFY_REVERT = 4002  ID_PROPERTY_ADD = 4003
653  ID_CLASSIFY_ADD = 4003  ID_PROPERTY_GENCLASS = 4004
654  ID_CLASSIFY_GENCLASS = 4004  ID_PROPERTY_REMOVE = 4005
655  ID_CLASSIFY_REMOVE = 4005  ID_PROPERTY_MOVEUP = 4006
656  ID_CLASSIFY_MOVEUP = 4006  ID_PROPERTY_MOVEDOWN = 4007
657  ID_CLASSIFY_MOVEDOWN = 4007  ID_PROPERTY_TRY = 4008
658  ID_CLASSIFY_TRY = 4008  ID_PROPERTY_EDITSYM = 4009
659  ID_CLASSIFY_EDITSYM = 4009  ID_PROPERTY_SELECT = 4011
660  ID_CLASSIFY_CLOSE = 4010  ID_PROPERTY_TITLE = 4012
661    ID_PROPERTY_FIELDTEXT = 4013
662    
663  BTN_ADD = 0  BTN_ADD = 0
664  BTN_EDIT = 1  BTN_EDIT = 1
# Line 667  BTN_UP = 3 Line 667  BTN_UP = 3
667  BTN_DOWN = 4  BTN_DOWN = 4
668  BTN_RM = 5  BTN_RM = 5
669    
670  class Classifier(NonModalDialog):  EB_LAYER_TITLE = 0
671    EB_SELECT_FIELD = 1
672    EB_GEN_CLASS = 2
673    
674    class Classifier(NonModalNonParentDialog):
675    
676      type2string = {None:             _("None"),      type2string = {None:             _("None"),
677                     FIELDTYPE_STRING: _("Text"),                     FIELDTYPE_STRING: _("Text"),
678                     FIELDTYPE_INT:    _("Integer"),                     FIELDTYPE_INT:    _("Integer"),
679                     FIELDTYPE_DOUBLE: _("Decimal")}                     FIELDTYPE_DOUBLE: _("Decimal")}
680    
681      def __init__(self, parent, name, layer, group = None):      def __init__(self, parent, name, map, layer, group = None):
682          NonModalDialog.__init__(self, parent, name,          NonModalNonParentDialog.__init__(self, parent, name, "")
                                 _("Classifier: %s") % layer.Title())  
683    
684          panel = wxPanel(self, -1, size=(100, 100))          self.__SetTitle(layer.Title())
685    
686          self.layer = layer          self.layer = layer
687            self.map = map
688    
689          self.originalClass = self.layer.GetClassification()          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
690          field = self.originalClass.GetField()          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
691          fieldType = self.originalClass.GetFieldType()                               self.layer_shapestore_replaced)
692    
693          self.genDlg = None          self.genDlg = None
694    
695          topBox = wxBoxSizer(wxVERTICAL)          ############################
696          panelBox = wxBoxSizer(wxVERTICAL)          # Create the controls
   
         #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),  
             #0, wxALIGN_LEFT | wxALL, 4)  
         panelBox.Add(wxStaticText(panel, -1,  
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
   
   
         #  
         # make field combo box  
697          #          #
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
698    
699          self.num_cols = layer.table.field_count()          panel = wxPanel(self, -1)
         # just assume the first field in case one hasn't been  
         # specified in the file.  
         self.__cur_field = 0  
   
         self.fields.Append("<None>")  
         self.fields.SetClientData(0, None)  
   
         for i in range(self.num_cols):  
             type, name, len, decc = layer.table.field_info(i)  
             self.fields.Append(name)  
   
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1,  
                                           copy.deepcopy(self.originalClass))  
             else:  
                 self.fields.SetClientData(i + 1, None)  
700    
701            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
702            self.fieldTypeText = wxStaticText(panel, -1, "")
703    
704          ###########          if layer.HasClassification():
705                self.originalClass = self.layer.GetClassification()
706                field = self.originalClass.GetField()
707                fieldType = self.originalClass.GetFieldType()
708    
709          self.fieldTypeText = wxStaticText(panel, -1, "")              table = layer.ShapeStore().Table()
710          panelBox.Add(self.fieldTypeText, 0,              #
711                       wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)              # make field choice box
712                #
713                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
714    
715          propertyBox = wxBoxSizer(wxHORIZONTAL)              self.num_cols = table.NumColumns()
716          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              # just assume the first field in case one hasn't been
717              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
718          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              self.__cur_field = 0
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
719    
720          panelBox.Add(propertyBox, 0, wxGROW, 4)              self.fields.Append("<None>")
721    
722                if self.originalClass.GetFieldType() is None:
723                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
724                else:
725                    self.fields.SetClientData(0, None)
726    
727          #              for i in range(self.num_cols):
728          # Control Box                  name = table.Column(i).name
729          #                  self.fields.Append(name)
730          controlBox = wxBoxSizer(wxHORIZONTAL)  
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 buttons:  
         #  
         self.controlButtons = []  
767    
768          controlButtonBox = wxBoxSizer(wxVERTICAL)          topBox = wxBoxSizer(wxVERTICAL)
769            panelBox = wxBoxSizer(wxVERTICAL)
770    
771          button = wxButton(panel, ID_CLASSIFY_GENCLASS, _("Generate Class"))          sizer = wxBoxSizer(wxHORIZONTAL)
772          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
773          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
774            sizer.Add(text_title, 1, wxGROW, 0)
775    
776          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
777    
778          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          if isinstance(layer, RasterLayer):
779          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              type = "Image"
780          self.controlButtons.append(button)          else:
781                type = layer.ShapeType()
782    
783          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
784          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
         self.controlButtons.append(button)  
785    
786          button = wxButton(panel, ID_CLASSIFY_EDITSYM, _("Edit Symbol"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
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_CLASSIFY_REMOVE, _("Remove"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
         self.controlButtons.append(button)  
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  
         #  
   
         self.classGrid = ClassGrid(panel, self)  
 #       self.classGrid = wxGrid(panel, -1)  
 #       self.classGrid.SetDefaultRenderer(wxGridCellBoolRenderer())  
 #       self.classGrid.SetDefaultEditor(wxGridCellBoolEditor())  
         #self.classGrid.CreateGrid(5, 5)  
         #self.classGrid.SetCellEditor(0, 0, wxGridCellBoolEditor())  
         #self.classGrid.SetCellRenderer(0, 0, wxGridCellBoolRenderer())  
         #print self.classGrid.GetCellEditor(0, 0)  
         #print self.classGrid.GetCellRenderer(0, 0)  
         #self.classGrid = ClassGrid(panel, self)  
   
         # need these  
         self.__SetGridTable(self.__cur_field, group)  
         self.fields.SetSelection(self.__cur_field)  
         #self.classGrid.SetCellEditor(0, 0, wxGridCellBoolEditor())  
         #self.classGrid.SetCellRenderer(0, 0, wxGridCellBoolRenderer())  
   
         # calling __SelectField after creating the classGrid fills in the  
         # grid with the correct information  
         #self.fields.SetSelection(self.__cur_field)  
         #self.__SelectField(self.__cur_field, group = group)  
   
         #self.classGrid.SelectGroup(group)  
   
         controlBox.Add(self.classGrid, 1, wxGROW, 0)  
798    
799                classBox.Add(self.fieldTypeText, 0,
800                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
801    
802                controlBox = wxBoxSizer(wxHORIZONTAL)
803                controlButtonBox = wxBoxSizer(wxVERTICAL)
804    
805          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
806          panelBox.Add(controlBox, 1, wxGROW, 10)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
807                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
808          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
809          EVT_BUTTON(self, ID_CLASSIFY_EDITSYM, self._OnEditSymbol)              controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
810          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
811          EVT_BUTTON(self, ID_CLASSIFY_GENCLASS, self._OnGenClass)              controlButtonBox.Add(button_remove, 0,
812          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)                                   wxGROW|wxALL|wxALIGN_BOTTOM, 4)
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
813    
814          ###########              controlBox.Add(self.classGrid, 1, wxGROW, 0)
815                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
816    
817          buttonBox = wxBoxSizer(wxHORIZONTAL)              classBox.Add(controlBox, 1, wxGROW, 10)
818          buttonBox.Add(wxButton(panel, ID_CLASSIFY_TRY, _("Try")),              panelBox.Add(classBox, 1, wxGROW, 0)
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_REVERT, _("Revert")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CLOSE, _("Close")),  
                       0, wxALL, 4)  
         panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)  
   
         EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)  
         EVT_BUTTON(self, ID_CLASSIFY_TRY, self._OnTry)  
         EVT_BUTTON(self, ID_CLASSIFY_CLOSE, self._OnCloseBtn)  
         EVT_BUTTON(self, ID_CLASSIFY_REVERT, self._OnRevert)  
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, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
833          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
834    
835          self.SetAutoLayout(True)          self.SetAutoLayout(True)
836          self.SetSizer(topBox)          self.SetSizer(topBox)
837            topBox.Fit(self)
838            topBox.SetSizeHints(self)
839            self.Layout()
840    
841            ###########
842    
843            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)
847            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
848            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            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
853            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
854            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)
877    
878          # get a new ClassGroupProperties object and copy the          # get a new ClassGroupProperties object and copy the
879          # values over to our current object          # values over to our current object
880          propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())          propDlg = SelectPropertiesDialog(self, prop, self.layer.ShapeType())
881    
882          self.Enable(False)          self.Enable(False)
883          if propDlg.ShowModal() == wxID_OK:          if propDlg.ShowModal() == wxID_OK:
# Line 936  class Classifier(NonModalDialog): Line 946  class Classifier(NonModalDialog):
946    
947          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
948    
949          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
950    
951      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
952          """This method assumes that the current selection for the          """This method assumes that the current selection for the
# Line 951  class Classifier(NonModalDialog): Line 961  class Classifier(NonModalDialog):
961    
962          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
963    
964          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
965    
966          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
967    
968        def __SetTitle(self, title):
969            if title != "":
970                title = ": " + title
971    
972            self.SetTitle(_("Layer Properties") + title)
973    
974      def _OnEditSymbol(self, event):      def _OnEditSymbol(self, event):
975          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 975  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 992  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 1015  class Classifier(NonModalDialog): Line 1033  class Classifier(NonModalDialog):
1033    
1034      def _OnGenClass(self, event):      def _OnGenClass(self, event):
1035    
         #if self.genDlg is None:  
1036          self.genDlg = ClassGenDialog(self, self.layer,          self.genDlg = ClassGenDialog(self, self.layer,
1037                            self.fields.GetString(self.__cur_field))                            self.fields.GetString(self.__cur_field))
1038    
1039          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1040    
1041          self.fields.Enable(False)          self.__EnableButtons(EB_GEN_CLASS, False)
         self.controlButtons[BTN_EDIT].Enable(False)  
         self.controlButtons[BTN_GEN].Enable(False)  
1042    
1043          self.genDlg.Show()          self.genDlg.Show()
         #if self.genDlg.ShowModal() == wxID_OK:  
         #    clazz = self.genDlg.GetClassification()  
         #    self.fields.SetClientData(self.__cur_field, clazz)  
         #    self.classGrid.GetTable().SetClassification(clazz)  
         #self.Enable(True)  
         #self.genDlg.Destroy()  
1044    
1045      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1046          self.genDlg.Destroy()          self.genDlg.Destroy()
1047            self.__EnableButtons(EB_GEN_CLASS, True)
         self.fields.Enable(True)  
         self.controlButtons[BTN_EDIT].Enable(True)  
         self.controlButtons[BTN_GEN].Enable(True)  
1048    
1049      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1050          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1070  class Classifier(NonModalDialog): Line 1076  class Classifier(NonModalDialog):
1076                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1077                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1078    
1079        def _OnTitleChanged(self, event):
1080            obj = event.GetEventObject()
1081    
1082            self.layer.SetTitle(obj.GetValue())
1083            self.__SetTitle(self.layer.Title())
1084    
1085            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1086    
1087        def __EnableButtons(self, case, enable):
1088    
1089            if case == EB_LAYER_TITLE:  
1090                list = (wxID_OK,
1091                        wxID_CANCEL)
1092    
1093            elif case == EB_SELECT_FIELD:
1094                list = (ID_PROPERTY_GENCLASS,
1095                        ID_PROPERTY_ADD,
1096                        ID_PROPERTY_MOVEUP,
1097                        ID_PROPERTY_MOVEDOWN,
1098                        ID_PROPERTY_EDITSYM,
1099                        ID_PROPERTY_REMOVE)
1100    
1101            elif case == EB_GEN_CLASS:
1102                list = (ID_PROPERTY_SELECT,
1103                        ID_PROPERTY_FIELDTEXT,
1104                        ID_PROPERTY_GENCLASS,
1105                        ID_PROPERTY_EDITSYM)
1106    
1107            for id in list:
1108                self.FindWindowById(id).Enable(enable)
1109    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1110  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1111  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1112  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1111  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 1159  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):
# Line 1336  class ClassGroupPropertiesCtrl(wxWindow, Line 1371  class ClassGroupPropertiesCtrl(wxWindow,
1371    
1372          wxWindow.__init__(self, parent, id, size = size, style = style)          wxWindow.__init__(self, parent, id, size = size, style = style)
1373    
1374            self.parent = parent
1375    
1376          self.SetProperties(props)          self.SetProperties(props)
1377          self.SetShapeType(shapeType)          self.SetShapeType(shapeType)
1378          self.AllowEdit(True)          self.AllowEdit(True)
# Line 1379  class ClassGroupPropertiesCtrl(wxWindow, Line 1416  class ClassGroupPropertiesCtrl(wxWindow,
1416      def DoEdit(self):      def DoEdit(self):
1417          if not self.allowEdit: return          if not self.allowEdit: return
1418    
1419          propDlg = SelectPropertiesDialog(NULL,          propDlg = SelectPropertiesDialog(self.parent,
1420                                           self.GetProperties(),                                           self.GetProperties(),
1421                                           self.GetShapeType())                                           self.GetShapeType())
1422    
Legend:
Removed from v.638  
changed lines
  Added in v.1302
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26