/[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 519 by jonathan, Tue Mar 11 22:27:35 2003 UTC revision 549 by jonathan, Thu Mar 20 09:45:07 2003 UTC
# Line 580  class ClassTable(wxPyGridTableBase): Line 580  class ClassTable(wxPyGridTableBase):
580    
581    
582  class Classifier(NonModalDialog):  class Classifier(NonModalDialog):
583        
584      def __init__(self, parent, interactor, name, layer):      def __init__(self, parent, name, layer):
585          NonModalDialog.__init__(self, parent, interactor, name,          NonModalDialog.__init__(self, parent, name,
586                                  _("Classifier: %s") % layer.Title())                                  _("Classifier: %s") % layer.Title())
587    
588          panel = wxPanel(self, -1, size=(100, 100))          panel = wxPanel(self, -1, size=(100, 100))
# Line 723  class Classifier(NonModalDialog): Line 723  class Classifier(NonModalDialog):
723          self.SetAutoLayout(True)          self.SetAutoLayout(True)
724          self.SetSizer(topBox)          self.SetSizer(topBox)
725    
726            ######################
727    
728            self.haveApplied = False
729    
730      def __BuildClassification(self, fieldIndex):      def __BuildClassification(self, fieldIndex):
731    
732          numRows = self.classGrid.GetNumberRows()          numRows = self.classGrid.GetNumberRows()
# Line 821  class Classifier(NonModalDialog): Line 825  class Classifier(NonModalDialog):
825    
826          self.layer.SetClassification(clazz)          self.layer.SetClassification(clazz)
827    
828            self.haveApplied = True
829    
830      def _OnOK(self, event):      def _OnOK(self, event):
831          self._OnApply(event)          self._OnApply(event)
832          self.OnClose(event)          self.OnClose(event)
833    
834      def _OnCancel(self, event):      def _OnCancel(self, event):
835          """The layer's current classification stays the same."""          """The layer's current classification stays the same."""
836          self.layer.SetClassification(self.originalClass)          if self.haveApplied:
837                self.layer.SetClassification(self.originalClass)
838    
839          self.OnClose(event)          self.OnClose(event)
840    
841      def _OnAdd(self, event):      def _OnAdd(self, event):
# Line 893  class SelectPropertiesDialog(wxDialog): Line 901  class SelectPropertiesDialog(wxDialog):
901          previewBox = wxBoxSizer(wxVERTICAL)          previewBox = wxBoxSizer(wxVERTICAL)
902          previewBox.Add(wxStaticText(self, -1, _("Preview:")),          previewBox.Add(wxStaticText(self, -1, _("Preview:")),
903              0, wxALIGN_LEFT | wxALL, 4)              0, wxALIGN_LEFT | wxALL, 4)
904          self.previewer = ClassDataPreviewer(None, self.prop, shapeType,          self.previewWin = ClassDataPreviewWindow(None, self.prop, shapeType,
905                                              self, ID_SELPROP_PREVIEW, (40, 40))                                              self, ID_SELPROP_PREVIEW, (40, 40))
906          previewBox.Add(self.previewer, 1, wxGROW, 15)          previewBox.Add(self.previewWin, 1, wxGROW, 15)
907    
908          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)          itemBox.Add(previewBox, 1, wxALIGN_LEFT | wxALL | wxGROW, 0)
909    
# Line 973  class SelectPropertiesDialog(wxDialog): Line 981  class SelectPropertiesDialog(wxDialog):
981    
982      def _OnSpin(self, event):      def _OnSpin(self, event):
983          self.prop.SetLineWidth(self.spinCtrl.GetValue())          self.prop.SetLineWidth(self.spinCtrl.GetValue())
984          self.previewer.Refresh()          self.previewWin.Refresh()
985    
986      def __GetColor(self, cur):      def __GetColor(self, cur):
987          dialog = wxColourDialog(self)          dialog = wxColourDialog(self)
# Line 990  class SelectPropertiesDialog(wxDialog): Line 998  class SelectPropertiesDialog(wxDialog):
998          clr = self.__GetColor(self.prop.GetLineColor())          clr = self.__GetColor(self.prop.GetLineColor())
999          if clr is not None:          if clr is not None:
1000              self.prop.SetLineColor(clr)              self.prop.SetLineColor(clr)
1001          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1002    
1003      def _OnChangeLineColorTrans(self, event):      def _OnChangeLineColorTrans(self, event):
1004          self.prop.SetLineColor(Color.None)          self.prop.SetLineColor(Color.None)
1005          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1006                    
1007      def _OnChangeFillColor(self, event):      def _OnChangeFillColor(self, event):
1008          clr = self.__GetColor(self.prop.GetFill())          clr = self.__GetColor(self.prop.GetFill())
1009          if clr is not None:          if clr is not None:
1010              self.prop.SetFill(clr)              self.prop.SetFill(clr)
1011          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1012    
1013      def _OnChangeFillColorTrans(self, event):      def _OnChangeFillColorTrans(self, event):
1014          self.prop.SetFill(Color.None)          self.prop.SetFill(Color.None)
1015          self.previewer.Refresh() # XXX: work around, see ClassDataPreviewer          self.previewWin.Refresh() # XXX: work around, see ClassDataPreviewer
1016    
1017      def GetClassGroupProperties(self):      def GetClassGroupProperties(self):
1018          return self.prop          return self.prop
1019    
1020    
1021  class ClassDataPreviewer(wxWindow):  class ClassDataPreviewWindow(wxWindow):
1022    
1023      def __init__(self, rect, prop, shapeType,      def __init__(self, rect, prop, shapeType,
1024                         parent = None, id = -1, size = wxDefaultSize):                         parent = None, id = -1, size = wxDefaultSize):
1025          if parent is not None:          if parent is not None:
1026              wxWindow.__init__(self, parent, id, size=size)              wxWindow.__init__(self, parent, id, (0, 0), size)
1027              EVT_PAINT(self, self._OnPaint)              EVT_PAINT(self, self._OnPaint)
1028    
1029          self.rect = rect          self.rect = rect
1030    
1031          self.prop = prop          self.prop = prop
1032          self.shapeType = shapeType          self.shapeType = shapeType
1033            self.previewer = ClassDataPreviewer()
1034    
1035      def _OnPaint(self, event):      def _OnPaint(self, event):
1036          dc = wxPaintDC(self)          dc = wxPaintDC(self)
# Line 1028  class ClassDataPreviewer(wxWindow): Line 1038  class ClassDataPreviewer(wxWindow):
1038          # XXX: this doesn't seem to be having an effect:          # XXX: this doesn't seem to be having an effect:
1039          dc.DestroyClippingRegion()          dc.DestroyClippingRegion()
1040    
1041          self.Draw(dc, None)          if self.rect is None:
1042                w, h = self.GetSize()
1043                rect = wxRect(0, 0, w, h)
1044            else:
1045                rect = self.rect
1046    
1047            self.previewer.Draw(dc, rect, self.prop, self.shapeType)
1048    
1049      def Draw(self, dc, rect, prop = None, shapeType = None):  class ClassDataPreviewer:
1050    
1051          if prop is None: prop = self.prop      def Draw(self, dc, rect, prop, shapeType):
1052          if shapeType is None: shapeType = self.shapeType  
1053            assert(dc is not None)
1054            assert(isinstance(prop, ClassGroupProperties))
1055    
1056          if rect is None:          if rect is None:
1057              x = y = 0              x = 0
1058              w, h = self.GetClientSizeTuple()              y = 0
1059                w, h = dc.GetSize()
1060          else:          else:
1061              x = rect.GetX()              x = rect.GetX()
1062              y = rect.GetY()              y = rect.GetY()
# Line 1077  class ClassRenderer(wxPyGridCellRenderer Line 1096  class ClassRenderer(wxPyGridCellRenderer
1096    
1097      def __init__(self, shapeType):      def __init__(self, shapeType):
1098          wxPyGridCellRenderer.__init__(self)          wxPyGridCellRenderer.__init__(self)
1099          self.previewer = ClassDataPreviewer(None, None, shapeType)          self.shapeType = shapeType
1100            self.previewer = ClassDataPreviewer()
1101    
1102      def Draw(self, grid, attr, dc, rect, row, col, isSelected):      def Draw(self, grid, attr, dc, rect, row, col, isSelected):
1103          data = grid.GetTable().GetClassGroup(row)          data = grid.GetTable().GetClassGroup(row)
# Line 1090  class ClassRenderer(wxPyGridCellRenderer Line 1110  class ClassRenderer(wxPyGridCellRenderer
1110                           rect.GetWidth(), rect.GetHeight())                           rect.GetWidth(), rect.GetHeight())
1111    
1112          if not isinstance(data, ClassGroupMap):          if not isinstance(data, ClassGroupMap):
1113              self.previewer.Draw(dc, rect, data.GetProperties())              self.previewer.Draw(dc, rect, data.GetProperties(), self.shapeType)
1114    
1115          if isSelected:          if isSelected:
1116              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),              dc.SetPen(wxPen(wxColour(0 * 255, 0 * 255, 0 * 255),
Legend:
Removed from v.519  
changed lines
  Added in v.549
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26