/[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 650 by jonathan, Fri Apr 11 14:27:41 2003 UTC revision 1342 by jonathan, Tue Jul 1 16:10: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.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 Transparent
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 63  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 244  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 398  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 458  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 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(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 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
697          sizer = wxBoxSizer(wxHORIZONTAL)          #
         sizer.Add(wxStaticText(self, -1, _("Title: ")),  
             0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)  
         sizer.Add(wxTextCtrl(self, ID_PROPERTY_TITLE, layer.Title()),  
                   1, wxGROW | wxALL, 4)  
         EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)  
   
         topBox.Add(sizer, 0, wxGROW, 4)  
   
         topBox.Add(wxStaticText(self, -1,  
                                 _("Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
   
         panel = wxPanel(self, -1, size=(100, 100))  
   
         #####################  
698    
699          #panelBox = wxBoxSizer(wxVERTICAL)          panel = wxPanel(self, -1)
         panelBox = wxStaticBoxSizer(  
                     wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)  
700    
701            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
702            self.fieldTypeText = wxStaticText(panel, -1, "")
703    
704          #          if layer.HasClassification():
705          # make field combo box              self.originalClass = self.layer.GetClassification()
706          #              field = self.originalClass.GetField()
707          self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",              fieldType = self.originalClass.GetFieldType()
                                      style = wxCB_READONLY)  
708    
709          self.num_cols = layer.table.field_count()              table = layer.ShapeStore().Table()
710          # just assume the first field in case one hasn't been              #
711          # specified in the file.              # make field choice box
712          self.__cur_field = 0              #
713                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
714    
715          self.fields.Append("<None>")              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          if self.originalClass.GetFieldType() is None:              self.fields.Append("<None>")
             self.fields.SetClientData(0, copy.deepcopy(self.originalClass))  
         else:  
             self.fields.SetClientData(0, None)  
721    
722          for i in range(self.num_cols):              if self.originalClass.GetFieldType() is None:
723              type, name, len, decc = layer.table.field_info(i)                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
             self.fields.Append(name)  
   
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1,  
                                           copy.deepcopy(self.originalClass))  
724              else:              else:
725                  self.fields.SetClientData(i + 1, None)                  self.fields.SetClientData(0, None)
726    
727                for i in range(self.num_cols):
728                    name = table.Column(i).name
729                    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_close = wxButton(self, wxID_CANCEL, _("Close"))
762            button_ok.SetDefault()
763    
764            ############################
765            # Layout the controls
766            #
767    
768            topBox = wxBoxSizer(wxVERTICAL)
769            panelBox = wxBoxSizer(wxVERTICAL)
770    
771          sizer = wxBoxSizer(wxHORIZONTAL)          sizer = wxBoxSizer(wxHORIZONTAL)
772          sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
773              0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
774          sizer.Add(self.fields, 1, wxGROW | wxALL, 4)          sizer.Add(text_title, 1, wxGROW, 0)
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
775    
776          panelBox.Add(sizer, 0, wxGROW, 4)          panelBox.Add(sizer, 0, wxGROW, 4)
777    
778          self.fieldTypeText = wxStaticText(panel, -1, "")          if isinstance(layer, RasterLayer):
779          panelBox.Add(self.fieldTypeText, 0,              type = "Image"
780                       wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)          else:
781                type = layer.ShapeType()
   
         #  
         # Control Box  
         #  
         controlBox = wxBoxSizer(wxHORIZONTAL)  
   
   
         ###########  
         #  
         # Control buttons:  
         #  
         controlButtonBox = wxBoxSizer(wxVERTICAL)  
   
         button = wxButton(panel, ID_PROPERTY_GENCLASS, _("Generate Class"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
782    
783          button = wxButton(panel, ID_PROPERTY_ADD, _("Add"))          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_MOVEUP, _("Move Up"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
787    
788          button = wxButton(panel, ID_PROPERTY_MOVEDOWN, _("Move Down"))              classBox = wxStaticBoxSizer(
789          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
790    
         button = wxButton(panel, ID_PROPERTY_EDITSYM, _("Edit Symbol"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
791    
792          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              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          button = wxButton(panel, ID_PROPERTY_REMOVE, _("Remove"))              classBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
798    
799                classBox.Add(self.fieldTypeText, 0,
800                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
801    
802          ###########              controlBox = wxBoxSizer(wxHORIZONTAL)
803          #              controlButtonBox = wxBoxSizer(wxVERTICAL)
         # Classification data table  
         #  
804    
805          self.classGrid = ClassGrid(panel, self)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
806                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          # calling __SelectField after creating the classGrid fills in the              controlBox.Add(self.classGrid, 1, wxGROW, 0)
815          # grid with the correct information              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
         self.fields.SetSelection(self.__cur_field)  
         self.__SelectField(self.__cur_field, group = group)  
816    
817          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox.Add(controlBox, 1, wxGROW, 10)
818                panelBox.Add(classBox, 1, wxGROW, 0)
819    
         controlBox.Add(controlButtonBox, 0, wxGROW, 10)  
         panelBox.Add(controlBox, 1, wxGROW, 10)  
820    
821          EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)          buttonBox = wxBoxSizer(wxHORIZONTAL)
822          EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
823          EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)          buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
824          EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
825          EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)          buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
         EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)  
   
         ###########  
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)
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 900  class Classifier(NonModalDialog): Line 909  class Classifier(NonModalDialog):
909          if copyClass:          if copyClass:
910              clazz = copy.deepcopy(clazz)              clazz = copy.deepcopy(clazz)
911    
912          clazz.SetField(fieldName)          clazz.SetFieldInfo(fieldName, fieldType)
         clazz.SetFieldType(fieldType)  
913    
914    
915  #       table = self.classGrid.GetTable()  #       table = self.classGrid.GetTable()
# Line 925  class Classifier(NonModalDialog): Line 933  class Classifier(NonModalDialog):
933    
934              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
935              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
936              clazz.SetFieldType(fieldType)              clazz.SetFieldInfo(fieldName, fieldType)
937                                    
938          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)
939    
# Line 952  class Classifier(NonModalDialog): Line 960  class Classifier(NonModalDialog):
960    
961          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
962    
963          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)          self.__EnableButtons(EB_SELECT_FIELD)
964    
965          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
966    
# Line 978  class Classifier(NonModalDialog): Line 986  class Classifier(NonModalDialog):
986             it to the layer.             it to the layer.
987          """          """
988    
989          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
990                clazz = self.fields.GetClientData(self.__cur_field)
991    
992          #              #
993          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
994          # to begin with or it has been modified              # to begin with or it has been modified
995          #              #
996          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
997              clazz = self.__BuildClassification(self.__cur_field, True)              if clazz is None or self.classGrid.GetTable().IsModified():
998                    clazz = self.__BuildClassification(self.__cur_field, True)
999    
1000          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
1001    
1002          self.haveApplied = True          self.haveApplied = True
1003    
# Line 995  class Classifier(NonModalDialog): Line 1005  class Classifier(NonModalDialog):
1005          self._OnTry(event)          self._OnTry(event)
1006          self.Close()          self.Close()
1007    
1008        def OnClose(self, event):
1009            self.unsubscribe_messages()
1010            NonModalNonParentDialog.OnClose(self, event)
1011    
1012      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
1013          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
1014          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1023  class Classifier(NonModalDialog): Line 1037  class Classifier(NonModalDialog):
1037    
1038          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1039    
1040          self.__EnableButtons(EB_GEN_CLASS, False)          self.__EnableButtons(EB_GEN_CLASS)
1041    
1042          self.genDlg.Show()          self.genDlg.Show()
1043    
1044      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1045          self.genDlg.Destroy()          self.genDlg.Destroy()
1046          self.__EnableButtons(EB_GEN_CLASS, True)          self.genDlg = None
1047            self.__EnableButtons(EB_GEN_CLASS)
1048    
1049      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1050          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1067  class Classifier(NonModalDialog): Line 1082  class Classifier(NonModalDialog):
1082          self.layer.SetTitle(obj.GetValue())          self.layer.SetTitle(obj.GetValue())
1083          self.__SetTitle(self.layer.Title())          self.__SetTitle(self.layer.Title())
1084    
1085          self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")          self.__EnableButtons(EB_LAYER_TITLE)
1086    
1087      def __EnableButtons(self, case, enable):      def __EnableButtons(self, case):
1088    
1089            list = {wxID_OK                 : True,
1090                    wxID_CANCEL             : True,
1091                    ID_PROPERTY_ADD         : True,
1092                    ID_PROPERTY_MOVEUP      : True,
1093                    ID_PROPERTY_MOVEDOWN    : True,
1094                    ID_PROPERTY_REMOVE      : True,
1095                    ID_PROPERTY_SELECT      : True,
1096                    ID_PROPERTY_FIELDTEXT   : True,
1097                    ID_PROPERTY_GENCLASS    : True,
1098                    ID_PROPERTY_EDITSYM     : True}
1099    
1100          if case == EB_LAYER_TITLE:            if case == EB_LAYER_TITLE:  
1101              list = (ID_PROPERTY_OK,              if self.layer.Title() == "":
1102                      ID_PROPERTY_CLOSE)                  list[wxID_OK] = False
1103                    list[wxID_CANCEL] = False
1104    
1105          elif case == EB_SELECT_FIELD:          elif case == EB_SELECT_FIELD:
1106              list = (ID_PROPERTY_GENCLASS,              if self.fields.GetSelection() == 0:
1107                      ID_PROPERTY_ADD,                  list[ID_PROPERTY_GENCLASS] = False
1108                      ID_PROPERTY_MOVEUP,                  list[ID_PROPERTY_ADD] = False
1109                      ID_PROPERTY_MOVEDOWN,                  list[ID_PROPERTY_MOVEUP] = False
1110                      ID_PROPERTY_EDITSYM,                  list[ID_PROPERTY_MOVEDOWN] = False
1111                      ID_PROPERTY_REMOVE)                  list[ID_PROPERTY_REMOVE] = False
1112    
1113          elif case == EB_GEN_CLASS:          elif case == EB_GEN_CLASS:
1114              list = (ID_PROPERTY_SELECT,              if self.genDlg is not None:
1115                      ID_PROPERTY_FIELDTEXT,                  list[ID_PROPERTY_SELECT] = False
1116                      ID_PROPERTY_GENCLASS,                  list[ID_PROPERTY_FIELDTEXT] = False
1117                      ID_PROPERTY_EDITSYM)                  list[ID_PROPERTY_GENCLASS] = False
1118    
1119          for id in list:          for id, enable in list.items():
1120              self.FindWindowById(id).Enable(enable)              win = self.FindWindowById(id)
1121                if win:
1122                    win.Enable(enable)
1123    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1124  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1125  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1126  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1132  class SelectPropertiesDialog(wxDialog): Line 1159  class SelectPropertiesDialog(wxDialog):
1159          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1160    
1161          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1162          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1163              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1164              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1165          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1166    
1167          lineColorBox.Add(          lineColorBox.Add(
# Line 1180  class SelectPropertiesDialog(wxDialog): Line 1207  class SelectPropertiesDialog(wxDialog):
1207          # Control buttons:          # Control buttons:
1208          #          #
1209          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1210          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1211                        0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1212          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1213                        0, wxALL, 4)                        0, wxRIGHT|wxEXPAND, 10)
1214          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1215    
1216            button_ok.SetDefault()
1217                                                                                                                                                                    
1218          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1219          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1220                                                                                                                                                                    
1221          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1222          self.SetSizer(topBox)          self.SetSizer(topBox)
1223          topBox.Fit(self)          topBox.Fit(self)
1224          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1225    
1226      def _OnOK(self, event):      def OnOK(self, event):
1227          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1228    
1229      def _OnCancel(self, event):      def OnCancel(self, event):
1230          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1231    
1232      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 1206  class SelectPropertiesDialog(wxDialog): Line 1235  class SelectPropertiesDialog(wxDialog):
1235    
1236      def __GetColor(self, cur):      def __GetColor(self, cur):
1237          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1238          if cur is not Color.Transparent:          if cur is not Transparent:
1239              dialog.GetColourData().SetColour(Color2wxColour(cur))              dialog.GetColourData().SetColour(Color2wxColour(cur))
1240    
1241          ret = None          ret = None
# Line 1224  class SelectPropertiesDialog(wxDialog): Line 1253  class SelectPropertiesDialog(wxDialog):
1253          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1254    
1255      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1256          self.prop.SetLineColor(Color.Transparent)          self.prop.SetLineColor(Transparent)
1257          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1258                    
1259      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1234  class SelectPropertiesDialog(wxDialog): Line 1263  class SelectPropertiesDialog(wxDialog):
1263          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1264    
1265      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1266          self.prop.SetFill(Color.Transparent)          self.prop.SetFill(Transparent)
1267          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1268    
1269      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1290  class ClassDataPreviewer: Line 1319  class ClassDataPreviewer:
1319              h = rect.GetHeight()              h = rect.GetHeight()
1320    
1321          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1322          if stroke is Color.Transparent:          if stroke is Transparent:
1323              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1324          else:          else:
1325              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1298  class ClassDataPreviewer: Line 1327  class ClassDataPreviewer:
1327                          wxSOLID)                          wxSOLID)
1328    
1329          stroke = prop.GetFill()          stroke = prop.GetFill()
1330          if stroke is Color.Transparent:          if stroke is Transparent:
1331              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1332          else:          else:
1333              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1357  class ClassGroupPropertiesCtrl(wxWindow, Line 1386  class ClassGroupPropertiesCtrl(wxWindow,
1386    
1387          wxWindow.__init__(self, parent, id, size = size, style = style)          wxWindow.__init__(self, parent, id, size = size, style = style)
1388    
1389            self.parent = parent
1390    
1391          self.SetProperties(props)          self.SetProperties(props)
1392          self.SetShapeType(shapeType)          self.SetShapeType(shapeType)
1393          self.AllowEdit(True)          self.AllowEdit(True)
# Line 1400  class ClassGroupPropertiesCtrl(wxWindow, Line 1431  class ClassGroupPropertiesCtrl(wxWindow,
1431      def DoEdit(self):      def DoEdit(self):
1432          if not self.allowEdit: return          if not self.allowEdit: return
1433    
1434          propDlg = SelectPropertiesDialog(NULL,          propDlg = SelectPropertiesDialog(self.parent,
1435                                           self.GetProperties(),                                           self.GetProperties(),
1436                                           self.GetShapeType())                                           self.GetShapeType())
1437    
Legend:
Removed from v.650  
changed lines
  Added in v.1342
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26