/[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 560 by jonathan, Wed Mar 26 11:05:47 2003 UTC revision 935 by jonathan, Tue May 20 15:24:17 2003 UTC
# Line 18  from wxPython.wx import * Line 18  from wxPython.wx import *
18  from wxPython.grid import *  from wxPython.grid import *
19    
20  from Thuban import _  from Thuban import _
21  from Thuban.common import *  from Thuban.UI.common import Color2wxColour, wxColour2Color
 from Thuban.UI.common import *  
22    
23  from Thuban.Model.classification import *  from Thuban.Model.range import Range
24    from Thuban.Model.classification import \
25        Classification, ClassGroupDefault, \
26        ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
27        ClassGroupProperties
28    
29  from Thuban.Model.color import Color  from Thuban.Model.color import Color
30    
31  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
32        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
33    
34    from Thuban.UI.classgen import ClassGenDialog, ClassGenerator
35    
36  from dialogs import NonModalDialog  from dialogs import NonModalDialog
37    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
38  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
39    
 ID_CLASSIFY_OK = 4001  
 ID_CLASSIFY_CANCEL = 4002  
 ID_CLASSIFY_ADD = 4003  
 ID_CLASSIFY_GENRANGE = 4004  
 ID_CLASSIFY_REMOVE = 4005  
 ID_CLASSIFY_MOVEUP = 4006  
 ID_CLASSIFY_MOVEDOWN = 4007  
 ID_CLASSIFY_APPLY = 4008  
40    
41  # table columns  # table columns
42  COL_SYMBOL = 0  COL_VISIBLE = 0
43  COL_VALUE  = 1  COL_SYMBOL  = 1
44  COL_LABEL  = 2  COL_VALUE   = 2
45    COL_LABEL   = 3
46    NUM_COLS    = 4
47    
48  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
49  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 59  FIELD_NAME = 2 Line 57  FIELD_NAME = 2
57  import weakref  import weakref
58  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
59    
60      def __init__(self, parent):  
61        def __init__(self, parent, classifier):
62          """Constructor.          """Constructor.
63    
64          parent -- the parent window          parent -- the parent window
# Line 68  class ClassGrid(wxGrid): Line 67  class ClassGrid(wxGrid):
67                   use for display.                   use for display.
68          """          """
69    
70          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
71          wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
72          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)          self.classifier = classifier
73    
74            self.currentSelection = []
75    
76          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
77          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)
78          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)
79            EVT_GRID_COL_SIZE(self, self._OnCellResize)
80            EVT_GRID_ROW_SIZE(self, self._OnCellResize)
81    
82          self.currentSelection = []      #def GetCellAttr(self, row, col):
83            #print "GetCellAttr ", row, col
84            #wxGrid.GetCellAttr(self, row, col)
85    
86      def CreateTable(self, clazz, shapeType):      def CreateTable(self, clazz, shapeType, group = None):
87    
88          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
89    
         self.shapeType = shapeType  
90          table = self.GetTable()          table = self.GetTable()
91          if table is None:          if table is None:
92              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
93              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
94                h = self.GetDefaultRowSize() * 4 \
95                    + self.GetDefaultColLabelSize()
96    
97              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
98              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
99              self.SetTable(ClassTable(clazz, self.shapeType, self), True)              table = ClassTable(self)
100          else:              self.SetTable(table, True)
101              table.Reset(clazz, self.shapeType)  
102    
103          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
104          self.ClearSelection()          self.ClearSelection()
105    
106            table.Reset(clazz, shapeType, group)
107    
108      def GetCurrentSelection(self):      def GetCurrentSelection(self):
109          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
110             of row numbers."""             of row numbers."""
# Line 103  class ClassGrid(wxGrid): Line 112  class ClassGrid(wxGrid):
112          sel.sort()          sel.sort()
113          return sel          return sel
114    
115      def SetCellRenderer(self, row, col):      def GetSelectedRows(self):
116          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          return self.GetCurrentSelection()
117    
118        #def SetCellRenderer(self, row, col, renderer):
119            #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
120    
121      #      #
122      # [Set|Get]Table is taken from http://wiki.wxpython.org      # [Set|Get]Table is taken from http://wiki.wxpython.org
# Line 169  class ClassGrid(wxGrid): Line 181  class ClassGrid(wxGrid):
181                  r = self.GetNumberRows() - 1                  r = self.GetNumberRows() - 1
182              self.SelectRow(r)              self.SelectRow(r)
183                    
184    
185        def SelectGroup(self, group, makeVisible = True):
186            if group is None: return
187    
188            assert isinstance(group, ClassGroup)
189    
190            table = self.GetTable()
191    
192            assert table is not None
193    
194            for i in range(table.GetNumberRows()):
195                g = table.GetClassGroup(i)
196                if g is group:
197                    self.SelectRow(i)
198                    if makeVisible:
199                        self.MakeCellVisible(i, 0)
200                    break
201    
202  #  #
203  # XXX: This isn't working, and there is no way to deselect rows wxPython!  # XXX: This isn't working, and there is no way to deselect rows wxPython!
204  #  #
# Line 181  class ClassGrid(wxGrid): Line 211  class ClassGrid(wxGrid):
211  #                                  sel = False))  #                                  sel = False))
212    
213      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
214          """Handle a double on a cell."""          """Handle a double click on a cell."""
215    
216          r = event.GetRow()          r = event.GetRow()
217          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             prop = self.GetTable().GetValueAsCustom(r, c, None)  
             #prop = group.GetProperties()  
218    
219              # get a new ClassGroupProperties object and copy the          if c == COL_SYMBOL:
220              # values over to our current object              self.classifier.EditSymbol(r)
221              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)          else:
222              if propDlg.ShowModal() == wxID_OK:              event.Skip()
                 new_prop = propDlg.GetClassGroupProperties()  
                 #prop.SetProperties(new_prop)  
                 self.GetTable().SetValueAsCustom(r, c, None, new_prop)  
             propDlg.Destroy()  
223    
224      #      #
225      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 223  class ClassGrid(wxGrid): Line 246  class ClassGrid(wxGrid):
246          #self.ConfigureForSelection()          #self.ConfigureForSelection()
247          event.Skip()          event.Skip()
248    
249        def _OnCellResize(self, event):
250            self.FitInside()
251            event.Skip()
252    
253  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
254      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
255    
256      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
257    
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
258    
259      def __init__(self, clazz, shapeType, view = None):      def __init__(self, view = None):
260        #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 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, 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 = clazz.GetFieldType()
296          self.shapeType = shapeType          self.shapeType = shapeType
297    
298          old_len = len(self.tdata)          self.SetClassification(clazz, group)
299            self.__Modified(-1)
300    
301            self.__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 300  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 329  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 362  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 371  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 380  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 445  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 480  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 508  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 553  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 570  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    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  class Classifier(NonModalDialog):  class Classifier(NonModalDialog):
674    
675      def __init__(self, parent, name, layer):      type2string = {None:             _("None"),
676          NonModalDialog.__init__(self, parent, name,                     FIELDTYPE_STRING: _("Text"),
677                                  _("Classifier: %s") % layer.Title())                     FIELDTYPE_INT:    _("Integer"),
678                       FIELDTYPE_DOUBLE: _("Decimal")}
679    
680          panel = wxPanel(self, -1, size=(100, 100))      def __init__(self, parent, name, layer, group = None):
681            NonModalDialog.__init__(self, parent, name, "")
682    
683            self.__SetTitle(layer.Title())
684    
685          self.layer = layer          self.layer = layer
686    
         self.originalClass = self.layer.GetClassification()  
         field = self.originalClass.GetField()  
         fieldType = self.originalClass.GetFieldType()  
687    
688          topBox = wxBoxSizer(wxVERTICAL)          self.genDlg = None
         panelBox = wxBoxSizer(wxVERTICAL)  
689    
690          #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),          ############################
691              #0, wxALIGN_LEFT | wxALL, 4)          # Create the controls
692          panelBox.Add(wxStaticText(panel, -1,          #
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
693    
694            panel = wxPanel(self, -1)
695    
696          #          text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
697          # make field combo box          self.fieldTypeText = wxStaticText(panel, -1, "")
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
698    
699          self.num_cols = layer.table.field_count()          if layer.HasClassification():
700          # just assume the first field in case one hasn't been              self.originalClass = self.layer.GetClassification()
701          # specified in the file.              field = self.originalClass.GetField()
702          self.__cur_field = 0              fieldType = self.originalClass.GetFieldType()
   
         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)  
703    
704                #
705                # make field choice box
706                #
707                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
708    
709          ###########              self.num_cols = layer.table.NumColumns()
710                # just assume the first field in case one hasn't been
711                # specified in the file.
712                self.__cur_field = 0
713    
714          self.fieldTypeText = wxStaticText(panel, -1, "")              self.fields.Append("<None>")
         panelBox.Add(self.fieldTypeText, 0,  
                      wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)  
715    
716          propertyBox = wxBoxSizer(wxHORIZONTAL)              if self.originalClass.GetFieldType() is None:
717          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
718              0, wxALIGN_LEFT | wxALL, 4)              else:
719          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)                  self.fields.SetClientData(0, None)
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
720    
721          panelBox.Add(propertyBox, 0, wxGROW, 4)              for i in range(self.num_cols):
722                    name = layer.table.Column(i).name
723                    self.fields.Append(name)
724    
725                    if name == field:
726                        self.__cur_field = i + 1
727                        self.fields.SetClientData(i + 1,
728                                                copy.deepcopy(self.originalClass))
729                    else:
730                        self.fields.SetClientData(i + 1, None)
731    
732          ###########              button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
733          #                  _("Generate Class"))
734          # Classification data table              button_add = wxButton(panel, ID_PROPERTY_ADD,
735                    _("Add"))
736                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
737                    _("Move Up"))
738                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
739                    _("Move Down"))
740                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
741                    _("Edit Symbol"))
742                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
743                    _("Remove"))
744    
745                self.classGrid = ClassGrid(panel, self)
746    
747                # calling __SelectField after creating the classGrid fills in the
748                # grid with the correct information
749                self.fields.SetSelection(self.__cur_field)
750                self.__SelectField(self.__cur_field, group = group)
751    
752            button_try = wxButton(panel, ID_PROPERTY_TRY, _("Try"))
753            button_revert = wxButton(panel, ID_PROPERTY_REVERT, _("Revert"))
754            button_ok = wxButton(panel, wxID_OK, _("OK"))
755            button_ok.SetDefault()
756            button_close = wxButton(panel, wxID_CANCEL, _("Close"))
757    
758            ############################
759            # Layout the controls
760          #          #
761    
762          controlBox = wxBoxSizer(wxHORIZONTAL)          topBox = wxBoxSizer(wxVERTICAL)
763            panelBox = wxBoxSizer(wxVERTICAL)
764    
765          self.classGrid = ClassGrid(panel)          sizer = wxBoxSizer(wxHORIZONTAL)
766          self.__SetGridTable(self.__cur_field)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
767                0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
768            sizer.Add(text_title, 1, wxGROW, 0)
769    
770          controlBox.Add(self.classGrid, 1, wxGROW, 0)          panelBox.Add(sizer, 0, wxGROW, 4)
771    
772          ###########          if isinstance(layer, RasterLayer):
773          #              type = "Image"
774          # Control buttons:          else:
775          #              type = layer.ShapeType()
         self.controlButtons = []  
776    
777          controlButtonBox = wxBoxSizer(wxVERTICAL)          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
778                0, wxALIGN_LEFT | wxALL, 4)
779    
780          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
781    
782          #button = wxButton(panel, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))              classBox = wxStaticBoxSizer(
783          #controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         #self.controlButtons.append(button)  
784    
         button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
785    
786          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))              sizer = wxBoxSizer(wxHORIZONTAL)
787          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
788          self.controlButtons.append(button)                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
789                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
790    
791          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              classBox.Add(sizer, 0, wxGROW, 4)
792    
793          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))              classBox.Add(self.fieldTypeText, 0,
794          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)                          wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
         self.controlButtons.append(button)  
795    
796          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox = wxBoxSizer(wxHORIZONTAL)
797          panelBox.Add(controlBox, 1, wxGROW, 10)              controlButtonBox = wxBoxSizer(wxVERTICAL)
798    
799          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
800          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
801          EVT_BUTTON(self, ID_CLASSIFY_GENRANGE, self._OnGenRange)              controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
802          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)              controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
803          EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)              controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
804                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
805                controlButtonBox.Add(button_remove, 0,
806                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
807    
808                controlBox.Add(self.classGrid, 1, wxGROW, 0)
809                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
810    
811                classBox.Add(controlBox, 1, wxGROW, 10)
812                panelBox.Add(classBox, 1, wxGROW, 0)
813    
         ###########  
814    
815          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
816          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),          buttonBox.Add(button_try, 0, wxALL, 4)
                       0, wxALL, 4)  
817          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
818          buttonBox.Add(wxButton(panel, ID_CLASSIFY_APPLY, _("Apply")),          buttonBox.Add(button_revert, 0, wxALL, 4)
                       0, wxALL, 4)  
819          buttonBox.Add(60, 20, 0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
820          buttonBox.Add(wxButton(panel, ID_CLASSIFY_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxALL, 4)
821                        0, wxALL, 4)          buttonBox.Add(60, 20, 0, wxALL, 4)
822          panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)          buttonBox.Add(button_close, 0, wxALL, 4)
823            panelBox.Add(buttonBox, 0,
824          EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)              wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)
         EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)  
         EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)  
   
         ###########  
   
         self.fields.SetSelection(self.__cur_field)  
         self.__SelectField(self.__cur_field)  
825    
826          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
827          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
828            panelBox.Fit(panel)
829          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
830    
831          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
832          panelBox.SetSizeHints(self)  
833          self.SetAutoLayout(True)          self.SetAutoLayout(True)
834          self.SetSizer(topBox)          self.SetSizer(topBox)
835            topBox.Fit(self)
836            topBox.SetSizeHints(self)
837            self.Layout()
838    
839            ###########
840    
841            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
842            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
843            EVT_BUTTON(self, wxID_OK, self._OnOK)
844            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
845            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
846            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
847    
848            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
849            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
850            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
851            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
852            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
853            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
854    
855          ######################          ######################
856    
857            text_title.SetFocus()
858          self.haveApplied = False          self.haveApplied = False
859    
860      def __BuildClassification(self, fieldIndex):      def EditSymbol(self, row):
861            table = self.classGrid.GetTable()
862            prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
863    
864            # get a new ClassGroupProperties object and copy the
865            # values over to our current object
866            propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())
867    
868            self.Enable(False)
869            if propDlg.ShowModal() == wxID_OK:
870                new_prop = propDlg.GetClassGroupProperties()
871                table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
872            self.Enable(True)
873            propDlg.Destroy()
874            
875        def _SetClassification(self, clazz):
876            
877            self.fields.SetClientData(self.__cur_field, clazz)
878            self.classGrid.GetTable().SetClassification(clazz)
879    
880        def __BuildClassification(self, fieldIndex, copyClass = False):
881    
882          numRows = self.classGrid.GetNumberRows()  #       numRows = self.classGrid.GetNumberRows()
883          assert(numRows > 0) # there should always be a default row  #       assert numRows > 0  # there should always be a default row
884    
885          clazz = Classification()  #       clazz = Classification()
886          if fieldIndex == 0:          if fieldIndex == 0:
887              fieldName = None              fieldName = None
888              fieldType = None              fieldType = None
# Line 741  class Classifier(NonModalDialog): Line 890  class Classifier(NonModalDialog):
890              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
891              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
892    
893            clazz = self.classGrid.GetTable().GetClassification()
894    
895            if copyClass:
896                clazz = copy.deepcopy(clazz)
897    
898          clazz.SetField(fieldName)          clazz.SetField(fieldName)
899          clazz.SetFieldType(fieldType)          clazz.SetFieldType(fieldType)
900    
901    
902          table = self.classGrid.GetTable()  #       table = self.classGrid.GetTable()
903          clazz.SetDefaultGroup(table.GetClassGroup(0))  #       clazz.SetDefaultGroup(table.GetClassGroup(0))
904    
905          for i in range(1, numRows):  #       for i in range(1, numRows):
906              clazz.AddGroup(table.GetClassGroup(i))  #           clazz.AppendGroup(table.GetClassGroup(i))
907    
908          return clazz          return clazz
909    
910      def __SetGridTable(self, fieldIndex):      def __SetGridTable(self, fieldIndex, group = None):
911    
912          clazz = self.fields.GetClientData(fieldIndex)          clazz = self.fields.GetClientData(fieldIndex)
913    
# Line 768  class Classifier(NonModalDialog): Line 922  class Classifier(NonModalDialog):
922              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
923              clazz.SetFieldType(fieldType)              clazz.SetFieldType(fieldType)
924                                    
925          self.classGrid.CreateTable(clazz, self.layer.ShapeType())          self.classGrid.CreateTable(clazz, self.layer.ShapeType(), group)
   
   
   
     type2string = {None:             _("None"),  
                    FIELDTYPE_STRING: _("Text"),  
                    FIELDTYPE_INT:    _("Integer"),  
                    FIELDTYPE_DOUBLE: _("Decimal")}  
926    
927      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
928          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
929          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
930    
931          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
932    
933          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
934    
935          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
936    
937      def __SelectField(self, newIndex, oldIndex = -1):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
938            """This method assumes that the current selection for the
939            combo has already been set by a call to SetSelection().
940            """
941    
942          assert(oldIndex >= -1)          assert oldIndex >= -1
943    
944          if oldIndex != -1:          if oldIndex != -1:
945              clazz = self.__BuildClassification(oldIndex)              clazz = self.__BuildClassification(oldIndex)
946              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
947    
948          self.__SetGridTable(newIndex)          self.__SetGridTable(newIndex, group)
   
         enabled = newIndex != 0  
949    
950          for b in self.controlButtons:          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
             b.Enable(enabled)  
951    
952          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
953    
954        def __SetTitle(self, title):
955            if title != "":
956                title = ": " + title
957    
958            self.SetTitle(_("Layer Properties") + title)
959    
960        def _OnEditSymbol(self, event):
961            sel = self.classGrid.GetCurrentSelection()
962    
963            if len(sel) == 1:
964                self.EditSymbol(sel[0])
965    
966      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
967          index = self.fields.GetSelection()          index = self.fields.GetSelection()
968          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
969          self.__cur_field = index          self.__cur_field = index
970    
971      def _OnApply(self, event):      def _OnTry(self, event):
972          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
973             it to the layer.             it to the layer.
974          """          """
975    
976          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
977                clazz = self.fields.GetClientData(self.__cur_field)
978    
979          #              #
980          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
981          # to begin with or it has been modified              # to begin with or it has been modified
982          #              #
983          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
984              clazz = self.__BuildClassification(self.__cur_field)              if clazz is None or self.classGrid.GetTable().IsModified():
985                    clazz = self.__BuildClassification(self.__cur_field, True)
986    
987          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
988    
989          self.haveApplied = True          self.haveApplied = True
990    
991      def _OnOK(self, event):      def _OnOK(self, event):
992          self._OnApply(event)          self._OnTry(event)
993          self.OnClose(event)          self.Close()
994    
995      def _OnCancel(self, event):      def OnClose(self, event):
996            NonModalDialog.OnClose(self, event)
997    
998        def _OnCloseBtn(self, event):
999            """Close is similar to Cancel except that any changes that were
1000            made and applied remain applied, but the currently displayed
1001            classification is discarded.
1002            """
1003    
1004            self.Close()
1005    
1006        def _OnRevert(self, event):
1007          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1008          if self.haveApplied:          if self.haveApplied:
1009              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1010    
1011          self.OnClose(event)          #self.Close()
1012    
1013      def _OnAdd(self, event):      def _OnAdd(self, event):
1014          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 845  class Classifier(NonModalDialog): Line 1016  class Classifier(NonModalDialog):
1016      def _OnRemove(self, event):      def _OnRemove(self, event):
1017          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1018    
1019      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1020          print "Classifier._OnGenRange()"  
1021            self.genDlg = ClassGenDialog(self, self.layer,
1022                              self.fields.GetString(self.__cur_field))
1023    
1024            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1025    
1026            self.__EnableButtons(EB_GEN_CLASS, False)
1027    
1028            self.genDlg.Show()
1029    
1030        def _OnGenDialogClose(self, event):
1031            self.genDlg.Destroy()
1032            self.__EnableButtons(EB_GEN_CLASS, True)
1033    
1034      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1035          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 861  class Classifier(NonModalDialog): Line 1044  class Classifier(NonModalDialog):
1044                  table.SetClassGroup(i, x)                  table.SetClassGroup(i, x)
1045                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1046                  self.classGrid.SelectRow(i - 1)                  self.classGrid.SelectRow(i - 1)
1047                    self.classGrid.MakeCellVisible(i - 1, 0)
1048    
1049      def _OnMoveDown(self, event):      def _OnMoveDown(self, event):
1050          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 875  class Classifier(NonModalDialog): Line 1059  class Classifier(NonModalDialog):
1059                  table.SetClassGroup(i + 1, x)                  table.SetClassGroup(i + 1, x)
1060                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1061                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1062                    self.classGrid.MakeCellVisible(i + 1, 0)
1063    
1064        def _OnTitleChanged(self, event):
1065            obj = event.GetEventObject()
1066    
1067            self.layer.SetTitle(obj.GetValue())
1068            self.__SetTitle(self.layer.Title())
1069    
1070            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1071    
1072        def __EnableButtons(self, case, enable):
1073    
1074            if case == EB_LAYER_TITLE:  
1075                list = (wxID_OK,
1076                        wxID_CANCEL)
1077    
1078            elif case == EB_SELECT_FIELD:
1079                list = (ID_PROPERTY_GENCLASS,
1080                        ID_PROPERTY_ADD,
1081                        ID_PROPERTY_MOVEUP,
1082                        ID_PROPERTY_MOVEDOWN,
1083                        ID_PROPERTY_EDITSYM,
1084                        ID_PROPERTY_REMOVE)
1085    
1086            elif case == EB_GEN_CLASS:
1087                list = (ID_PROPERTY_SELECT,
1088                        ID_PROPERTY_FIELDTEXT,
1089                        ID_PROPERTY_GENCLASS,
1090                        ID_PROPERTY_EDITSYM)
1091    
1092            for id in list:
1093                self.FindWindowById(id).Enable(enable)
1094    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1095  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1096  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1097  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 902  class SelectPropertiesDialog(wxDialog): Line 1115  class SelectPropertiesDialog(wxDialog):
1115          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1116          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1117              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1118          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,  
1119                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1120          previewBox.Add(self.previewWin, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1121                (40, 40), wxSIMPLE_BORDER)
1122    
1123            self.previewWin.AllowEdit(False)
1124    
1125            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1126    
1127          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1128    
# Line 912  class SelectPropertiesDialog(wxDialog): Line 1130  class SelectPropertiesDialog(wxDialog):
1130          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1131    
1132          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1133          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1134              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1135              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1136          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1137    
1138          lineColorBox.Add(          lineColorBox.Add(
# Line 960  class SelectPropertiesDialog(wxDialog): Line 1178  class SelectPropertiesDialog(wxDialog):
1178          # Control buttons:          # Control buttons:
1179          #          #
1180          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1181          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1182                        0, wxALL, 4)          button_ok.SetDefault()
1183          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxALL, 4)
1184            buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1185                        0, wxALL, 4)                        0, wxALL, 4)
1186          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)
1187                                                                                                                                                                    
1188          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1189          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1190                                                                                                                                                                    
1191          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1192          self.SetSizer(topBox)          self.SetSizer(topBox)
1193          topBox.Fit(self)          topBox.Fit(self)
1194          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1195    
1196      def _OnOK(self, event):      def OnOK(self, event):
1197          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1198    
1199      def _OnCancel(self, event):      def OnCancel(self, event):
1200          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1201    
1202      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 986  class SelectPropertiesDialog(wxDialog): Line 1205  class SelectPropertiesDialog(wxDialog):
1205    
1206      def __GetColor(self, cur):      def __GetColor(self, cur):
1207          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1208          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Color.Transparent:
1209                dialog.GetColourData().SetColour(Color2wxColour(cur))
1210    
1211          ret = None          ret = None
1212          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1213              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 1002  class SelectPropertiesDialog(wxDialog): Line 1223  class SelectPropertiesDialog(wxDialog):
1223          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1224    
1225      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1226          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Color.Transparent)
1227          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1228                    
1229      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1012  class SelectPropertiesDialog(wxDialog): Line 1233  class SelectPropertiesDialog(wxDialog):
1233          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1234    
1235      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1236          self.prop.SetFill(Color.None)          self.prop.SetFill(Color.Transparent)
1237          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1238    
1239      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1033  class ClassDataPreviewWindow(wxWindow): Line 1254  class ClassDataPreviewWindow(wxWindow):
1254          self.shapeType = shapeType          self.shapeType = shapeType
1255          self.previewer = ClassDataPreviewer()          self.previewer = ClassDataPreviewer()
1256    
1257        def GetProperties():
1258            return self.prop
1259    
1260      def _OnPaint(self, event):      def _OnPaint(self, event):
1261          dc = wxPaintDC(self)          dc = wxPaintDC(self)
1262    
# Line 1051  class ClassDataPreviewer: Line 1275  class ClassDataPreviewer:
1275    
1276      def Draw(self, dc, rect, prop, shapeType):      def Draw(self, dc, rect, prop, shapeType):
1277    
1278          assert(dc is not None)          assert dc is not None
1279          assert(isinstance(prop, ClassGroupProperties))          assert isinstance(prop, ClassGroupProperties)
1280    
1281          if rect is None:          if rect is None:
1282              x = 0              x = 0
# Line 1065  class ClassDataPreviewer: Line 1289  class ClassDataPreviewer:
1289              h = rect.GetHeight()              h = rect.GetHeight()
1290    
1291          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1292          if stroke is Color.None:          if stroke is Color.Transparent:
1293              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1294          else:          else:
1295              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1073  class ClassDataPreviewer: Line 1297  class ClassDataPreviewer:
1297                          wxSOLID)                          wxSOLID)
1298    
1299          stroke = prop.GetFill()          stroke = prop.GetFill()
1300          if stroke is Color.None:          if stroke is Color.Transparent:
1301              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1302          else:          else:
1303              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1087  class ClassDataPreviewer: Line 1311  class ClassDataPreviewer:
1311                             wxPoint(x + w/2, y + h/4*3),                             wxPoint(x + w/2, y + h/4*3),
1312                             wxPoint(x + w, y)])                             wxPoint(x + w, y)])
1313    
1314          elif shapeType == SHAPETYPE_POINT or \          elif shapeType == SHAPETYPE_POINT:
              shapeType == SHAPETYPE_POLYGON:  
1315    
1316              dc.DrawCircle(x + w/2, y + h/2,              dc.DrawCircle(x + w/2, y + h/2,
1317                            (min(w, h) - prop.GetLineWidth())/2)                            (min(w, h) - prop.GetLineWidth())/2)
1318    
1319            elif shapeType == SHAPETYPE_POLYGON:
1320                dc.DrawRectangle(x, y, w, h)
1321    
1322  class ClassRenderer(wxPyGridCellRenderer):  class ClassRenderer(wxPyGridCellRenderer):
1323    
1324      def __init__(self, shapeType):      def __init__(self, shapeType):
# Line 1114  class ClassRenderer(wxPyGridCellRenderer Line 1340  class ClassRenderer(wxPyGridCellRenderer
1340              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1341    
1342          if isSelected:          if isSelected:
1343              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1344              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1345    
1346              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1347                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1348    
1349          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1350    
1351    
1352    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1353    
1354        def __init__(self, parent, id, props, shapeType,
1355                     size = wxDefaultSize, style = 0):
1356    
1357            wxWindow.__init__(self, parent, id, size = size, style = style)
1358    
1359            self.SetProperties(props)
1360            self.SetShapeType(shapeType)
1361            self.AllowEdit(True)
1362    
1363            EVT_PAINT(self, self._OnPaint)
1364            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1365    
1366            self.previewer = ClassDataPreviewer()
1367    
1368        def _OnPaint(self, event):
1369            dc = wxPaintDC(self)
1370    
1371            # XXX: this doesn't seem to be having an effect:
1372            dc.DestroyClippingRegion()
1373    
1374            w, h = self.GetClientSize()
1375    
1376            self.previewer.Draw(dc,
1377                                wxRect(0, 0, w, h),
1378                                self.GetProperties(),
1379                                self.GetShapeType())
1380    
1381    
1382        def GetProperties(self):
1383            return self.props
1384    
1385        def SetProperties(self, props):
1386            self.props = props
1387            self.Refresh()
1388    
1389        def GetShapeType(self):
1390            return self.shapeType
1391    
1392        def SetShapeType(self, shapeType):
1393            self.shapeType = shapeType
1394            self.Refresh()
1395    
1396        def AllowEdit(self, allow):
1397            self.allowEdit = allow
1398    
1399        def DoEdit(self):
1400            if not self.allowEdit: return
1401    
1402            propDlg = SelectPropertiesDialog(NULL,
1403                                             self.GetProperties(),
1404                                             self.GetShapeType())
1405    
1406            if propDlg.ShowModal() == wxID_OK:
1407                new_prop = propDlg.GetClassGroupProperties()
1408                self.SetProperties(new_prop)
1409                self.Refresh()
1410    
1411            propDlg.Destroy()
1412    
1413        def _OnLeftDClick(self, event):
1414            self.DoEdit()
Legend:
Removed from v.560  
changed lines
  Added in v.935
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26