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