/[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 476 by bh, Thu Mar 6 15:03:37 2003 UTC revision 485 by jonathan, Fri Mar 7 18:20:31 2003 UTC
# Line 27  from Thuban.Model.color import Color Line 27  from Thuban.Model.color import Color
27    
28  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
29    
30    from dialogs import NonModalDialog
31    
32  # widget id's  # widget id's
33  ID_PROPERTY_SELECT = 4010  ID_PROPERTY_SELECT = 4010
34  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
# Line 38  ID_CLASSIFY_GENRANGE = 4004 Line 40  ID_CLASSIFY_GENRANGE = 4004
40  ID_CLASSIFY_REMOVE = 4005  ID_CLASSIFY_REMOVE = 4005
41  ID_CLASSIFY_MOVEUP = 4006  ID_CLASSIFY_MOVEUP = 4006
42  ID_CLASSIFY_MOVEDOWN = 4007  ID_CLASSIFY_MOVEDOWN = 4007
43    ID_CLASSIFY_APPLY = 4008
44    
45  # table columns  # table columns
46  COL_SYMBOL = 0  COL_SYMBOL = 0
# 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, size = (340, 160))          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))
72            wxGrid.__init__(self, parent, ID_CLASS_TABLE)
73          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), true)          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), true)
74    
75          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
# Line 128  class ClassGrid(wxGrid): Line 132  class ClassGrid(wxGrid):
132          # if only one thing is selected check if it is the default          # if only one thing is selected check if it is the default
133          # data row, because we can't remove that          # data row, because we can't remove that
134          if len(sel) == 1:          if len(sel) == 1:
135              group = self.GetTable().GetValueAsCustom(sel[0], COL_SYMBOL, None)              #group = self.GetTable().GetValueAsCustom(sel[0], COL_SYMBOL, None)
136                group = self.GetTable().GetClassGroup(sel[0])
137              if isinstance(group, ClassGroupDefault):              if isinstance(group, ClassGroupDefault):
138                  wxMessageDialog(self,                  wxMessageDialog(self,
139                                  "The Default group cannot be removed.",                                  "The Default group cannot be removed.",
# Line 177  class ClassGrid(wxGrid): Line 182  class ClassGrid(wxGrid):
182          r = event.GetRow()          r = event.GetRow()
183          c = event.GetCol()          c = event.GetCol()
184          if c == COL_SYMBOL:          if c == COL_SYMBOL:
185              group = self.GetTable().GetValueAsCustom(r, c, None)              prop = self.GetTable().GetValueAsCustom(r, c, None)
186              prop = group.GetProperties()              #prop = group.GetProperties()
187    
188              # get a new ClassGroupProperties object and copy the              # get a new ClassGroupProperties object and copy the
189              # values over to our current object              # values over to our current object
190              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)
191              if propDlg.ShowModal() == wxID_OK:              if propDlg.ShowModal() == wxID_OK:
192                  new_prop = propDlg.GetClassGroupProperties()                  new_prop = propDlg.GetClassGroupProperties()
193                  prop.SetProperties(new_prop)                  #prop.SetProperties(new_prop)
194                  self.Refresh()                  self.GetTable().SetValueAsCustom(r, c, None, new_prop)
195              propDlg.Destroy()              propDlg.Destroy()
196    
197      #      #
# Line 230  class ClassTable(wxPyGridTableBase): Line 235  class ClassTable(wxPyGridTableBase):
235          """          """
236    
237          wxPyGridTableBase.__init__(self)          wxPyGridTableBase.__init__(self)
238    
239          self.SetView(view)          self.SetView(view)
240          self.tdata = []          self.tdata = []
241    
# Line 253  class ClassTable(wxPyGridTableBase): Line 259  class ClassTable(wxPyGridTableBase):
259    
260          self.GetView().BeginBatch()          self.GetView().BeginBatch()
261    
262          self.clazz = clazz          self.fieldType = clazz.GetFieldType()
263          self.shapeType = shapeType          self.shapeType = shapeType
         self.renderer = ClassRenderer(self.shapeType)  
264    
265          old_len = len(self.tdata)          old_len = len(self.tdata)
266    
# Line 265  class ClassTable(wxPyGridTableBase): Line 270  class ClassTable(wxPyGridTableBase):
270          # copy the data out of the classification and into our          # copy the data out of the classification and into our
271          # array          # array
272          #          #
273          for p in self.clazz:          for p in clazz:
274              np = copy.copy(p)              np = copy.deepcopy(p)
275              self.__SetRow(-1, np)              self.__SetRow(-1, np)
276    
277    
278          self.__Modified(False)          self.__Modified(-1)
279    
280          self.__NotifyRowChanges(old_len, len(self.tdata))          self.__NotifyRowChanges(old_len, len(self.tdata))
281    
282            view = self.GetView()
283            w = view.GetDefaultColSize() * 3 + view.GetDefaultRowLabelSize()
284            h = view.GetDefaultRowSize() * 4 + view.GetDefaultColLabelSize()
285            view.SetDimensions(-1, -1, w, h)
286            view.SetSizeHints(w, h, -1, -1)
287                
288          self.GetView().EndBatch()          self.GetView().EndBatch()
289    
290      def __NotifyRowChanges(self, curRows, newRows):      def __NotifyRowChanges(self, curRows, newRows):
# Line 295  class ClassTable(wxPyGridTableBase): Line 307  class ClassTable(wxPyGridTableBase):
307      def __SetRow(self, row, group):      def __SetRow(self, row, group):
308          """Set a row's data to that of the group.          """Set a row's data to that of the group.
309    
310            The table is considered modified after this operation.
311    
312          row -- if row is -1 or greater than the current number of rows          row -- if row is -1 or greater than the current number of rows
313                 then group is appended to the end.                 then group is appended to the end.
314          """          """
# Line 359  class ClassTable(wxPyGridTableBase): Line 373  class ClassTable(wxPyGridTableBase):
373          group = self.tdata[row]          group = self.tdata[row]
374    
375          if col == COL_SYMBOL:          if col == COL_SYMBOL:
376              return group              return group.GetProperties()
377    
378          if col == COL_LABEL:          if col == COL_LABEL:
379              return group.GetLabel()              return group.GetLabel()
# Line 385  class ClassTable(wxPyGridTableBase): Line 399  class ClassTable(wxPyGridTableBase):
399          value, or of length two if it is a range.          value, or of length two if it is a range.
400          """          """
401    
402          type = self.clazz.GetFieldType()          type = self.fieldType
403    
404          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
405              return (value,)              return (value,)
# Line 415  class ClassTable(wxPyGridTableBase): Line 429  class ClassTable(wxPyGridTableBase):
429                  return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))                  return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))
430    
431          assert(False) # shouldn't get here          assert(False) # shouldn't get here
432            return (0,)
433                            
434    
435      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
# Line 434  class ClassTable(wxPyGridTableBase): Line 449  class ClassTable(wxPyGridTableBase):
449    
450          group = self.tdata[row]          group = self.tdata[row]
451    
452          mod = False          mod = True # assume the data will change
453    
454          if col == COL_SYMBOL:          if col == COL_SYMBOL:
455              self.__SetRow(row, value)              group.SetProperties(value)
456              mod = True          elif col == COL_LABEL:
457                group.SetLabel(value)
458          elif col == COL_VALUE:          elif col == COL_VALUE:
459              if isinstance(group, ClassGroupDefault):              if isinstance(group, ClassGroupDefault):
460                  # not allowed to modify the default value                  # not allowed to modify the default value
# Line 451  class ClassTable(wxPyGridTableBase): Line 467  class ClassTable(wxPyGridTableBase):
467                      dataInfo = self.__ParseInput(value)                      dataInfo = self.__ParseInput(value)
468                  except ValueError:                  except ValueError:
469                      # bad input, ignore the request                      # bad input, ignore the request
470                      pass                      mod = False
471                  else:                  else:
472    
473                        changed = False
474                      ngroup = group                      ngroup = group
475                      props = group.GetProperties()                      props = group.GetProperties()
476    
# Line 465  class ClassTable(wxPyGridTableBase): Line 482  class ClassTable(wxPyGridTableBase):
482                      if len(dataInfo) == 1:                      if len(dataInfo) == 1:
483                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
484                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(prop = props)
485                                changed = True
486                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[0])
487                      elif len(dataInfo) == 2:                      elif len(dataInfo) == 2:
488                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
489                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(prop = props)
490                                changed = True
491                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[0], dataInfo[1])
492                      else:                      else:
493                          assert(False)                          assert(False)
494                            pass
495    
496                      ngroup.SetLabel(group.GetLabel())                      if changed:
497                            ngroup.SetLabel(group.GetLabel())
498                      self.__SetRow(row, ngroup)                          self.SetClassGroup(row, ngroup)
499            else:
500                      mod = True              assert(False) # shouldn't be here
501                pass
   
         elif col == COL_LABEL:  
             group.SetLabel(value)  
             mod = True  
502    
503          if mod:          if mod:
504              self.__Modified()              self.__Modified()
505              self.GetView().Refresh()              self.GetView().Refresh()
506    
# Line 495  class ClassTable(wxPyGridTableBase): Line 511  class ClassTable(wxPyGridTableBase):
511          #attr = wxPyGridTableBase.GetAttr(self, row, col, someExtraParameter)          #attr = wxPyGridTableBase.GetAttr(self, row, col, someExtraParameter)
512    
513          if col == COL_SYMBOL:          if col == COL_SYMBOL:
514                # we need to create a new renderer each time, because
515                # SetRenderer takes control of the parameter
516              attr.SetRenderer(ClassRenderer(self.shapeType))              attr.SetRenderer(ClassRenderer(self.shapeType))
517              attr.SetReadOnly()              attr.SetReadOnly()
518    
# Line 503  class ClassTable(wxPyGridTableBase): Line 521  class ClassTable(wxPyGridTableBase):
521      def GetClassGroup(self, row):      def GetClassGroup(self, row):
522          """Return the ClassGroup object representing row 'row'."""          """Return the ClassGroup object representing row 'row'."""
523    
524          return self.GetValueAsCustom(row, COL_SYMBOL, None)          return self.tdata[row] # self.GetValueAsCustom(row, COL_SYMBOL, None)
525    
526      def SetClassGroup(self, row, group):      def SetClassGroup(self, row, group):
527          self.SetValueAsCustom(row, COL_SYMBOL, None, group)          self.__SetRow(row, group)
528            self.GetView().Refresh()
529    
530      def __Modified(self, mod = True):      def __Modified(self, mod = True):
531          """Set the modified flag."""          """Adjust the modified flag.
532          self.modified = mod  
533            mod -- if -1 set the modified flag to False, otherwise perform
534                   an 'or' operation with the current value of the flag and
535                   'mod'
536            """
537    
538            if mod == -1:
539                self.modified = False
540            else:
541                self.modified = mod or self.modified
542    
543      def IsModified(self):      def IsModified(self):
544          """True if this table is considered modified."""          """True if this table is considered modified."""
545          return self.modified          return self.modified
546    
547      def DeleteRows(self, pos, numRows = 1):      def DeleteRows(self, pos, numRows = 1):
548          """Deletes 'numRows' beginning at row 'pos'.          """Deletes 'numRows' beginning at row 'pos'.
549    
550          The table is considered modified after this operation.          The row representing the default group is not removed.
551    
552            The table is considered modified if any rows are removed.
553          """          """
554    
555          assert(pos >= 0)          assert(pos >= 0)
556          old_len = len(self.tdata)          old_len = len(self.tdata)
557          for row in range(pos, pos - numRows, -1):          for row in range(pos, pos - numRows, -1):
558              group = self.GetValueAsCustom(row, COL_SYMBOL, None)              group = self.GetClassGroup(row)
559              if not isinstance(group, ClassGroupDefault):              if not isinstance(group, ClassGroupDefault):
560                  self.tdata.pop(row)                  self.tdata.pop(row)
561                  self.__Modified()                  self.__Modified()
# Line 534  class ClassTable(wxPyGridTableBase): Line 564  class ClassTable(wxPyGridTableBase):
564              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, len(self.tdata))
565    
566      def AppendRows(self, numRows = 1):      def AppendRows(self, numRows = 1):
567          """Append 'numRows' empty rows to the end of the table."""          """Append 'numRows' empty rows to the end of the table.
568    
569            The table is considered modified if any rows are appended.
570            """
571    
572          old_len = len(self.tdata)          old_len = len(self.tdata)
573          for i in range(numRows):          for i in range(numRows):
574              np = ClassGroupSingleton()              np = ClassGroupSingleton()
575              self.__SetRow(-1, np)              self.__SetRow(-1, np)
             #self.tdata.append([np, np.GetValue(), np.GetLabel()])  
             self.__Modified()  
576    
577          if self.IsModified():          if self.IsModified():
578              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, len(self.tdata))
579    
580    
581  class Classifier(wxDialog):  class Classifier(NonModalDialog):
582            
583      def __init__(self, parent, layer):      def __init__(self, parent, interactor, name, layer):
584          wxDialog.__init__(self, parent, -1, _("Classify"),          NonModalDialog.__init__(self, parent, interactor, name,
585                            style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)                                  _("Classifier: %s") % layer.Title())
   
586    
587          self.layer = layer          self.layer = layer
588    
589            self.originalClass = self.layer.GetClassification()
590            field = self.originalClass.GetField()
591            fieldType = self.originalClass.GetFieldType()
592    
593          topBox = wxBoxSizer(wxVERTICAL)          topBox = wxBoxSizer(wxVERTICAL)
594    
595          topBox.Add(wxStaticText(self, -1, _("Layer: %s") % layer.Title()),          #topBox.Add(wxStaticText(self, -1, _("Layer: %s") % layer.Title()),
596              0, wxALIGN_LEFT | wxALL, 4)              #0, wxALIGN_LEFT | wxALL, 4)
597          topBox.Add(wxStaticText(self, -1, _("Type: %s") % layer.ShapeType()),          topBox.Add(wxStaticText(self, -1,
598                                    _("Layer Type: %s") % layer.ShapeType()),
599              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
600    
         propertyBox = wxBoxSizer(wxHORIZONTAL)  
         propertyBox.Add(wxStaticText(self, -1, _("Field: ")),  
             0, wxALIGN_CENTER | wxALL, 4)  
601    
602            #
603            # make field combo box
604            #
605          self.fields = wxComboBox(self, ID_PROPERTY_SELECT, "",          self.fields = wxComboBox(self, ID_PROPERTY_SELECT, "",
606                                       style = wxCB_READONLY)                                       style = wxCB_READONLY)
607    
# Line 574  class Classifier(wxDialog): Line 609  class Classifier(wxDialog):
609          # just assume the first field in case one hasn't been          # just assume the first field in case one hasn't been
610          # specified in the file.          # specified in the file.
611          self.__cur_field = 0          self.__cur_field = 0
         clazz = layer.GetClassification()  
         field = clazz.GetField()  
612    
613          self.fields.Append("<None>")          self.fields.Append("<None>")
614          self.fields.SetClientData(0, None)          self.fields.SetClientData(0, None)
# Line 586  class Classifier(wxDialog): Line 619  class Classifier(wxDialog):
619    
620              if name == field:              if name == field:
621                  self.__cur_field = i + 1                  self.__cur_field = i + 1
622                  self.fields.SetClientData(i + 1, clazz)                  self.fields.SetClientData(i + 1, self.originalClass)
623              else:              else:
624                  self.fields.SetClientData(i + 1, None)                  self.fields.SetClientData(i + 1, None)
625    
626          self.fields.SetSelection(self.__cur_field)          self.fields.SetSelection(self.__cur_field)
627    
628            #
629            #
630            #
631    
632            self.fieldTypeText = wxStaticText(self, -1, "")
633            self.__SetFieldTypeText(self.__cur_field)
634    
635            topBox.Add(self.fieldTypeText, 0, wxALIGN_LEFT | wxALL, 4)
636            #self.fieldTypeText.SetLabel("asdfadsfs")
637    
638            propertyBox = wxBoxSizer(wxHORIZONTAL)
639            propertyBox.Add(wxStaticText(self, -1, _("Field: ")),
640                0, wxALIGN_CENTER | wxALL, 4)
641          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)
642          EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)          EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
643    
# Line 602  class Classifier(wxDialog): Line 648  class Classifier(wxDialog):
648          #          #
649    
650          controlBox = wxBoxSizer(wxHORIZONTAL)          controlBox = wxBoxSizer(wxHORIZONTAL)
         self.classGrid = ClassGrid(self)  
651    
652            self.classGrid = ClassGrid(self)
653          self.__SetGridTable(self.__cur_field)          self.__SetGridTable(self.__cur_field)
654            print self.classGrid.GetSizeTuple()
655    
656          controlBox.Add(self.classGrid, 1, wxGROW, 0)          controlBox.Add(self.classGrid, 1, wxGROW, 0)
657    
658          controlButtonBox = wxBoxSizer(wxVERTICAL)          controlButtonBox = wxBoxSizer(wxVERTICAL)
         controlButtonBox.Add(wxButton(self, ID_CLASSIFY_ADD,  
             _("Add")), 0, wxGROW | wxALL, 4)  
         controlButtonBox.Add(wxButton(self, ID_CLASSIFY_GENRANGE,  
             _("Generate Ranges")), 0, wxGROW | wxALL, 4)  
   
         controlButtonBox.Add(wxButton(self, ID_CLASSIFY_MOVEUP,  
             _("Move Up")), 0, wxGROW | wxALL, 4)  
         controlButtonBox.Add(wxButton(self, ID_CLASSIFY_MOVEDOWN,  
             _("Move Down")), 0, wxGROW | wxALL, 4)  
659    
660          controlButtonBox.Add(wxButton(self, ID_CLASSIFY_REMOVE,          #
661              _("Remove")), 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          # Control buttons:
662            #
663            self.controlButtons = []
664    
665            button = wxButton(self, ID_CLASSIFY_ADD, _("Add"))
666            controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)
667            self.controlButtons.append(button)
668    
669            #button = wxButton(self, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))
670            #controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)
671            #self.controlButtons.append(button)
672    
673            button = wxButton(self, ID_CLASSIFY_MOVEUP, _("Move Up"))
674            controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)
675            self.controlButtons.append(button)
676    
677            button = wxButton(self, ID_CLASSIFY_MOVEDOWN, _("Move Down"))
678            controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)
679            self.controlButtons.append(button)
680    
681            controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)
682    
683            button = wxButton(self, ID_CLASSIFY_REMOVE, _("Remove"))
684            controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)
685            self.controlButtons.append(button)
686    
687          controlBox.Add(controlButtonBox, 0, wxGROW, 10)          controlBox.Add(controlButtonBox, 0, wxGROW, 10)
688          topBox.Add(controlBox, 1, wxGROW, 10)          topBox.Add(controlBox, 1, wxGROW, 10)
# Line 631  class Classifier(wxDialog): Line 693  class Classifier(wxDialog):
693          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)
694          EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)          EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)
695    
         #  
         # Control buttons:  
         #  
696          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
697          buttonBox.Add(wxButton(self, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(wxButton(self, ID_CLASSIFY_OK, _("OK")),
698                        0, wxALL, 4)                        0, wxALL, 4)
699            buttonBox.Add(60, 20, 0, wxALL, 4)
700            buttonBox.Add(wxButton(self, ID_CLASSIFY_APPLY, _("Apply")),
701                          0, wxALL, 4)
702            buttonBox.Add(60, 20, 0, wxALL, 4)
703          buttonBox.Add(wxButton(self, ID_CLASSIFY_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, ID_CLASSIFY_CANCEL, _("Cancel")),
704                        0, wxALL, 4)                        0, wxALL, 4)
705          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)
706    
707          EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)          EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)
708            EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)
709          EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)          EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)
710    
   
   
711          self.SetAutoLayout(true)          self.SetAutoLayout(true)
712          self.SetSizer(topBox)          self.SetSizer(topBox)
713          topBox.Fit(self)          topBox.Fit(self)
714          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
715    
716    
717      def __BuildClassification(self, fieldIndex):      def __BuildClassification(self, fieldIndex):
718    
719          clazz = Classification()          clazz = Classification()
# Line 680  class Classifier(wxDialog): Line 743  class Classifier(wxDialog):
743              clazz = Classification()              clazz = Classification()
744              clazz.SetDefaultGroup(              clazz.SetDefaultGroup(
745                  ClassGroupDefault(                  ClassGroupDefault(
746                      self.layer.GetClassification().GetDefaultGroup().GetProperties()))                      self.layer.GetClassification().
747                                   GetDefaultGroup().GetProperties()))
748    
749              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
750              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
# Line 688  class Classifier(wxDialog): Line 752  class Classifier(wxDialog):
752                                    
753          self.classGrid.CreateTable(clazz, self.layer.ShapeType())          self.classGrid.CreateTable(clazz, self.layer.ShapeType())
754    
755        def __SetFieldTypeText(self, fieldIndex):
756            fieldName = self.fields.GetString(fieldIndex)
757            fieldType = self.layer.GetFieldType(fieldName)
758    
759            if fieldType is None:
760                text = "None"
761            elif fieldType == FIELDTYPE_STRING:
762                text = "Text"
763            elif fieldType == FIELDTYPE_INT:
764                text = "Integer"
765            elif fieldType == FIELDTYPE_DOUBLE:
766                text = "Decimal" # Rational?
767            else:
768                assert(False)
769                text = "UNKNOWN"
770    
771            self.fieldTypeText.SetLabel(_("Field Type: %s") % text)
772    
773      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
774          clazz = self.__BuildClassification(self.__cur_field)          clazz = self.__BuildClassification(self.__cur_field)
775          self.fields.SetClientData(self.__cur_field, clazz)          self.fields.SetClientData(self.__cur_field, clazz)
# Line 695  class Classifier(wxDialog): Line 777  class Classifier(wxDialog):
777          self.__cur_field = self.fields.GetSelection()          self.__cur_field = self.fields.GetSelection()
778          self.__SetGridTable(self.__cur_field)          self.__SetGridTable(self.__cur_field)
779    
780      def _OnOK(self, event):          enabled = self.__cur_field != 0
781    
782            for b in self.controlButtons:
783                b.Enable(enabled)
784    
785            self.__SetFieldTypeText(self.__cur_field)
786    
787    
788        def _OnApply(self, event):
789          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
790             it to the layer.             it to the layer.
791          """          """
# Line 709  class Classifier(wxDialog): Line 799  class Classifier(wxDialog):
799          if clazz is None or self.classGrid.GetTable().IsModified():          if clazz is None or self.classGrid.GetTable().IsModified():
800              clazz = self.__BuildClassification(self.__cur_field)              clazz = self.__BuildClassification(self.__cur_field)
801    
         clazz.SetLayer(self.layer)  
   
802          self.layer.SetClassification(clazz)          self.layer.SetClassification(clazz)
803    
804          self.EndModal(wxID_OK)      def _OnOK(self, event):
805            self._OnApply(event)
806            self.OnClose(event)
807    
808      def _OnCancel(self, event):      def _OnCancel(self, event):
809          """Do nothing. The layer's current classification stays the same."""          """The layer's current classification stays the same."""
810          self.EndModal(wxID_CANCEL)          self.layer.SetClassification(self.originalClass)
811            self.OnClose(event)
812    
813      def _OnAdd(self, event):      def _OnAdd(self, event):
814          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 763  ID_SELPROP_SPINCTRL = 4002 Line 854  ID_SELPROP_SPINCTRL = 4002
854  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
855  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
856  ID_SELPROP_FILLCLR = 4005  ID_SELPROP_FILLCLR = 4005
857    ID_SELPROP_STROKECLRTRANS = 4006
858    ID_SELPROP_FILLCLRTRANS = 4007
859    
860  class SelectPropertiesDialog(wxDialog):  class SelectPropertiesDialog(wxDialog):
861    
# Line 788  class SelectPropertiesDialog(wxDialog): Line 881  class SelectPropertiesDialog(wxDialog):
881    
882          # control box          # control box
883          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
884          ctrlBox.Add(  
885            lineColorBox = wxBoxSizer(wxHORIZONTAL)
886            lineColorBox.Add(
887              wxButton(self, ID_SELPROP_STROKECLR, "Change Line Color"),              wxButton(self, ID_SELPROP_STROKECLR, "Change Line Color"),
888              0, wxALIGN_CENTER_HORIZONTAL | wxALL | wxGROW, 4)              1, wxALL | wxGROW, 4)
889          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
890    
891            lineColorBox.Add(
892                wxButton(self, ID_SELPROP_STROKECLRTRANS, "Transparent"),
893                1, wxALL | wxGROW, 4)
894            EVT_BUTTON(self, ID_SELPROP_STROKECLRTRANS,
895                       self._OnChangeLineColorTrans)
896    
897            ctrlBox.Add(lineColorBox, 0,
898                        wxALIGN_CENTER_HORIZONTAL | wxALL | wxGROW, 4)
899    
900          if shapeType != SHAPETYPE_ARC:          if shapeType != SHAPETYPE_ARC:
901              ctrlBox.Add(              fillColorBox = wxBoxSizer(wxHORIZONTAL)
902                fillColorBox.Add(
903                  wxButton(self, ID_SELPROP_FILLCLR, "Change Fill Color"),                  wxButton(self, ID_SELPROP_FILLCLR, "Change Fill Color"),
904                  0, wxALIGN_LEFT | wxALL | wxGROW, 4)                  1, wxALL | wxGROW, 4)
905              EVT_BUTTON(self, ID_SELPROP_FILLCLR, self._OnChangeFillColor)              EVT_BUTTON(self, ID_SELPROP_FILLCLR, self._OnChangeFillColor)
906                fillColorBox.Add(
907                    wxButton(self, ID_SELPROP_FILLCLRTRANS, "Transparent"),
908                    1, wxALL | wxGROW, 4)
909                EVT_BUTTON(self, ID_SELPROP_FILLCLRTRANS,
910                           self._OnChangeFillColorTrans)
911                ctrlBox.Add(fillColorBox, 0,
912                            wxALIGN_CENTER_HORIZONTAL | wxALL | wxGROW, 4)
913    
914          spinBox = wxBoxSizer(wxHORIZONTAL)          spinBox = wxBoxSizer(wxHORIZONTAL)
915          spinBox.Add(wxStaticText(self, -1, _("Line Width: ")),          spinBox.Add(wxStaticText(self, -1, _("Line Width: ")),
# Line 815  class SelectPropertiesDialog(wxDialog): Line 927  class SelectPropertiesDialog(wxDialog):
927          itemBox.Add(ctrlBox, 0, wxALIGN_RIGHT | wxALL | wxGROW, 0)          itemBox.Add(ctrlBox, 0, wxALIGN_RIGHT | wxALL | wxGROW, 0)
928          topBox.Add(itemBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          topBox.Add(itemBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
929    
   
930          #          #
931          # Control buttons:          # Control buttons:
932          #          #
933          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
934          buttonBox.Add(wxButton(self, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),
935                        0, wxALL, 4)                        0, wxALL, 4)
936          buttonBox.Add(wxButton(self, ID_CLASSIFY_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),
937                        0, wxALL, 4)                        0, wxALL, 4)
938          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)
939                                                                                                                                                                    
# Line 861  class SelectPropertiesDialog(wxDialog): Line 972  class SelectPropertiesDialog(wxDialog):
972              self.prop.SetLineColor(clr)              self.prop.SetLineColor(clr)
973          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer
974    
975        def _OnChangeLineColorTrans(self, event):
976            self.prop.SetLineColor(Color.None)
977            self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer
978            
979      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
980          clr = self.__GetColor(self.prop.GetFill())          clr = self.__GetColor(self.prop.GetFill())
981          if clr is not None:          if clr is not None:
982              self.prop.SetFill(clr)              self.prop.SetFill(clr)
983          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer
984    
985        def _OnChangeFillColorTrans(self, event):
986            self.prop.SetFill(Color.None)
987            self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer
988    
989      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
990          return self.prop          return self.prop
991    
# Line 941  class ClassRenderer(wxPyGridCellRenderer Line 1060  class ClassRenderer(wxPyGridCellRenderer
1060          self.previewer = ClassDataPreviewer(None, None, shapeType)          self.previewer = ClassDataPreviewer(None, None, shapeType)
1061    
1062      def Draw(self, grid, attr, dc, rect, row, col, isSelected):      def Draw(self, grid, attr, dc, rect, row, col, isSelected):
1063          data = grid.GetTable().GetValueAsCustom(row, col, None)          data = grid.GetTable().GetClassGroup(row)
1064    
1065          dc.SetClippingRegion(rect.GetX(), rect.GetY(),          dc.SetClippingRegion(rect.GetX(), rect.GetY(),
1066                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
Legend:
Removed from v.476  
changed lines
  Added in v.485
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26