/[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 615 by jonathan, Mon Apr 7 08:57:20 2003 UTC revision 1207 by bh, Fri Jun 13 18:16:10 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Color
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator  from Thuban.UI.classgen import ClassGenDialog
36    
37  from dialogs import NonModalDialog  from dialogs import NonModalNonParentDialog
38    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
39  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
40    
 ID_CLASSIFY_OK = 4001  
 ID_CLASSIFY_CANCEL = 4002  
 ID_CLASSIFY_ADD = 4003  
 ID_CLASSIFY_GENCLASS = 4004  
 ID_CLASSIFY_REMOVE = 4005  
 ID_CLASSIFY_MOVEUP = 4006  
 ID_CLASSIFY_MOVEDOWN = 4007  
 ID_CLASSIFY_APPLY = 4008  
 ID_CLASSIFY_EDITPROPS = 4009  
 ID_CLASSIFY_CLOSE = 4010  
41    
42  # table columns  # table columns
43  COL_SYMBOL = 0  COL_VISIBLE = 0
44  COL_VALUE  = 1  COL_SYMBOL  = 1
45  COL_LABEL  = 2  COL_VALUE   = 2
46    COL_LABEL   = 3
47    NUM_COLS    = 4
48    
49  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
50  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 73  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, style = 0)
         wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
         #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)  
72    
73          self.classifier = classifier          self.classifier = classifier
74    
# Line 87  class ClassGrid(wxGrid): Line 80  class ClassGrid(wxGrid):
80          EVT_GRID_COL_SIZE(self, self._OnCellResize)          EVT_GRID_COL_SIZE(self, self._OnCellResize)
81          EVT_GRID_ROW_SIZE(self, self._OnCellResize)          EVT_GRID_ROW_SIZE(self, self._OnCellResize)
82    
83          #print "123123123: ", ('Show' in dir(self))      #def GetCellAttr(self, row, col):
84            #print "GetCellAttr ", row, col
85      #def Show(self):          #wxGrid.GetCellAttr(self, row, col)
         #print "SHOW!"  
   
     #def Refresh(self):  
         #self.Show()  
     #def Update(self):  
         #self.Show()  
86    
87      def CreateTable(self, clazz, shapeType, group = None):      def CreateTable(self, clazz, shapeType, group = None):
88    
# Line 103  class ClassGrid(wxGrid): Line 90  class ClassGrid(wxGrid):
90    
91          table = self.GetTable()          table = self.GetTable()
92          if table is None:          if table is None:
93              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
94              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
95                h = self.GetDefaultRowSize() * 4 \
96                    + self.GetDefaultColLabelSize()
97    
98              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
99              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
100              table = ClassTable(self)              table = ClassTable(self)
# Line 114  class ClassGrid(wxGrid): Line 104  class ClassGrid(wxGrid):
104          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
105          self.ClearSelection()          self.ClearSelection()
106    
         #print "8------------------"  
107          table.Reset(clazz, shapeType, group)          table.Reset(clazz, shapeType, group)
         #print "9------------------"  
   
 #   def Show(self, show = True):  
 #       print "SHOW!"  
 #       wxGrid.Show(self, show)  
   
 #       sel = self.GetCurrentSelection()  
   
 #       print "( 1"  
 #       if len(sel) == 1:  
 #           print "( 2"  
 #           self.MakeCellVisible(sel[0], 0)  
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
111             of row numbers."""             of row numbers."""
         #print "@@ ", self.currentSelection  
112          sel = copy.copy(self.currentSelection)          sel = copy.copy(self.currentSelection)
113          sel.sort()          sel.sort()
114          return sel          return sel
# Line 140  class ClassGrid(wxGrid): Line 116  class ClassGrid(wxGrid):
116      def GetSelectedRows(self):      def GetSelectedRows(self):
117          return self.GetCurrentSelection()          return self.GetCurrentSelection()
118    
119      def SetCellRenderer(self, row, col):      #def SetCellRenderer(self, row, col, renderer):
120          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
121    
122      #      #
123      # [Set|Get]Table is taken from http://wiki.wxpython.org      # [Set|Get]Table is taken from http://wiki.wxpython.org
# Line 216  class ClassGrid(wxGrid): Line 192  class ClassGrid(wxGrid):
192    
193          assert table is not None          assert table is not None
194    
   
         #print "-- ", group  
195          for i in range(table.GetNumberRows()):          for i in range(table.GetNumberRows()):
196              g = table.GetClassGroup(i)              g = table.GetClassGroup(i)
             #print "1", g  
197              if g is group:              if g is group:
                 #print "2"  
198                  self.SelectRow(i)                  self.SelectRow(i)
199                  if makeVisible:                  if makeVisible:
                     #print "3"  
200                      self.MakeCellVisible(i, 0)                      self.MakeCellVisible(i, 0)
201                  break                  break
202    
           
   
203  #  #
204  # XXX: This isn't working, and there is no way to deselect rows wxPython!  # XXX: This isn't working, and there is no way to deselect rows wxPython!
205  #  #
# Line 243  class ClassGrid(wxGrid): Line 212  class ClassGrid(wxGrid):
212  #                                  sel = False))  #                                  sel = False))
213    
214      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
215          """Handle a double on a cell."""          """Handle a double click on a cell."""
216    
217          r = event.GetRow()          r = event.GetRow()
218          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             self.classifier.EditGroupProperties(r)  
219    
220            if c == COL_SYMBOL:
221                self.classifier.EditSymbol(r)
222            else:
223                event.Skip()
224    
225      #      #
226      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 261  class ClassGrid(wxGrid): Line 232  class ClassGrid(wxGrid):
232          if event.Selecting():          if event.Selecting():
233              for index in range( event.GetTopRow(), event.GetBottomRow()+1):              for index in range( event.GetTopRow(), event.GetBottomRow()+1):
234                  if index not in self.currentSelection:                  if index not in self.currentSelection:
                     #print "    ", index  
235                      self.currentSelection.append( index )                      self.currentSelection.append( index )
236          else:          else:
237              for index in range( event.GetTopRow(), event.GetBottomRow()+1):              for index in range( event.GetTopRow(), event.GetBottomRow()+1):
238                  while index in self.currentSelection:                  while index in self.currentSelection:
                     #print "    ", index  
239                      self.currentSelection.remove( index )                      self.currentSelection.remove( index )
240          #self.ConfigureForSelection()          #self.ConfigureForSelection()
241    
         #print self.GetCurrentSelection()  
242          event.Skip()          event.Skip()
243    
244      def _OnSelectedCell( self, event ):      def _OnSelectedCell( self, event ):
245          """Internal update to the selection tracking list"""          """Internal update to the selection tracking list"""
         #print "selecting cell: ", event.GetRow()  
246          self.currentSelection = [ event.GetRow() ]          self.currentSelection = [ event.GetRow() ]
247          #self.ConfigureForSelection()          #self.ConfigureForSelection()
248          event.Skip()          event.Skip()
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."""
256    
257      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
   
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
258    
259    
260      def __init__(self, view = None):      def __init__(self, view = None):
# Line 302  class ClassTable(wxPyGridTableBase): Line 268  class ClassTable(wxPyGridTableBase):
268    
269          wxPyGridTableBase.__init__(self)          wxPyGridTableBase.__init__(self)
270    
271          self.SetView(view)          assert len(ClassTable.__col_labels) == NUM_COLS
272    
273          self.clazz = None          self.clazz = None
274            self.__colAttr = {}
275    
276          #self.Reset(clazz, shapeType)          self.SetView(view)
277    
278      def Reset(self, clazz, shapeType, group = None):      def Reset(self, clazz, shapeType, group = None):
279          """Reset the table with the given data.          """Reset the table with the given data.
# Line 330  class ClassTable(wxPyGridTableBase): Line 298  class ClassTable(wxPyGridTableBase):
298    
299          self.SetClassification(clazz, group)          self.SetClassification(clazz, group)
300          self.__Modified(-1)          self.__Modified(-1)
301          #print "11------------------"  
302            self.__colAttr = {}
303    
304            attr = wxGridCellAttr()
305            attr.SetEditor(wxGridCellBoolEditor())
306            attr.SetRenderer(wxGridCellBoolRenderer())
307            attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER)
308            self.__colAttr[COL_VISIBLE] = attr
309    
310            attr = wxGridCellAttr()
311            attr.SetRenderer(ClassRenderer(self.shapeType))
312            attr.SetReadOnly()
313            self.__colAttr[COL_SYMBOL] = attr
314    
315          self.GetView().EndBatch()          self.GetView().EndBatch()
316          self.GetView().FitInside()          self.GetView().FitInside()
# Line 344  class ClassTable(wxPyGridTableBase): Line 324  class ClassTable(wxPyGridTableBase):
324    
325          old_len = self.GetNumberRows()          old_len = self.GetNumberRows()
326    
         #print "9------------------"  
         #  
         # copy the data out of the classification and into our  
         # array  
         #  
327          row = -1          row = -1
 #       for g in clazz:  
 #           ng = copy.deepcopy(g)  
 #           self.__SetRow(None, ng)  
 #           if g is group:  
 #               row = self.GetNumberRows() - 1  
 #               #print "selecting row..."  
   
         #print "10------------------"  
   
         #self.clazz = copy.deepcopy(clazz)  
328          self.clazz = clazz          self.clazz = clazz
329    
330          self.__NotifyRowChanges(old_len, self.GetNumberRows())          self.__NotifyRowChanges(old_len, self.GetNumberRows())
331    
332            #
333            # XXX: this is dead code at the moment
334            #
335          if row > -1:          if row > -1:
336              self.GetView().ClearSelection()              self.GetView().ClearSelection()
337              self.GetView().SelectRow(row)              self.GetView().SelectRow(row)
# Line 371  class ClassTable(wxPyGridTableBase): Line 339  class ClassTable(wxPyGridTableBase):
339    
340          self.__Modified()          self.__Modified()
341    
342    
343          self.GetView().EndBatch()          self.GetView().EndBatch()
344          self.GetView().FitInside()          self.GetView().FitInside()
345    
# Line 435  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 446  class ClassTable(wxPyGridTableBase): Line 415  class ClassTable(wxPyGridTableBase):
415    
416      def GetNumberCols(self):      def GetNumberCols(self):
417          """Return the number of columns."""          """Return the number of columns."""
418          return self.NUM_COLS          return NUM_COLS
419    
420      def IsEmptyCell(self, row, col):      def IsEmptyCell(self, row, col):
421          """Determine if a cell is empty. This is always false."""          """Determine if a cell is empty. This is always false."""
# Line 464  class ClassTable(wxPyGridTableBase): Line 433  class ClassTable(wxPyGridTableBase):
433          """          """
434    
435          self.SetValueAsCustom(row, col, None, value)          self.SetValueAsCustom(row, col, None, value)
         self.__Modified()  
436                
437      def GetValueAsCustom(self, row, col, typeName):      def GetValueAsCustom(self, row, col, typeName):
438          """Return the object that is used to represent the given          """Return the object that is used to represent the given
# Line 479  class ClassTable(wxPyGridTableBase): Line 447  class ClassTable(wxPyGridTableBase):
447              group = self.clazz.GetGroup(row - 1)              group = self.clazz.GetGroup(row - 1)
448    
449    
450            if col == COL_VISIBLE:
451                return group.IsVisible()
452    
453          if col == COL_SYMBOL:          if col == COL_SYMBOL:
454              return group.GetProperties()              return group.GetProperties()
455    
# Line 493  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 == FIELDTYPE_INT or type == 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 551  class ClassTable(wxPyGridTableBase): Line 514  class ClassTable(wxPyGridTableBase):
514          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
515          """          """
516    
517          assert col >= 0 and col < self.GetNumberCols()          assert 0 <= col < self.GetNumberCols()
518          assert row >= 0 and row < self.GetNumberRows()          assert 0 <= row < self.GetNumberRows()
519    
520          if row == 0:          if row == 0:
521              group = self.clazz.GetDefaultGroup()              group = self.clazz.GetDefaultGroup()
# Line 561  class ClassTable(wxPyGridTableBase): Line 524  class ClassTable(wxPyGridTableBase):
524    
525          mod = True # assume the data will change          mod = True # assume the data will change
526    
527          if col == COL_SYMBOL:          if col == COL_VISIBLE:
528                group.SetVisible(value)
529            elif col == COL_SYMBOL:
530              group.SetProperties(value)              group.SetProperties(value)
531          elif col == COL_LABEL:          elif col == COL_LABEL:
532              group.SetLabel(value)              group.SetLabel(value)
# Line 589  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 617  class ClassTable(wxPyGridTableBase): Line 582  class ClassTable(wxPyGridTableBase):
582      def GetAttr(self, row, col, someExtraParameter):      def GetAttr(self, row, col, someExtraParameter):
583          """Returns the cell attributes"""          """Returns the cell attributes"""
584    
585          attr = wxGridCellAttr()          return self.__colAttr.get(col, wxGridCellAttr()).Clone()
         #attr = wxPyGridTableBase.GetAttr(self, row, col, someExtraParameter)  
   
         if col == COL_SYMBOL:  
             # we need to create a new renderer each time, because  
             # SetRenderer takes control of the parameter  
             attr.SetRenderer(ClassRenderer(self.shapeType))  
             attr.SetReadOnly()  
   
         return attr  
586    
587      def GetClassGroup(self, row):      def GetClassGroup(self, row):
588          """Return the ClassGroup object representing row 'row'."""          """Return the ClassGroup object representing row 'row'."""
# Line 692  class ClassTable(wxPyGridTableBase): Line 648  class ClassTable(wxPyGridTableBase):
648              self.__NotifyRowChanges(old_len, self.GetNumberRows())              self.__NotifyRowChanges(old_len, self.GetNumberRows())
649    
650    
651  class Classifier(NonModalDialog):  ID_PROPERTY_REVERT = 4002
652    ID_PROPERTY_ADD = 4003
653    ID_PROPERTY_GENCLASS = 4004
654    ID_PROPERTY_REMOVE = 4005
655    ID_PROPERTY_MOVEUP = 4006
656    ID_PROPERTY_MOVEDOWN = 4007
657    ID_PROPERTY_TRY = 4008
658    ID_PROPERTY_EDITSYM = 4009
659    ID_PROPERTY_SELECT = 4011
660    ID_PROPERTY_TITLE = 4012
661    ID_PROPERTY_FIELDTEXT = 4013
662    
663    BTN_ADD = 0
664    BTN_EDIT = 1
665    BTN_GEN = 2
666    BTN_UP = 3
667    BTN_DOWN = 4
668    BTN_RM = 5
669    
670    EB_LAYER_TITLE = 0
671    EB_SELECT_FIELD = 1
672    EB_GEN_CLASS = 2
673    
674      def __init__(self, parent, name, layer, group = None):  class Classifier(NonModalNonParentDialog):
         NonModalDialog.__init__(self, parent, name,  
                                 _("Classifier: %s") % layer.Title())  
675    
676          panel = wxPanel(self, -1, size=(100, 100))      type2string = {None:             _("None"),
677                       FIELDTYPE_STRING: _("Text"),
678                       FIELDTYPE_INT:    _("Integer"),
679                       FIELDTYPE_DOUBLE: _("Decimal")}
680    
681          self.layer = layer      def __init__(self, parent, name, map, layer, group = None):
682            NonModalNonParentDialog.__init__(self, parent, name, "")
683    
684          self.originalClass = self.layer.GetClassification()          self.__SetTitle(layer.Title())
         field = self.originalClass.GetField()  
         fieldType = self.originalClass.GetFieldType()  
685    
686          topBox = wxBoxSizer(wxVERTICAL)          self.layer = layer
687          panelBox = wxBoxSizer(wxVERTICAL)          self.map = map
688    
689          #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
690              #0, wxALIGN_LEFT | wxALL, 4)          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
691          panelBox.Add(wxStaticText(panel, -1,                               self.layer_shapestore_replaced)
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
692    
693            self.genDlg = None
694    
695            ############################
696            # Create the controls
697          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
698    
699          self.num_cols = layer.table.field_count()          panel = wxPanel(self, -1)
         # just assume the first field in case one hasn't been  
         # specified in the file.  
         self.__cur_field = 0  
   
         self.fields.Append("<None>")  
         self.fields.SetClientData(0, None)  
   
         for i in range(self.num_cols):  
             type, name, len, decc = layer.table.field_info(i)  
             self.fields.Append(name)  
   
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1,  
                                           copy.deepcopy(self.originalClass))  
             else:  
                 self.fields.SetClientData(i + 1, None)  
   
   
         ###########  
700    
701            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
702          self.fieldTypeText = wxStaticText(panel, -1, "")          self.fieldTypeText = wxStaticText(panel, -1, "")
         panelBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
   
         propertyBox = wxBoxSizer(wxHORIZONTAL)  
         propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),  
             0, wxALIGN_LEFT | wxALL, 4)  
         propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)  
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
703    
704          panelBox.Add(propertyBox, 0, wxGROW, 4)          if layer.HasClassification():
705                self.originalClass = self.layer.GetClassification()
706                field = self.originalClass.GetField()
707                fieldType = self.originalClass.GetFieldType()
708    
709                #
710                # make field choice box
711                #
712                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
713    
714          #              self.num_cols = layer.table.NumColumns()
715          # Control Box              # just assume the first field in case one hasn't been
716          #              # specified in the file.
717          controlBox = wxBoxSizer(wxHORIZONTAL)              self.__cur_field = 0
718    
719                self.fields.Append("<None>")
720    
721          ###########              if self.originalClass.GetFieldType() is None:
722          #                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
723          # Control buttons:              else:
724          #                  self.fields.SetClientData(0, None)
         self.controlButtons = []  
725    
726          controlButtonBox = wxBoxSizer(wxVERTICAL)              for i in range(self.num_cols):
727                    name = layer.table.Column(i).name
728                    self.fields.Append(name)
729    
730                    if name == field:
731                        self.__cur_field = i + 1
732                        self.fields.SetClientData(i + 1,
733                                                copy.deepcopy(self.originalClass))
734                    else:
735                        self.fields.SetClientData(i + 1, None)
736    
737          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))              button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
738          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                  _("Generate Class"))
739          self.controlButtons.append(button)              button_add = wxButton(panel, ID_PROPERTY_ADD,
740                    _("Add"))
741                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
742                    _("Move Up"))
743                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
744                    _("Move Down"))
745                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
746                    _("Edit Symbol"))
747                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
748                    _("Remove"))
749    
750                self.classGrid = ClassGrid(panel, self)
751    
752                # calling __SelectField after creating the classGrid fills in the
753                # grid with the correct information
754                self.fields.SetSelection(self.__cur_field)
755                self.__SelectField(self.__cur_field, group = group)
756    
757            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
758            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
759            button_ok = wxButton(self, wxID_OK, _("OK"))
760            button_ok.SetDefault()
761            button_close = wxButton(self, wxID_CANCEL, _("Close"))
762    
763          button = wxButton(panel, ID_CLASSIFY_EDITPROPS, _("Edit Properties"))          ############################
764          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          # Layout the controls
765          self.controlButtons.append(button)          #
766    
767          button = wxButton(panel, ID_CLASSIFY_GENCLASS, _("Generate Class"))          topBox = wxBoxSizer(wxVERTICAL)
768          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          panelBox = wxBoxSizer(wxVERTICAL)
         self.controlButtons.append(button)  
769    
770          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          sizer = wxBoxSizer(wxHORIZONTAL)
771          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
772          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
773            sizer.Add(text_title, 1, wxGROW, 0)
774    
775          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
776    
777          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          if isinstance(layer, RasterLayer):
778                type = "Image"
779            else:
780                type = layer.ShapeType()
781    
782          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
783          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              0, wxALIGN_LEFT | wxALL, 4)
         self.controlButtons.append(button)  
784    
785            if layer.HasClassification():
786    
787          ###########              classBox = wxStaticBoxSizer(
788          #                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         # Classification data table  
         #  
789    
         self.classGrid = ClassGrid(panel, self)  
         #self.__SetGridTable(self.__cur_field, group)  
         #self.fields.SetSelection(self.__cur_field)  
790    
791          # calling __SelectField after creating the classGrid fills in the              sizer = wxBoxSizer(wxHORIZONTAL)
792          # grid with the correct information              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
793          #print "2------------------"                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
794          self.fields.SetSelection(self.__cur_field)              sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
         self.__SelectField(self.__cur_field, group = group)  
795    
796          #self.classGrid.SelectGroup(group)              classBox.Add(sizer, 0, wxGROW, 4)
797    
798          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox.Add(self.fieldTypeText, 0,
799                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
800    
801                controlBox = wxBoxSizer(wxHORIZONTAL)
802                controlButtonBox = wxBoxSizer(wxVERTICAL)
803    
804                controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
805                controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
806                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
807                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
808                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
809                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
810                controlButtonBox.Add(button_remove, 0,
811                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
812    
813          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox.Add(self.classGrid, 1, wxGROW, 0)
814          panelBox.Add(controlBox, 1, wxGROW, 10)              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
815    
816          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              classBox.Add(controlBox, 1, wxGROW, 10)
817          EVT_BUTTON(self, ID_CLASSIFY_EDITPROPS, self._OnEditGroupProperties)              panelBox.Add(classBox, 1, wxGROW, 0)
         EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)  
         EVT_BUTTON(self, ID_CLASSIFY_GENCLASS, self._OnGenClass)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
818    
         ###########  
819    
820          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
821          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
822                        0, wxALL, 4)          buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
823          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
824          buttonBox.Add(wxButton(panel, ID_CLASSIFY_APPLY, _("Apply")),          buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CLOSE, _("Close")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CANCEL, _("Cancel")),  
                       0, wxALL, 4)  
         panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)  
   
         EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)  
         EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)  
         EVT_BUTTON(self, ID_CLASSIFY_CLOSE, self._OnCloseBtn)  
         EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)  
   
         ###########  
   
825    
826          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
827          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
828            panelBox.Fit(panel)
829          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
830    
831          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
832          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
833    
834          self.SetAutoLayout(True)          self.SetAutoLayout(True)
835          self.SetSizer(topBox)          self.SetSizer(topBox)
836            topBox.Fit(self)
837            topBox.SetSizeHints(self)
838            self.Layout()
839    
840            ###########
841    
842            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
843            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
844            EVT_BUTTON(self, wxID_OK, self._OnOK)
845            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
846            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
847            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
848    
849            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
850            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
851            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
852            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
853            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
854            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
855    
         #print "1------------------"  
         #self.Fit()  
856          ######################          ######################
857    
858            text_title.SetFocus()
859          self.haveApplied = False          self.haveApplied = False
860    
861      def EditGroupProperties(self, row):      def unsubscribe_messages(self):
862            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
863            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
864                                   self.layer_shapestore_replaced)
865    
866        def map_layers_removed(self, map):
867            if self.layer not in self.map.Layers():
868                self.Close()
869    
870        def layer_shapestore_replaced(self, *args):
871            self.Close()
872    
873        def EditSymbol(self, row):
874          table = self.classGrid.GetTable()          table = self.classGrid.GetTable()
875          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)          prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
876    
877          # get a new ClassGroupProperties object and copy the          # get a new ClassGroupProperties object and copy the
878          # values over to our current object          # values over to our current object
879          propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())          propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())
880    
881            self.Enable(False)
882          if propDlg.ShowModal() == wxID_OK:          if propDlg.ShowModal() == wxID_OK:
883              new_prop = propDlg.GetClassGroupProperties()              new_prop = propDlg.GetClassGroupProperties()
884              table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)              table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
885            self.Enable(True)
886          propDlg.Destroy()          propDlg.Destroy()
887                    
888        def _SetClassification(self, clazz):
889            
890            self.fields.SetClientData(self.__cur_field, clazz)
891            self.classGrid.GetTable().SetClassification(clazz)
892    
893      def __BuildClassification(self, fieldIndex, copyClass = False):      def __BuildClassification(self, fieldIndex, copyClass = False):
894    
# Line 926  class Classifier(NonModalDialog): Line 935  class Classifier(NonModalDialog):
935              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
936              clazz.SetFieldType(fieldType)              clazz.SetFieldType(fieldType)
937                                    
         #print "6------------------"  
938          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)
         #print "7------------------"  
   
   
   
     type2string = {None:             _("None"),  
                    FIELDTYPE_STRING: _("Text"),  
                    FIELDTYPE_INT:    _("Integer"),  
                    FIELDTYPE_DOUBLE: _("Decimal")}  
939    
940      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
941          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
# Line 945  class Classifier(NonModalDialog): Line 945  class Classifier(NonModalDialog):
945    
946          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
947    
948          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
949    
950      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
951          """This method assumes that the current selection for the          """This method assumes that the current selection for the
952          combo has already been set by a call to SetSelection().          combo has already been set by a call to SetSelection().
953          """          """
954    
         #print "3------------------"  
   
955          assert oldIndex >= -1          assert oldIndex >= -1
956    
957          if oldIndex != -1:          if oldIndex != -1:
958              clazz = self.__BuildClassification(oldIndex)              clazz = self.__BuildClassification(oldIndex)
959              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
960    
         #print "4------------------"  
961          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
         #print "5------------------"  
962    
963          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
964    
965          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
966    
967        def __SetTitle(self, title):
968            if title != "":
969                title = ": " + title
970    
971            self.SetTitle(_("Layer Properties") + title)
972    
973      def _OnEditGroupProperties(self, event):      def _OnEditSymbol(self, event):
974          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
975    
976          if len(sel) == 1:          if len(sel) == 1:
977              self.EditGroupProperties(sel[0])              self.EditSymbol(sel[0])
978    
979      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
980          index = self.fields.GetSelection()          index = self.fields.GetSelection()
981          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
982          self.__cur_field = index          self.__cur_field = index
983    
984      def _OnApply(self, event):      def _OnTry(self, event):
985          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
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    
1004      def _OnOK(self, event):      def _OnOK(self, event):
1005          self._OnApply(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 1013  class Classifier(NonModalDialog): Line 1017  class Classifier(NonModalDialog):
1017    
1018          self.Close()          self.Close()
1019    
1020      def _OnCancel(self, event):      def _OnRevert(self, event):
1021          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1022          if self.haveApplied:          if self.haveApplied:
1023              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1024    
1025          self.Close()          #self.Close()
1026    
1027      def _OnAdd(self, event):      def _OnAdd(self, event):
1028          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 1028  class Classifier(NonModalDialog): Line 1032  class Classifier(NonModalDialog):
1032    
1033      def _OnGenClass(self, event):      def _OnGenClass(self, event):
1034    
1035          genDlg = ClassGenDialog(self,          self.genDlg = ClassGenDialog(self, self.layer,
1036                                  self.layer.table,                            self.fields.GetString(self.__cur_field))
1037                                  self.fields.GetString(self.__cur_field))  
1038            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1039          if genDlg.ShowModal() == wxID_OK:  
1040              clazz = genDlg.GetClassification()          self.__EnableButtons(EB_GEN_CLASS, False)
1041              self.fields.SetClientData(self.__cur_field, clazz)  
1042              self.classGrid.GetTable().SetClassification(clazz)          self.genDlg.Show()
1043          genDlg.Destroy()  
1044        def _OnGenDialogClose(self, event):
1045            self.genDlg.Destroy()
1046            self.__EnableButtons(EB_GEN_CLASS, True)
1047    
1048      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1049          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
1050    
         #print "sel: ", sel  
   
1051          if len(sel) == 1:          if len(sel) == 1:
1052              i = sel[0]              i = sel[0]
1053              if i > 1:              if i > 1:
# Line 1070  class Classifier(NonModalDialog): Line 1075  class Classifier(NonModalDialog):
1075                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1076                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1077    
1078        def _OnTitleChanged(self, event):
1079            obj = event.GetEventObject()
1080    
1081            self.layer.SetTitle(obj.GetValue())
1082            self.__SetTitle(self.layer.Title())
1083    
1084            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1085    
1086        def __EnableButtons(self, case, enable):
1087    
1088            if case == EB_LAYER_TITLE:  
1089                list = (wxID_OK,
1090                        wxID_CANCEL)
1091    
1092            elif case == EB_SELECT_FIELD:
1093                list = (ID_PROPERTY_GENCLASS,
1094                        ID_PROPERTY_ADD,
1095                        ID_PROPERTY_MOVEUP,
1096                        ID_PROPERTY_MOVEDOWN,
1097                        ID_PROPERTY_EDITSYM,
1098                        ID_PROPERTY_REMOVE)
1099    
1100            elif case == EB_GEN_CLASS:
1101                list = (ID_PROPERTY_SELECT,
1102                        ID_PROPERTY_FIELDTEXT,
1103                        ID_PROPERTY_GENCLASS,
1104                        ID_PROPERTY_EDITSYM)
1105    
1106            for id in list:
1107                self.FindWindowById(id).Enable(enable)
1108    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1109  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1110  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1111  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1096  class SelectPropertiesDialog(wxDialog): Line 1129  class SelectPropertiesDialog(wxDialog):
1129          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1130          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1131              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1132          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,  
1133                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1134                self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1135                (40, 40), wxSIMPLE_BORDER)
1136    
1137            self.previewWin.AllowEdit(False)
1138    
1139          previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)          previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1140    
1141          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
# Line 1106  class SelectPropertiesDialog(wxDialog): Line 1144  class SelectPropertiesDialog(wxDialog):
1144          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1145    
1146          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1147          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1148              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1149              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1150          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1151    
1152          lineColorBox.Add(          lineColorBox.Add(
# Line 1154  class SelectPropertiesDialog(wxDialog): Line 1192  class SelectPropertiesDialog(wxDialog):
1192          # Control buttons:          # Control buttons:
1193          #          #
1194          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1195          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1196                        0, wxALL, 4)          button_ok.SetDefault()
1197          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1198                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1199          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1200            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1201                                                                                                                                                                    
1202          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1203          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1204                                                                                                                                                                    
1205          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1206          self.SetSizer(topBox)          self.SetSizer(topBox)
1207          topBox.Fit(self)          topBox.Fit(self)
1208          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1209    
1210      def _OnOK(self, event):      def OnOK(self, event):
1211          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1212    
1213      def _OnCancel(self, event):      def OnCancel(self, event):
1214          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1215    
1216      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 1229  class ClassDataPreviewWindow(wxWindow): Line 1268  class ClassDataPreviewWindow(wxWindow):
1268          self.shapeType = shapeType          self.shapeType = shapeType
1269          self.previewer = ClassDataPreviewer()          self.previewer = ClassDataPreviewer()
1270    
1271        def GetProperties():
1272            return self.prop
1273    
1274      def _OnPaint(self, event):      def _OnPaint(self, event):
1275          dc = wxPaintDC(self)          dc = wxPaintDC(self)
1276    
# Line 1320  class ClassRenderer(wxPyGridCellRenderer Line 1362  class ClassRenderer(wxPyGridCellRenderer
1362    
1363          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1364    
1365    
1366    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1367    
1368        def __init__(self, parent, id, props, shapeType,
1369                     size = wxDefaultSize, style = 0):
1370    
1371            wxWindow.__init__(self, parent, id, size = size, style = style)
1372    
1373            self.SetProperties(props)
1374            self.SetShapeType(shapeType)
1375            self.AllowEdit(True)
1376    
1377            EVT_PAINT(self, self._OnPaint)
1378            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1379    
1380            self.previewer = ClassDataPreviewer()
1381    
1382        def _OnPaint(self, event):
1383            dc = wxPaintDC(self)
1384    
1385            # XXX: this doesn't seem to be having an effect:
1386            dc.DestroyClippingRegion()
1387    
1388            w, h = self.GetClientSize()
1389    
1390            self.previewer.Draw(dc,
1391                                wxRect(0, 0, w, h),
1392                                self.GetProperties(),
1393                                self.GetShapeType())
1394    
1395    
1396        def GetProperties(self):
1397            return self.props
1398    
1399        def SetProperties(self, props):
1400            self.props = props
1401            self.Refresh()
1402    
1403        def GetShapeType(self):
1404            return self.shapeType
1405    
1406        def SetShapeType(self, shapeType):
1407            self.shapeType = shapeType
1408            self.Refresh()
1409    
1410        def AllowEdit(self, allow):
1411            self.allowEdit = allow
1412    
1413        def DoEdit(self):
1414            if not self.allowEdit: return
1415    
1416            propDlg = SelectPropertiesDialog(NULL,
1417                                             self.GetProperties(),
1418                                             self.GetShapeType())
1419    
1420            if propDlg.ShowModal() == wxID_OK:
1421                new_prop = propDlg.GetClassGroupProperties()
1422                self.SetProperties(new_prop)
1423                self.Refresh()
1424    
1425            propDlg.Destroy()
1426    
1427        def _OnLeftDClick(self, event):
1428            self.DoEdit()
Legend:
Removed from v.615  
changed lines
  Added in v.1207
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26