/[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 549 by jonathan, Thu Mar 20 09:45:07 2003 UTC revision 1207 by bh, Fri Jun 13 18:16:10 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 Color
31    
32  from Thuban.Model.layer import Layer, SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT  from Thuban.Model.layer import Layer, RasterLayer, \
33        SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
34    
35  from dialogs import NonModalDialog  from Thuban.UI.classgen import ClassGenDialog
36    
37    from dialogs import NonModalNonParentDialog
38    
 # widget id's  
 ID_PROPERTY_SELECT = 4010  
39  ID_CLASS_TABLE = 40011  ID_CLASS_TABLE = 40011
40    
 ID_CLASSIFY_OK = 4001  
 ID_CLASSIFY_CANCEL = 4002  
 ID_CLASSIFY_ADD = 4003  
 ID_CLASSIFY_GENRANGE = 4004  
 ID_CLASSIFY_REMOVE = 4005  
 ID_CLASSIFY_MOVEUP = 4006  
 ID_CLASSIFY_MOVEDOWN = 4007  
 ID_CLASSIFY_APPLY = 4008  
41    
42  # table columns  # table columns
43  COL_SYMBOL = 0  COL_VISIBLE = 0
44  COL_VALUE  = 1  COL_SYMBOL  = 1
45  COL_LABEL  = 2  COL_VALUE   = 2
46    COL_LABEL   = 3
47    NUM_COLS    = 4
48    
49  # indices into the client data lists in Classifier.fields  # indices into the client data lists in Classifier.fields
50  FIELD_CLASS = 0  FIELD_CLASS = 0
# Line 59  FIELD_NAME = 2 Line 58  FIELD_NAME = 2
58  import weakref  import weakref
59  class ClassGrid(wxGrid):  class ClassGrid(wxGrid):
60    
61      def __init__(self, parent):  
62        def __init__(self, parent, classifier):
63          """Constructor.          """Constructor.
64    
65          parent -- the parent window          parent -- the parent window
# Line 68  class ClassGrid(wxGrid): Line 68  class ClassGrid(wxGrid):
68                   use for display.                   use for display.
69          """          """
70    
71          #wxGrid.__init__(self, parent, ID_CLASS_TABLE, size = (340, 160))          wxGrid.__init__(self, parent, ID_CLASS_TABLE, style = 0)
72          wxGrid.__init__(self, parent, ID_CLASS_TABLE)  
73          #self.SetTable(ClassTable(fieldData, layer.ShapeType(), self), True)          self.classifier = classifier
74    
75            self.currentSelection = []
76    
77          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)          EVT_GRID_CELL_LEFT_DCLICK(self, self._OnCellDClick)
78          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)          EVT_GRID_RANGE_SELECT(self, self._OnSelectedRange)
79          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)          EVT_GRID_SELECT_CELL(self, self._OnSelectedCell)
80            EVT_GRID_COL_SIZE(self, self._OnCellResize)
81            EVT_GRID_ROW_SIZE(self, self._OnCellResize)
82    
83          self.currentSelection = []      #def GetCellAttr(self, row, col):
84            #print "GetCellAttr ", row, col
85            #wxGrid.GetCellAttr(self, row, col)
86    
87      def CreateTable(self, clazz, shapeType):      def CreateTable(self, clazz, shapeType, group = None):
88    
89          assert(isinstance(clazz, Classification))          assert isinstance(clazz, Classification)
90    
         self.shapeType = shapeType  
91          table = self.GetTable()          table = self.GetTable()
92          if table is None:          if table is None:
93              w = self.GetDefaultColSize() * 3 + self.GetDefaultRowLabelSize()              w = self.GetDefaultColSize() * NUM_COLS \
94              h = self.GetDefaultRowSize() * 4 + self.GetDefaultColLabelSize()                  + self.GetDefaultRowLabelSize()
95                h = self.GetDefaultRowSize() * 4 \
96                    + self.GetDefaultColLabelSize()
97    
98              self.SetDimensions(-1, -1, w, h)              self.SetDimensions(-1, -1, w, h)
99              self.SetSizeHints(w, h, -1, -1)              self.SetSizeHints(w, h, -1, -1)
100              self.SetTable(ClassTable(clazz, self.shapeType, self), True)              table = ClassTable(self)
101          else:              self.SetTable(table, True)
102              table.Reset(clazz, self.shapeType)  
103    
104          self.SetSelectionMode(wxGrid.wxGridSelectRows)          self.SetSelectionMode(wxGrid.wxGridSelectRows)
105          self.ClearSelection()          self.ClearSelection()
106    
107            table.Reset(clazz, shapeType, group)
108    
109      def GetCurrentSelection(self):      def GetCurrentSelection(self):
110          """Return the currently highlighted rows as an increasing list          """Return the currently highlighted rows as an increasing list
111             of row numbers."""             of row numbers."""
# Line 103  class ClassGrid(wxGrid): Line 113  class ClassGrid(wxGrid):
113          sel.sort()          sel.sort()
114          return sel          return sel
115    
116      def SetCellRenderer(self, row, col):      def GetSelectedRows(self):
117          raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))          return self.GetCurrentSelection()
118    
119        #def SetCellRenderer(self, row, col, renderer):
120            #raise ValueError(_("Must not allow setting of renderer in ClassGrid!"))
121    
122      #      #
123      # [Set|Get]Table is taken from http://wiki.wxpython.org      # [Set|Get]Table is taken from http://wiki.wxpython.org
# Line 169  class ClassGrid(wxGrid): Line 182  class ClassGrid(wxGrid):
182                  r = self.GetNumberRows() - 1                  r = self.GetNumberRows() - 1
183              self.SelectRow(r)              self.SelectRow(r)
184                    
185    
186        def SelectGroup(self, group, makeVisible = True):
187            if group is None: return
188    
189            assert isinstance(group, ClassGroup)
190    
191            table = self.GetTable()
192    
193            assert table is not None
194    
195            for i in range(table.GetNumberRows()):
196                g = table.GetClassGroup(i)
197                if g is group:
198                    self.SelectRow(i)
199                    if makeVisible:
200                        self.MakeCellVisible(i, 0)
201                    break
202    
203  #  #
204  # XXX: This isn't working, and there is no way to deselect rows wxPython!  # XXX: This isn't working, and there is no way to deselect rows wxPython!
205  #  #
# Line 181  class ClassGrid(wxGrid): Line 212  class ClassGrid(wxGrid):
212  #                                  sel = False))  #                                  sel = False))
213    
214      def _OnCellDClick(self, event):      def _OnCellDClick(self, event):
215          """Handle a double on a cell."""          """Handle a double click on a cell."""
216    
217          r = event.GetRow()          r = event.GetRow()
218          c = event.GetCol()          c = event.GetCol()
         if c == COL_SYMBOL:  
             prop = self.GetTable().GetValueAsCustom(r, c, None)  
             #prop = group.GetProperties()  
219    
220              # get a new ClassGroupProperties object and copy the          if c == COL_SYMBOL:
221              # values over to our current object              self.classifier.EditSymbol(r)
222              propDlg = SelectPropertiesDialog(NULL, prop, self.shapeType)          else:
223              if propDlg.ShowModal() == wxID_OK:              event.Skip()
                 new_prop = propDlg.GetClassGroupProperties()  
                 #prop.SetProperties(new_prop)  
                 self.GetTable().SetValueAsCustom(r, c, None, new_prop)  
             propDlg.Destroy()  
224    
225      #      #
226      # _OnSelectedRange() and _OnSelectedCell() were borrowed      # _OnSelectedRange() and _OnSelectedCell() were borrowed
# Line 223  class ClassGrid(wxGrid): Line 247  class ClassGrid(wxGrid):
247          #self.ConfigureForSelection()          #self.ConfigureForSelection()
248          event.Skip()          event.Skip()
249    
250        def _OnCellResize(self, event):
251            self.FitInside()
252            event.Skip()
253    
254  class ClassTable(wxPyGridTableBase):  class ClassTable(wxPyGridTableBase):
255      """Represents the underlying data structure for the grid."""      """Represents the underlying data structure for the grid."""
256    
257      NUM_COLS = 3      __col_labels = [_("Visible"), _("Symbol"), _("Value"), _("Label")]
258    
     __col_labels = [_("Symbol"), _("Value"), _("Label")]  
259    
260      def __init__(self, clazz, shapeType, view = None):      def __init__(self, view = None):
261        #def __init__(self, clazz, shapeType, 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
272          self.tdata = []  
273            self.clazz = None
274            self.__colAttr = {}
275    
276          self.Reset(clazz, shapeType)          self.SetView(view)
277    
278      def Reset(self, clazz, shapeType):      def Reset(self, clazz, 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 = clazz.GetFieldType()
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 300  class ClassTable(wxPyGridTableBase): Line 357  class ClassTable(wxPyGridTableBase):
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()              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    ID_PROPERTY_GENCLASS = 4004
654    ID_PROPERTY_REMOVE = 4005
655    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      def __init__(self, parent, name, layer):  class Classifier(NonModalNonParentDialog):
         NonModalDialog.__init__(self, parent, name,  
                                 _("Classifier: %s") % layer.Title())  
675    
676          panel = wxPanel(self, -1, size=(100, 100))      type2string = {None:             _("None"),
677                       FIELDTYPE_STRING: _("Text"),
678                       FIELDTYPE_INT:    _("Integer"),
679                       FIELDTYPE_DOUBLE: _("Decimal")}
680    
681          self.layer = layer      def __init__(self, parent, name, map, layer, group = None):
682            NonModalNonParentDialog.__init__(self, parent, name, "")
683    
684          self.originalClass = self.layer.GetClassification()          self.__SetTitle(layer.Title())
         field = self.originalClass.GetField()  
         fieldType = self.originalClass.GetFieldType()  
685    
686          topBox = wxBoxSizer(wxVERTICAL)          self.layer = layer
687          panelBox = wxBoxSizer(wxVERTICAL)          self.map = map
688    
689          #panelBox.Add(wxStaticText(panel, -1, _("Layer: %s") % layer.Title()),          self.map.Subscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
690              #0, wxALIGN_LEFT | wxALL, 4)          self.layer.Subscribe(LAYER_SHAPESTORE_REPLACED,
691          panelBox.Add(wxStaticText(panel, -1,                               self.layer_shapestore_replaced)
                                 _("Layer Type: %s") % layer.ShapeType()),  
             0, wxALIGN_LEFT | wxALL, 4)  
692    
693            self.genDlg = None
694    
695            ############################
696            # Create the controls
697          #          #
         # make field combo box  
         #  
         self.fields = wxComboBox(panel, ID_PROPERTY_SELECT, "",  
                                      style = wxCB_READONLY)  
698    
699          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)  
700    
701            text_title = wxTextCtrl(panel, ID_PROPERTY_TITLE, layer.Title())
702            self.fieldTypeText = wxStaticText(panel, -1, "")
703    
704          ###########          if layer.HasClassification():
705                self.originalClass = self.layer.GetClassification()
706                field = self.originalClass.GetField()
707                fieldType = self.originalClass.GetFieldType()
708    
709          self.fieldTypeText = wxStaticText(panel, -1, "")              #
710          panelBox.Add(self.fieldTypeText, 0, wxGROW | wxALIGN_LEFT | wxALL, 4)              # make field choice box
711                #
712                self.fields = wxChoice(panel, ID_PROPERTY_SELECT,)
713    
714          propertyBox = wxBoxSizer(wxHORIZONTAL)              self.num_cols = layer.table.NumColumns()
715          propertyBox.Add(wxStaticText(panel, -1, _("Field: ")),              # just assume the first field in case one hasn't been
716              0, wxALIGN_LEFT | wxALL, 4)              # specified in the file.
717          propertyBox.Add(self.fields, 1, wxGROW|wxALL, 4)              self.__cur_field = 0
         EVT_COMBOBOX(self, ID_PROPERTY_SELECT, self._OnFieldSelect)  
718    
719          panelBox.Add(propertyBox, 0, wxGROW, 4)              self.fields.Append("<None>")
720    
721          ###########              if self.originalClass.GetFieldType() is None:
722          #                  self.fields.SetClientData(0, copy.deepcopy(self.originalClass))
723          # Classification data table              else:
724                    self.fields.SetClientData(0, None)
725    
726                for i in range(self.num_cols):
727                    name = layer.table.Column(i).name
728                    self.fields.Append(name)
729    
730                    if name == field:
731                        self.__cur_field = i + 1
732                        self.fields.SetClientData(i + 1,
733                                                copy.deepcopy(self.originalClass))
734                    else:
735                        self.fields.SetClientData(i + 1, None)
736    
737                button_gen = wxButton(panel, ID_PROPERTY_GENCLASS,
738                    _("Generate Class"))
739                button_add = wxButton(panel, ID_PROPERTY_ADD,
740                    _("Add"))
741                button_moveup = wxButton(panel, ID_PROPERTY_MOVEUP,
742                    _("Move Up"))
743                button_movedown = wxButton(panel, ID_PROPERTY_MOVEDOWN,
744                    _("Move Down"))
745                button_edit = wxButton(panel, ID_PROPERTY_EDITSYM,
746                    _("Edit Symbol"))
747                button_remove = wxButton(panel, ID_PROPERTY_REMOVE,
748                    _("Remove"))
749    
750                self.classGrid = ClassGrid(panel, self)
751    
752                # calling __SelectField after creating the classGrid fills in the
753                # grid with the correct information
754                self.fields.SetSelection(self.__cur_field)
755                self.__SelectField(self.__cur_field, group = group)
756    
757            button_try = wxButton(self, ID_PROPERTY_TRY, _("Try"))
758            button_revert = wxButton(self, ID_PROPERTY_REVERT, _("Revert"))
759            button_ok = wxButton(self, wxID_OK, _("OK"))
760            button_ok.SetDefault()
761            button_close = wxButton(self, wxID_CANCEL, _("Close"))
762    
763            ############################
764            # Layout the controls
765          #          #
766    
767          controlBox = wxBoxSizer(wxHORIZONTAL)          topBox = wxBoxSizer(wxVERTICAL)
768            panelBox = wxBoxSizer(wxVERTICAL)
769    
770          self.classGrid = ClassGrid(panel)          sizer = wxBoxSizer(wxHORIZONTAL)
771          self.__SetGridTable(self.__cur_field)          sizer.Add(wxStaticText(panel, -1, _("Title: ")),
772                0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 4)
773            sizer.Add(text_title, 1, wxGROW, 0)
774    
775          controlBox.Add(self.classGrid, 1, wxGROW, 0)          panelBox.Add(sizer, 0, wxGROW, 4)
776    
777          ###########          if isinstance(layer, RasterLayer):
778          #              type = "Image"
779          # Control buttons:          else:
780          #              type = layer.ShapeType()
         self.controlButtons = []  
781    
782          controlButtonBox = wxBoxSizer(wxVERTICAL)          panelBox.Add(wxStaticText(panel, -1, _("Type: %s") % type),
783                0, wxALIGN_LEFT | wxALL, 4)
784    
785          button = wxButton(panel, ID_CLASSIFY_ADD, _("Add"))          if layer.HasClassification():
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
786    
787          #button = wxButton(panel, ID_CLASSIFY_GENRANGE, _("Generate Ranges"))              classBox = wxStaticBoxSizer(
788          #controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)                          wxStaticBox(panel, -1, _("Classification")), wxVERTICAL)
         #self.controlButtons.append(button)  
789    
         button = wxButton(panel, ID_CLASSIFY_MOVEUP, _("Move Up"))  
         controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)  
         self.controlButtons.append(button)  
790    
791          button = wxButton(panel, ID_CLASSIFY_MOVEDOWN, _("Move Down"))              sizer = wxBoxSizer(wxHORIZONTAL)
792          controlButtonBox.Add(button, 0, wxGROW | wxALL, 4)              sizer.Add(wxStaticText(panel, ID_PROPERTY_FIELDTEXT, _("Field: ")),
793          self.controlButtons.append(button)                  0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 4)
794                sizer.Add(self.fields, 1, wxGROW | wxALL, 4)
795    
796          controlButtonBox.Add(60, 20, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)              classBox.Add(sizer, 0, wxGROW, 4)
797    
798          button = wxButton(panel, ID_CLASSIFY_REMOVE, _("Remove"))              classBox.Add(self.fieldTypeText, 0,
799          controlButtonBox.Add(button, 0, wxGROW | wxALL | wxALIGN_BOTTOM, 4)                          wxGROW | wxALIGN_LEFT | wxALL | wxADJUST_MINSIZE, 4)
         self.controlButtons.append(button)  
800    
801          controlBox.Add(controlButtonBox, 0, wxGROW, 10)              controlBox = wxBoxSizer(wxHORIZONTAL)
802          panelBox.Add(controlBox, 1, wxGROW, 10)              controlButtonBox = wxBoxSizer(wxVERTICAL)
803    
804          EVT_BUTTON(self, ID_CLASSIFY_ADD, self._OnAdd)              controlButtonBox.Add(button_gen, 0, wxGROW|wxALL, 4)
805          EVT_BUTTON(self, ID_CLASSIFY_REMOVE, self._OnRemove)              controlButtonBox.Add(button_add, 0, wxGROW|wxALL, 4)
806          EVT_BUTTON(self, ID_CLASSIFY_GENRANGE, self._OnGenRange)              controlButtonBox.Add(button_moveup, 0, wxGROW|wxALL, 4)
807          EVT_BUTTON(self, ID_CLASSIFY_MOVEUP, self._OnMoveUp)              controlButtonBox.Add(button_movedown, 0, wxGROW|wxALL, 4)
808          EVT_BUTTON(self, ID_CLASSIFY_MOVEDOWN, self._OnMoveDown)              controlButtonBox.Add(button_edit, 0, wxGROW|wxALL, 4)
809                controlButtonBox.Add(60, 20, 0, wxGROW|wxALL|wxALIGN_BOTTOM, 4)
810                controlButtonBox.Add(button_remove, 0,
811                                     wxGROW|wxALL|wxALIGN_BOTTOM, 4)
812    
813          ###########              controlBox.Add(self.classGrid, 1, wxGROW, 0)
814                controlBox.Add(controlButtonBox, 0, wxGROW, 10)
815    
816          buttonBox = wxBoxSizer(wxHORIZONTAL)              classBox.Add(controlBox, 1, wxGROW, 10)
817          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)  
818    
         ###########  
819    
820          self.fields.SetSelection(self.__cur_field)          buttonBox = wxBoxSizer(wxHORIZONTAL)
821          self.__SelectField(self.__cur_field)          buttonBox.Add(button_try, 0, wxRIGHT|wxEXPAND, 10)
822            buttonBox.Add(button_revert, 0, wxRIGHT|wxEXPAND, 10)
823            buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
824            buttonBox.Add(button_close, 0, wxRIGHT|wxEXPAND, 10)
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)          topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
833    
834          self.SetAutoLayout(True)          self.SetAutoLayout(True)
835          self.SetSizer(topBox)          self.SetSizer(topBox)
836            topBox.Fit(self)
837            topBox.SetSizeHints(self)
838            self.Layout()
839    
840            ###########
841    
842            EVT_CHOICE(self, ID_PROPERTY_SELECT, self._OnFieldSelect)
843            EVT_TEXT(self, ID_PROPERTY_TITLE, self._OnTitleChanged)
844            EVT_BUTTON(self, wxID_OK, self._OnOK)
845            EVT_BUTTON(self, ID_PROPERTY_TRY, self._OnTry)
846            EVT_BUTTON(self, wxID_CANCEL, self._OnCloseBtn)
847            EVT_BUTTON(self, ID_PROPERTY_REVERT, self._OnRevert)
848    
849            EVT_BUTTON(self, ID_PROPERTY_ADD, self._OnAdd)
850            EVT_BUTTON(self, ID_PROPERTY_EDITSYM, self._OnEditSymbol)
851            EVT_BUTTON(self, ID_PROPERTY_REMOVE, self._OnRemove)
852            EVT_BUTTON(self, ID_PROPERTY_GENCLASS, self._OnGenClass)
853            EVT_BUTTON(self, ID_PROPERTY_MOVEUP, self._OnMoveUp)
854            EVT_BUTTON(self, ID_PROPERTY_MOVEDOWN, self._OnMoveDown)
855    
856          ######################          ######################
857    
858            text_title.SetFocus()
859          self.haveApplied = False          self.haveApplied = False
860    
861      def __BuildClassification(self, fieldIndex):      def unsubscribe_messages(self):
862            self.map.Unsubscribe(MAP_LAYERS_REMOVED, self.map_layers_removed)
863            self.layer.Unsubscribe(LAYER_SHAPESTORE_REPLACED,
864                                   self.layer_shapestore_replaced)
865    
866        def map_layers_removed(self, map):
867            if self.layer not in self.map.Layers():
868                self.Close()
869    
870          numRows = self.classGrid.GetNumberRows()      def layer_shapestore_replaced(self, *args):
871          assert(numRows > 0) # there should always be a default row          self.Close()
872    
873          clazz = Classification()      def EditSymbol(self, row):
874            table = self.classGrid.GetTable()
875            prop = table.GetValueAsCustom(row, COL_SYMBOL, None)
876    
877            # get a new ClassGroupProperties object and copy the
878            # values over to our current object
879            propDlg = SelectPropertiesDialog(NULL, prop, self.layer.ShapeType())
880    
881            self.Enable(False)
882            if propDlg.ShowModal() == wxID_OK:
883                new_prop = propDlg.GetClassGroupProperties()
884                table.SetValueAsCustom(row, COL_SYMBOL, None, new_prop)
885            self.Enable(True)
886            propDlg.Destroy()
887            
888        def _SetClassification(self, clazz):
889            
890            self.fields.SetClientData(self.__cur_field, clazz)
891            self.classGrid.GetTable().SetClassification(clazz)
892    
893        def __BuildClassification(self, fieldIndex, copyClass = False):
894    
895    #       numRows = self.classGrid.GetNumberRows()
896    #       assert numRows > 0  # there should always be a default row
897    
898    #       clazz = Classification()
899          if fieldIndex == 0:          if fieldIndex == 0:
900              fieldName = None              fieldName = None
901              fieldType = None              fieldType = None
# Line 740  class Classifier(NonModalDialog): Line 903  class Classifier(NonModalDialog):
903              fieldName = self.fields.GetString(fieldIndex)              fieldName = self.fields.GetString(fieldIndex)
904              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
905    
906            clazz = self.classGrid.GetTable().GetClassification()
907    
908            if copyClass:
909                clazz = copy.deepcopy(clazz)
910    
911          clazz.SetField(fieldName)          clazz.SetField(fieldName)
912          clazz.SetFieldType(fieldType)          clazz.SetFieldType(fieldType)
913    
914    
915          table = self.classGrid.GetTable()  #       table = self.classGrid.GetTable()
916          clazz.SetDefaultGroup(table.GetClassGroup(0))  #       clazz.SetDefaultGroup(table.GetClassGroup(0))
917    
918          for i in range(1, numRows):  #       for i in range(1, numRows):
919              clazz.AddGroup(table.GetClassGroup(i))  #           clazz.AppendGroup(table.GetClassGroup(i))
920    
921          return clazz          return clazz
922    
923      def __SetGridTable(self, fieldIndex):      def __SetGridTable(self, fieldIndex, group = None):
924    
925          clazz = self.fields.GetClientData(fieldIndex)          clazz = self.fields.GetClientData(fieldIndex)
926    
# Line 767  class Classifier(NonModalDialog): Line 935  class Classifier(NonModalDialog):
935              fieldType = self.layer.GetFieldType(fieldName)              fieldType = self.layer.GetFieldType(fieldName)
936              clazz.SetFieldType(fieldType)              clazz.SetFieldType(fieldType)
937                                    
938          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")}  
939    
940      def __SetFieldTypeText(self, fieldIndex):      def __SetFieldTypeText(self, fieldIndex):
941          fieldName = self.fields.GetString(fieldIndex)          fieldName = self.fields.GetString(fieldIndex)
942          fieldType = self.layer.GetFieldType(fieldName)          fieldType = self.layer.GetFieldType(fieldName)
943    
944          assert(Classifier.type2string.has_key(fieldType))          assert Classifier.type2string.has_key(fieldType)
945    
946          text = Classifier.type2string[fieldType]          text = Classifier.type2string[fieldType]
947    
948          self.fieldTypeText.SetLabel(_("Field Type: %s") % text)          self.fieldTypeText.SetLabel(_("Data Type: %s") % text)
949    
950      def __SelectField(self, newIndex, oldIndex = -1):      def __SelectField(self, newIndex, oldIndex = -1, group = None):
951            """This method assumes that the current selection for the
952            combo has already been set by a call to SetSelection().
953            """
954    
955          assert(oldIndex >= -1)          assert oldIndex >= -1
956    
957          if oldIndex != -1:          if oldIndex != -1:
958              clazz = self.__BuildClassification(oldIndex)              clazz = self.__BuildClassification(oldIndex)
959              self.fields.SetClientData(oldIndex, clazz)              self.fields.SetClientData(oldIndex, clazz)
960    
961          self.__SetGridTable(newIndex)          self.__SetGridTable(newIndex, group)
   
         enabled = newIndex != 0  
962    
963          for b in self.controlButtons:          self.__EnableButtons(EB_SELECT_FIELD, newIndex != 0)
             b.Enable(enabled)  
964    
965          self.__SetFieldTypeText(newIndex)          self.__SetFieldTypeText(newIndex)
966    
967        def __SetTitle(self, title):
968            if title != "":
969                title = ": " + title
970    
971            self.SetTitle(_("Layer Properties") + title)
972    
973        def _OnEditSymbol(self, event):
974            sel = self.classGrid.GetCurrentSelection()
975    
976            if len(sel) == 1:
977                self.EditSymbol(sel[0])
978    
979      def _OnFieldSelect(self, event):      def _OnFieldSelect(self, event):
980          index = self.fields.GetSelection()          index = self.fields.GetSelection()
981          self.__SelectField(index, self.__cur_field)          self.__SelectField(index, self.__cur_field)
982          self.__cur_field = index          self.__cur_field = index
983    
984      def _OnApply(self, event):      def _OnTry(self, event):
985          """Put the data from the table into a new Classification and hand          """Put the data from the table into a new Classification and hand
986             it to the layer.             it to the layer.
987          """          """
988    
989          clazz = self.fields.GetClientData(self.__cur_field)          if self.layer.HasClassification():
990                clazz = self.fields.GetClientData(self.__cur_field)
991    
992          #              #
993          # only build the classification if there wasn't one to              # only build the classification if there wasn't one to
994          # to begin with or it has been modified              # to begin with or it has been modified
995          #              #
996          if clazz is None or self.classGrid.GetTable().IsModified():              self.classGrid.SaveEditControlValue()
997              clazz = self.__BuildClassification(self.__cur_field)              if clazz is None or self.classGrid.GetTable().IsModified():
998                    clazz = self.__BuildClassification(self.__cur_field, True)
999    
1000          self.layer.SetClassification(clazz)              self.layer.SetClassification(clazz)
1001    
1002          self.haveApplied = True          self.haveApplied = True
1003    
1004      def _OnOK(self, event):      def _OnOK(self, event):
1005          self._OnApply(event)          self._OnTry(event)
1006          self.OnClose(event)          self.Close()
1007    
1008      def _OnCancel(self, event):      def OnClose(self, event):
1009            self.unsubscribe_messages()
1010            NonModalNonParentDialog.OnClose(self, event)
1011    
1012        def _OnCloseBtn(self, event):
1013            """Close is similar to Cancel except that any changes that were
1014            made and applied remain applied, but the currently displayed
1015            classification is discarded.
1016            """
1017    
1018            self.Close()
1019    
1020        def _OnRevert(self, event):
1021          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
1022          if self.haveApplied:          if self.haveApplied:
1023              self.layer.SetClassification(self.originalClass)              self.layer.SetClassification(self.originalClass)
1024    
1025          self.OnClose(event)          #self.Close()
1026    
1027      def _OnAdd(self, event):      def _OnAdd(self, event):
1028          self.classGrid.AppendRows()          self.classGrid.AppendRows()
# Line 844  class Classifier(NonModalDialog): Line 1030  class Classifier(NonModalDialog):
1030      def _OnRemove(self, event):      def _OnRemove(self, event):
1031          self.classGrid.DeleteSelectedRows()          self.classGrid.DeleteSelectedRows()
1032    
1033      def _OnGenRange(self, event):      def _OnGenClass(self, event):
1034          print "Classifier._OnGenRange()"  
1035            self.genDlg = ClassGenDialog(self, self.layer,
1036                              self.fields.GetString(self.__cur_field))
1037    
1038            EVT_CLOSE(self.genDlg, self._OnGenDialogClose)
1039    
1040            self.__EnableButtons(EB_GEN_CLASS, False)
1041    
1042            self.genDlg.Show()
1043    
1044        def _OnGenDialogClose(self, event):
1045            self.genDlg.Destroy()
1046            self.__EnableButtons(EB_GEN_CLASS, True)
1047    
1048      def _OnMoveUp(self, event):      def _OnMoveUp(self, event):
1049          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 860  class Classifier(NonModalDialog): Line 1058  class Classifier(NonModalDialog):
1058                  table.SetClassGroup(i, x)                  table.SetClassGroup(i, x)
1059                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1060                  self.classGrid.SelectRow(i - 1)                  self.classGrid.SelectRow(i - 1)
1061                    self.classGrid.MakeCellVisible(i - 1, 0)
1062    
1063      def _OnMoveDown(self, event):      def _OnMoveDown(self, event):
1064          sel = self.classGrid.GetCurrentSelection()          sel = self.classGrid.GetCurrentSelection()
# Line 874  class Classifier(NonModalDialog): Line 1073  class Classifier(NonModalDialog):
1073                  table.SetClassGroup(i + 1, x)                  table.SetClassGroup(i + 1, x)
1074                  self.classGrid.ClearSelection()                  self.classGrid.ClearSelection()
1075                  self.classGrid.SelectRow(i + 1)                  self.classGrid.SelectRow(i + 1)
1076                    self.classGrid.MakeCellVisible(i + 1, 0)
1077    
1078        def _OnTitleChanged(self, event):
1079            obj = event.GetEventObject()
1080    
1081            self.layer.SetTitle(obj.GetValue())
1082            self.__SetTitle(self.layer.Title())
1083    
1084            self.__EnableButtons(EB_LAYER_TITLE, self.layer.Title() != "")
1085    
1086        def __EnableButtons(self, case, enable):
1087    
1088            if case == EB_LAYER_TITLE:  
1089                list = (wxID_OK,
1090                        wxID_CANCEL)
1091    
1092            elif case == EB_SELECT_FIELD:
1093                list = (ID_PROPERTY_GENCLASS,
1094                        ID_PROPERTY_ADD,
1095                        ID_PROPERTY_MOVEUP,
1096                        ID_PROPERTY_MOVEDOWN,
1097                        ID_PROPERTY_EDITSYM,
1098                        ID_PROPERTY_REMOVE)
1099    
1100            elif case == EB_GEN_CLASS:
1101                list = (ID_PROPERTY_SELECT,
1102                        ID_PROPERTY_FIELDTEXT,
1103                        ID_PROPERTY_GENCLASS,
1104                        ID_PROPERTY_EDITSYM)
1105    
1106            for id in list:
1107                self.FindWindowById(id).Enable(enable)
1108    
 ID_SELPROP_OK = 4001  
 ID_SELPROP_CANCEL = 4002  
1109  ID_SELPROP_SPINCTRL = 4002  ID_SELPROP_SPINCTRL = 4002
1110  ID_SELPROP_PREVIEW = 4003  ID_SELPROP_PREVIEW = 4003
1111  ID_SELPROP_STROKECLR = 4004  ID_SELPROP_STROKECLR = 4004
# Line 901  class SelectPropertiesDialog(wxDialog): Line 1129  class SelectPropertiesDialog(wxDialog):
1129          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
1130          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
1131              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
1132          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,  
1133                                              self, ID_SELPROP_PREVIEW, (40, 40))          self.previewWin = ClassGroupPropertiesCtrl(
1134          previewBox.Add(self.previewWin, 1, wxGROW, 15)              self, ID_SELPROP_PREVIEW, self.prop, shapeType,
1135                (40, 40), wxSIMPLE_BORDER)
1136    
1137            self.previewWin.AllowEdit(False)
1138    
1139            previewBox.Add(self.previewWin, 1, wxGROW | wxALL, 4)
1140    
1141          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
1142    
# Line 911  class SelectPropertiesDialog(wxDialog): Line 1144  class SelectPropertiesDialog(wxDialog):
1144          ctrlBox = wxBoxSizer(wxVERTICAL)          ctrlBox = wxBoxSizer(wxVERTICAL)
1145    
1146          lineColorBox = wxBoxSizer(wxHORIZONTAL)          lineColorBox = wxBoxSizer(wxHORIZONTAL)
1147          lineColorBox.Add(          button = wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color"))
1148              wxButton(self, ID_SELPROP_STROKECLR, _("Change Line Color")),          button.SetFocus()
1149              1, wxALL | wxGROW, 4)          lineColorBox.Add(button, 1, wxALL | wxGROW, 4)
1150          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)          EVT_BUTTON(self, ID_SELPROP_STROKECLR, self._OnChangeLineColor)
1151    
1152          lineColorBox.Add(          lineColorBox.Add(
# Line 959  class SelectPropertiesDialog(wxDialog): Line 1192  class SelectPropertiesDialog(wxDialog):
1192          # Control buttons:          # Control buttons:
1193          #          #
1194          buttonBox = wxBoxSizer(wxHORIZONTAL)          buttonBox = wxBoxSizer(wxHORIZONTAL)
1195          buttonBox.Add(wxButton(self, ID_SELPROP_OK, _("OK")),          button_ok = wxButton(self, wxID_OK, _("OK"))
1196                        0, wxALL, 4)          button_ok.SetDefault()
1197          buttonBox.Add(wxButton(self, ID_SELPROP_CANCEL, _("Cancel")),          buttonBox.Add(button_ok, 0, wxRIGHT|wxEXPAND, 10)
1198                        0, wxALL, 4)          buttonBox.Add(wxButton(self, wxID_CANCEL, _("Cancel")),
1199          topBox.Add(buttonBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM, 10)                        0, wxRIGHT|wxEXPAND, 10)
1200            topBox.Add(buttonBox, 0, wxALIGN_RIGHT|wxBOTTOM|wxTOP, 10)
1201                                                                                                                                                                    
1202          EVT_BUTTON(self, ID_SELPROP_OK, self._OnOK)          #EVT_BUTTON(self, wxID_OK, self._OnOK)
1203          EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)          #EVT_BUTTON(self, ID_SELPROP_CANCEL, self._OnCancel)
1204                                                                                                                                                                    
1205          self.SetAutoLayout(True)          self.SetAutoLayout(True)
1206          self.SetSizer(topBox)          self.SetSizer(topBox)
1207          topBox.Fit(self)          topBox.Fit(self)
1208          topBox.SetSizeHints(self)          topBox.SetSizeHints(self)
1209    
1210      def _OnOK(self, event):      def OnOK(self, event):
1211          self.EndModal(wxID_OK)          self.EndModal(wxID_OK)
1212    
1213      def _OnCancel(self, event):      def OnCancel(self, event):
1214          self.EndModal(wxID_CANCEL)          self.EndModal(wxID_CANCEL)
1215    
1216      def _OnSpin(self, event):      def _OnSpin(self, event):
# Line 985  class SelectPropertiesDialog(wxDialog): Line 1219  class SelectPropertiesDialog(wxDialog):
1219    
1220      def __GetColor(self, cur):      def __GetColor(self, cur):
1221          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
1222          dialog.GetColourData().SetColour(Color2wxColour(cur))          if cur is not Color.Transparent:
1223                dialog.GetColourData().SetColour(Color2wxColour(cur))
1224    
1225          ret = None          ret = None
1226          if dialog.ShowModal() == wxID_OK:          if dialog.ShowModal() == wxID_OK:
1227              ret = wxColour2Color(dialog.GetColourData().GetColour())              ret = wxColour2Color(dialog.GetColourData().GetColour())
# Line 1001  class SelectPropertiesDialog(wxDialog): Line 1237  class SelectPropertiesDialog(wxDialog):
1237          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1238    
1239      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1240          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Color.Transparent)
1241          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1242                    
1243      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
# Line 1011  class SelectPropertiesDialog(wxDialog): Line 1247  class SelectPropertiesDialog(wxDialog):
1247          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1248    
1249      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1250          self.prop.SetFill(Color.None)          self.prop.SetFill(Color.Transparent)
1251          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1252    
1253      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
# Line 1032  class ClassDataPreviewWindow(wxWindow): Line 1268  class ClassDataPreviewWindow(wxWindow):
1268          self.shapeType = shapeType          self.shapeType = shapeType
1269          self.previewer = ClassDataPreviewer()          self.previewer = ClassDataPreviewer()
1270    
1271        def GetProperties():
1272            return self.prop
1273    
1274      def _OnPaint(self, event):      def _OnPaint(self, event):
1275          dc = wxPaintDC(self)          dc = wxPaintDC(self)
1276    
# Line 1050  class ClassDataPreviewer: Line 1289  class ClassDataPreviewer:
1289    
1290      def Draw(self, dc, rect, prop, shapeType):      def Draw(self, dc, rect, prop, shapeType):
1291    
1292          assert(dc is not None)          assert dc is not None
1293          assert(isinstance(prop, ClassGroupProperties))          assert isinstance(prop, ClassGroupProperties)
1294    
1295          if rect is None:          if rect is None:
1296              x = 0              x = 0
# Line 1064  class ClassDataPreviewer: Line 1303  class ClassDataPreviewer:
1303              h = rect.GetHeight()              h = rect.GetHeight()
1304    
1305          stroke = prop.GetLineColor()          stroke = prop.GetLineColor()
1306          if stroke is Color.None:          if stroke is Color.Transparent:
1307              pen = wxTRANSPARENT_PEN              pen = wxTRANSPARENT_PEN
1308          else:          else:
1309              pen = wxPen(Color2wxColour(stroke),              pen = wxPen(Color2wxColour(stroke),
# Line 1072  class ClassDataPreviewer: Line 1311  class ClassDataPreviewer:
1311                          wxSOLID)                          wxSOLID)
1312    
1313          stroke = prop.GetFill()          stroke = prop.GetFill()
1314          if stroke is Color.None:          if stroke is Color.Transparent:
1315              brush = wxTRANSPARENT_BRUSH              brush = wxTRANSPARENT_BRUSH
1316          else:          else:
1317              brush = wxBrush(Color2wxColour(stroke), wxSOLID)              brush = wxBrush(Color2wxColour(stroke), wxSOLID)
# Line 1086  class ClassDataPreviewer: Line 1325  class ClassDataPreviewer:
1325                             wxPoint(x + w/2, y + h/4*3),                             wxPoint(x + w/2, y + h/4*3),
1326                             wxPoint(x + w, y)])                             wxPoint(x + w, y)])
1327    
1328          elif shapeType == SHAPETYPE_POINT or \          elif shapeType == SHAPETYPE_POINT:
              shapeType == SHAPETYPE_POLYGON:  
1329    
1330              dc.DrawCircle(x + w/2, y + h/2,              dc.DrawCircle(x + w/2, y + h/2,
1331                            (min(w, h) - prop.GetLineWidth())/2)                            (min(w, h) - prop.GetLineWidth())/2)
1332    
1333            elif shapeType == SHAPETYPE_POLYGON:
1334                dc.DrawRectangle(x, y, w, h)
1335    
1336  class ClassRenderer(wxPyGridCellRenderer):  class ClassRenderer(wxPyGridCellRenderer):
1337    
1338      def __init__(self, shapeType):      def __init__(self, shapeType):
# Line 1113  class ClassRenderer(wxPyGridCellRenderer Line 1354  class ClassRenderer(wxPyGridCellRenderer
1354              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1355    
1356          if isSelected:          if isSelected:
1357              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxBLACK, 1, wxSOLID))
                       4, wxSOLID))  
1358              dc.SetBrush(wxTRANSPARENT_BRUSH)              dc.SetBrush(wxTRANSPARENT_BRUSH)
1359    
1360              dc.DrawRectangle(rect.GetX(), rect.GetY(),              dc.DrawRectangle(rect.GetX(), rect.GetY(),
1361                               rect.GetWidth(), rect.GetHeight())                               rect.GetWidth(), rect.GetHeight())
1362    
1363          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1364    
1365    
1366    class ClassGroupPropertiesCtrl(wxWindow, wxControl):
1367    
1368        def __init__(self, parent, id, props, shapeType,
1369                     size = wxDefaultSize, style = 0):
1370    
1371            wxWindow.__init__(self, parent, id, size = size, style = style)
1372    
1373            self.SetProperties(props)
1374            self.SetShapeType(shapeType)
1375            self.AllowEdit(True)
1376    
1377            EVT_PAINT(self, self._OnPaint)
1378            EVT_LEFT_DCLICK(self, self._OnLeftDClick)
1379    
1380            self.previewer = ClassDataPreviewer()
1381    
1382        def _OnPaint(self, event):
1383            dc = wxPaintDC(self)
1384    
1385            # XXX: this doesn't seem to be having an effect:
1386            dc.DestroyClippingRegion()
1387    
1388            w, h = self.GetClientSize()
1389    
1390            self.previewer.Draw(dc,
1391                                wxRect(0, 0, w, h),
1392                                self.GetProperties(),
1393                                self.GetShapeType())
1394    
1395    
1396        def GetProperties(self):
1397            return self.props
1398    
1399        def SetProperties(self, props):
1400            self.props = props
1401            self.Refresh()
1402    
1403        def GetShapeType(self):
1404            return self.shapeType
1405    
1406        def SetShapeType(self, shapeType):
1407            self.shapeType = shapeType
1408            self.Refresh()
1409    
1410        def AllowEdit(self, allow):
1411            self.allowEdit = allow
1412    
1413        def DoEdit(self):
1414            if not self.allowEdit: return
1415    
1416            propDlg = SelectPropertiesDialog(NULL,
1417                                             self.GetProperties(),
1418                                             self.GetShapeType())
1419    
1420            if propDlg.ShowModal() == wxID_OK:
1421                new_prop = propDlg.GetClassGroupProperties()
1422                self.SetProperties(new_prop)
1423                self.Refresh()
1424    
1425            propDlg.Destroy()
1426    
1427        def _OnLeftDClick(self, event):
1428            self.DoEdit()
Legend:
Removed from v.549  
changed lines
  Added in v.1207
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26