/[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 513 by jonathan, Tue Mar 11 16:42:38 2003 UTC revision 1464 by bh, Fri Jul 18 18:20:40 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    from messages import MAP_REPLACED
39    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
40  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
41    
 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  
42    
43  # table columns  # table columns
44  COL_SYMBOL = 0  COL_VISIBLE = 0
45  COL_VALUE  = 1  COL_SYMBOL  = 1
46  COL_LABEL  = 2  COL_VALUE   = 2
47    COL_LABEL   = 3
48    NUM_COLS    = 4
49    
50  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
51  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 59  FIELD_NAME = 2 Line 59  FIELD_NAME = 2
59  import weakref  import weakref
60  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
61    
62      def __init__(self, parent):  
63        def __init__(self, parent, classifier):
64          """Constructor.          """Constructor.
65    
66          parent -- the parent window          parent -- the parent window
# Line 68  class ClassGrid(wxGrid): Line 69  class ClassGrid(wxGrid):
69                   use for display.                   use for display.
70          """          """
71    
72          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
73          wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
74          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)          self.classifier = classifier
75    
76            self.currentSelection = []
77    
78          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
79          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)
80          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)
81            EVT_GRID_COL_SIZE(self, self._OnCellResize)
82            EVT_GRID_ROW_SIZE(self, self._OnCellResize)
83    
84          self.currentSelection = []      #def GetCellAttr(self, row, col):
85            #print "GetCellAttr ", row, col
86            #wxGrid.GetCellAttr(self, row, col)
87    
88      def CreateTable(self, clazz, shapeType):      def CreateTable(self, clazz, fieldType, shapeType, group = None):
89    
90          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
91    
         self.shapeType = shapeType  
92          table = self.GetTable()          table = self.GetTable()
93          if table is None:          if table is None:
94              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
95              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
96                h = self.GetDefaultRowSize() * 4 \
97                    + self.GetDefaultColLabelSize()
98    
99              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
100              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
101              self.SetTable(ClassTable(clazz, self.shapeType, self), True)              table = ClassTable(self)
102          else:              self.SetTable(table, True)
103              table.Reset(clazz, self.shapeType)  
104    
105          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
106          self.ClearSelection()          self.ClearSelection()
107    
108            table.Reset(clazz, fieldType, shapeType, group)
109    
110      def GetCurrentSelection(self):      def GetCurrentSelection(self):
111          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
112             of row numbers."""             of row numbers."""
# Line 103  class ClassGrid(wxGrid): Line 114  class ClassGrid(wxGrid):
114          sel.sort()          sel.sort()
115          return sel          return sel
116    
117      def SetCellRenderer(self, row, col):      def GetSelectedRows(self):
118          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          return self.GetCurrentSelection()
119    
120        #def SetCellRenderer(self, row, col, renderer):
121            #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
122    
123      #      #
124      # [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 183  class ClassGrid(wxGrid):
183                  r = self.GetNumberRows() - 1                  r = self.GetNumberRows() - 1
184              self.SelectRow(r)              self.SelectRow(r)
185                    
186    
187        def SelectGroup(self, group, makeVisible = True):
188            if group is None: return
189    
190            assert isinstance(group, ClassGroup)
191    
192            table = self.GetTable()
193    
194            assert table is not None
195    
196            for i in range(table.GetNumberRows()):
197                g = table.GetClassGroup(i)
198                if g is group:
199                    self.SelectRow(i)
200                    if makeVisible:
201                        self.MakeCellVisible(i, 0)
202                    break
203    
204  #  #
205  # 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!
206  #  #
# Line 181  class ClassGrid(wxGrid): Line 213  class ClassGrid(wxGrid):
213  #                                  sel = False))  #                                  sel = False))
214    
215      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
216          """Handle a double on a cell."""          """Handle a double click on a cell."""
217    
218          r = event.GetRow()          r = event.GetRow()
219          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             prop = self.GetTable().GetValueAsCustom(r, c, None)  
             #prop = group.GetProperties()  
220    
221              # get a new ClassGroupProperties object and copy the          if c == COL_SYMBOL:
222              # values over to our current object              self.classifier.EditSymbol(r)
223              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)          else:
224              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()  
225    
226      #      #
227      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 223  class ClassGrid(wxGrid): Line 248  class ClassGrid(wxGrid):
248          #self.ConfigureForSelection()          #self.ConfigureForSelection()
249          event.Skip()          event.Skip()
250    
251        def _OnCellResize(self, event):
252            self.FitInside()
253            event.Skip()
254    
255  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
256      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
257    
258      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
259    
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
260    
261      def __init__(self, clazz, shapeType, view = None):      def __init__(self, view = None):
262          """Constructor.          """Constructor.
263    
264          shapeType -- the type of shape that the layer uses          shapeType -- the type of shape that the layer uses
# Line 240  class ClassTable(wxPyGridTableBase): Line 268  class ClassTable(wxPyGridTableBase):
268    
269          wxPyGridTableBase.__init__(self)          wxPyGridTableBase.__init__(self)
270    
271          self.SetView(view)          assert len(ClassTable.__col_labels) == NUM_COLS
         self.tdata = []  
272    
273          self.Reset(clazz, shapeType)          self.clazz = None
274            self.__colAttr = {}
275    
276      def Reset(self, clazz, shapeType):          self.SetView(view)
277    
278        def Reset(self, clazz, fieldType, shapeType, group = None):
279          """Reset the table with the given data.          """Reset the table with the given data.
280    
281          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 289  class ClassTable(wxPyGridTableBase):
289          shapeType -- the type of shape that the layer uses          shapeType -- the type of shape that the layer uses
290          """          """
291    
292          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
293    
294          self.GetView().BeginBatch()          self.GetView().BeginBatch()
295    
296          self.fieldType = clazz.GetFieldType()          self.fieldType = fieldType
297          self.shapeType = shapeType          self.shapeType = shapeType
298    
299          old_len = len(self.tdata)          self.SetClassification(clazz, group)
300            self.__Modified(-1)
301    
302            self.__colAttr = {}
303    
304            attr = wxGridCellAttr()
305            attr.SetEditor(wxGridCellBoolEditor())
306            attr.SetRenderer(wxGridCellBoolRenderer())
307            attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER)
308            self.__colAttr[COL_VISIBLE] = attr
309    
310            attr = wxGridCellAttr()
311            attr.SetRenderer(ClassRenderer(self.shapeType))
312            attr.SetReadOnly()
313            self.__colAttr[COL_SYMBOL] = attr
314    
315            self.GetView().EndBatch()
316            self.GetView().FitInside()
317    
318        def GetClassification(self):
319            return self.clazz
320    
321        def SetClassification(self, clazz, group = None):
322    
323            self.GetView().BeginBatch()
324    
325            old_len = self.GetNumberRows()
326    
327          self.tdata = []          row = -1
328            self.clazz = clazz
329    
330            self.__NotifyRowChanges(old_len, self.GetNumberRows())
331    
332          #          #
333          # copy the data out of the classification and into our          # XXX: this is dead code at the moment
         # array  
334          #          #
335          for p in clazz:          if row > -1:
336              np = copy.deepcopy(p)              self.GetView().ClearSelection()
337              self.__SetRow(-1, np)              self.GetView().SelectRow(row)
338                self.GetView().MakeCellVisible(row, 0)
339    
340            self.__Modified()
         self.__Modified(-1)  
341    
         self.__NotifyRowChanges(old_len, len(self.tdata))  
342    
               
343          self.GetView().EndBatch()          self.GetView().EndBatch()
344            self.GetView().FitInside()
345    
346      def __NotifyRowChanges(self, curRows, newRows):      def __NotifyRowChanges(self, curRows, newRows):
347          #          #
# Line 296  class ClassTable(wxPyGridTableBase): Line 353  class ClassTable(wxPyGridTableBase):
353                          wxGRIDTABLE_NOTIFY_ROWS_APPENDED,                          wxGRIDTABLE_NOTIFY_ROWS_APPENDED,
354                          newRows - curRows)    # how many                          newRows - curRows)    # how many
355              self.GetView().ProcessTableMessage(msg)              self.GetView().ProcessTableMessage(msg)
356              #self.GetView().FitInside() # XXX: only with wxWindows2.4              self.GetView().FitInside()
357          elif newRows < curRows:          elif newRows < curRows:
358              msg = wxGridTableMessage(self,              msg = wxGridTableMessage(self,
359                          wxGRIDTABLE_NOTIFY_ROWS_DELETED,                          wxGRIDTABLE_NOTIFY_ROWS_DELETED,
360                          curRows - newRows,    # position                          curRows,              # position
361                          curRows - newRows)    # how many                          curRows - newRows)    # how many
362              self.GetView().ProcessTableMessage(msg)              self.GetView().ProcessTableMessage(msg)
363              #self.GetView().FitInside() # XXX: only with wxWindows2.4              self.GetView().FitInside()
364    
365    
366      def __SetRow(self, row, group):      def __SetRow(self, row, group):
367          """Set a row's data to that of the group.          """Set a row's data to that of the group.
368    
369          The table is considered modified after this operation.          The table is considered modified after this operation.
370    
371          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
372                 then group is appended to the end.                 if row is >= GetNumberRows() or None 'group' is append to
373                        the end of the table.
374                   otherwise 'group' replaces row 'row'
375          """          """
376    
377          # either append or replace          # either append or replace
378          if row == -1 or row >= self.GetNumberRows():          if row is None or row >= self.GetNumberRows():
379              self.tdata.append(group)              self.clazz.AppendGroup(group)
380            elif row < 0:
381                self.clazz.InsertGroup(0, group)
382          else:          else:
383              self.tdata[row] = group              if row == 0:
384                    self.clazz.SetDefaultGroup(group)
385                else:
386                    self.clazz.ReplaceGroup(row - 1, group)
387    
388          self.__Modified()          self.__Modified()
389    
# Line 329  class ClassTable(wxPyGridTableBase): Line 394  class ClassTable(wxPyGridTableBase):
394      def GetRowLabelValue(self, row):      def GetRowLabelValue(self, row):
395          """Return the label for the given row."""          """Return the label for the given row."""
396    
397          group = self.tdata[row]          if row == 0:
398          if isinstance(group, ClassGroupDefault):   return _("Default")              return _("Default")
399          if isinstance(group, ClassGroupSingleton): return _("Singleton")          else:
400          if isinstance(group, ClassGroupRange):     return _("Range")              group = self.clazz.GetGroup(row - 1)
401          if isinstance(group, ClassGroupMap):       return _("Map")              if isinstance(group, ClassGroupDefault):   return _("Default")
402                if isinstance(group, ClassGroupSingleton): return _("Singleton")
403                if isinstance(group, ClassGroupRange):     return _("Range")
404                if isinstance(group, ClassGroupMap):       return _("Map")
405    
406          assert(False) # shouldn't get here          assert False # shouldn't get here
407          return _("")          return ""
408    
409      def GetNumberRows(self):      def GetNumberRows(self):
410          """Return the number of rows."""          """Return the number of rows."""
411          return len(self.tdata)          if self.clazz is None:
412                return 0
413    
414            return self.clazz.GetNumGroups() + 1 # +1 for default group
415    
416      def GetNumberCols(self):      def GetNumberCols(self):
417          """Return the number of columns."""          """Return the number of columns."""
418          return self.NUM_COLS          return NUM_COLS
419    
420      def IsEmptyCell(self, row, col):      def IsEmptyCell(self, row, col):
421          """Determine if a cell is empty. This is always false."""          """Determine if a cell is empty. This is always false."""
# Line 362  class ClassTable(wxPyGridTableBase): Line 433  class ClassTable(wxPyGridTableBase):
433          """          """
434    
435          self.SetValueAsCustom(row, col, None, value)          self.SetValueAsCustom(row, col, None, value)
         self.__Modified()  
436                
437      def GetValueAsCustom(self, row, col, typeName):      def GetValueAsCustom(self, row, col, typeName):
438          """Return the object that is used to represent the given          """Return the object that is used to represent the given
# Line 371  class ClassTable(wxPyGridTableBase): Line 441  class ClassTable(wxPyGridTableBase):
441          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
442          """          """
443    
444          group = self.tdata[row]          if row == 0:
445                group = self.clazz.GetDefaultGroup()
446            else:
447                group = self.clazz.GetGroup(row - 1)
448    
449    
450            if col == COL_VISIBLE:
451                return group.IsVisible()
452    
453          if col == COL_SYMBOL:          if col == COL_SYMBOL:
454              return group.GetProperties()              return group.GetProperties()
# Line 380  class ClassTable(wxPyGridTableBase): Line 457  class ClassTable(wxPyGridTableBase):
457              return group.GetLabel()              return group.GetLabel()
458    
459          # col must be COL_VALUE          # col must be COL_VALUE
460          assert(col == COL_VALUE)          assert col == COL_VALUE
461    
462          if isinstance(group, ClassGroupDefault):          if isinstance(group, ClassGroupDefault):
463              return _("DEFAULT")              return _("DEFAULT")
464          elif isinstance(group, ClassGroupSingleton):          elif isinstance(group, ClassGroupSingleton):
465              return group.GetValue()              return group.GetValue()
466          elif isinstance(group, ClassGroupRange):          elif isinstance(group, ClassGroupRange):
467              return _("%s - %s") % (group.GetMin(), group.GetMax())              return group.GetRange()
468    
469          assert(False) # shouldn't get here          assert False # shouldn't get here
470          return None          return None
471    
472      def __ParseInput(self, value):      def __ParseInput(self, value):
473          """Try to determine what kind of input value is          """Try to determine what kind of input value is
474             (string, number, or range)             (string, number, or range)
475    
476          Returns a tuple of length one if there is a single          Returns a tuple (type, data) where type is 0 if data is
477          value, or of length two if it is a range.          a singleton value, or 1 if is a range
478          """          """
479    
480          type = self.fieldType          type = self.fieldType
481    
482          if type == FIELDTYPE_STRING:          if type == FIELDTYPE_STRING:
483              return (value,)              return (0, value)
484          elif type == FIELDTYPE_INT or type == FIELDTYPE_DOUBLE:          elif type in (FIELDTYPE_INT, FIELDTYPE_DOUBLE):
   
485              if type == FIELDTYPE_INT:              if type == FIELDTYPE_INT:
486                    # the float call allows the user to enter 1.0 for 1
487                  conv = lambda p: int(float(p))                  conv = lambda p: int(float(p))
488              else:              else:
489                  conv = lambda p: p                  conv = float
490    
491              #              #
492              # first try to take the input as a single number              # first try to take the input as a single number
493              # if there's an exception try to break it into              # if there's an exception try to break it into
494              # a range seperated by a '-'. take care to ignore              # a range. if there is an exception here, let it
495              # a leading '-' as that could be for a negative number.              # pass up to the calling function.
             # then try to parse the individual parts. if there  
             # is an exception here, let it pass up to the calling  
             # function.  
496              #              #
497              try:              try:
498                  return (conv(Str2Num(value)),)                  return (0, conv(value))
499              except ValueError:              except ValueError:
500                  i = value.find('-')                  return (1, Range(value))
501                  if i == 0:  
502                      i = value.find('-', 1)          assert False  # shouldn't get here
503            return (0,None)
                 return (conv(Str2Num(value[:i])), conv(Str2Num(value[i+1:])))  
   
         assert(False) # shouldn't get here  
         return (0,)  
               
504    
505      def SetValueAsCustom(self, row, col, typeName, value):      def SetValueAsCustom(self, row, col, typeName, value):
506          """Set the cell specified by 'row' and 'col' to 'value'.          """Set the cell specified by 'row' and 'col' to 'value'.
# Line 445  class ClassTable(wxPyGridTableBase): Line 514  class ClassTable(wxPyGridTableBase):
514          typeName -- unused, but needed to overload wxPyGridTableBase          typeName -- unused, but needed to overload wxPyGridTableBase
515          """          """
516    
517          assert(col >= 0 and col < self.GetNumberCols())          assert 0 <= col < self.GetNumberCols()
518          assert(row >= 0 and row < self.GetNumberRows())          assert 0 <= row < self.GetNumberRows()
519    
520          group = self.tdata[row]          if row == 0:
521                group = self.clazz.GetDefaultGroup()
522            else:
523                group = self.clazz.GetGroup(row - 1)
524    
525          mod = True # assume the data will change          mod = True # assume the data will change
526    
527          if col == COL_SYMBOL:          if col == COL_VISIBLE:
528                group.SetVisible(value)
529            elif col == COL_SYMBOL:
530              group.SetProperties(value)              group.SetProperties(value)
531          elif col == COL_LABEL:          elif col == COL_LABEL:
532              group.SetLabel(value)              group.SetLabel(value)
# Line 480  class ClassTable(wxPyGridTableBase): Line 554  class ClassTable(wxPyGridTableBase):
554                      # changing the underlying group type if the                      # changing the underlying group type if the
555                      # group was a singleton and a range was entered                      # group was a singleton and a range was entered
556                      #                      #
557                      if len(dataInfo) == 1:                      if dataInfo[0] == 0:
558                          if not isinstance(group, ClassGroupSingleton):                          if not isinstance(group, ClassGroupSingleton):
559                              ngroup = ClassGroupSingleton(prop = props)                              ngroup = ClassGroupSingleton(props = props)
560                              changed = True                              changed = True
561                          ngroup.SetValue(dataInfo[0])                          ngroup.SetValue(dataInfo[1])
562                      elif len(dataInfo) == 2:                      elif dataInfo[0] == 1:
563                          if not isinstance(group, ClassGroupRange):                          if not isinstance(group, ClassGroupRange):
564                              ngroup = ClassGroupRange(prop = props)                              ngroup = ClassGroupRange(props = props)
565                              changed = True                              changed = True
566                          ngroup.SetRange(dataInfo[0], dataInfo[1])                          ngroup.SetRange(dataInfo[1])
567                      else:                      else:
568                          assert(False)                          assert False
569                          pass                          pass
570    
571                      if changed:                      if changed:
572                          ngroup.SetLabel(group.GetLabel())                          ngroup.SetLabel(group.GetLabel())
573                          self.SetClassGroup(row, ngroup)                          self.SetClassGroup(row, ngroup)
574          else:          else:
575              assert(False) # shouldn't be here              assert False # shouldn't be here
576              pass              pass
577    
578          if mod:          if mod:
# Line 508  class ClassTable(wxPyGridTableBase): Line 582  class ClassTable(wxPyGridTableBase):
582      def GetAttr(self, row, col, someExtraParameter):      def GetAttr(self, row, col, someExtraParameter):
583          """Returns the cell attributes"""          """Returns the cell attributes"""
584    
585          attr = wxGridCellAttr()          return self.__colAttr.get(col, wxGridCellAttr()).Clone()
         #attr = wxPyGridTableBase.GetAttr(self, row, col, someExtraParameter)  
   
         if col == COL_SYMBOL:  
             # we need to create a new renderer each time, because  
             # SetRenderer takes control of the parameter  
             attr.SetRenderer(ClassRenderer(self.shapeType))  
             attr.SetReadOnly()  
   
         return attr  
586    
587      def GetClassGroup(self, row):      def GetClassGroup(self, row):
588          """Return the ClassGroup object representing row 'row'."""          """Return the ClassGroup object representing row 'row'."""
589    
590          return self.tdata[row] # self.GetValueAsCustom(row, COL_SYMBOL, None)          #return self.GetValueAsCustom(row, COL_SYMBOL, None)
591            if row == 0:
592                return self.clazz.GetDefaultGroup()
593            else:
594                return self.clazz.GetGroup(row - 1)
595    
596      def SetClassGroup(self, row, group):      def SetClassGroup(self, row, group):
597          self.__SetRow(row, group)          self.__SetRow(row, group)
# Line 553  class ClassTable(wxPyGridTableBase): Line 622  class ClassTable(wxPyGridTableBase):
622          The table is considered modified if any rows are removed.          The table is considered modified if any rows are removed.
623          """          """
624    
625          assert(pos >= 0)          assert pos >= 0
626          old_len = len(self.tdata)          old_len = self.GetNumberRows()
627          for row in range(pos, pos - numRows, -1):          for row in range(pos, pos - numRows, -1):
628              group = self.GetClassGroup(row)              group = self.GetClassGroup(row)
629              if not isinstance(group, ClassGroupDefault):              if row != 0:
630                  self.tdata.pop(row)                  self.clazz.RemoveGroup(row - 1)
631                  self.__Modified()                  self.__Modified()
632            
633          if self.IsModified():          if self.IsModified():
634              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, self.GetNumberRows())
635    
636      def AppendRows(self, numRows = 1):      def AppendRows(self, numRows = 1):
637          """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 639  class ClassTable(wxPyGridTableBase):
639          The table is considered modified if any rows are appended.          The table is considered modified if any rows are appended.
640          """          """
641    
642          old_len = len(self.tdata)          old_len = self.GetNumberRows()
643          for i in range(numRows):          for i in range(numRows):
644              np = ClassGroupSingleton()              np = ClassGroupSingleton()
645              self.__SetRow(-1, np)              self.__SetRow(None, np)
646    
647          if self.IsModified():          if self.IsModified():
648              self.__NotifyRowChanges(old_len, len(self.tdata))              self.__NotifyRowChanges(old_len, self.GetNumberRows())
649    
650    
651  class Classifier(NonModalDialog):  ID_PROPERTY_REVERT = 4002
652        ID_PROPERTY_ADD = 4003
653      def __init__(self, parent, interactor, name, layer):  ID_PROPERTY_GENCLASS = 4004
654          NonModalDialog.__init__(self, parent, interactor, name,  ID_PROPERTY_REMOVE = 4005
655                                  _("Classifier: %s") % layer.Title())  ID_PROPERTY_MOVEUP = 4006
656    ID_PROPERTY_MOVEDOWN = 4007
657    ID_PROPERTY_TRY = 4008
658    ID_PROPERTY_EDITSYM = 4009
659    ID_PROPERTY_SELECT = 4011
660    ID_PROPERTY_TITLE = 4012
661    ID_PROPERTY_FIELDTEXT = 4013
662    
663    BTN_ADD = 0
664    BTN_EDIT = 1
665    BTN_GEN = 2
666    BTN_UP = 3
667    BTN_DOWN = 4
668    BTN_RM = 5
669    
670    EB_LAYER_TITLE = 0
671    EB_SELECT_FIELD = 1
672    EB_GEN_CLASS = 2
673    
674          panel = wxPanel(self, -1, size=(100, 100))  class Classifier(NonModalNonParentDialog):
675    
676          self.layer = layer      type2string = {None:             _("None"),
677                       FIELDTYPE_STRING: _("Text"),
678                       FIELDTYPE_INT:    _("Integer"),
679                       FIELDTYPE_DOUBLE: _("Decimal")}
680    
681          self.originalClass = self.layer.GetClassification()      def __init__(self, parent, name, map, layer, group = None):
682          field = self.originalClass.GetField()          NonModalNonParentDialog.__init__(self, parent, name, "")
         fieldType = self.originalClass.GetFieldType()  
683    
684          topBox = wxBoxSizer(wxVERTICAL)          self.__SetTitle(layer.Title())
         panelBox = wxBoxSizer(wxVERTICAL)  
685    
686          #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),          self.parent.Subscribe(MAP_REPLACED, self.map_replaced)
687              #0, wxALIGN_LEFT | wxALL, 4)          self.layer = layer
688          panelBox.Add(wxStaticText(panel, -1,          self.map = map
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
689    
690            self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
691            self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
692                                 self.layer_shapestore_replaced)
693    
694            self.genDlg = None
695    
696            ############################
697            # Create the controls
698          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
699    
700          self.num_cols = layer.table.field_count()          panel = wxPanel(self, -1)
         # just assume the first field in case one hasn't been  
         # specified in the file.  
         self.__cur_field = 0  
   
         self.fields.Append("<None>")  
         self.fields.SetClientData(0, None)  
   
         for i in range(self.num_cols):  
             type, name, len, decc = layer.table.field_info(i)  
             self.fields.Append(name)  
   
             if name == field:  
                 self.__cur_field = i + 1  
                 self.fields.SetClientData(i + 1, self.originalClass)  
             else:  
                 self.fields.SetClientData(i + 1, None)  
701    
702            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
703            self.fieldTypeText = wxStaticText(panel, -1, "")
704    
705          ###########          if layer.HasClassification():
706                self.originalClass = self.layer.GetClassification()
707                self.originalClassField = self.layer.GetClassificationColumn()
708                field = self.originalClassField
709                fieldType = self.layer.GetFieldType(field)
710    
711          self.fieldTypeText = wxStaticText(panel, -1, "")              table = layer.ShapeStore().Table()
712          panelBox.Add(self.fieldTypeText, 0, wxGROW | wxALIGN_LEFT | wxALL, 4)              #
713                # make field choice box
714                #
715                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
716    
717          propertyBox = wxBoxSizer(wxHORIZONTAL)              self.num_cols = table.NumColumns()
718          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              # just assume the first field in case one hasn't been
719              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
720          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              self.__cur_field = 0
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
721    
722          panelBox.Add(propertyBox, 0, wxGROW, 4)              self.fields.Append("<None>")
723    
724          ###########              if fieldType is None:
725          #                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
726          # Classification data table              else:
727                    self.fields.SetClientData(0, None)
728    
729                for i in range(self.num_cols):
730                    name = table.Column(i).name
731                    self.fields.Append(name)
732    
733                    if name == field:
734                        self.__cur_field = i + 1
735                        self.fields.SetClientData(i + 1,
736                                                  copy.deepcopy(self.originalClass))
737                    else:
738                        self.fields.SetClientData(i + 1, None)
739    
740                button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
741                    _("Generate Class"))
742                button_add = wxButton(panel, ID_PROPERTY_ADD,
743                    _("Add"))
744                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
745                    _("Move Up"))
746                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
747                    _("Move Down"))
748                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
749                    _("Edit Symbol"))
750                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
751                    _("Remove"))
752    
753                self.classGrid = ClassGrid(panel, self)
754    
755                # calling __SelectField after creating the classGrid fills in the
756                # grid with the correct information
757                self.fields.SetSelection(self.__cur_field)
758                self.__SelectField(self.__cur_field, group = group)
759    
760            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
761            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
762            button_ok = wxButton(self, wxID_OK, _("OK"))
763            button_close = wxButton(self, wxID_CANCEL, _("Close"))
764            button_ok.SetDefault()
765    
766            ############################
767            # Layout the controls
768          #          #
769    
770          controlBox = wxBoxSizer(wxHORIZONTAL)          topBox = wxBoxSizer(wxVERTICAL)
771            panelBox = wxBoxSizer(wxVERTICAL)
772    
773          self.classGrid = ClassGrid(panel)          sizer = wxBoxSizer(wxHORIZONTAL)
774          self.__SetGridTable(self.__cur_field)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
775                0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
776            sizer.Add(text_title, 1, wxGROW, 0)
777    
778          controlBox.Add(self.classGrid, 1, wxGROW, 0)          panelBox.Add(sizer, 0, wxGROW, 4)
779    
780          ###########          if isinstance(layer, RasterLayer):
781          #              type = "Image"
782          # Control buttons:          else:
783          #              type = layer.ShapeType()
         self.controlButtons = []  
784    
785          controlButtonBox = wxBoxSizer(wxVERTICAL)          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
786                0, wxALIGN_LEFT | wxALL, 4)
787    
788          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
789    
790          #button = wxButton(panel, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))              classBox = wxStaticBoxSizer(
791          #controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         #self.controlButtons.append(button)  
792    
         button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
793    
794          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))              sizer = wxBoxSizer(wxHORIZONTAL)
795          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
796          self.controlButtons.append(button)                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
797                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
798    
799          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              classBox.Add(sizer, 0, wxGROW, 4)
800    
801          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))              classBox.Add(self.fieldTypeText, 0,
802          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)                          wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
         self.controlButtons.append(button)  
803    
804          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox = wxBoxSizer(wxHORIZONTAL)
805          panelBox.Add(controlBox, 1, wxGROW, 10)              controlButtonBox = wxBoxSizer(wxVERTICAL)
806    
807          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
808          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
809          EVT_BUTTON(self, ID_CLASSIFY_GENRANGE, self._OnGenRange)              controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
810          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)              controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
811          EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)              controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
812                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
813                controlButtonBox.Add(button_remove, 0,
814                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
815    
816          ###########              controlBox.Add(self.classGrid, 1, wxGROW, 0)
817                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
818    
819          buttonBox = wxBoxSizer(wxHORIZONTAL)              classBox.Add(controlBox, 1, wxGROW, 10)
820          buttonBox.Add(wxButton(panel, ID_CLASSIFY_OK, _("OK")),              panelBox.Add(classBox, 1, wxGROW, 0)
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_APPLY, _("Apply")),  
                       0, wxALL, 4)  
         buttonBox.Add(60, 20, 0, wxALL, 4)  
         buttonBox.Add(wxButton(panel, ID_CLASSIFY_CANCEL, _("Cancel")),  
                       0, wxALL, 4)  
         panelBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 0)  
   
         EVT_BUTTON(self, ID_CLASSIFY_OK, self._OnOK)  
         EVT_BUTTON(self, ID_CLASSIFY_APPLY, self._OnApply)  
         EVT_BUTTON(self, ID_CLASSIFY_CANCEL, self._OnCancel)  
821    
         ###########  
822    
823          self.fields.SetSelection(self.__cur_field)          buttonBox = wxBoxSizer(wxHORIZONTAL)
824          self.__SelectField(self.__cur_field)          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
825            buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
826            buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
827            buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
828    
829          panel.SetAutoLayout(True)          panel.SetAutoLayout(True)
830          panel.SetSizer(panelBox)          panel.SetSizer(panelBox)
831            panelBox.Fit(panel)
832          panelBox.SetSizeHints(panel)          panelBox.SetSizeHints(panel)
833    
834          topBox.Add(panel, 1, wxGROW, 0)          topBox.Add(panel, 1, wxGROW | wxALL, 4)
835          panelBox.SetSizeHints(self)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
836    
837          self.SetAutoLayout(True)          self.SetAutoLayout(True)
838          self.SetSizer(topBox)          self.SetSizer(topBox)
839            topBox.Fit(self)
840            topBox.SetSizeHints(self)
841            self.Layout()
842    
843      def __BuildClassification(self, fieldIndex):          ###########
844    
845          numRows = self.classGrid.GetNumberRows()          EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
846          assert(numRows > 0) # there should always be a default row          EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
847            EVT_BUTTON(self, wxID_OK, self._OnOK)
848            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
849            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
850            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
851    
852            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
853            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
854            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
855            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
856            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
857            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
858    
859            ######################
860    
861            text_title.SetFocus()
862            self.haveApplied = False
863    
864        def unsubscribe_messages(self):
865            self.parent.Unsubscribe(MAP_REPLACED, self.map_replaced)
866            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
867            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
868                                   self.layer_shapestore_replaced)
869    
870        def map_layers_removed(self, map):
871            if self.layer not in self.map.Layers():
872                self.Close()
873    
874        def layer_shapestore_replaced(self, *args):
875            """Subscribed to the map's LAYER_SHAPESTORE_REPLACED message.
876    
877            Close self.
878            """
879            self.Close()
880    
881        def map_replaced(self, *args):
882            """Subscribed to the mainwindow's MAP_REPLACED message. Close self."""
883            self.Close()
884    
885        def EditSymbol(self, row):
886            table = self.classGrid.GetTable()
887            prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
888    
889            # get a new ClassGroupProperties object and copy the
890            # values over to our current object
891            propDlg = SelectPropertiesDialog(self, prop, self.layer.ShapeType())
892    
893            self.Enable(False)
894            if propDlg.ShowModal() == wxID_OK:
895                new_prop = propDlg.GetClassGroupProperties()
896                table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
897            self.Enable(True)
898            propDlg.Destroy()
899            
900        def _SetClassification(self, clazz):
901            
902            self.fields.SetClientData(self.__cur_field, clazz)
903            self.classGrid.GetTable().SetClassification(clazz)
904    
905        def __BuildClassification(self, fieldIndex, copyClass=False, force=False):
906    
907    #       numRows = self.classGrid.GetNumberRows()
908    #       assert numRows > 0  # there should always be a default row
909    
         clazz = Classification()  
910          if fieldIndex == 0:          if fieldIndex == 0:
911              fieldName = None              fieldName = None
912              fieldType = None              fieldType = None
# Line 736  class Classifier(NonModalDialog): Line 914  class Classifier(NonModalDialog):
914              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
915              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
916    
917          clazz.SetField(fieldName)          clazz = self.fields.GetClientData(fieldIndex)
918          clazz.SetFieldType(fieldType)          if clazz is None or self.classGrid.GetTable().IsModified() or force:
919                clazz = self.classGrid.GetTable().GetClassification()
920                if copyClass:
921          table = self.classGrid.GetTable()                  clazz = copy.deepcopy(clazz)
         clazz.SetDefaultGroup(table.GetClassGroup(0))  
   
         for i in range(1, numRows):  
             clazz.AddGroup(table.GetClassGroup(i))  
922    
923          return clazz          return clazz, fieldName
924    
925      def __SetGridTable(self, fieldIndex):      def __SetGridTable(self, fieldIndex, group = None):
926    
927          clazz = self.fields.GetClientData(fieldIndex)          clazz = self.fields.GetClientData(fieldIndex)
928    
# Line 759  class Classifier(NonModalDialog): Line 933  class Classifier(NonModalDialog):
933                      self.layer.GetClassification().                      self.layer.GetClassification().
934                                 GetDefaultGroup().GetProperties()))                                 GetDefaultGroup().GetProperties()))
935    
936              fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
937              fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
             clazz.SetFieldType(fieldType)  
938                                    
939          self.classGrid.CreateTable(clazz, self.layer.ShapeType())          self.classGrid.CreateTable(clazz, fieldType,
940                                       self.layer.ShapeType(), group)
   
   
     type2string = {None:             _("None"),  
                    FIELDTYPE_STRING: _("Text"),  
                    FIELDTYPE_INT:    _("Integer"),  
                    FIELDTYPE_DOUBLE: _("Decimal")}  
941    
942      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
943          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
944          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
945    
946          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
947    
948          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
949    
950          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
951    
952      def __SelectField(self, newIndex, oldIndex = -1):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
953            """This method assumes that the current selection for the
954            combo has already been set by a call to SetSelection().
955            """
956    
957          assert(oldIndex >= -1)          assert oldIndex >= -1
958    
959          if oldIndex != -1:          if oldIndex != -1:
960              clazz = self.__BuildClassification(oldIndex)              clazz, name = self.__BuildClassification(oldIndex, force = True)
961              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
962    
963          self.__SetGridTable(newIndex)          self.__SetGridTable(newIndex, group)
   
         enabled = newIndex != 0  
964    
965          for b in self.controlButtons:          self.__EnableButtons(EB_SELECT_FIELD)
             b.Enable(enabled)  
966    
967          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
968    
969        def __SetTitle(self, title):
970            if title != "":
971                title = ": " + title
972    
973            self.SetTitle(_("Layer Properties") + title)
974    
975        def _OnEditSymbol(self, event):
976            sel = self.classGrid.GetCurrentSelection()
977    
978            if len(sel) == 1:
979                self.EditSymbol(sel[0])
980    
981      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
982          index = self.fields.GetSelection()          index = self.fields.GetSelection()
983          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
984          self.__cur_field = index          self.__cur_field = index
985    
986      def _OnApply(self, event):      def _OnTry(self, event):
987          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
988             it to the layer.             it to the layer.
989          """          """
990    
991          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
992                clazz = self.fields.GetClientData(self.__cur_field)
993    
994          #              #
995          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
996          # to begin with or it has been modified              # to begin with or it has been modified
997          #              #
998          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
999              clazz = self.__BuildClassification(self.__cur_field)              clazz, name = self.__BuildClassification(self.__cur_field, True)
1000    
1001                self.layer.SetClassificationColumn(name)
1002                self.layer.SetClassification(clazz)
1003    
1004          self.layer.SetClassification(clazz)          self.haveApplied = True
1005    
1006      def _OnOK(self, event):      def _OnOK(self, event):
1007          self._OnApply(event)          self._OnTry(event)
1008          self.OnClose(event)          self.Close()
1009    
1010      def _OnCancel(self, event):      def OnClose(self, event):
1011            self.unsubscribe_messages()
1012            NonModalNonParentDialog.OnClose(self, event)
1013    
1014        def _OnCloseBtn(self, event):
1015            """Close is similar to Cancel except that any changes that were
1016            made and applied remain applied, but the currently displayed
1017            classification is discarded.
1018            """
1019    
1020            self.Close()
1021    
1022        def _OnRevert(self, event):
1023          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1024          self.layer.SetClassification(self.originalClass)          if self.haveApplied:
1025          self.OnClose(event)              self.layer.SetClassificationColumn(self.originalClassField)
1026                self.layer.SetClassification(self.originalClass)
1027    
1028            #self.Close()
1029    
1030      def _OnAdd(self, event):      def _OnAdd(self, event):
1031          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 836  class Classifier(NonModalDialog): Line 1033  class Classifier(NonModalDialog):
1033      def _OnRemove(self, event):      def _OnRemove(self, event):
1034          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1035    
1036      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1037          print "Classifier._OnGenRange()"  
1038            self.genDlg = ClassGenDialog(self, self.layer,
1039                              self.fields.GetString(self.__cur_field))
1040    
1041            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1042    
1043            self.__EnableButtons(EB_GEN_CLASS)
1044    
1045            self.genDlg.Show()
1046    
1047        def _OnGenDialogClose(self, event):
1048            self.genDlg.Destroy()
1049            self.genDlg = None
1050            self.__EnableButtons(EB_GEN_CLASS)
1051    
1052      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1053          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 852  class Classifier(NonModalDialog): Line 1062  class Classifier(NonModalDialog):
1062                  table.SetClassGroup(i, x)                  table.SetClassGroup(i, x)
1063                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1064                  self.classGrid.SelectRow(i - 1)                  self.classGrid.SelectRow(i - 1)
1065                    self.classGrid.MakeCellVisible(i - 1, 0)
1066    
1067      def _OnMoveDown(self, event):      def _OnMoveDown(self, event):
1068          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 866  class Classifier(NonModalDialog): Line 1077  class Classifier(NonModalDialog):
1077                  table.SetClassGroup(i + 1, x)                  table.SetClassGroup(i + 1, x)
1078                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1079                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1080                    self.classGrid.MakeCellVisible(i + 1, 0)
1081    
1082        def _OnTitleChanged(self, event):
1083            obj = event.GetEventObject()
1084    
1085            self.layer.SetTitle(obj.GetValue())
1086            self.__SetTitle(self.layer.Title())
1087    
1088            self.__EnableButtons(EB_LAYER_TITLE)
1089    
1090        def __EnableButtons(self, case):
1091    
1092            list = {wxID_OK                 : True,
1093                    wxID_CANCEL             : True,
1094                    ID_PROPERTY_ADD         : True,
1095                    ID_PROPERTY_MOVEUP      : True,
1096                    ID_PROPERTY_MOVEDOWN    : True,
1097                    ID_PROPERTY_REMOVE      : True,
1098                    ID_PROPERTY_SELECT      : True,
1099                    ID_PROPERTY_FIELDTEXT   : True,
1100                    ID_PROPERTY_GENCLASS    : True,
1101                    ID_PROPERTY_EDITSYM     : True}
1102    
1103            if case == EB_LAYER_TITLE:  
1104                if self.layer.Title() == "":
1105                    list[wxID_OK] = False
1106                    list[wxID_CANCEL] = False
1107    
1108            elif case == EB_SELECT_FIELD:
1109                if self.fields.GetSelection() == 0:
1110                    list[ID_PROPERTY_GENCLASS] = False
1111                    list[ID_PROPERTY_ADD] = False
1112                    list[ID_PROPERTY_MOVEUP] = False
1113                    list[ID_PROPERTY_MOVEDOWN] = False
1114                    list[ID_PROPERTY_REMOVE] = False
1115    
1116            elif case == EB_GEN_CLASS:
1117                if self.genDlg is not None:
1118                    list[ID_PROPERTY_SELECT] = False
1119                    list[ID_PROPERTY_FIELDTEXT] = False
1120                    list[ID_PROPERTY_GENCLASS] = False
1121    
1122            for id, enable in list.items():
1123                win = self.FindWindowById(id)
1124                if win:
1125                    win.Enable(enable)
1126    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1127  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1128  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1129  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 893  class SelectPropertiesDialog(wxDialog): Line 1147  class SelectPropertiesDialog(wxDialog):
1147          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1148          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1149              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1150          self.previewer = ClassDataPreviewer(None, self.prop, shapeType,  
1151                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1152          previewBox.Add(self.previewer, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1153                (40, 40), wxSIMPLE_BORDER)
1154    
1155            self.previewWin.AllowEdit(False)
1156    
1157            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1158    
1159          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1160    
# Line 903  class SelectPropertiesDialog(wxDialog): Line 1162  class SelectPropertiesDialog(wxDialog):
1162          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1163    
1164          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1165          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1166              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1167              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1168          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1169    
1170          lineColorBox.Add(          lineColorBox.Add(
# Line 951  class SelectPropertiesDialog(wxDialog): Line 1210  class SelectPropertiesDialog(wxDialog):
1210          # Control buttons:          # Control buttons:
1211          #          #
1212          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1213          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1214                        0, wxALL, 4)          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1215          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1216                        0, wxALL, 4)                        0, wxRIGHT|wxEXPAND, 10)
1217          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1218    
1219            button_ok.SetDefault()
1220                                                                                                                                                                    
1221          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1222          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1223                                                                                                                                                                    
1224          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1225          self.SetSizer(topBox)          self.SetSizer(topBox)
1226          topBox.Fit(self)          topBox.Fit(self)
1227          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1228    
1229      def _OnOK(self, event):      def OnOK(self, event):
1230          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1231    
1232      def _OnCancel(self, event):      def OnCancel(self, event):
1233          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1234    
1235      def _OnSpin(self, event):      def _OnSpin(self, event):
1236          self.prop.SetLineWidth(self.spinCtrl.GetValue())          self.prop.SetLineWidth(self.spinCtrl.GetValue())
1237          self.previewer.Refresh()          self.previewWin.Refresh()
1238    
1239      def __GetColor(self, cur):      def __GetColor(self, cur):
1240          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1241          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Transparent:
1242                dialog.GetColourData().SetColour(Color2wxColour(cur))
1243    
1244          ret = None          ret = None
1245          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1246              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 990  class SelectPropertiesDialog(wxDialog): Line 1253  class SelectPropertiesDialog(wxDialog):
1253          clr = self.__GetColor(self.prop.GetLineColor())          clr = self.__GetColor(self.prop.GetLineColor())
1254          if clr is not None:          if clr is not None:
1255              self.prop.SetLineColor(clr)              self.prop.SetLineColor(clr)
1256          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1257    
1258      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1259          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Transparent)
1260          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1261                    
1262      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
1263          clr = self.__GetColor(self.prop.GetFill())          clr = self.__GetColor(self.prop.GetFill())
1264          if clr is not None:          if clr is not None:
1265              self.prop.SetFill(clr)              self.prop.SetFill(clr)
1266          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1267    
1268      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1269          self.prop.SetFill(Color.None)          self.prop.SetFill(Transparent)
1270          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1271    
1272      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
1273          return self.prop          return self.prop
1274    
1275    
1276  class ClassDataPreviewer(wxWindow):  class ClassDataPreviewWindow(wxWindow):
1277    
1278      def __init__(self, rect, prop, shapeType,      def __init__(self, rect, prop, shapeType,
1279                         parent = None, id = -1, size = wxDefaultSize):                         parent = None, id = -1, size = wxDefaultSize):
1280          if parent is not None:          if parent is not None:
1281              wxWindow.__init__(self, parent, id, size=size)              wxWindow.__init__(self, parent, id, (0, 0), size)
1282              EVT_PAINT(self, self._OnPaint)              EVT_PAINT(self, self._OnPaint)
1283    
1284          self.rect = rect          self.rect = rect
1285    
1286          self.prop = prop          self.prop = prop
1287          self.shapeType = shapeType          self.shapeType = shapeType
1288            self.previewer = ClassDataPreviewer()
1289    
1290        def GetProperties():
1291            return self.prop
1292    
1293      def _OnPaint(self, event):      def _OnPaint(self, event):
1294          dc = wxPaintDC(self)          dc = wxPaintDC(self)
# Line 1028  class ClassDataPreviewer(wxWindow): Line 1296  class ClassDataPreviewer(wxWindow):
1296          # XXX: this doesn't seem to be having an effect:          # XXX: this doesn't seem to be having an effect:
1297          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1298    
1299          self.Draw(dc, None)          if self.rect is None:
1300                w, h = self.GetSize()
1301                rect = wxRect(0, 0, w, h)
1302            else:
1303                rect = self.rect
1304    
1305            self.previewer.Draw(dc, rect, self.prop, self.shapeType)
1306    
1307    class ClassDataPreviewer:
1308    
1309      def Draw(self, dc, rect, prop = None, shapeType = None):      def Draw(self, dc, rect, prop, shapeType):
1310    
1311          if prop is None: prop = self.prop          assert dc is not None
1312          if shapeType is None: shapeType = self.shapeType          assert isinstance(prop, ClassGroupProperties)
1313    
1314          if rect is None:          if rect is None:
1315              x = y = 0              x = 0
1316              w, h = self.GetClientSizeTuple()              y = 0
1317                w, h = dc.GetSize()
1318          else:          else:
1319              x = rect.GetX()              x = rect.GetX()
1320              y = rect.GetY()              y = rect.GetY()
# Line 1045  class ClassDataPreviewer(wxWindow): Line 1322  class ClassDataPreviewer(wxWindow):
1322              h = rect.GetHeight()              h = rect.GetHeight()
1323    
1324          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1325          if stroke is Color.None:          if stroke is Transparent:
1326              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1327          else:          else:
1328              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1053  class ClassDataPreviewer(wxWindow): Line 1330  class ClassDataPreviewer(wxWindow):
1330                          wxSOLID)                          wxSOLID)
1331    
1332          stroke = prop.GetFill()          stroke = prop.GetFill()
1333          if stroke is Color.None:          if stroke is Transparent:
1334              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1335          else:          else:
1336              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1067  class ClassDataPreviewer(wxWindow): Line 1344  class ClassDataPreviewer(wxWindow):
1344                             wxPoint(x + w/2, y + h/4*3),                             wxPoint(x + w/2, y + h/4*3),
1345                             wxPoint(x + w, y)])                             wxPoint(x + w, y)])
1346    
1347          elif shapeType == SHAPETYPE_POINT or \          elif shapeType == SHAPETYPE_POINT:
              shapeType == SHAPETYPE_POLYGON:  
1348    
1349              dc.DrawCircle(x + w/2, y + h/2,              dc.DrawCircle(x + w/2, y + h/2,
1350                            (min(w, h) - prop.GetLineWidth())/2)                            (min(w, h) - prop.GetLineWidth())/2)
1351    
1352            elif shapeType == SHAPETYPE_POLYGON:
1353                dc.DrawRectangle(x, y, w, h)
1354    
1355  class ClassRenderer(wxPyGridCellRenderer):  class ClassRenderer(wxPyGridCellRenderer):
1356    
1357      def __init__(self, shapeType):      def __init__(self, shapeType):
1358          wxPyGridCellRenderer.__init__(self)          wxPyGridCellRenderer.__init__(self)
1359          self.previewer = ClassDataPreviewer(None, None, shapeType)          self.shapeType = shapeType
1360            self.previewer = ClassDataPreviewer()
1361    
1362      def Draw(self, grid, attr, dc, rect, row, col, isSelected):      def Draw(self, grid, attr, dc, rect, row, col, isSelected):
1363          data = grid.GetTable().GetClassGroup(row)          data = grid.GetTable().GetClassGroup(row)
# Line 1090  class ClassRenderer(wxPyGridCellRenderer Line 1370  class ClassRenderer(wxPyGridCellRenderer
1370                           rect.GetWidth(), rect.GetHeight())                           rect.GetWidth(), rect.GetHeight())
1371    
1372          if not isinstance(data, ClassGroupMap):          if not isinstance(data, ClassGroupMap):
1373              self.previewer.Draw(dc, rect, data.GetProperties())              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1374    
1375          if isSelected:          if isSelected:
1376              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1377              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1378    
1379              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1380                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1381    
1382          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1383    
1384    
1385    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1386    
1387        def __init__(self, parent, id, props, shapeType,
1388                     size = wxDefaultSize, style = 0):
1389    
1390            wxWindow.__init__(self, parent, id, size = size, style = style)
1391    
1392            self.parent = parent
1393    
1394            self.SetProperties(props)
1395            self.SetShapeType(shapeType)
1396            self.AllowEdit(True)
1397    
1398            EVT_PAINT(self, self._OnPaint)
1399            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1400    
1401            self.previewer = ClassDataPreviewer()
1402    
1403        def _OnPaint(self, event):
1404            dc = wxPaintDC(self)
1405    
1406            # XXX: this doesn't seem to be having an effect:
1407            dc.DestroyClippingRegion()
1408    
1409            w, h = self.GetClientSize()
1410    
1411            self.previewer.Draw(dc,
1412                                wxRect(0, 0, w, h),
1413                                self.GetProperties(),
1414                                self.GetShapeType())
1415    
1416    
1417        def GetProperties(self):
1418            return self.props
1419    
1420        def SetProperties(self, props):
1421            self.props = props
1422            self.Refresh()
1423    
1424        def GetShapeType(self):
1425            return self.shapeType
1426    
1427        def SetShapeType(self, shapeType):
1428            self.shapeType = shapeType
1429            self.Refresh()
1430    
1431        def AllowEdit(self, allow):
1432            self.allowEdit = allow
1433    
1434        def DoEdit(self):
1435            if not self.allowEdit: return
1436    
1437            propDlg = SelectPropertiesDialog(self.parent,
1438                                             self.GetProperties(),
1439                                             self.GetShapeType())
1440    
1441            if propDlg.ShowModal() == wxID_OK:
1442                new_prop = propDlg.GetClassGroupProperties()
1443                self.SetProperties(new_prop)
1444                self.Refresh()
1445    
1446            propDlg.Destroy()
1447    
1448        def _OnLeftDClick(self, event):
1449            self.DoEdit()
Legend:
Removed from v.513  
changed lines
  Added in v.1464
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26