/[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 712 by jonathan, Wed Apr 23 08:46:40 2003 UTC revision 1433 by jonathan, Wed Jul 16 13:24:25 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 79  class ClassGrid(wxGrid): Line 84  class ClassGrid(wxGrid):
84          #print "GetCellAttr ", row, col          #print "GetCellAttr ", row, col
85          #wxGrid.GetCellAttr(self, row, col)          #wxGrid.GetCellAttr(self, row, col)
86    
87      def CreateTable(self, clazz, shapeType, group = None):      def CreateTable(self, clazz, fieldType, shapeType, group = None):
88    
89          assert isinstance(clazz, Classification)          assert isinstance(clazz, Classification)
90    
# Line 99  class ClassGrid(wxGrid): Line 104  class ClassGrid(wxGrid):
104          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
105          self.ClearSelection()          self.ClearSelection()
106    
107          table.Reset(clazz, shapeType, group)          table.Reset(clazz, fieldType, shapeType, group)
108    
109      def GetCurrentSelection(self):      def GetCurrentSelection(self):
110          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
# 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 252  class ClassTable(wxPyGridTableBase): Line 258  class ClassTable(wxPyGridTableBase):
258    
259    
260      def __init__(self, view = None):      def __init__(self, view = None):
     #def __init__(self, clazz, shapeType, view = None):  
261          """Constructor.          """Constructor.
262    
263          shapeType -- the type of shape that the layer uses          shapeType -- the type of shape that the layer uses
# Line 269  class ClassTable(wxPyGridTableBase): Line 274  class ClassTable(wxPyGridTableBase):
274    
275          self.SetView(view)          self.SetView(view)
276    
277      def Reset(self, clazz, shapeType, group = None):      def Reset(self, clazz, fieldType, shapeType, group = None):
278          """Reset the table with the given data.          """Reset the table with the given data.
279    
280          This is necessary because wxWindows does not allow a grid's          This is necessary because wxWindows does not allow a grid's
# Line 287  class ClassTable(wxPyGridTableBase): Line 292  class ClassTable(wxPyGridTableBase):
292    
293          self.GetView().BeginBatch()          self.GetView().BeginBatch()
294    
295          self.fieldType = clazz.GetFieldType()          self.fieldType = fieldType
296          self.shapeType = shapeType          self.shapeType = shapeType
297    
298          self.SetClassification(clazz, group)          self.SetClassification(clazz, group)
# Line 458  class ClassTable(wxPyGridTableBase): Line 463  class ClassTable(wxPyGridTableBase):
463          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
464              return group.GetValue()              return group.GetValue()
465          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
466              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
467    
468          assert(False) # shouldn't get here          assert False # shouldn't get here
469          return None          return None
470    
471      def __ParseInput(self, value):      def __ParseInput(self, value):
472          """Try to determine what kind of input value is          """Try to determine what kind of input value is
473             (string, number, or range)             (string, number, or range)
474    
475          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
476          value, or of length two if it is a range.          a singleton value, or 1 if is a range
477          """          """
478    
479          type = self.fieldType          type = self.fieldType
480    
481          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
482              return (value,)              return (0, value)
483          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
484              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
485                    # the float call allows the user to enter 1.0 for 1
486                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
487              else:              else:
488                  conv = lambda p: p                  conv = float
489    
490              #              #
491              # first try to take the input as a single number              # first try to take the input as a single number
492              # if there's an exception try to break it into              # if there's an exception try to break it into
493              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
494              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
495              #              #
496              try:              try:
497                  return (conv(Str2Num(value)),)                  return (0, conv(value))
498              except ValueError:              except ValueError:
499                  i = value.find('-')                  return (1, Range(value))
                 if i == 0:  
                     i = value.find('-', 1)  
   
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
500    
501          assert False  # shouldn't get here          assert False  # shouldn't get here
502          return (0,)          return (0,None)
               
503    
504      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
505          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 556  class ClassTable(wxPyGridTableBase): Line 553  class ClassTable(wxPyGridTableBase):
553                      # changing the underlying group type if the                      # changing the underlying group type if the
554                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
555                      #                      #
556                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
557                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
558                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
559                              changed = True                              changed = True
560                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
561                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
562                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
563                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
564                              changed = True                              changed = True
565                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
566                      else:                      else:
567                          assert False                          assert False
568                          pass                          pass
# Line 650  class ClassTable(wxPyGridTableBase): Line 647  class ClassTable(wxPyGridTableBase):
647              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
648    
649    
 ID_PROPERTY_OK = 4001  
650  ID_PROPERTY_REVERT = 4002  ID_PROPERTY_REVERT = 4002
651  ID_PROPERTY_ADD = 4003  ID_PROPERTY_ADD = 4003
652  ID_PROPERTY_GENCLASS = 4004  ID_PROPERTY_GENCLASS = 4004
# Line 659  ID_PROPERTY_MOVEUP = 4006 Line 655  ID_PROPERTY_MOVEUP = 4006
655  ID_PROPERTY_MOVEDOWN = 4007  ID_PROPERTY_MOVEDOWN = 4007
656  ID_PROPERTY_TRY = 4008  ID_PROPERTY_TRY = 4008
657  ID_PROPERTY_EDITSYM = 4009  ID_PROPERTY_EDITSYM = 4009
 ID_PROPERTY_CLOSE = 4010  
658  ID_PROPERTY_SELECT = 4011  ID_PROPERTY_SELECT = 4011
659  ID_PROPERTY_TITLE = 4012  ID_PROPERTY_TITLE = 4012
660  ID_PROPERTY_FIELDTEXT = 4013  ID_PROPERTY_FIELDTEXT = 4013
# Line 675  EB_LAYER_TITLE = 0 Line 670  EB_LAYER_TITLE = 0
670  EB_SELECT_FIELD = 1  EB_SELECT_FIELD = 1
671  EB_GEN_CLASS = 2  EB_GEN_CLASS = 2
672    
673  class Classifier(NonModalDialog):  class Classifier(NonModalNonParentDialog):
674    
675      type2string = {None:             _("None"),      type2string = {None:             _("None"),
676                     FIELDTYPE_STRING: _("Text"),                     FIELDTYPE_STRING: _("Text"),
677                     FIELDTYPE_INT:    _("Integer"),                     FIELDTYPE_INT:    _("Integer"),
678                     FIELDTYPE_DOUBLE: _("Decimal")}                     FIELDTYPE_DOUBLE: _("Decimal")}
679    
680      def __init__(self, parent, name, layer, group = None):      def __init__(self, parent, name, map, layer, group = None):
681          NonModalDialog.__init__(self, parent, name, "")          NonModalNonParentDialog.__init__(self, parent, name, "")
682    
683          self.__SetTitle(layer.Title())          self.__SetTitle(layer.Title())
684    
685          self.layer = layer          self.layer = layer
686            self.map = map
687    
688          self.originalClass = self.layer.GetClassification()          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
689          field = self.originalClass.GetField()          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
690          fieldType = self.originalClass.GetFieldType()                               self.layer_shapestore_replaced)
691    
692          self.genDlg = None          self.genDlg = None
693    
694          topBox = wxBoxSizer(wxVERTICAL)          ############################
695            # 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)  
   
   
         #  
         # make field choice box  
696          #          #
         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  
   
         self.fields.Append("<None>")  
697    
698          if self.originalClass.GetFieldType() is None:          panel = wxPanel(self, -1)
             self.fields.SetClientData(0, copy.deepcopy(self.originalClass))  
         else:  
             self.fields.SetClientData(0, None)  
699    
700          for i in range(self.num_cols):          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
701              type, name, len, decc = layer.table.field_info(i)          self.fieldTypeText = wxStaticText(panel, -1, "")
             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)  
702    
703            if layer.HasClassification():
704                self.originalClass = self.layer.GetClassification()
705                self.originalClassField = self.layer.GetClassificationField()
706                field = self.originalClassField
707                fieldType = self.layer.GetFieldType(field)
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          sizer = wxBoxSizer(wxHORIZONTAL)              self.fields.Append("<None>")
         sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),  
             0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)  
         sizer.Add(self.fields, 1, wxGROW | wxALL, 4)  
         EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
         #EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
721    
722          classBox.Add(sizer, 0, wxGROW, 4)              if fieldType is None:
723                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
724                else:
725                    self.fields.SetClientData(0, None)
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_close = wxButton(self, wxID_CANCEL, _("Close"))
762            button_ok.SetDefault()
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)
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 894  class Classifier(NonModalDialog): Line 896  class Classifier(NonModalDialog):
896  #       numRows = self.classGrid.GetNumberRows()  #       numRows = self.classGrid.GetNumberRows()
897  #       assert numRows > 0  # there should always be a default row  #       assert numRows > 0  # there should always be a default row
898    
 #       clazz = Classification()  
899          if fieldIndex == 0:          if fieldIndex == 0:
900              fieldName = None              fieldName = None
901              fieldType = None              fieldType = None
# Line 907  class Classifier(NonModalDialog): Line 908  class Classifier(NonModalDialog):
908          if copyClass:          if copyClass:
909              clazz = copy.deepcopy(clazz)              clazz = copy.deepcopy(clazz)
910    
         clazz.SetField(fieldName)  
         clazz.SetFieldType(fieldType)  
   
   
 #       table = self.classGrid.GetTable()  
 #       clazz.SetDefaultGroup(table.GetClassGroup(0))  
   
 #       for i in range(1, numRows):  
 #           clazz.AppendGroup(table.GetClassGroup(i))  
   
911          return clazz          return clazz
912    
913      def __SetGridTable(self, fieldIndex, group = None):      def __SetGridTable(self, fieldIndex, group = None):
# Line 930  class Classifier(NonModalDialog): Line 921  class Classifier(NonModalDialog):
921                      self.layer.GetClassification().                      self.layer.GetClassification().
922                                 GetDefaultGroup().GetProperties()))                                 GetDefaultGroup().GetProperties()))
923    
924              fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
925              fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
             clazz.SetFieldType(fieldType)  
926                                    
927          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)          self.classGrid.CreateTable(clazz, fieldType,
928                                       self.layer.ShapeType(), group)
929    
930      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
931          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
# Line 959  class Classifier(NonModalDialog): Line 950  class Classifier(NonModalDialog):
950    
951          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
952    
953          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)          self.__EnableButtons(EB_SELECT_FIELD)
954    
955          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
956    
# Line 985  class Classifier(NonModalDialog): Line 976  class Classifier(NonModalDialog):
976             it to the layer.             it to the layer.
977          """          """
978    
979          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
980                clazz = self.fields.GetClientData(self.__cur_field)
         #  
         # only build the classification if there wasn't one to  
         # to begin with or it has been modified  
         #  
         if clazz is None or self.classGrid.GetTable().IsModified():  
             clazz = self.__BuildClassification(self.__cur_field, True)  
981    
982          self.layer.SetClassification(clazz)              #
983                # only build the classification if there wasn't one to
984                # to begin with or it has been modified
985                #
986                self.classGrid.SaveEditControlValue()
987                if clazz is None or self.classGrid.GetTable().IsModified():
988                    clazz = self.__BuildClassification(self.__cur_field, True)
989    
990                self.layer.SetClassificationField(
991                    self.fields.GetString(self.__cur_field))
992                self.layer.SetClassification(clazz)
993    
994          self.haveApplied = True          self.haveApplied = True
995    
# Line 1002  class Classifier(NonModalDialog): Line 997  class Classifier(NonModalDialog):
997          self._OnTry(event)          self._OnTry(event)
998          self.Close()          self.Close()
999    
1000        def OnClose(self, event):
1001            self.unsubscribe_messages()
1002            NonModalNonParentDialog.OnClose(self, event)
1003    
1004      def _OnCloseBtn(self, event):      def _OnCloseBtn(self, event):
1005          """Close is similar to Cancel except that any changes that were          """Close is similar to Cancel except that any changes that were
1006          made and applied remain applied, but the currently displayed          made and applied remain applied, but the currently displayed
# Line 1013  class Classifier(NonModalDialog): Line 1012  class Classifier(NonModalDialog):
1012      def _OnRevert(self, event):      def _OnRevert(self, event):
1013          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1014          if self.haveApplied:          if self.haveApplied:
1015                self.layer.SetClassificationField(self.originalClassField)
1016              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1017    
1018          #self.Close()          #self.Close()
# Line 1030  class Classifier(NonModalDialog): Line 1030  class Classifier(NonModalDialog):
1030    
1031          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)          EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1032    
1033          self.__EnableButtons(EB_GEN_CLASS, False)          self.__EnableButtons(EB_GEN_CLASS)
1034    
1035          self.genDlg.Show()          self.genDlg.Show()
1036    
1037      def _OnGenDialogClose(self, event):      def _OnGenDialogClose(self, event):
1038          self.genDlg.Destroy()          self.genDlg.Destroy()
1039          self.__EnableButtons(EB_GEN_CLASS, True)          self.genDlg = None
1040            self.__EnableButtons(EB_GEN_CLASS)
1041    
1042      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1043          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 1074  class Classifier(NonModalDialog): Line 1075  class Classifier(NonModalDialog):
1075          self.layer.SetTitle(obj.GetValue())          self.layer.SetTitle(obj.GetValue())
1076          self.__SetTitle(self.layer.Title())          self.__SetTitle(self.layer.Title())
1077    
1078          self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")          self.__EnableButtons(EB_LAYER_TITLE)
1079    
1080        def __EnableButtons(self, case):
1081    
1082      def __EnableButtons(self, case, enable):          list = {wxID_OK                 : True,
1083                    wxID_CANCEL             : True,
1084                    ID_PROPERTY_ADD         : True,
1085                    ID_PROPERTY_MOVEUP      : True,
1086                    ID_PROPERTY_MOVEDOWN    : True,
1087                    ID_PROPERTY_REMOVE      : True,
1088                    ID_PROPERTY_SELECT      : True,
1089                    ID_PROPERTY_FIELDTEXT   : True,
1090                    ID_PROPERTY_GENCLASS    : True,
1091                    ID_PROPERTY_EDITSYM     : True}
1092    
1093          if case == EB_LAYER_TITLE:            if case == EB_LAYER_TITLE:  
1094              list = (ID_PROPERTY_OK,              if self.layer.Title() == "":
1095                      ID_PROPERTY_CLOSE)                  list[wxID_OK] = False
1096                    list[wxID_CANCEL] = False
1097    
1098          elif case == EB_SELECT_FIELD:          elif case == EB_SELECT_FIELD:
1099              list = (ID_PROPERTY_GENCLASS,              if self.fields.GetSelection() == 0:
1100                      ID_PROPERTY_ADD,                  list[ID_PROPERTY_GENCLASS] = False
1101                      ID_PROPERTY_MOVEUP,                  list[ID_PROPERTY_ADD] = False
1102                      ID_PROPERTY_MOVEDOWN,                  list[ID_PROPERTY_MOVEUP] = False
1103                      ID_PROPERTY_EDITSYM,                  list[ID_PROPERTY_MOVEDOWN] = False
1104                      ID_PROPERTY_REMOVE)                  list[ID_PROPERTY_REMOVE] = False
1105    
1106          elif case == EB_GEN_CLASS:          elif case == EB_GEN_CLASS:
1107              list = (ID_PROPERTY_SELECT,              if self.genDlg is not None:
1108                      ID_PROPERTY_FIELDTEXT,                  list[ID_PROPERTY_SELECT] = False
1109                      ID_PROPERTY_GENCLASS,                  list[ID_PROPERTY_FIELDTEXT] = False
1110                      ID_PROPERTY_EDITSYM)                  list[ID_PROPERTY_GENCLASS] = False
1111    
1112            for id, enable in list.items():
1113                win = self.FindWindowById(id)
1114                if win:
1115                    win.Enable(enable)
1116    
         for id in list:  
             self.FindWindowById(id).Enable(enable)  
   
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1117  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1118  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1119  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1139  class SelectPropertiesDialog(wxDialog): Line 1152  class SelectPropertiesDialog(wxDialog):
1152          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1153    
1154          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1155          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1156              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1157              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1158          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1159    
1160          lineColorBox.Add(          lineColorBox.Add(
# Line 1187  class SelectPropertiesDialog(wxDialog): Line 1200  class SelectPropertiesDialog(wxDialog):
1200          # Control buttons:          # Control buttons:
1201          #          #
1202          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1203          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1204                        0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1205          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1206                        0, wxALL, 4)                        0, wxRIGHT|wxEXPAND, 10)
1207          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1208    
1209            button_ok.SetDefault()
1210                                                                                                                                                                    
1211          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1212          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1213                                                                                                                                                                    
1214          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1215          self.SetSizer(topBox)          self.SetSizer(topBox)
1216          topBox.Fit(self)          topBox.Fit(self)
1217          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1218    
1219      def _OnOK(self, event):      def OnOK(self, event):
1220          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1221    
1222      def _OnCancel(self, event):      def OnCancel(self, event):
1223          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1224    
1225      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 1213  class SelectPropertiesDialog(wxDialog): Line 1228  class SelectPropertiesDialog(wxDialog):
1228    
1229      def __GetColor(self, cur):      def __GetColor(self, cur):
1230          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1231          if cur is not Color.Transparent:          if cur is not Transparent:
1232              dialog.GetColourData().SetColour(Color2wxColour(cur))              dialog.GetColourData().SetColour(Color2wxColour(cur))
1233    
1234          ret = None          ret = None
# Line 1231  class SelectPropertiesDialog(wxDialog): Line 1246  class SelectPropertiesDialog(wxDialog):
1246          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1247    
1248      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1249          self.prop.SetLineColor(Color.Transparent)          self.prop.SetLineColor(Transparent)
1250          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1251                    
1252      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1241  class SelectPropertiesDialog(wxDialog): Line 1256  class SelectPropertiesDialog(wxDialog):
1256          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1257    
1258      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1259          self.prop.SetFill(Color.Transparent)          self.prop.SetFill(Transparent)
1260          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1261    
1262      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1297  class ClassDataPreviewer: Line 1312  class ClassDataPreviewer:
1312              h = rect.GetHeight()              h = rect.GetHeight()
1313    
1314          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1315          if stroke is Color.Transparent:          if stroke is Transparent:
1316              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1317          else:          else:
1318              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1305  class ClassDataPreviewer: Line 1320  class ClassDataPreviewer:
1320                          wxSOLID)                          wxSOLID)
1321    
1322          stroke = prop.GetFill()          stroke = prop.GetFill()
1323          if stroke is Color.Transparent:          if stroke is Transparent:
1324              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1325          else:          else:
1326              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1364  class ClassGroupPropertiesCtrl(wxWindow, Line 1379  class ClassGroupPropertiesCtrl(wxWindow,
1379    
1380          wxWindow.__init__(self, parent, id, size = size, style = style)          wxWindow.__init__(self, parent, id, size = size, style = style)
1381    
1382            self.parent = parent
1383    
1384          self.SetProperties(props)          self.SetProperties(props)
1385          self.SetShapeType(shapeType)          self.SetShapeType(shapeType)
1386          self.AllowEdit(True)          self.AllowEdit(True)
# Line 1407  class ClassGroupPropertiesCtrl(wxWindow, Line 1424  class ClassGroupPropertiesCtrl(wxWindow,
1424      def DoEdit(self):      def DoEdit(self):
1425          if not self.allowEdit: return          if not self.allowEdit: return
1426    
1427          propDlg = SelectPropertiesDialog(NULL,          propDlg = SelectPropertiesDialog(self.parent,
1428                                           self.GetProperties(),                                           self.GetProperties(),
1429                                           self.GetShapeType())                                           self.GetShapeType())
1430    
Legend:
Removed from v.712  
changed lines
  Added in v.1433
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26