/[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 507 by jonathan, Mon Mar 10 17:36:42 2003 UTC revision 1433 by jonathan, Wed Jul 16 13:24:25 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.messages import MAP_LAYERS_REMOVED, LAYER_SHAPESTORE_REPLACED
24    from Thuban.Model.range import Range
25    from Thuban.Model.classification import \
26        Classification, ClassGroupDefault, \
27        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
28        ClassGroupProperties
29    
30  from Thuban.Model.color import Color  from Thuban.Model.color import Transparent
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from 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 59  FIELD_NAME = 2 Line 58  FIELD_NAME = 2
58  import weakref  import weakref
59  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
60    
61      def __init__(self, parent):  
62        def __init__(self, parent, classifier):
63          """Constructor.          """Constructor.
64    
65          parent -- the parent window          parent -- the parent window
# Line 68  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 = []
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          self.currentSelection = []      #def GetCellAttr(self, row, col):
84            #print "GetCellAttr ", row, col
85            #wxGrid.GetCellAttr(self, row, col)
86    
87      def CreateTable(self, clazz, shapeType):      def CreateTable(self, clazz, fieldType, shapeType, group = None):
88    
89          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
90    
         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              self.SetTable(ClassTable(clazz, self.shapeType, self), true)              table = ClassTable(self)
101          else:              self.SetTable(table, True)
102              table.Reset(clazz, self.shapeType)  
103    
104          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
105          self.ClearSelection()          self.ClearSelection()
106    
107            table.Reset(clazz, fieldType, shapeType, group)
108    
109      def GetCurrentSelection(self):      def GetCurrentSelection(self):
110          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
111             of row numbers."""             of row numbers."""
# Line 103  class ClassGrid(wxGrid): Line 113  class ClassGrid(wxGrid):
113          sel.sort()          sel.sort()
114          return sel          return sel
115    
116      def SetCellRenderer(self, row, col):      def GetSelectedRows(self):
117          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          return self.GetCurrentSelection()
118    
119        #def SetCellRenderer(self, row, col, renderer):
120            #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 169  class ClassGrid(wxGrid): Line 182  class ClassGrid(wxGrid):
182                  r = self.GetNumberRows() - 1                  r = self.GetNumberRows() - 1
183              self.SelectRow(r)              self.SelectRow(r)
184                    
185    
186        def SelectGroup(self, group, makeVisible = True):
187            if group is None: return
188    
189            assert isinstance(group, ClassGroup)
190    
191            table = self.GetTable()
192    
193            assert table is not None
194    
195            for i in range(table.GetNumberRows()):
196                g = table.GetClassGroup(i)
197                if g is group:
198                    self.SelectRow(i)
199                    if makeVisible:
200                        self.MakeCellVisible(i, 0)
201                    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 181  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 223  class ClassGrid(wxGrid): Line 247  class ClassGrid(wxGrid):
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")]
258    
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
259    
260      def __init__(self, clazz, shapeType, view = None):      def __init__(self, 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 240  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):          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 259  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.__colAttr = {}
302    
303            attr = wxGridCellAttr()
304            attr.SetEditor(wxGridCellBoolEditor())
305            attr.SetRenderer(wxGridCellBoolRenderer())
306            attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER)
307            self.__colAttr[COL_VISIBLE] = attr
308    
309            attr = wxGridCellAttr()
310            attr.SetRenderer(ClassRenderer(self.shapeType))
311            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.tdata = []      def SetClassification(self, clazz, group = None):
321    
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          # copy the data out of the classification and into our          # XXX: this is dead code at the moment
         # array  
333          #          #
334          for p in clazz:          if row > -1:
335              np = copy.deepcopy(p)              self.GetView().ClearSelection()
336              self.__SetRow(-1, np)              self.GetView().SelectRow(row)
337                self.GetView().MakeCellVisible(row, 0)
338    
339            self.__Modified()
         self.__Modified(-1)  
340    
         self.__NotifyRowChanges(old_len, len(self.tdata))  
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 296  class ClassTable(wxPyGridTableBase): Line 352  class ClassTable(wxPyGridTableBase):
352                          wxGRIDTABLE_NOTIFY_ROWS_APPENDED,                          wxGRIDTABLE_NOTIFY_ROWS_APPENDED,
353                          newRows - curRows)    # how many                          newRows - curRows)    # how many
354              self.GetView().ProcessTableMessage(msg)              self.GetView().ProcessTableMessage(msg)
355                self.GetView().FitInside()
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()
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 327  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 360  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 369  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 378  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 443  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 478  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 506  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 551  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 568  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      def __init__(self, parent, interactor, name, layer):  ID_PROPERTY_GENCLASS = 4004
653          NonModalDialog.__init__(self, parent, interactor, name,  ID_PROPERTY_REMOVE = 4005
654                                  _("Classifier: %s") % layer.Title())  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          self.layer = layer  class Classifier(NonModalNonParentDialog):
674    
675        type2string = {None:             _("None"),
676                       FIELDTYPE_STRING: _("Text"),
677                       FIELDTYPE_INT:    _("Integer"),
678                       FIELDTYPE_DOUBLE: _("Decimal")}
679    
680          self.originalClass = self.layer.GetClassification()      def __init__(self, parent, name, map, layer, group = None):
681          field = self.originalClass.GetField()          NonModalNonParentDialog.__init__(self, parent, name, "")
         fieldType = self.originalClass.GetFieldType()  
682    
683          topBox = wxBoxSizer(wxVERTICAL)          self.__SetTitle(layer.Title())
684    
685          #topBox.Add(wxStaticText(self, -1, _("Layer: %s") % layer.Title()),          self.layer = layer
686              #0, wxALIGN_LEFT | wxALL, 4)          self.map = map
         topBox.Add(wxStaticText(self, -1,  
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
687    
688            self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
689            self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
690                                 self.layer_shapestore_replaced)
691    
692            self.genDlg = None
693    
694            ############################
695            # Create the controls
696          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(self, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
697    
698          self.num_cols = layer.table.field_count()          panel = wxPanel(self, -1)
699          # just assume the first field in case one hasn't been  
700          # specified in the file.          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
701          self.__cur_field = 0          self.fieldTypeText = wxStaticText(panel, -1, "")
702    
703          self.fields.Append("<None>")          if layer.HasClassification():
704          self.fields.SetClientData(0, None)              self.originalClass = self.layer.GetClassification()
705                self.originalClassField = self.layer.GetClassificationField()
706          for i in range(self.num_cols):              field = self.originalClassField
707              type, name, len, decc = layer.table.field_info(i)              fieldType = self.layer.GetFieldType(field)
708              self.fields.Append(name)  
709                table = layer.ShapeStore().Table()
710              if name == field:              #
711                  self.__cur_field = i + 1              # make field choice box
712                  self.fields.SetClientData(i + 1, self.originalClass)              #
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>")
721    
722                if fieldType is None:
723                    self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
724              else:              else:
725                  self.fields.SetClientData(i + 1, None)                  self.fields.SetClientData(0, None)
726    
727                for i in range(self.num_cols):
728                    name = table.Column(i).name
729                    self.fields.Append(name)
730    
731                    if name == field:
732                        self.__cur_field = i + 1
733                        self.fields.SetClientData(i + 1,
734                                                  copy.deepcopy(self.originalClass))
735                    else:
736                        self.fields.SetClientData(i + 1, None)
737    
738          #              button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
739          #                  _("Generate Class"))
740                button_add = wxButton(panel, ID_PROPERTY_ADD,
741                    _("Add"))
742                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
743                    _("Move Up"))
744                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
745                    _("Move Down"))
746                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
747                    _("Edit Symbol"))
748                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
749                    _("Remove"))
750    
751                self.classGrid = ClassGrid(panel, self)
752    
753                # calling __SelectField after creating the classGrid fills in the
754                # grid with the correct information
755                self.fields.SetSelection(self.__cur_field)
756                self.__SelectField(self.__cur_field, group = group)
757    
758            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
759            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
760            button_ok = wxButton(self, wxID_OK, _("OK"))
761            button_close = wxButton(self, wxID_CANCEL, _("Close"))
762            button_ok.SetDefault()
763    
764            ############################
765            # Layout the controls
766          #          #
767    
768          self.fieldTypeText = wxStaticText(self, -1, "")          topBox = wxBoxSizer(wxVERTICAL)
769          topBox.Add(self.fieldTypeText, 0, wxGROW | wxALIGN_LEFT | wxALL, 4)          panelBox = wxBoxSizer(wxVERTICAL)
770    
771          propertyBox = wxBoxSizer(wxHORIZONTAL)          sizer = wxBoxSizer(wxHORIZONTAL)
772          propertyBox.Add(wxStaticText(self, -1, _("Field: ")),          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
773              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
774          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)          sizer.Add(text_title, 1, wxGROW, 0)
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
775    
776          topBox.Add(propertyBox, 0, wxGROW, 4)          panelBox.Add(sizer, 0, wxGROW, 4)
777    
778          #          if isinstance(layer, RasterLayer):
779          # Classification data table              type = "Image"
780          #          else:
781                type = layer.ShapeType()
782    
783          controlBox = wxBoxSizer(wxHORIZONTAL)          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
784                0, wxALIGN_LEFT | wxALL, 4)
785    
786          self.classGrid = ClassGrid(self)          if layer.HasClassification():
         self.__SetGridTable(self.__cur_field)  
787    
788          controlBox.Add(self.classGrid, 1, wxGROW, 0)              classBox = wxStaticBoxSizer(
789                            wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
790    
         controlButtonBox = wxBoxSizer(wxVERTICAL)  
791    
792          #              sizer = wxBoxSizer(wxHORIZONTAL)
793          # Control buttons:              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
794          #                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
795          self.controlButtons = []              sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
796    
797                classBox.Add(sizer, 0, wxGROW, 4)
798    
799                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(self.classGrid, 1, wxGROW, 0)
815                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
816    
817                classBox.Add(controlBox, 1, wxGROW, 10)
818                panelBox.Add(classBox, 1, wxGROW, 0)
819    
         button = wxButton(self, ID_CLASSIFY_ADD, _("Add"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         #button = wxButton(self, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))  
         #controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         #self.controlButtons.append(button)  
   
         button = wxButton(self, ID_CLASSIFY_MOVEUP, _("Move Up"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         button = wxButton(self, ID_CLASSIFY_MOVEDOWN, _("Move Down"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
   
         controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
   
         button = wxButton(self, ID_CLASSIFY_REMOVE, _("Remove"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)  
         self.controlButtons.append(button)  
   
         controlBox.Add(controlButtonBox, 0, wxGROW, 10)  
         topBox.Add(controlBox, 1, wxGROW, 10)  
   
         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)  
820    
821          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
822          buttonBox.Add(wxButton(self, 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(self, ID_CLASSIFY_APPLY, _("Apply")),          buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
826                        0, wxALL, 4)  
827          buttonBox.Add(60, 20, 0, wxALL, 4)          panel.SetAutoLayout(True)
828          buttonBox.Add(wxButton(self, ID_CLASSIFY_CANCEL, _("Cancel")),          panel.SetSizer(panelBox)
829                        0, wxALL, 4)          panelBox.Fit(panel)
830          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          panelBox.SetSizeHints(panel)
   
         EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)  
         EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)  
         EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)  
831    
832          self.fields.SetSelection(self.__cur_field)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
833          self.__SelectField(self.__cur_field)          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)          topBox.Fit(self)
838          topBox.SetSizeHints(self)          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    
857            ######################
858    
859            text_title.SetFocus()
860            self.haveApplied = False
861    
862        def unsubscribe_messages(self):
863            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
864            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
865                                   self.layer_shapestore_replaced)
866    
867        def map_layers_removed(self, map):
868            if self.layer not in self.map.Layers():
869                self.Close()
870    
871        def layer_shapestore_replaced(self, *args):
872            self.Close()
873    
874        def EditSymbol(self, row):
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):      def __BuildClassification(self, fieldIndex, copyClass = 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 724  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.classGrid.GetTable().GetClassification()
         clazz.SetFieldType(fieldType)  
   
   
         table = self.classGrid.GetTable()  
         clazz.SetDefaultGroup(table.GetClassGroup(0))  
907    
908          for i in range(1, numRows):          if copyClass:
909              clazz.AddGroup(table.GetClassGroup(i))              clazz = copy.deepcopy(clazz)
910    
911          return clazz          return clazz
912    
913      def __SetGridTable(self, fieldIndex):      def __SetGridTable(self, fieldIndex, group = None):
914    
915          clazz = self.fields.GetClientData(fieldIndex)          clazz = self.fields.GetClientData(fieldIndex)
916    
# Line 747  class Classifier(NonModalDialog): Line 921  class Classifier(NonModalDialog):
921                      self.layer.GetClassification().                      self.layer.GetClassification().
922                                 GetDefaultGroup().GetProperties()))                                 GetDefaultGroup().GetProperties()))
923    
924              fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
925              fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
             clazz.SetFieldType(fieldType)  
926                                    
927          self.classGrid.CreateTable(clazz, self.layer.ShapeType())          self.classGrid.CreateTable(clazz, fieldType,
928                                       self.layer.ShapeType(), group)
   
   
     type2string = {None:             _("None"),  
                    FIELDTYPE_STRING: _("Text"),  
                    FIELDTYPE_INT:    _("Integer"),  
                    FIELDTYPE_DOUBLE: _("Decimal")}  
929    
930      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
931          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
932          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
933    
934          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
935    
936          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
937    
938          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
939    
940      def __SelectField(self, newIndex, oldIndex = -1):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
941            """This method assumes that the current selection for the
942            combo has already been set by a call to SetSelection().
943            """
944    
945          assert(oldIndex >= -1)          assert oldIndex >= -1
946    
947          if oldIndex != -1:          if oldIndex != -1:
948              clazz = self.__BuildClassification(oldIndex)              clazz = self.__BuildClassification(oldIndex)
949              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
950    
951          self.__SetGridTable(newIndex)          self.__SetGridTable(newIndex, group)
   
         enabled = newIndex != 0  
952    
953          for b in self.controlButtons:          self.__EnableButtons(EB_SELECT_FIELD)
             b.Enable(enabled)  
954    
955          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
956    
957        def __SetTitle(self, title):
958            if title != "":
959                title = ": " + title
960    
961            self.SetTitle(_("Layer Properties") + title)
962    
963        def _OnEditSymbol(self, event):
964            sel = self.classGrid.GetCurrentSelection()
965    
966            if len(sel) == 1:
967                self.EditSymbol(sel[0])
968    
969      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
970          index = self.fields.GetSelection()          index = self.fields.GetSelection()
971          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
972          self.__cur_field = index          self.__cur_field = index
973    
974      def _OnApply(self, event):      def _OnTry(self, event):
975          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
976             it to the layer.             it to the layer.
977          """          """
978    
979          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
980                clazz = self.fields.GetClientData(self.__cur_field)
981    
982          #              #
983          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
984          # to begin with or it has been modified              # to begin with or it has been modified
985          #              #
986          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
987              clazz = self.__BuildClassification(self.__cur_field)              if clazz is None or self.classGrid.GetTable().IsModified():
988                    clazz = self.__BuildClassification(self.__cur_field, True)
989    
990                self.layer.SetClassificationField(
991                    self.fields.GetString(self.__cur_field))
992                self.layer.SetClassification(clazz)
993    
994          self.layer.SetClassification(clazz)          self.haveApplied = True
995    
996      def _OnOK(self, event):      def _OnOK(self, event):
997          self._OnApply(event)          self._OnTry(event)
998          self.OnClose(event)          self.Close()
999    
1000        def OnClose(self, event):
1001            self.unsubscribe_messages()
1002            NonModalNonParentDialog.OnClose(self, event)
1003    
1004        def _OnCloseBtn(self, event):
1005            """Close is similar to Cancel except that any changes that were
1006            made and applied remain applied, but the currently displayed
1007            classification is discarded.
1008            """
1009    
1010            self.Close()
1011    
1012      def _OnCancel(self, event):      def _OnRevert(self, event):
1013          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1014          self.layer.SetClassification(self.originalClass)          if self.haveApplied:
1015          self.OnClose(event)              self.layer.SetClassificationField(self.originalClassField)
1016                self.layer.SetClassification(self.originalClass)
1017    
1018            #self.Close()
1019    
1020      def _OnAdd(self, event):      def _OnAdd(self, event):
1021          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 824  class Classifier(NonModalDialog): Line 1023  class Classifier(NonModalDialog):
1023      def _OnRemove(self, event):      def _OnRemove(self, event):
1024          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1025    
1026      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1027          print "Classifier._OnGenRange()"  
1028            self.genDlg = ClassGenDialog(self, self.layer,
1029                              self.fields.GetString(self.__cur_field))
1030    
1031            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1032    
1033            self.__EnableButtons(EB_GEN_CLASS)
1034    
1035            self.genDlg.Show()
1036    
1037        def _OnGenDialogClose(self, event):
1038            self.genDlg.Destroy()
1039            self.genDlg = None
1040            self.__EnableButtons(EB_GEN_CLASS)
1041    
1042      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1043          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 840  class Classifier(NonModalDialog): Line 1052  class Classifier(NonModalDialog):
1052                  table.SetClassGroup(i, x)                  table.SetClassGroup(i, x)
1053                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1054                  self.classGrid.SelectRow(i - 1)                  self.classGrid.SelectRow(i - 1)
1055                    self.classGrid.MakeCellVisible(i - 1, 0)
1056    
1057      def _OnMoveDown(self, event):      def _OnMoveDown(self, event):
1058          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 854  class Classifier(NonModalDialog): Line 1067  class Classifier(NonModalDialog):
1067                  table.SetClassGroup(i + 1, x)                  table.SetClassGroup(i + 1, x)
1068                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1069                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1070                    self.classGrid.MakeCellVisible(i + 1, 0)
1071    
1072        def _OnTitleChanged(self, event):
1073            obj = event.GetEventObject()
1074    
1075            self.layer.SetTitle(obj.GetValue())
1076            self.__SetTitle(self.layer.Title())
1077    
1078            self.__EnableButtons(EB_LAYER_TITLE)
1079    
1080        def __EnableButtons(self, case):
1081    
1082            list = {wxID_OK                 : True,
1083                    wxID_CANCEL             : True,
1084                    ID_PROPERTY_ADD         : True,
1085                    ID_PROPERTY_MOVEUP      : True,
1086                    ID_PROPERTY_MOVEDOWN    : True,
1087                    ID_PROPERTY_REMOVE      : True,
1088                    ID_PROPERTY_SELECT      : True,
1089                    ID_PROPERTY_FIELDTEXT   : True,
1090                    ID_PROPERTY_GENCLASS    : True,
1091                    ID_PROPERTY_EDITSYM     : True}
1092    
1093            if case == EB_LAYER_TITLE:  
1094                if self.layer.Title() == "":
1095                    list[wxID_OK] = False
1096                    list[wxID_CANCEL] = False
1097    
1098            elif case == EB_SELECT_FIELD:
1099                if self.fields.GetSelection() == 0:
1100                    list[ID_PROPERTY_GENCLASS] = False
1101                    list[ID_PROPERTY_ADD] = False
1102                    list[ID_PROPERTY_MOVEUP] = False
1103                    list[ID_PROPERTY_MOVEDOWN] = False
1104                    list[ID_PROPERTY_REMOVE] = False
1105    
1106            elif case == EB_GEN_CLASS:
1107                if self.genDlg is not None:
1108                    list[ID_PROPERTY_SELECT] = False
1109                    list[ID_PROPERTY_FIELDTEXT] = False
1110                    list[ID_PROPERTY_GENCLASS] = False
1111    
1112            for id, enable in list.items():
1113                win = self.FindWindowById(id)
1114                if win:
1115                    win.Enable(enable)
1116    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1117  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1118  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1119  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 881  class SelectPropertiesDialog(wxDialog): Line 1137  class SelectPropertiesDialog(wxDialog):
1137          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1138          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1139              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1140          self.previewer = ClassDataPreviewer(None, self.prop, shapeType,  
1141                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1142          previewBox.Add(self.previewer, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1143                (40, 40), wxSIMPLE_BORDER)
1144    
1145            self.previewWin.AllowEdit(False)
1146    
1147            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1148    
1149          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1150    
# Line 891  class SelectPropertiesDialog(wxDialog): Line 1152  class SelectPropertiesDialog(wxDialog):
1152          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1153    
1154          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1155          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1156              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1157              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1158          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1159    
1160          lineColorBox.Add(          lineColorBox.Add(
# Line 939  class SelectPropertiesDialog(wxDialog): Line 1200  class SelectPropertiesDialog(wxDialog):
1200          # Control buttons:          # Control buttons:
1201          #          #
1202          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1203          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1204                        0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1205          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1206                        0, wxALL, 4)                        0, wxRIGHT|wxEXPAND, 10)
1207          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1208    
1209            button_ok.SetDefault()
1210                                                                                                                                                                    
1211          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1212          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1213                                                                                                                                                                    
1214          self.SetAutoLayout(true)          self.SetAutoLayout(True)
1215          self.SetSizer(topBox)          self.SetSizer(topBox)
1216          topBox.Fit(self)          topBox.Fit(self)
1217          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1218    
1219      def _OnOK(self, event):      def OnOK(self, event):
1220          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1221    
1222      def _OnCancel(self, event):      def OnCancel(self, event):
1223          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1224    
1225      def _OnSpin(self, event):      def _OnSpin(self, event):
1226          self.prop.SetLineWidth(self.spinCtrl.GetValue())          self.prop.SetLineWidth(self.spinCtrl.GetValue())
1227          self.previewer.Refresh()          self.previewWin.Refresh()
1228    
1229      def __GetColor(self, cur):      def __GetColor(self, cur):
1230          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1231          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Transparent:
1232                dialog.GetColourData().SetColour(Color2wxColour(cur))
1233    
1234          ret = None          ret = None
1235          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1236              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 978  class SelectPropertiesDialog(wxDialog): Line 1243  class SelectPropertiesDialog(wxDialog):
1243          clr = self.__GetColor(self.prop.GetLineColor())          clr = self.__GetColor(self.prop.GetLineColor())
1244          if clr is not None:          if clr is not None:
1245              self.prop.SetLineColor(clr)              self.prop.SetLineColor(clr)
1246          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1247    
1248      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1249          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Transparent)
1250          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1251                    
1252      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
1253          clr = self.__GetColor(self.prop.GetFill())          clr = self.__GetColor(self.prop.GetFill())
1254          if clr is not None:          if clr is not None:
1255              self.prop.SetFill(clr)              self.prop.SetFill(clr)
1256          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1257    
1258      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1259          self.prop.SetFill(Color.None)          self.prop.SetFill(Transparent)
1260          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1261    
1262      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
1263          return self.prop          return self.prop
1264    
1265    
1266  class ClassDataPreviewer(wxWindow):  class ClassDataPreviewWindow(wxWindow):
1267    
1268      def __init__(self, rect, prop, shapeType,      def __init__(self, rect, prop, shapeType,
1269                         parent = None, id = -1, size = wxDefaultSize):                         parent = None, id = -1, size = wxDefaultSize):
1270          if parent is not None:          if parent is not None:
1271              wxWindow.__init__(self, parent, id, size=size)              wxWindow.__init__(self, parent, id, (0, 0), size)
1272              EVT_PAINT(self, self._OnPaint)              EVT_PAINT(self, self._OnPaint)
1273    
1274          self.rect = rect          self.rect = rect
1275    
1276          self.prop = prop          self.prop = prop
1277          self.shapeType = shapeType          self.shapeType = shapeType
1278            self.previewer = ClassDataPreviewer()
1279    
1280        def GetProperties():
1281            return self.prop
1282    
1283      def _OnPaint(self, event):      def _OnPaint(self, event):
1284          dc = wxPaintDC(self)          dc = wxPaintDC(self)
# Line 1016  class ClassDataPreviewer(wxWindow): Line 1286  class ClassDataPreviewer(wxWindow):
1286          # XXX: this doesn't seem to be having an effect:          # XXX: this doesn't seem to be having an effect:
1287          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1288    
1289          self.Draw(dc, None)          if self.rect is None:
1290                w, h = self.GetSize()
1291                rect = wxRect(0, 0, w, h)
1292            else:
1293                rect = self.rect
1294    
1295            self.previewer.Draw(dc, rect, self.prop, self.shapeType)
1296    
1297      def Draw(self, dc, rect, prop = None, shapeType = None):  class ClassDataPreviewer:
1298    
1299          if prop is None: prop = self.prop      def Draw(self, dc, rect, prop, shapeType):
1300          if shapeType is None: shapeType = self.shapeType  
1301            assert dc is not None
1302            assert isinstance(prop, ClassGroupProperties)
1303    
1304          if rect is None:          if rect is None:
1305              x = y = 0              x = 0
1306              w, h = self.GetClientSizeTuple()              y = 0
1307                w, h = dc.GetSize()
1308          else:          else:
1309              x = rect.GetX()              x = rect.GetX()
1310              y = rect.GetY()              y = rect.GetY()
# Line 1033  class ClassDataPreviewer(wxWindow): Line 1312  class ClassDataPreviewer(wxWindow):
1312              h = rect.GetHeight()              h = rect.GetHeight()
1313    
1314          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1315          if stroke is Color.None:          if stroke is Transparent:
1316              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1317          else:          else:
1318              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1041  class ClassDataPreviewer(wxWindow): Line 1320  class ClassDataPreviewer(wxWindow):
1320                          wxSOLID)                          wxSOLID)
1321    
1322          stroke = prop.GetFill()          stroke = prop.GetFill()
1323          if stroke is Color.None:          if stroke is Transparent:
1324              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1325          else:          else:
1326              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1055  class ClassDataPreviewer(wxWindow): Line 1334  class ClassDataPreviewer(wxWindow):
1334                             wxPoint(x + w/2, y + h/4*3),                             wxPoint(x + w/2, y + h/4*3),
1335                             wxPoint(x + w, y)])                             wxPoint(x + w, y)])
1336    
1337          elif shapeType == SHAPETYPE_POINT or \          elif shapeType == SHAPETYPE_POINT:
              shapeType == SHAPETYPE_POLYGON:  
1338    
1339              dc.DrawCircle(x + w/2, y + h/2,              dc.DrawCircle(x + w/2, y + h/2,
1340                            (min(w, h) - prop.GetLineWidth())/2)                            (min(w, h) - prop.GetLineWidth())/2)
1341    
1342            elif shapeType == SHAPETYPE_POLYGON:
1343                dc.DrawRectangle(x, y, w, h)
1344    
1345  class ClassRenderer(wxPyGridCellRenderer):  class ClassRenderer(wxPyGridCellRenderer):
1346    
1347      def __init__(self, shapeType):      def __init__(self, shapeType):
1348          wxPyGridCellRenderer.__init__(self)          wxPyGridCellRenderer.__init__(self)
1349          self.previewer = ClassDataPreviewer(None, None, shapeType)          self.shapeType = shapeType
1350            self.previewer = ClassDataPreviewer()
1351    
1352      def Draw(self, grid, attr, dc, rect, row, col, isSelected):      def Draw(self, grid, attr, dc, rect, row, col, isSelected):
1353          data = grid.GetTable().GetClassGroup(row)          data = grid.GetTable().GetClassGroup(row)
# Line 1078  class ClassRenderer(wxPyGridCellRenderer Line 1360  class ClassRenderer(wxPyGridCellRenderer
1360                           rect.GetWidth(), rect.GetHeight())                           rect.GetWidth(), rect.GetHeight())
1361    
1362          if not isinstance(data, ClassGroupMap):          if not isinstance(data, ClassGroupMap):
1363              self.previewer.Draw(dc, rect, data.GetProperties())              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1364    
1365          if isSelected:          if isSelected:
1366              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1367              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1368    
1369              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1370                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1371    
1372          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1373    
1374    
1375    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1376    
1377        def __init__(self, parent, id, props, shapeType,
1378                     size = wxDefaultSize, style = 0):
1379    
1380            wxWindow.__init__(self, parent, id, size = size, style = style)
1381    
1382            self.parent = parent
1383    
1384            self.SetProperties(props)
1385            self.SetShapeType(shapeType)
1386            self.AllowEdit(True)
1387    
1388            EVT_PAINT(self, self._OnPaint)
1389            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1390    
1391            self.previewer = ClassDataPreviewer()
1392    
1393        def _OnPaint(self, event):
1394            dc = wxPaintDC(self)
1395    
1396            # XXX: this doesn't seem to be having an effect:
1397            dc.DestroyClippingRegion()
1398    
1399            w, h = self.GetClientSize()
1400    
1401            self.previewer.Draw(dc,
1402                                wxRect(0, 0, w, h),
1403                                self.GetProperties(),
1404                                self.GetShapeType())
1405    
1406    
1407        def GetProperties(self):
1408            return self.props
1409    
1410        def SetProperties(self, props):
1411            self.props = props
1412            self.Refresh()
1413    
1414        def GetShapeType(self):
1415            return self.shapeType
1416    
1417        def SetShapeType(self, shapeType):
1418            self.shapeType = shapeType
1419            self.Refresh()
1420    
1421        def AllowEdit(self, allow):
1422            self.allowEdit = allow
1423    
1424        def DoEdit(self):
1425            if not self.allowEdit: return
1426    
1427            propDlg = SelectPropertiesDialog(self.parent,
1428                                             self.GetProperties(),
1429                                             self.GetShapeType())
1430    
1431            if propDlg.ShowModal() == wxID_OK:
1432                new_prop = propDlg.GetClassGroupProperties()
1433                self.SetProperties(new_prop)
1434                self.Refresh()
1435    
1436            propDlg.Destroy()
1437    
1438        def _OnLeftDClick(self, event):
1439            self.DoEdit()
Legend:
Removed from v.507  
changed lines
  Added in v.1433
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26