wxTinderbox build fix.

[wxWidgets.git] / wxPython / wx / lib / plot.py

diff --git a/wxPython/wx/lib/plot.py b/wxPython/wx/lib/plot.py
index a5fbb89e98031198ddd9ec0784579b70eb617085..251d3a54beabd14c0a68335b0a72adaa489ba714 100644 (file)
--- a/wxPython/wx/lib/plot.py
+++ b/wxPython/wx/lib/plot.py
@@ -201,7 +201,9 @@ class PolyLine(PolyPoints):
         colour = self.attributes['colour']
         width = self.attributes['width'] * printerScale
         style= self.attributes['style']
         colour = self.attributes['colour']
         width = self.attributes['width'] * printerScale
         style= self.attributes['style']

-        pen = wx.Pen(wx.NamedColour(colour), width, style)
+        if not isinstance(colour, wx.Colour):
+            colour = wx.NamedColour(colour)
+        pen = wx.Pen(colour, width, style)

         pen.SetCap(wx.CAP_BUTT)
         dc.SetPen(pen)
         if coord == None:
         pen.SetCap(wx.CAP_BUTT)
         dc.SetPen(pen)
         if coord == None:


@@ -262,11 +264,16 @@ class PolyMarker(PolyPoints):
         fillstyle = self.attributes['fillstyle']
         marker = self.attributes['marker']
 
         fillstyle = self.attributes['fillstyle']
         marker = self.attributes['marker']
 

-        dc.SetPen(wx.Pen(wx.NamedColour(colour), width))
+        if colour and not isinstance(colour, wx.Colour):
+            colour = wx.NamedColour(colour)
+        if fillcolour and not isinstance(fillcolour, wx.Colour):
+            fillcolour = wx.NamedColour(fillcolour)
+            
+        dc.SetPen(wx.Pen(colour, width))

         if fillcolour:
         if fillcolour:

-            dc.SetBrush(wx.Brush(wx.NamedColour(fillcolour),fillstyle))
+            dc.SetBrush(wx.Brush(fillcolour,fillstyle))

         else:
         else:

-            dc.SetBrush(wx.Brush(wx.NamedColour(colour), fillstyle))
+            dc.SetBrush(wx.Brush(colour, fillstyle))

         if coord == None:
             self._drawmarkers(dc, self.scaled, marker, size)
         else:
         if coord == None:
             self._drawmarkers(dc, self.scaled, marker, size)
         else:


@@ -487,6 +494,17 @@ class PlotCanvas(wx.Window):
         if wx.Platform != "__WXMAC__":
             self.OnSize(None) # sets the initial size based on client size
 
         if wx.Platform != "__WXMAC__":
             self.OnSize(None) # sets the initial size based on client size
 

+        self._gridColour = wx.NamedColour('black')
+
+    def GetGridColour(self):
+        return self._gridColour
+
+    def SetGridColour(self, colour):
+        if isinstance(colour, wx.Colour):
+            self._gridColour = colour
+        else:
+            self._gridColour = wx.NamedColour(colour)
+

         
     # SaveFile
     def SaveFile(self, fileName= ''):
         
     # SaveFile
     def SaveFile(self, fileName= ''):


@@ -564,8 +582,7 @@ class PlotCanvas(wx.Window):
         """Print current plot."""
         if paper != None:
             self.print_data.SetPaperId(paper)
         """Print current plot."""
         if paper != None:
             self.print_data.SetPaperId(paper)

-        pdd = wx.PrintDialogData()
-        pdd.SetPrintData(self.print_data)
+        pdd = wx.PrintDialogData(self.print_data)

         printer = wx.Printer(pdd)
         out = PlotPrintout(self)
         print_ok = printer.Print(self.parent, out)
         printer = wx.Printer(pdd)
         out = PlotPrintout(self)
         print_ok = printer.Print(self.parent, out)


@@ -689,7 +706,7 @@ class PlotCanvas(wx.Window):
     def ScrollUp(self, units):
         """Move view up number of axis units."""
         self.last_PointLabel = None        #reset pointLabel
     def ScrollUp(self, units):
         """Move view up number of axis units."""
         self.last_PointLabel = None        #reset pointLabel

-        if self.last_draw is not None:         
+        if self.last_draw is not None:

              graphics, xAxis, yAxis= self.last_draw
              yAxis= (yAxis[0]+units, yAxis[1]+units)
              self.Draw(graphics,xAxis,yAxis)
              graphics, xAxis, yAxis= self.last_draw
              yAxis= (yAxis[0]+units, yAxis[1]+units)
              self.Draw(graphics,xAxis,yAxis)


@@ -1227,7 +1244,7 @@ class PlotCanvas(wx.Window):
     def _drawAxes(self, dc, p1, p2, scale, shift, xticks, yticks):
         
         penWidth= self.printerScale        # increases thickness for printing only
     def _drawAxes(self, dc, p1, p2, scale, shift, xticks, yticks):
         
         penWidth= self.printerScale        # increases thickness for printing only

-        dc.SetPen(wx.Pen(wx.NamedColour('BLACK'), penWidth))
+        dc.SetPen(wx.Pen(self._gridColour, penWidth))

         
         # set length of tick marks--long ones make grid
         if self._gridEnabled:
         
         # set length of tick marks--long ones make grid
         if self._gridEnabled: