/[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 576 by jonathan, Mon Mar 31 18:31:17 2003 UTC revision 1452 by bh, Fri Jul 18 12:57:59 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Transparent
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from dialogs import NonModalDialog  from Thuban.UI.classgen import ClassGenDialog
36    
37    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_GENRANGE = 4004  
 ID_CLASSIFY_REMOVE = 4005  
 ID_CLASSIFY_MOVEUP = 4006  
 ID_CLASSIFY_MOVEDOWN = 4007  
 ID_CLASSIFY_APPLY = 4008  
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 60  import weakref Line 59  import weakref
59  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
60    
61    
62      def __init__(self, parent):      def __init__(self, parent, classifier):
63          """Constructor.          """Constructor.
64    
65          parent -- the parent window          parent -- the parent window
# Line 69  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)
72          wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
73          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)          self.classifier = classifier
74    
75          self.currentSelection = []          self.currentSelection = []
76    
77          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
78          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)
79          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)
80            EVT_GRID_COL_SIZE(self, self._OnCellResize)
81            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!"  
86    
87      #def Refresh(self):      def CreateTable(self, clazz, fieldType, shapeType, group = None):
         #self.Show()  
     #def Update(self):  
         #self.Show()  
88    
89      def CreateTable(self, clazz, shapeType, group = None):          assert isinstance(clazz, Classification)
90    
         assert(isinstance(clazz, Classification))  
   
         self.shapeType = shapeType  
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 107  class ClassGrid(wxGrid): Line 104  class ClassGrid(wxGrid):
104          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
105          self.ClearSelection()          self.ClearSelection()
106    
107          #print "8------------------"          table.Reset(clazz, fieldType, 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)  
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 133  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 203  class ClassGrid(wxGrid): Line 186  class ClassGrid(wxGrid):
186      def SelectGroup(self, group, makeVisible = True):      def SelectGroup(self, group, makeVisible = True):
187          if group is None: return          if group is None: return
188    
189          assert(isinstance(group, ClassGroup))          assert isinstance(group, ClassGroup)
190    
191          table = self.GetTable()          table = self.GetTable()
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 236  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:  
             prop = self.GetTable().GetValueAsCustom(r, c, None)  
             #prop = group.GetProperties()  
219    
220              # get a new ClassGroupProperties object and copy the          if c == COL_SYMBOL:
221              # values over to our current object              self.classifier.EditSymbol(r)
222              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)          else:
223              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()  
224    
225      #      #
226      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 263  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):
251            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):
     #def __init__(self, clazz, shapeType, view = None):  
261          """Constructor.          """Constructor.
262    
263          shapeType -- the type of shape that the layer uses          shapeType -- the type of shape that the layer uses
# Line 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      def Reset(self, clazz, shapeType, group = None):          self.SetView(view)
276    
277        def Reset(self, clazz, fieldType, shapeType, group = None):
278          """Reset the table with the given data.          """Reset the table with the given data.
279    
280          This is necessary because wxWindows does not allow a grid's          This is necessary because wxWindows does not allow a grid's
# Line 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 = fieldType
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        def SetClassification(self, clazz, group = None):
321    
322          self.__NotifyRowChanges(old_len, len(self.tdata))          self.GetView().BeginBatch()
323          #print "11------------------"  
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, map, 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
686          panelBox = wxBoxSizer(wxVERTICAL)          self.map = map
687    
688          #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
689              #0, wxALIGN_LEFT | wxALL, 4)          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
690          panelBox.Add(wxStaticText(panel, -1,                               self.layer_shapestore_replaced)
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
691    
692            self.genDlg = None
693    
694            ############################
695            # Create the controls
696          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
   
         self.num_cols = layer.table.field_count()  
         # just assume the first field in case one hasn't been  
         # specified in the file.  
         self.__cur_field = 0  
   
         self.fields.Append("<None>")  
         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)  
697    
698            panel = wxPanel(self, -1)
699    
700          ###########          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
   
701          self.fieldTypeText = wxStaticText(panel, -1, "")          self.fieldTypeText = wxStaticText(panel, -1, "")
         panelBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
702    
703          propertyBox = wxBoxSizer(wxHORIZONTAL)          if layer.HasClassification():
704          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              self.originalClass = self.layer.GetClassification()
705              0, wxALIGN_LEFT | wxALL, 4)              self.originalClassField = self.layer.GetClassificationColumn()
706          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              field = self.originalClassField
707          EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)              fieldType = self.layer.GetFieldType(field)
708    
709          panelBox.Add(propertyBox, 0, wxGROW, 4)              table = layer.ShapeStore().Table()
710                #
711                # make field choice box
712                #
713                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
714    
715                self.num_cols = table.NumColumns()
716                # just assume the first field in case one hasn't been
717                # specified in the file.
718                self.__cur_field = 0
719    
720          #              self.fields.Append("<None>")
         # Control Box  
         #  
         controlBox = wxBoxSizer(wxHORIZONTAL)  
721    
722                if fieldType is None:
723                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
724                else:
725                    self.fields.SetClientData(0, None)
726    
727          ###########              for i in range(self.num_cols):
728          #                  name = table.Column(i).name
729          # Control buttons:                  self.fields.Append(name)
730          #  
731          self.controlButtons = []                  if name == field:
732                        self.__cur_field = i + 1
733                        self.fields.SetClientData(i + 1,
734                                                  copy.deepcopy(self.originalClass))
735                    else:
736                        self.fields.SetClientData(i + 1, None)
737    
738          controlButtonBox = wxBoxSizer(wxVERTICAL)              button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
739                    _("Generate Class"))
740                button_add = wxButton(panel, ID_PROPERTY_ADD,
741                    _("Add"))
742                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
743                    _("Move Up"))
744                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
745                    _("Move Down"))
746                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
747                    _("Edit Symbol"))
748                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
749                    _("Remove"))
750    
751                self.classGrid = ClassGrid(panel, self)
752    
753                # calling __SelectField after creating the classGrid fills in the
754                # grid with the correct information
755                self.fields.SetSelection(self.__cur_field)
756                self.__SelectField(self.__cur_field, group = group)
757    
758            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
759            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
760            button_ok = wxButton(self, wxID_OK, _("OK"))
761            button_close = wxButton(self, wxID_CANCEL, _("Close"))
762            button_ok.SetDefault()
763    
764          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          ############################
765          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          # Layout the controls
766          self.controlButtons.append(button)          #
767    
768          button = wxButton(panel, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))          topBox = wxBoxSizer(wxVERTICAL)
769          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          panelBox = wxBoxSizer(wxVERTICAL)
         self.controlButtons.append(button)  
770    
771          button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))          sizer = wxBoxSizer(wxHORIZONTAL)
772          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
773          self.controlButtons.append(button)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
774            sizer.Add(text_title, 1, wxGROW, 0)
775    
776          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)  
777    
778          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)          if isinstance(layer, RasterLayer):
779                type = "Image"
780            else:
781                type = layer.ShapeType()
782    
783          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
784          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              0, wxALIGN_LEFT | wxALL, 4)
         self.controlButtons.append(button)  
785    
786            if layer.HasClassification():
787    
788          ###########              classBox = wxStaticBoxSizer(
789          #                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         # Classification data table  
         #  
790    
         self.classGrid = ClassGrid(panel)  
         #self.__SetGridTable(self.__cur_field, group)  
         #self.fields.SetSelection(self.__cur_field)  
791    
792          # calling __SelectField after creating the classGrid fills in the              sizer = wxBoxSizer(wxHORIZONTAL)
793          # grid with the correct information              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
794          #print "2------------------"                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
795          self.__SelectField(self.__cur_field, group = group)              sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
796    
797          #self.classGrid.SelectGroup(group)              classBox.Add(sizer, 0, wxGROW, 4)
798    
799          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox.Add(self.fieldTypeText, 0,
800                            wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
801    
802                controlBox = wxBoxSizer(wxHORIZONTAL)
803                controlButtonBox = wxBoxSizer(wxVERTICAL)
804    
805                controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
806                controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
807                controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
808                controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
809                controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
810                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
811                controlButtonBox.Add(button_remove, 0,
812                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
813    
814          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox.Add(self.classGrid, 1, wxGROW, 0)
815          panelBox.Add(controlBox, 1, wxGROW, 10)              controlBox.Add(controlButtonBox, 0, wxGROW, 10)
816    
817          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              classBox.Add(controlBox, 1, wxGROW, 10)
818          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              panelBox.Add(classBox, 1, wxGROW, 0)
         EVT_BUTTON(self, ID_CLASSIFY_GENRANGE, self._OnGenRange)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)  
         EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)  
819    
         ###########  
820    
821          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
822          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
823                        0, wxALL, 4)          buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
824          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
825          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)  
   
         ###########  
   
826    
827          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
828          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
829            panelBox.Fit(panel)
830          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
831    
832          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
833          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
834    
835          self.SetAutoLayout(True)          self.SetAutoLayout(True)
836          self.SetSizer(topBox)          self.SetSizer(topBox)
837            topBox.Fit(self)
838            topBox.SetSizeHints(self)
839            self.Layout()
840    
841            ###########
842    
843            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
844            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
845            EVT_BUTTON(self, wxID_OK, self._OnOK)
846            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
847            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
848            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
849    
850            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
851            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
852            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
853            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
854            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
855            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
856    
         #print "1------------------"  
         #self.Fit()  
857          ######################          ######################
858    
859            text_title.SetFocus()
860          self.haveApplied = False          self.haveApplied = False
861    
862      def __BuildClassification(self, fieldIndex):      def unsubscribe_messages(self):
863            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
864            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
865                                   self.layer_shapestore_replaced)
866    
867        def map_layers_removed(self, map):
868            if self.layer not in self.map.Layers():
869                self.Close()
870    
871        def layer_shapestore_replaced(self, *args):
872            self.Close()
873    
874        def EditSymbol(self, row):
875            table = self.classGrid.GetTable()
876            prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
877    
878            # get a new ClassGroupProperties object and copy the
879            # values over to our current object
880            propDlg = SelectPropertiesDialog(self, prop, self.layer.ShapeType())
881    
882            self.Enable(False)
883            if propDlg.ShowModal() == wxID_OK:
884                new_prop = propDlg.GetClassGroupProperties()
885                table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
886            self.Enable(True)
887            propDlg.Destroy()
888            
889        def _SetClassification(self, clazz):
890            
891            self.fields.SetClientData(self.__cur_field, clazz)
892            self.classGrid.GetTable().SetClassification(clazz)
893    
894        def __BuildClassification(self, fieldIndex, copyClass=False, force=False):
895    
896          numRows = self.classGrid.GetNumberRows()  #       numRows = self.classGrid.GetNumberRows()
897          assert(numRows > 0) # there should always be a default row  #       assert numRows > 0  # there should always be a default row
898    
         clazz = Classification()  
899          if fieldIndex == 0:          if fieldIndex == 0:
900              fieldName = None              fieldName = None
901              fieldType = None              fieldType = None
# Line 829  class Classifier(NonModalDialog): Line 903  class Classifier(NonModalDialog):
903              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
904              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
905    
906          clazz.SetField(fieldName)          clazz = self.fields.GetClientData(fieldIndex)
907          clazz.SetFieldType(fieldType)          if clazz is None or self.classGrid.GetTable().IsModified() or force:
908                clazz = self.classGrid.GetTable().GetClassification()
909                if copyClass:
910          table = self.classGrid.GetTable()                  clazz = copy.deepcopy(clazz)
         clazz.SetDefaultGroup(table.GetClassGroup(0))  
   
         for i in range(1, numRows):  
             clazz.AddGroup(table.GetClassGroup(i))  
911    
912          return clazz          return clazz, fieldName
913    
914      def __SetGridTable(self, fieldIndex, group = None):      def __SetGridTable(self, fieldIndex, group = None):
915    
# Line 852  class Classifier(NonModalDialog): Line 922  class Classifier(NonModalDialog):
922                      self.layer.GetClassification().                      self.layer.GetClassification().
923                                 GetDefaultGroup().GetProperties()))                                 GetDefaultGroup().GetProperties()))
924    
925              fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
926              fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
             clazz.SetFieldType(fieldType)  
927                                    
928          #print "6------------------"          self.classGrid.CreateTable(clazz, fieldType,
929          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)                                     self.layer.ShapeType(), group)
         #print "7------------------"  
   
   
   
     type2string = {None:             _("None"),  
                    FIELDTYPE_STRING: _("Text"),  
                    FIELDTYPE_INT:    _("Integer"),  
                    FIELDTYPE_DOUBLE: _("Decimal")}  
930    
931      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
932          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
933          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
934    
935          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
936    
937          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
938    
939          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
940    
941      def __SelectField(self, newIndex, oldIndex = -1, group = None):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
942            """This method assumes that the current selection for the
943            combo has already been set by a call to SetSelection().
944            """
945    
946          #print "3------------------"          assert oldIndex >= -1
   
         assert(oldIndex >= -1)  
   
         self.fields.SetSelection(newIndex)  
947    
948          if oldIndex != -1:          if oldIndex != -1:
949              clazz = self.__BuildClassification(oldIndex)              clazz, name = self.__BuildClassification(oldIndex, force = True)
950              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
951    
         #print "4------------------"  
952          self.__SetGridTable(newIndex, group)          self.__SetGridTable(newIndex, group)
         #print "5------------------"  
953    
954          enabled = newIndex != 0          self.__EnableButtons(EB_SELECT_FIELD)
   
         for b in self.controlButtons:  
             b.Enable(enabled)  
955    
956          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
957    
958        def __SetTitle(self, title):
959            if title != "":
960                title = ": " + title
961    
962            self.SetTitle(_("Layer Properties") + title)
963    
964        def _OnEditSymbol(self, event):
965            sel = self.classGrid.GetCurrentSelection()
966    
967            if len(sel) == 1:
968                self.EditSymbol(sel[0])
969    
970      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
971          index = self.fields.GetSelection()          index = self.fields.GetSelection()
972          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
973          self.__cur_field = index          self.__cur_field = index
974    
975      def _OnApply(self, event):      def _OnTry(self, event):
976          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
977             it to the layer.             it to the layer.
978          """          """
979    
980          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
981                clazz = self.fields.GetClientData(self.__cur_field)
982    
983          #              #
984          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
985          # to begin with or it has been modified              # to begin with or it has been modified
986          #              #
987          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
988              clazz = self.__BuildClassification(self.__cur_field)              clazz, name = self.__BuildClassification(self.__cur_field, True)
989    
990          self.layer.SetClassification(clazz)              self.layer.SetClassificationColumn(name)
991                self.layer.SetClassification(clazz)
992    
993          self.haveApplied = True          self.haveApplied = True
994    
995      def _OnOK(self, event):      def _OnOK(self, event):
996          self._OnApply(event)          self._OnTry(event)
997          self.OnClose(event)          self.Close()
998    
999        def OnClose(self, event):
1000            self.unsubscribe_messages()
1001            NonModalNonParentDialog.OnClose(self, event)
1002    
1003        def _OnCloseBtn(self, event):
1004            """Close is similar to Cancel except that any changes that were
1005            made and applied remain applied, but the currently displayed
1006            classification is discarded.
1007            """
1008    
1009      def _OnCancel(self, event):          self.Close()
1010    
1011        def _OnRevert(self, event):
1012          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1013          if self.haveApplied:          if self.haveApplied:
1014                self.layer.SetClassificationColumn(self.originalClassField)
1015              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1016    
1017          self.OnClose(event)          #self.Close()
1018    
1019      def _OnAdd(self, event):      def _OnAdd(self, event):
1020          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 941  class Classifier(NonModalDialog): Line 1022  class Classifier(NonModalDialog):
1022      def _OnRemove(self, event):      def _OnRemove(self, event):
1023          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1024    
1025      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1026          print "Classifier._OnGenRange()"  
1027            self.genDlg = ClassGenDialog(self, self.layer,
1028                              self.fields.GetString(self.__cur_field))
1029    
1030            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1031    
1032            self.__EnableButtons(EB_GEN_CLASS)
1033    
1034            self.genDlg.Show()
1035    
1036        def _OnGenDialogClose(self, event):
1037            self.genDlg.Destroy()
1038            self.genDlg = None
1039            self.__EnableButtons(EB_GEN_CLASS)
1040    
1041      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1042          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
1043    
         #print "sel: ", sel  
   
1044          if len(sel) == 1:          if len(sel) == 1:
1045              i = sel[0]              i = sel[0]
1046              if i > 1:              if i > 1:
# Line 976  class Classifier(NonModalDialog): Line 1068  class Classifier(NonModalDialog):
1068                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1069                  self.classGrid.MakeCellVisible(i + 1, 0)                  self.classGrid.MakeCellVisible(i + 1, 0)
1070    
1071        def _OnTitleChanged(self, event):
1072            obj = event.GetEventObject()
1073    
1074            self.layer.SetTitle(obj.GetValue())
1075            self.__SetTitle(self.layer.Title())
1076    
1077            self.__EnableButtons(EB_LAYER_TITLE)
1078    
1079        def __EnableButtons(self, case):
1080    
1081            list = {wxID_OK                 : True,
1082                    wxID_CANCEL             : True,
1083                    ID_PROPERTY_ADD         : True,
1084                    ID_PROPERTY_MOVEUP      : True,
1085                    ID_PROPERTY_MOVEDOWN    : True,
1086                    ID_PROPERTY_REMOVE      : True,
1087                    ID_PROPERTY_SELECT      : True,
1088                    ID_PROPERTY_FIELDTEXT   : True,
1089                    ID_PROPERTY_GENCLASS    : True,
1090                    ID_PROPERTY_EDITSYM     : True}
1091    
1092            if case == EB_LAYER_TITLE:  
1093                if self.layer.Title() == "":
1094                    list[wxID_OK] = False
1095                    list[wxID_CANCEL] = False
1096    
1097            elif case == EB_SELECT_FIELD:
1098                if self.fields.GetSelection() == 0:
1099                    list[ID_PROPERTY_GENCLASS] = False
1100                    list[ID_PROPERTY_ADD] = False
1101                    list[ID_PROPERTY_MOVEUP] = False
1102                    list[ID_PROPERTY_MOVEDOWN] = False
1103                    list[ID_PROPERTY_REMOVE] = False
1104    
1105            elif case == EB_GEN_CLASS:
1106                if self.genDlg is not None:
1107                    list[ID_PROPERTY_SELECT] = False
1108                    list[ID_PROPERTY_FIELDTEXT] = False
1109                    list[ID_PROPERTY_GENCLASS] = False
1110    
1111            for id, enable in list.items():
1112                win = self.FindWindowById(id)
1113                if win:
1114                    win.Enable(enable)
1115    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1116  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1117  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1118  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 1002  class SelectPropertiesDialog(wxDialog): Line 1136  class SelectPropertiesDialog(wxDialog):
1136          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1137          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1138              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1139          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,  
1140                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1141          previewBox.Add(self.previewWin, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1142                (40, 40), wxSIMPLE_BORDER)
1143    
1144            self.previewWin.AllowEdit(False)
1145    
1146            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1147    
1148          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1149    
# Line 1012  class SelectPropertiesDialog(wxDialog): Line 1151  class SelectPropertiesDialog(wxDialog):
1151          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1152    
1153          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1154          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1155              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1156              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1157          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1158    
1159          lineColorBox.Add(          lineColorBox.Add(
# Line 1060  class SelectPropertiesDialog(wxDialog): Line 1199  class SelectPropertiesDialog(wxDialog):
1199          # Control buttons:          # Control buttons:
1200          #          #
1201          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1202          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1203                        0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1204          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1205                        0, wxALL, 4)                        0, wxRIGHT|wxEXPAND, 10)
1206          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1207    
1208            button_ok.SetDefault()
1209                                                                                                                                                                    
1210          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1211          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1212                                                                                                                                                                    
1213          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1214          self.SetSizer(topBox)          self.SetSizer(topBox)
1215          topBox.Fit(self)          topBox.Fit(self)
1216          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1217    
1218      def _OnOK(self, event):      def OnOK(self, event):
1219          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1220    
1221      def _OnCancel(self, event):      def OnCancel(self, event):
1222          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1223    
1224      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 1086  class SelectPropertiesDialog(wxDialog): Line 1227  class SelectPropertiesDialog(wxDialog):
1227    
1228      def __GetColor(self, cur):      def __GetColor(self, cur):
1229          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1230          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Transparent:
1231                dialog.GetColourData().SetColour(Color2wxColour(cur))
1232    
1233          ret = None          ret = None
1234          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1235              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 1102  class SelectPropertiesDialog(wxDialog): Line 1245  class SelectPropertiesDialog(wxDialog):
1245          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1246    
1247      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1248          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Transparent)
1249          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1250                    
1251      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1112  class SelectPropertiesDialog(wxDialog): Line 1255  class SelectPropertiesDialog(wxDialog):
1255          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1256    
1257      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1258          self.prop.SetFill(Color.None)          self.prop.SetFill(Transparent)
1259          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1260    
1261      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1133  class ClassDataPreviewWindow(wxWindow): Line 1276  class ClassDataPreviewWindow(wxWindow):
1276          self.shapeType = shapeType          self.shapeType = shapeType
1277          self.previewer = ClassDataPreviewer()          self.previewer = ClassDataPreviewer()
1278    
1279        def GetProperties():
1280            return self.prop
1281    
1282      def _OnPaint(self, event):      def _OnPaint(self, event):
1283          dc = wxPaintDC(self)          dc = wxPaintDC(self)
1284    
# Line 1151  class ClassDataPreviewer: Line 1297  class ClassDataPreviewer:
1297    
1298      def Draw(self, dc, rect, prop, shapeType):      def Draw(self, dc, rect, prop, shapeType):
1299    
1300          assert(dc is not None)          assert dc is not None
1301          assert(isinstance(prop, ClassGroupProperties))          assert isinstance(prop, ClassGroupProperties)
1302    
1303          if rect is None:          if rect is None:
1304              x = 0              x = 0
# Line 1165  class ClassDataPreviewer: Line 1311  class ClassDataPreviewer:
1311              h = rect.GetHeight()              h = rect.GetHeight()
1312    
1313          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1314          if stroke is Color.None:          if stroke is Transparent:
1315              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1316          else:          else:
1317              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1173  class ClassDataPreviewer: Line 1319  class ClassDataPreviewer:
1319                          wxSOLID)                          wxSOLID)
1320    
1321          stroke = prop.GetFill()          stroke = prop.GetFill()
1322          if stroke is Color.None:          if stroke is Transparent:
1323              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1324          else:          else:
1325              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1216  class ClassRenderer(wxPyGridCellRenderer Line 1362  class ClassRenderer(wxPyGridCellRenderer
1362              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1363    
1364          if isSelected:          if isSelected:
1365              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1366              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1367    
1368              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1369                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1370    
1371          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1372    
1373    
1374    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1375    
1376        def __init__(self, parent, id, props, shapeType,
1377                     size = wxDefaultSize, style = 0):
1378    
1379            wxWindow.__init__(self, parent, id, size = size, style = style)
1380    
1381            self.parent = parent
1382    
1383            self.SetProperties(props)
1384            self.SetShapeType(shapeType)
1385            self.AllowEdit(True)
1386    
1387            EVT_PAINT(self, self._OnPaint)
1388            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1389    
1390            self.previewer = ClassDataPreviewer()
1391    
1392        def _OnPaint(self, event):
1393            dc = wxPaintDC(self)
1394    
1395            # XXX: this doesn't seem to be having an effect:
1396            dc.DestroyClippingRegion()
1397    
1398            w, h = self.GetClientSize()
1399    
1400            self.previewer.Draw(dc,
1401                                wxRect(0, 0, w, h),
1402                                self.GetProperties(),
1403                                self.GetShapeType())
1404    
1405    
1406        def GetProperties(self):
1407            return self.props
1408    
1409        def SetProperties(self, props):
1410            self.props = props
1411            self.Refresh()
1412    
1413        def GetShapeType(self):
1414            return self.shapeType
1415    
1416        def SetShapeType(self, shapeType):
1417            self.shapeType = shapeType
1418            self.Refresh()
1419    
1420        def AllowEdit(self, allow):
1421            self.allowEdit = allow
1422    
1423        def DoEdit(self):
1424            if not self.allowEdit: return
1425    
1426            propDlg = SelectPropertiesDialog(self.parent,
1427                                             self.GetProperties(),
1428                                             self.GetShapeType())
1429    
1430            if propDlg.ShowModal() == wxID_OK:
1431                new_prop = propDlg.GetClassGroupProperties()
1432                self.SetProperties(new_prop)
1433                self.Refresh()
1434    
1435            propDlg.Destroy()
1436    
1437        def _OnLeftDClick(self, event):
1438            self.DoEdit()
Legend:
Removed from v.576  
changed lines
  Added in v.1452
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26