/[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 570 by jonathan, Fri Mar 28 17:06:26 2003 UTC revision 1058 by frank, Tue May 27 11:30:29 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.range import Range
24    from Thuban.Model.classification import \
25        Classification, ClassGroupDefault, \
26        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
27        ClassGroupProperties
28    
29  from Thuban.Model.color import Color  from Thuban.Model.color import Color
30    
31  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
32        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
33    
34  from dialogs import NonModalDialog  from Thuban.UI.classgen import ClassGenDialog, ClassGenerator
35    
36    from dialogs import NonModalNonParentDialog
37    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
38  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
39    
 ID_CLASSIFY_OK = 4001  
 ID_CLASSIFY_CANCEL = 4002  
 ID_CLASSIFY_ADD = 4003  
 ID_CLASSIFY_GENRANGE = 4004  
 ID_CLASSIFY_REMOVE = 4005  
 ID_CLASSIFY_MOVEUP = 4006  
 ID_CLASSIFY_MOVEDOWN = 4007  
 ID_CLASSIFY_APPLY = 4008  
40    
41  # table columns  # table columns
42  COL_SYMBOL = 0  COL_VISIBLE = 0
43  COL_VALUE  = 1  COL_SYMBOL  = 1
44  COL_LABEL  = 2  COL_VALUE   = 2
45    COL_LABEL   = 3
46    NUM_COLS    = 4
47    
48  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
49  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 60  import weakref Line 58  import weakref
58  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
59    
60    
61      def __init__(self, parent):      def __init__(self, parent, classifier):
62          """Constructor.          """Constructor.
63    
64          parent -- the parent window          parent -- the parent window
# Line 69  class ClassGrid(wxGrid): Line 67  class ClassGrid(wxGrid):
67                   use for display.                   use for display.
68          """          """
69    
70          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
71          wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
72          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)          self.classifier = classifier
73    
74          self.currentSelection = []          self.currentSelection = []
75    
76          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
77          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)
78          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)
79            EVT_GRID_COL_SIZE(self, self._OnCellResize)
80            EVT_GRID_ROW_SIZE(self, self._OnCellResize)
81    
82          print "123123123: ", ('Show' in dir(self))      #def GetCellAttr(self, row, col):
83            #print "GetCellAttr ", row, col
84      def Show(self):          #wxGrid.GetCellAttr(self, row, col)
         print "SHOW!"  
   
     def Refresh(self):  
         self.Show()  
     def Update(self):  
         self.Show()  
85    
86      def CreateTable(self, clazz, shapeType, group = None):      def CreateTable(self, clazz, shapeType, group = None):
87    
88          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
89    
         self.shapeType = shapeType  
90          table = self.GetTable()          table = self.GetTable()
91          if table is None:          if table is None:
92              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
93              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
94                h = self.GetDefaultRowSize() * 4 \
95                    + self.GetDefaultColLabelSize()
96    
97              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
98              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
99              table = ClassTable(self)              table = ClassTable(self)
# Line 107  class ClassGrid(wxGrid): Line 103  class ClassGrid(wxGrid):
103          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
104          self.ClearSelection()          self.ClearSelection()
105    
106          print "8------------------"          table.Reset(clazz, shapeType, group)
         table.Reset(clazz, self.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)  
107    
108      def GetCurrentSelection(self):      def GetCurrentSelection(self):
109          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
110             of row numbers."""             of row numbers."""
         print "@@ ", self.currentSelection  
111          sel = copy.copy(self.currentSelection)          sel = copy.copy(self.currentSelection)
112          sel.sort()          sel.sort()
113          return sel          return sel
# Line 133  class ClassGrid(wxGrid): Line 115  class ClassGrid(wxGrid):
115      def GetSelectedRows(self):      def GetSelectedRows(self):
116          return self.GetCurrentSelection()          return self.GetCurrentSelection()
117    
118      def SetCellRenderer(self, row, col):      #def SetCellRenderer(self, row, col, renderer):
119          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
120    
121      #      #
122      # [Set|Get]Table is taken from http://wiki.wxpython.org      # [Set|Get]Table is taken from http://wiki.wxpython.org
# Line 203  class ClassGrid(wxGrid): Line 185  class ClassGrid(wxGrid):
185      def SelectGroup(self, group, makeVisible = True):      def SelectGroup(self, group, makeVisible = True):
186          if group is None: return          if group is None: return
187    
188          assert(isinstance(group, ClassGroup))          assert isinstance(group, ClassGroup)
189    
190          table = self.GetTable()          table = self.GetTable()
191    
192          assert(table is not None)          assert table is not None
193    
   
         print "-- ", group  
194          for i in range(table.GetNumberRows()):          for i in range(table.GetNumberRows()):
195              g = table.GetClassGroup(i)              g = table.GetClassGroup(i)
             print "1", g  
196              if g is group:              if g is group:
                 print "2"  
197                  self.SelectRow(i)                  self.SelectRow(i)
198                  if makeVisible:                  if makeVisible:
                     print "3"  
199                      self.MakeCellVisible(i, 0)                      self.MakeCellVisible(i, 0)
200                  break                  break
201    
           
   
202  #  #
203  # 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!
204  #  #
# Line 236  class ClassGrid(wxGrid): Line 211  class ClassGrid(wxGrid):
211  #                                  sel = False))  #                                  sel = False))
212    
213      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
214          """Handle a double on a cell."""          """Handle a double click on a cell."""
215    
216          r = event.GetRow()          r = event.GetRow()
217          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             prop = self.GetTable().GetValueAsCustom(r, c, None)  
             #prop = group.GetProperties()  
218    
219              # get a new ClassGroupProperties object and copy the          if c == COL_SYMBOL:
220              # values over to our current object              self.classifier.EditSymbol(r)
221              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)          else:
222              if propDlg.ShowModal() == wxID_OK:              event.Skip()
                 new_prop = propDlg.GetClassGroupProperties()  
                 #prop.SetProperties(new_prop)  
                 self.GetTable().SetValueAsCustom(r, c, None, new_prop)  
             propDlg.Destroy()  
223    
224      #      #
225      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 263  class ClassGrid(wxGrid): Line 231  class ClassGrid(wxGrid):
231          if event.Selecting():          if event.Selecting():
232              for index in range( event.GetTopRow(), event.GetBottomRow()+1):              for index in range( event.GetTopRow(), event.GetBottomRow()+1):
233                  if index not in self.currentSelection:                  if index not in self.currentSelection:
                     print "    ", index  
234                      self.currentSelection.append( index )                      self.currentSelection.append( index )
235          else:          else:
236              for index in range( event.GetTopRow(), event.GetBottomRow()+1):              for index in range( event.GetTopRow(), event.GetBottomRow()+1):
237                  while index in self.currentSelection:                  while index in self.currentSelection:
                     print "    ", index  
238                      self.currentSelection.remove( index )                      self.currentSelection.remove( index )
239          #self.ConfigureForSelection()          #self.ConfigureForSelection()
240    
         print self.GetCurrentSelection()  
241          event.Skip()          event.Skip()
242    
243      def _OnSelectedCell( self, event ):      def _OnSelectedCell( self, event ):
244          """Internal update to the selection tracking list"""          """Internal update to the selection tracking list"""
         print "selecting cell: ", event.GetRow()  
245          self.currentSelection = [ event.GetRow() ]          self.currentSelection = [ event.GetRow() ]
246          #self.ConfigureForSelection()          #self.ConfigureForSelection()
247          event.Skip()          event.Skip()
248    
249        def _OnCellResize(self, event):
250            self.FitInside()
251            event.Skip()
252    
253  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
254      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
255    
256      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
   
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
257    
258    
259      def __init__(self, view = None):      def __init__(self, view = None):
# Line 301  class ClassTable(wxPyGridTableBase): Line 267  class ClassTable(wxPyGridTableBase):
267    
268          wxPyGridTableBase.__init__(self)          wxPyGridTableBase.__init__(self)
269    
270          self.SetView(view)          assert len(ClassTable.__col_labels) == NUM_COLS
         self.tdata = []  
271    
272          #self.Reset(clazz, shapeType)          self.clazz = None
273            self.__colAttr = {}
274    
275            self.SetView(view)
276    
277      def Reset(self, clazz, shapeType, group = None):      def Reset(self, clazz, shapeType, group = None):
278          """Reset the table with the given data.          """Reset the table with the given data.
# Line 320  class ClassTable(wxPyGridTableBase): Line 288  class ClassTable(wxPyGridTableBase):
288          shapeType -- the type of shape that the layer uses          shapeType -- the type of shape that the layer uses
289          """          """
290    
291          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
292    
293          self.GetView().BeginBatch()          self.GetView().BeginBatch()
294    
295          self.fieldType = clazz.GetFieldType()          self.fieldType = clazz.GetFieldType()
296          self.shapeType = shapeType          self.shapeType = shapeType
297    
298          old_len = len(self.tdata)          self.SetClassification(clazz, group)
299            self.__Modified(-1)
300    
301          self.tdata = []          self.__colAttr = {}
302    
303          print "9------------------"          attr = wxGridCellAttr()
304          #          attr.SetEditor(wxGridCellBoolEditor())
305          # copy the data out of the classification and into our          attr.SetRenderer(wxGridCellBoolRenderer())
306          # array          attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER)
307          #          self.__colAttr[COL_VISIBLE] = attr
         row = -1  
         for g in clazz:  
             ng = copy.deepcopy(g)  
             self.__SetRow(-1, ng)  
             if g is group:  
                 row = self.GetNumberRows() - 1  
                 print "selecting row..."  
308    
309          print "10------------------"          attr = wxGridCellAttr()
310            attr.SetRenderer(ClassRenderer(self.shapeType))
311          self.__Modified(-1)          attr.SetReadOnly()
312            self.__colAttr[COL_SYMBOL] = attr
313    
314            self.GetView().EndBatch()
315            self.GetView().FitInside()
316    
317        def GetClassification(self):
318            return self.clazz
319    
320          self.__NotifyRowChanges(old_len, len(self.tdata))      def SetClassification(self, clazz, group = None):
321          print "11------------------"  
322            self.GetView().BeginBatch()
323    
324            old_len = self.GetNumberRows()
325    
326            row = -1
327            self.clazz = clazz
328    
329            self.__NotifyRowChanges(old_len, self.GetNumberRows())
330    
331            #
332            # XXX: this is dead code at the moment
333            #
334          if row > -1:          if row > -1:
335              self.GetView().ClearSelection()              self.GetView().ClearSelection()
336              self.GetView().SelectRow(row)              self.GetView().SelectRow(row)
337              self.GetView().MakeCellVisible(row, 0)              self.GetView().MakeCellVisible(row, 0)
338                
339            self.__Modified()
340    
341    
342          self.GetView().EndBatch()          self.GetView().EndBatch()
343            self.GetView().FitInside()
344    
345      def __NotifyRowChanges(self, curRows, newRows):      def __NotifyRowChanges(self, curRows, newRows):
346          #          #
# Line 372  class ClassTable(wxPyGridTableBase): Line 356  class ClassTable(wxPyGridTableBase):
356          elif newRows < curRows:          elif newRows < curRows:
357              msg = wxGridTableMessage(self,              msg = wxGridTableMessage(self,
358                          wxGRIDTABLE_NOTIFY_ROWS_DELETED,                          wxGRIDTABLE_NOTIFY_ROWS_DELETED,
359                          curRows - newRows,    # position                          curRows,              # position
360                          curRows - newRows)    # how many                          curRows - newRows)    # how many
361              self.GetView().ProcessTableMessage(msg)              self.GetView().ProcessTableMessage(msg)
362              self.GetView().FitInside()              self.GetView().FitInside()
363    
364    
365      def __SetRow(self, row, group):      def __SetRow(self, row, group):
366          """Set a row's data to that of the group.          """Set a row's data to that of the group.
367    
368          The table is considered modified after this operation.          The table is considered modified after this operation.
369    
370          row -- if row is -1 or greater than the current number of rows          row -- if row is < 0 'group' is inserted at the top of the table
371                 then group is appended to the end.                 if row is >= GetNumberRows() or None 'group' is append to
372                        the end of the table.
373                   otherwise 'group' replaces row 'row'
374          """          """
375    
376          # either append or replace          # either append or replace
377          if row == -1 or row >= self.GetNumberRows():          if row is None or row >= self.GetNumberRows():
378              self.tdata.append(group)              self.clazz.AppendGroup(group)
379            elif row < 0:
380                self.clazz.InsertGroup(0, group)
381          else:          else:
382              self.tdata[row] = group              if row == 0:
383                    self.clazz.SetDefaultGroup(group)
384                else:
385                    self.clazz.ReplaceGroup(row - 1, group)
386    
387          self.__Modified()          self.__Modified()
388    
# Line 401  class ClassTable(wxPyGridTableBase): Line 393  class ClassTable(wxPyGridTableBase):
393      def GetRowLabelValue(self, row):      def GetRowLabelValue(self, row):
394          """Return the label for the given row."""          """Return the label for the given row."""
395    
396          group = self.tdata[row]          if row == 0:
397          if isinstance(group, ClassGroupDefault):   return _("Default")              return _("Default")
398          if isinstance(group, ClassGroupSingleton): return _("Singleton")          else:
399          if isinstance(group, ClassGroupRange):     return _("Range")              group = self.clazz.GetGroup(row - 1)
400          if isinstance(group, ClassGroupMap):       return _("Map")              if isinstance(group, ClassGroupDefault):   return _("Default")
401                if isinstance(group, ClassGroupSingleton): return _("Singleton")
402                if isinstance(group, ClassGroupRange):     return _("Range")
403                if isinstance(group, ClassGroupMap):       return _("Map")
404    
405          assert(False) # shouldn't get here          assert False # shouldn't get here
406          return _("")          return ""
407    
408      def GetNumberRows(self):      def GetNumberRows(self):
409          """Return the number of rows."""          """Return the number of rows."""
410          return len(self.tdata)          if self.clazz is None:
411                return 0
412    
413            return self.clazz.GetNumGroups() + 1 # +1 for default group
414    
415      def GetNumberCols(self):      def GetNumberCols(self):
416          """Return the number of columns."""          """Return the number of columns."""
417          return self.NUM_COLS          return NUM_COLS
418    
419      def IsEmptyCell(self, row, col):      def IsEmptyCell(self, row, col):
420          """Determine if a cell is empty. This is always false."""          """Determine if a cell is empty. This is always false."""
# Line 434  class ClassTable(wxPyGridTableBase): Line 432  class ClassTable(wxPyGridTableBase):
432          """          """
433    
434          self.SetValueAsCustom(row, col, None, value)          self.SetValueAsCustom(row, col, None, value)
         self.__Modified()  
435                
436      def GetValueAsCustom(self, row, col, typeName):      def GetValueAsCustom(self, row, col, typeName):
437          """Return the object that is used to represent the given          """Return the object that is used to represent the given
# Line 443  class ClassTable(wxPyGridTableBase): Line 440  class ClassTable(wxPyGridTableBase):
440          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
441          """          """
442    
443          group = self.tdata[row]          if row == 0:
444                group = self.clazz.GetDefaultGroup()
445            else:
446                group = self.clazz.GetGroup(row - 1)
447    
448    
449            if col == COL_VISIBLE:
450                return group.IsVisible()
451    
452          if col == COL_SYMBOL:          if col == COL_SYMBOL:
453              return group.GetProperties()              return group.GetProperties()
# Line 452  class ClassTable(wxPyGridTableBase): Line 456  class ClassTable(wxPyGridTableBase):
456              return group.GetLabel()              return group.GetLabel()
457    
458          # col must be COL_VALUE          # col must be COL_VALUE
459          assert(col == COL_VALUE)          assert col == COL_VALUE
460    
461          if isinstance(group, ClassGroupDefault):          if isinstance(group, ClassGroupDefault):
462              return _("DEFAULT")              return _("DEFAULT")
463          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
464              return group.GetValue()              return group.GetValue()
465          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
466              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
467    
468          assert(False) # shouldn't get here          assert False # shouldn't get here
469          return None          return None
470    
471      def __ParseInput(self, value):      def __ParseInput(self, value):
472          """Try to determine what kind of input value is          """Try to determine what kind of input value is
473             (string, number, or range)             (string, number, or range)
474    
475          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
476          value, or of length two if it is a range.          a singleton value, or 1 if is a range
477          """          """
478    
479          type = self.fieldType          type = self.fieldType
480    
481          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
482              return (value,)              return (0, value)
483          elif type == FIELDTYPE_INT or type == FIELDTYPE_DOUBLE:          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
484              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
485                    # the float call allows the user to enter 1.0 for 1
486                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
487              else:              else:
488                  conv = lambda p: p                  conv = float
489    
490              #              #
491              # first try to take the input as a single number              # first try to take the input as a single number
492              # if there's an exception try to break it into              # if there's an exception try to break it into
493              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
494              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
495              #              #
496              try:              try:
497                  return (conv(Str2Num(value)),)                  return (0, conv(value))
498              except ValueError:              except ValueError:
499                  i = value.find('-')                  return (1, Range(value))
500                  if i == 0:  
501                      i = value.find('-', 1)          assert False  # shouldn't get here
502            return (0,None)
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
   
         assert(False) # shouldn't get here  
         return (0,)  
               
503    
504      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
505          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 517  class ClassTable(wxPyGridTableBase): Line 513  class ClassTable(wxPyGridTableBase):
513          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
514          """          """
515    
516          assert(col >= 0 and col < self.GetNumberCols())          assert 0 <= col < self.GetNumberCols()
517          assert(row >= 0 and row < self.GetNumberRows())          assert 0 <= row < self.GetNumberRows()
518    
519          group = self.tdata[row]          if row == 0:
520                group = self.clazz.GetDefaultGroup()
521            else:
522                group = self.clazz.GetGroup(row - 1)
523    
524          mod = True # assume the data will change          mod = True # assume the data will change
525    
526          if col == COL_SYMBOL:          if col == COL_VISIBLE:
527                group.SetVisible(value)
528            elif col == COL_SYMBOL:
529              group.SetProperties(value)              group.SetProperties(value)
530          elif col == COL_LABEL:          elif col == COL_LABEL:
531              group.SetLabel(value)              group.SetLabel(value)
# Line 552  class ClassTable(wxPyGridTableBase): Line 553  class ClassTable(wxPyGridTableBase):
553                      # changing the underlying group type if the                      # changing the underlying group type if the
554                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
555                      #                      #
556                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
557                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
558                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
559                              changed = True                              changed = True
560                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
561                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
562                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
563                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
564                              changed = True                              changed = True
565                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
566                      else:                      else:
567                          assert(False)                          assert False
568                          pass                          pass
569    
570                      if changed:                      if changed:
571                          ngroup.SetLabel(group.GetLabel())                          ngroup.SetLabel(group.GetLabel())
572                          self.SetClassGroup(row, ngroup)                          self.SetClassGroup(row, ngroup)
573          else:          else:
574              assert(False) # shouldn't be here              assert False # shouldn't be here
575              pass              pass
576    
577          if mod:          if mod:
# Line 580  class ClassTable(wxPyGridTableBase): Line 581  class ClassTable(wxPyGridTableBase):
581      def GetAttr(self, row, col, someExtraParameter):      def GetAttr(self, row, col, someExtraParameter):
582          """Returns the cell attributes"""          """Returns the cell attributes"""
583    
584          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  
585    
586      def GetClassGroup(self, row):      def GetClassGroup(self, row):
587          """Return the ClassGroup object representing row 'row'."""          """Return the ClassGroup object representing row 'row'."""
588    
589          return self.tdata[row] # self.GetValueAsCustom(row, COL_SYMBOL, None)          #return self.GetValueAsCustom(row, COL_SYMBOL, None)
590            if row == 0:
591                return self.clazz.GetDefaultGroup()
592            else:
593                return self.clazz.GetGroup(row - 1)
594    
595      def SetClassGroup(self, row, group):      def SetClassGroup(self, row, group):
596          self.__SetRow(row, group)          self.__SetRow(row, group)
# Line 625  class ClassTable(wxPyGridTableBase): Line 621  class ClassTable(wxPyGridTableBase):
621          The table is considered modified if any rows are removed.          The table is considered modified if any rows are removed.
622          """          """
623    
624          assert(pos >= 0)          assert pos >= 0
625          old_len = len(self.tdata)          old_len = self.GetNumberRows()
626          for row in range(pos, pos - numRows, -1):          for row in range(pos, pos - numRows, -1):
627              group = self.GetClassGroup(row)              group = self.GetClassGroup(row)
628              if not isinstance(group, ClassGroupDefault):              if row != 0:
629                  self.tdata.pop(row)                  self.clazz.RemoveGroup(row - 1)
630                  self.__Modified()                  self.__Modified()
631            
632          if self.IsModified():          if self.IsModified():
633              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, self.GetNumberRows())
634    
635      def AppendRows(self, numRows = 1):      def AppendRows(self, numRows = 1):
636          """Append 'numRows' empty rows to the end of the table.          """Append 'numRows' empty rows to the end of the table.
# Line 642  class ClassTable(wxPyGridTableBase): Line 638  class ClassTable(wxPyGridTableBase):
638          The table is considered modified if any rows are appended.          The table is considered modified if any rows are appended.
639          """          """
640    
641          old_len = len(self.tdata)          old_len = self.GetNumberRows()
642          for i in range(numRows):          for i in range(numRows):
643              np = ClassGroupSingleton()              np = ClassGroupSingleton()
644              self.__SetRow(-1, np)              self.__SetRow(None, np)
645    
646          if self.IsModified():          if self.IsModified():
647              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, self.GetNumberRows())
648    
649    
650  class Classifier(NonModalDialog):  ID_PROPERTY_REVERT = 4002
651    ID_PROPERTY_ADD = 4003
652    ID_PROPERTY_GENCLASS = 4004
653    ID_PROPERTY_REMOVE = 4005
654    ID_PROPERTY_MOVEUP = 4006
655    ID_PROPERTY_MOVEDOWN = 4007
656    ID_PROPERTY_TRY = 4008
657    ID_PROPERTY_EDITSYM = 4009
658    ID_PROPERTY_SELECT = 4011
659    ID_PROPERTY_TITLE = 4012
660    ID_PROPERTY_FIELDTEXT = 4013
661    
662    BTN_ADD = 0
663    BTN_EDIT = 1
664    BTN_GEN = 2
665    BTN_UP = 3
666    BTN_DOWN = 4
667    BTN_RM = 5
668    
669    EB_LAYER_TITLE = 0
670    EB_SELECT_FIELD = 1
671    EB_GEN_CLASS = 2
672    
673      def __init__(self, parent, name, layer, group = None):  class Classifier(NonModalNonParentDialog):
         NonModalDialog.__init__(self, parent, name,  
                                 _("Classifier: %s") % layer.Title())  
674    
675          panel = wxPanel(self, -1, size=(100, 100))      type2string = {None:             _("None"),
676                       FIELDTYPE_STRING: _("Text"),
677                       FIELDTYPE_INT:    _("Integer"),
678                       FIELDTYPE_DOUBLE: _("Decimal")}
679    
680          self.layer = layer      def __init__(self, parent, name, layer, group = None):
681            NonModalNonParentDialog.__init__(self, parent, name, "")
682    
683          self.originalClass = self.layer.GetClassification()          self.__SetTitle(layer.Title())
         field = self.originalClass.GetField()  
         fieldType = self.originalClass.GetFieldType()  
684    
685          topBox = wxBoxSizer(wxVERTICAL)          self.layer = layer
         panelBox = wxBoxSizer(wxVERTICAL)  
686    
         #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),  
             #0, wxALIGN_LEFT | wxALL, 4)  
         panelBox.Add(wxStaticText(panel, -1,  
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
687    
688            self.genDlg = None
689    
690            ############################
691            # Create the controls
692          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
693    
694          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, self.originalClass)  
             else:  
                 self.fields.SetClientData(i + 1, None)  
695    
696            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
697            self.fieldTypeText = wxStaticText(panel, -1, "")
698    
699          ###########          if layer.HasClassification():
700                self.originalClass = self.layer.GetClassification()
701                field = self.originalClass.GetField()
702                fieldType = self.originalClass.GetFieldType()
703    
704          self.fieldTypeText = wxStaticText(panel, -1, "")              #
705          panelBox.Add(self.fieldTypeText, 0,              # make field choice box
706                       wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)              #
707                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
708    
709          propertyBox = wxBoxSizer(wxHORIZONTAL)              self.num_cols = layer.table.NumColumns()
710          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              # just assume the first field in case one hasn't been
711              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
712          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              self.__cur_field = 0
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
713    
714          panelBox.Add(propertyBox, 0, wxGROW, 4)              self.fields.Append("<None>")
715    
716                if self.originalClass.GetFieldType() is None:
717                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
718                else:
719                    self.fields.SetClientData(0, None)
720    
721          #              for i in range(self.num_cols):
722          # Control Box                  name = layer.table.Column(i).name
723          #                  self.fields.Append(name)
724          controlBox = wxBoxSizer(wxHORIZONTAL)  
725                    if name == field:
726                        self.__cur_field = i + 1
727                        self.fields.SetClientData(i + 1,
728                                                copy.deepcopy(self.originalClass))
729                    else:
730                        self.fields.SetClientData(i + 1, None)
731    
732                button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
733                    _("Generate Class"))
734                button_add = wxButton(panel, ID_PROPERTY_ADD,
735                    _("Add"))
736                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
737                    _("Move Up"))
738                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
739                    _("Move Down"))
740                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
741                    _("Edit Symbol"))
742                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
743                    _("Remove"))
744    
745                self.classGrid = ClassGrid(panel, self)
746    
747                # calling __SelectField after creating the classGrid fills in the
748                # grid with the correct information
749                self.fields.SetSelection(self.__cur_field)
750                self.__SelectField(self.__cur_field, group = group)
751    
752            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
753            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
754            button_ok = wxButton(self, wxID_OK, _("OK"))
755            button_ok.SetDefault()
756            button_close = wxButton(self, wxID_CANCEL, _("Close"))
757    
758          ###########          ############################
759          #          # Layout the controls
         # Control buttons:  
760          #          #
         self.controlButtons = []  
761    
762          controlButtonBox = wxBoxSizer(wxVERTICAL)          topBox = wxBoxSizer(wxVERTICAL)
763            panelBox = wxBoxSizer(wxVERTICAL)
         button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
764    
765          button = wxButton(panel, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))          sizer = wxBoxSizer(wxHORIZONTAL)
766          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
767          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
768            sizer.Add(text_title, 1, wxGROW, 0)
769    
770          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          panelBox.Add(sizer, 0, wxGROW, 4)
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
771    
772          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))          if isinstance(layer, RasterLayer):
773          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              type = "Image"
774          self.controlButtons.append(button)          else:
775                type = layer.ShapeType()
776    
777          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
778                0, wxALIGN_LEFT | wxALL, 4)
779    
780          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
         self.controlButtons.append(button)  
781    
782                classBox = wxStaticBoxSizer(
783                            wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
784    
         ###########  
         #  
         # Classification data table  
         #  
785    
786          self.classGrid = ClassGrid(panel)              sizer = wxBoxSizer(wxHORIZONTAL)
787          #self.__SetGridTable(self.__cur_field, group)              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
788          #self.fields.SetSelection(self.__cur_field)                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
789                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
790    
791          # calling __SelectField after creating the classGrid fills in the              classBox.Add(sizer, 0, wxGROW, 4)
         # grid with the correct information  
         print "2------------------"  
         self.__SelectField(self.__cur_field, group = group)  
792    
793          #self.classGrid.SelectGroup(group)              classBox.Add(self.fieldTypeText, 0,
794                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
795    
796          controlBox.Add(self.classGrid, 1, wxGROW, 0)              controlBox = wxBoxSizer(wxHORIZONTAL)
797                controlButtonBox = wxBoxSizer(wxVERTICAL)
798    
799                controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
800                controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
801                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
802                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
803                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
804                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
805                controlButtonBox.Add(button_remove, 0,
806                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
807    
808                controlBox.Add(self.classGrid, 1, wxGROW, 0)
809                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
810    
811          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              classBox.Add(controlBox, 1, wxGROW, 10)
812          panelBox.Add(controlBox, 1, wxGROW, 10)              panelBox.Add(classBox, 1, wxGROW, 0)
813    
         EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)  
         EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)  
         EVT_BUTTON(self, ID_CLASSIFY_GENRANGE, self._OnGenRange)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
   
         ###########  
814    
815          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
816          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
817                        0, wxALL, 4)          buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
818          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
819          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_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_CANCEL, self._OnCancel)  
   
         ###########  
   
820    
821          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
822          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
823            panelBox.Fit(panel)
824          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
825    
826          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
827          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
828    
829          self.SetAutoLayout(True)          self.SetAutoLayout(True)
830          self.SetSizer(topBox)          self.SetSizer(topBox)
831            topBox.Fit(self)
832            topBox.SetSizeHints(self)
833            self.Layout()
834    
835            ###########
836    
837            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
838            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
839            EVT_BUTTON(self, wxID_OK, self._OnOK)
840            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
841            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
842            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
843    
844            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
845            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
846            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
847            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
848            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
849            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
850    
         print "1------------------"  
         #self.Fit()  
851          ######################          ######################
852    
853            text_title.SetFocus()
854          self.haveApplied = False          self.haveApplied = False
855    
856      def __BuildClassification(self, fieldIndex):      def EditSymbol(self, row):
857            table = self.classGrid.GetTable()
858            prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
859    
860          numRows = self.classGrid.GetNumberRows()          # get a new ClassGroupProperties object and copy the
861          assert(numRows > 0) # there should always be a default row          # values over to our current object
862            propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())
863    
864            self.Enable(False)
865            if propDlg.ShowModal() == wxID_OK:
866                new_prop = propDlg.GetClassGroupProperties()
867                table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
868            self.Enable(True)
869            propDlg.Destroy()
870            
871        def _SetClassification(self, clazz):
872            
873            self.fields.SetClientData(self.__cur_field, clazz)
874            self.classGrid.GetTable().SetClassification(clazz)
875    
876        def __BuildClassification(self, fieldIndex, copyClass = False):
877    
878          clazz = Classification()  #       numRows = self.classGrid.GetNumberRows()
879    #       assert numRows > 0  # there should always be a default row
880    
881    #       clazz = Classification()
882          if fieldIndex == 0:          if fieldIndex == 0:
883              fieldName = None              fieldName = None
884              fieldType = None              fieldType = None
# Line 829  class Classifier(NonModalDialog): Line 886  class Classifier(NonModalDialog):
886              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
887              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
888    
889            clazz = self.classGrid.GetTable().GetClassification()
890    
891            if copyClass:
892                clazz = copy.deepcopy(clazz)
893    
894          clazz.SetField(fieldName)          clazz.SetField(fieldName)
895          clazz.SetFieldType(fieldType)          clazz.SetFieldType(fieldType)
896    
897    
898          table = self.classGrid.GetTable()  #       table = self.classGrid.GetTable()
899          clazz.SetDefaultGroup(table.GetClassGroup(0))  #       clazz.SetDefaultGroup(table.GetClassGroup(0))
900    
901          for i in range(1, numRows):  #       for i in range(1, numRows):
902              clazz.AddGroup(table.GetClassGroup(i))  #           clazz.AppendGroup(table.GetClassGroup(i))
903    
904          return clazz          return clazz
905    
# Line 856  class Classifier(NonModalDialog): Line 918  class Classifier(NonModalDialog):
918              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
919              clazz.SetFieldType(fieldType)              clazz.SetFieldType(fieldType)
920                                    
         print "6------------------"  
921          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")}  
922    
923      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
924          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
925          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
926    
927          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
928    
929          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
930    
931          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
932    
933      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
934            """This method assumes that the current selection for the
935            combo has already been set by a call to SetSelection().
936            """
937    
938          print "3------------------"          assert oldIndex >= -1
   
         assert(oldIndex >= -1)  
   
         self.fields.SetSelection(newIndex)  
939    
940          if oldIndex != -1:          if oldIndex != -1:
941              clazz = self.__BuildClassification(oldIndex)              clazz = self.__BuildClassification(oldIndex)
942              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
943    
         print "4------------------"  
944          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
         print "5------------------"  
945    
946          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
947    
948          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
949    
950        def __SetTitle(self, title):
951            if title != "":
952                title = ": " + title
953    
954            self.SetTitle(_("Layer Properties") + title)
955    
956        def _OnEditSymbol(self, event):
957            sel = self.classGrid.GetCurrentSelection()
958    
959            if len(sel) == 1:
960                self.EditSymbol(sel[0])
961    
962      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
963          index = self.fields.GetSelection()          index = self.fields.GetSelection()
964          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
965          self.__cur_field = index          self.__cur_field = index
966    
967      def _OnApply(self, event):      def _OnTry(self, event):
968          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
969             it to the layer.             it to the layer.
970          """          """
971    
972          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
973                clazz = self.fields.GetClientData(self.__cur_field)
974    
975          #              #
976          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
977          # to begin with or it has been modified              # to begin with or it has been modified
978          #              #
979          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
980              clazz = self.__BuildClassification(self.__cur_field)              if clazz is None or self.classGrid.GetTable().IsModified():
981                    clazz = self.__BuildClassification(self.__cur_field, True)
982    
983          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
984    
985          self.haveApplied = True          self.haveApplied = True
986    
987      def _OnOK(self, event):      def _OnOK(self, event):
988          self._OnApply(event)          self._OnTry(event)
989          self.OnClose(event)          self.Close()
990    
991        def OnClose(self, event):
992            NonModalNonParentDialog.OnClose(self, event)
993    
994      def _OnCancel(self, event):      def _OnCloseBtn(self, event):
995            """Close is similar to Cancel except that any changes that were
996            made and applied remain applied, but the currently displayed
997            classification is discarded.
998            """
999    
1000            self.Close()
1001    
1002        def _OnRevert(self, event):
1003          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1004          if self.haveApplied:          if self.haveApplied:
1005              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1006    
1007          self.OnClose(event)          #self.Close()
1008    
1009      def _OnAdd(self, event):      def _OnAdd(self, event):
1010          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 941  class Classifier(NonModalDialog): Line 1012  class Classifier(NonModalDialog):
1012      def _OnRemove(self, event):      def _OnRemove(self, event):
1013          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1014    
1015      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1016          print "Classifier._OnGenRange()"  
1017            self.genDlg = ClassGenDialog(self, self.layer,
1018                              self.fields.GetString(self.__cur_field))
1019    
1020            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1021    
1022            self.__EnableButtons(EB_GEN_CLASS, False)
1023    
1024            self.genDlg.Show()
1025    
1026        def _OnGenDialogClose(self, event):
1027            self.genDlg.Destroy()
1028            self.__EnableButtons(EB_GEN_CLASS, True)
1029    
1030      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1031          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
1032    
         print "sel: ", sel  
   
1033          if len(sel) == 1:          if len(sel) == 1:
1034              i = sel[0]              i = sel[0]
1035              if i > 1:              if i > 1:
# Line 976  class Classifier(NonModalDialog): Line 1057  class Classifier(NonModalDialog):
1057                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1058                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1059    
1060        def _OnTitleChanged(self, event):
1061            obj = event.GetEventObject()
1062    
1063            self.layer.SetTitle(obj.GetValue())
1064            self.__SetTitle(self.layer.Title())
1065    
1066            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1067    
1068        def __EnableButtons(self, case, enable):
1069    
1070            if case == EB_LAYER_TITLE:  
1071                list = (wxID_OK,
1072                        wxID_CANCEL)
1073    
1074            elif case == EB_SELECT_FIELD:
1075                list = (ID_PROPERTY_GENCLASS,
1076                        ID_PROPERTY_ADD,
1077                        ID_PROPERTY_MOVEUP,
1078                        ID_PROPERTY_MOVEDOWN,
1079                        ID_PROPERTY_EDITSYM,
1080                        ID_PROPERTY_REMOVE)
1081    
1082            elif case == EB_GEN_CLASS:
1083                list = (ID_PROPERTY_SELECT,
1084                        ID_PROPERTY_FIELDTEXT,
1085                        ID_PROPERTY_GENCLASS,
1086                        ID_PROPERTY_EDITSYM)
1087    
1088            for id in list:
1089                self.FindWindowById(id).Enable(enable)
1090    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1091  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1092  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1093  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1002  class SelectPropertiesDialog(wxDialog): Line 1111  class SelectPropertiesDialog(wxDialog):
1111          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1112          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1113              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1114          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,  
1115                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1116          previewBox.Add(self.previewWin, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1117                (40, 40), wxSIMPLE_BORDER)
1118    
1119            self.previewWin.AllowEdit(False)
1120    
1121            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1122    
1123          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1124    
# Line 1012  class SelectPropertiesDialog(wxDialog): Line 1126  class SelectPropertiesDialog(wxDialog):
1126          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1127    
1128          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1129          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1130              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1131              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1132          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1133    
1134          lineColorBox.Add(          lineColorBox.Add(
# Line 1060  class SelectPropertiesDialog(wxDialog): Line 1174  class SelectPropertiesDialog(wxDialog):
1174          # Control buttons:          # Control buttons:
1175          #          #
1176          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1177          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1178                        0, wxALL, 4)          button_ok.SetDefault()
1179          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1180                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1181          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1182            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1183                                                                                                                                                                    
1184          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1185          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1186                                                                                                                                                                    
1187          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1188          self.SetSizer(topBox)          self.SetSizer(topBox)
1189          topBox.Fit(self)          topBox.Fit(self)
1190          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1191    
1192      def _OnOK(self, event):      def OnOK(self, event):
1193          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1194    
1195      def _OnCancel(self, event):      def OnCancel(self, event):
1196          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1197    
1198      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 1086  class SelectPropertiesDialog(wxDialog): Line 1201  class SelectPropertiesDialog(wxDialog):
1201    
1202      def __GetColor(self, cur):      def __GetColor(self, cur):
1203          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1204          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Color.Transparent:
1205                dialog.GetColourData().SetColour(Color2wxColour(cur))
1206    
1207          ret = None          ret = None
1208          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1209              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 1102  class SelectPropertiesDialog(wxDialog): Line 1219  class SelectPropertiesDialog(wxDialog):
1219          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1220    
1221      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1222          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Color.Transparent)
1223          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1224                    
1225      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1112  class SelectPropertiesDialog(wxDialog): Line 1229  class SelectPropertiesDialog(wxDialog):
1229          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1230    
1231      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1232          self.prop.SetFill(Color.None)          self.prop.SetFill(Color.Transparent)
1233          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1234    
1235      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1133  class ClassDataPreviewWindow(wxWindow): Line 1250  class ClassDataPreviewWindow(wxWindow):
1250          self.shapeType = shapeType          self.shapeType = shapeType
1251          self.previewer = ClassDataPreviewer()          self.previewer = ClassDataPreviewer()
1252    
1253        def GetProperties():
1254            return self.prop
1255    
1256      def _OnPaint(self, event):      def _OnPaint(self, event):
1257          dc = wxPaintDC(self)          dc = wxPaintDC(self)
1258    
# Line 1151  class ClassDataPreviewer: Line 1271  class ClassDataPreviewer:
1271    
1272      def Draw(self, dc, rect, prop, shapeType):      def Draw(self, dc, rect, prop, shapeType):
1273    
1274          assert(dc is not None)          assert dc is not None
1275          assert(isinstance(prop, ClassGroupProperties))          assert isinstance(prop, ClassGroupProperties)
1276    
1277          if rect is None:          if rect is None:
1278              x = 0              x = 0
# Line 1165  class ClassDataPreviewer: Line 1285  class ClassDataPreviewer:
1285              h = rect.GetHeight()              h = rect.GetHeight()
1286    
1287          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1288          if stroke is Color.None:          if stroke is Color.Transparent:
1289              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1290          else:          else:
1291              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1173  class ClassDataPreviewer: Line 1293  class ClassDataPreviewer:
1293                          wxSOLID)                          wxSOLID)
1294    
1295          stroke = prop.GetFill()          stroke = prop.GetFill()
1296          if stroke is Color.None:          if stroke is Color.Transparent:
1297              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1298          else:          else:
1299              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1187  class ClassDataPreviewer: Line 1307  class ClassDataPreviewer:
1307                             wxPoint(x + w/2, y + h/4*3),                             wxPoint(x + w/2, y + h/4*3),
1308                             wxPoint(x + w, y)])                             wxPoint(x + w, y)])
1309    
1310          elif shapeType == SHAPETYPE_POINT or \          elif shapeType == SHAPETYPE_POINT:
              shapeType == SHAPETYPE_POLYGON:  
1311    
1312              dc.DrawCircle(x + w/2, y + h/2,              dc.DrawCircle(x + w/2, y + h/2,
1313                            (min(w, h) - prop.GetLineWidth())/2)                            (min(w, h) - prop.GetLineWidth())/2)
1314    
1315            elif shapeType == SHAPETYPE_POLYGON:
1316                dc.DrawRectangle(x, y, w, h)
1317    
1318  class ClassRenderer(wxPyGridCellRenderer):  class ClassRenderer(wxPyGridCellRenderer):
1319    
1320      def __init__(self, shapeType):      def __init__(self, shapeType):
# Line 1214  class ClassRenderer(wxPyGridCellRenderer Line 1336  class ClassRenderer(wxPyGridCellRenderer
1336              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1337    
1338          if isSelected:          if isSelected:
1339              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1340              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1341    
1342              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1343                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1344    
1345          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1346    
1347    
1348    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1349    
1350        def __init__(self, parent, id, props, shapeType,
1351                     size = wxDefaultSize, style = 0):
1352    
1353            wxWindow.__init__(self, parent, id, size = size, style = style)
1354    
1355            self.SetProperties(props)
1356            self.SetShapeType(shapeType)
1357            self.AllowEdit(True)
1358    
1359            EVT_PAINT(self, self._OnPaint)
1360            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1361    
1362            self.previewer = ClassDataPreviewer()
1363    
1364        def _OnPaint(self, event):
1365            dc = wxPaintDC(self)
1366    
1367            # XXX: this doesn't seem to be having an effect:
1368            dc.DestroyClippingRegion()
1369    
1370            w, h = self.GetClientSize()
1371    
1372            self.previewer.Draw(dc,
1373                                wxRect(0, 0, w, h),
1374                                self.GetProperties(),
1375                                self.GetShapeType())
1376    
1377    
1378        def GetProperties(self):
1379            return self.props
1380    
1381        def SetProperties(self, props):
1382            self.props = props
1383            self.Refresh()
1384    
1385        def GetShapeType(self):
1386            return self.shapeType
1387    
1388        def SetShapeType(self, shapeType):
1389            self.shapeType = shapeType
1390            self.Refresh()
1391    
1392        def AllowEdit(self, allow):
1393            self.allowEdit = allow
1394    
1395        def DoEdit(self):
1396            if not self.allowEdit: return
1397    
1398            propDlg = SelectPropertiesDialog(NULL,
1399                                             self.GetProperties(),
1400                                             self.GetShapeType())
1401    
1402            if propDlg.ShowModal() == wxID_OK:
1403                new_prop = propDlg.GetClassGroupProperties()
1404                self.SetProperties(new_prop)
1405                self.Refresh()
1406    
1407            propDlg.Destroy()
1408    
1409        def _OnLeftDClick(self, event):
1410            self.DoEdit()
Legend:
Removed from v.570  
changed lines
  Added in v.1058
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26