Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch #1441370: lib.plot - allow passing in wx.Colour()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-03-10 17:44:48 +00:00
parent cc59d93963
commit b0d45269cc
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wxPython/wx/lib/plot.py
View File

@@ -201,7 +201,9 @@ class PolyLine(PolyPoints):
colour = self.attributes['colour'] colour = self.attributes['colour']
width = self.attributes['width'] * printerScale width = self.attributes['width'] * printerScale
style= self.attributes['style'] 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) pen.SetCap(wx.CAP_BUTT)
dc.SetPen(pen) dc.SetPen(pen)
if coord == None: if coord == None:
@@ -262,11 +264,16 @@ class PolyMarker(PolyPoints):
fillstyle = self.attributes['fillstyle'] fillstyle = self.attributes['fillstyle']
marker = self.attributes['marker'] 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: if coord == None:
self._drawmarkers(dc, self.scaled, marker, size) self._drawmarkers(dc, self.scaled, marker, size)
else: else:
@@ -487,6 +494,17 @@ class PlotCanvas(wx.Window):
if wx.Platform != "__WXMAC__": if wx.Platform != "__WXMAC__":
self.OnSize(None) # sets the initial size based on client size 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 # SaveFile
def SaveFile(self, fileName= ''): def SaveFile(self, fileName= ''):
@@ -1226,7 +1244,7 @@ class PlotCanvas(wx.Window):
def _drawAxes(self, dc, p1, p2, scale, shift, xticks, yticks): def _drawAxes(self, dc, p1, p2, scale, shift, xticks, yticks):
penWidth= self.printerScale # increases thickness for printing only 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 # set length of tick marks--long ones make grid
if self._gridEnabled: if self._gridEnabled: