From be483e21d844ba1b585891c1d07ec8d4bc56678d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Wed, 17 Oct 2012 11:08:31 +0000 Subject: [PATCH] fix columnnames and adjustaxis method signatures git-svn-id: http://svn.code.sf.net/p/pyx/code/trunk/pyx@3317 a4f5e268-e194-4f32-bce1-d30804cbbcc5 --- examples/graphstyles/cal.py | 4 ++-- examples/graphstyles/changesymbol.py | 6 +++--- pyx/graph/style.py | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/graphstyles/cal.py b/examples/graphstyles/cal.py index ccb004eb..aaf3bf50 100644 --- a/examples/graphstyles/cal.py +++ b/examples/graphstyles/cal.py @@ -3,7 +3,7 @@ from pyx import * class daystyle(graph.style._style): - def columnnames(self, privatedata, sharedata, graph, columnnames): + def columnnames(self, privatedata, sharedata, graph, columnnames, dataaxisnames): # register the new column names usecolumnnames = ["day", "month", "weekday", "note"] for columnname in usecolumnnames: @@ -11,7 +11,7 @@ class daystyle(graph.style._style): raise ValueError("column '%s' missing" % columnname) return usecolumnnames - def adjustaxis(self, privatedata, sharedata, graph, columnname, data): + def adjustaxis(self, privatedata, sharedata, graph, plotitem, columnname, data): # adjust axes ranges if columnname == "month": graph.axes["x"].adjustaxis([(x, 0) for x in data]) diff --git a/examples/graphstyles/changesymbol.py b/examples/graphstyles/changesymbol.py index cb0d1a0a..59a0fd94 100644 --- a/examples/graphstyles/changesymbol.py +++ b/examples/graphstyles/changesymbol.py @@ -15,15 +15,15 @@ class changesymbol(graph.style.symbol): self.gradient = gradient graph.style.symbol.__init__(self, symbol=symbol, symbolattrs=symbolattrs, **kwargs) - def columnnames(self, privatedata, sharedata, agraph, columnnames): + def columnnames(self, privatedata, sharedata, agraph, columnnames, dataaxisnames): # register the new column names if self.sizecolumnname not in columnnames: raise ValueError("column '%s' missing" % self.sizecolumnname) if self.colorcolumnname not in columnnames: raise ValueError("column '%s' missing" % self.colorcolumnname) return ([self.sizecolumnname, self.colorcolumnname] + - graph.style.symbol.columnnames(self, privatedata, - sharedata, agraph, columnnames)) + graph.style.symbol.columnnames(self, privatedata, sharedata, agraph, + columnnames, dataaxisnames)) def drawpoint(self, privatedata, sharedata, graph, point): # replace the original drawpoint method by a slightly revised one diff --git a/pyx/graph/style.py b/pyx/graph/style.py index d2e4cf61..0fdede78 100644 --- a/pyx/graph/style.py +++ b/pyx/graph/style.py @@ -115,6 +115,7 @@ class _style: pass +class _marker: pass class _autokeygraph: pass @@ -864,7 +865,7 @@ class text(_styleneedingpointpos): if self.dyname not in columnnames: raise ValueError("column '%s' missing" % self.dyname) names.append(self.dyname) - return names + _styleneedingpointpos.columnnames(self, privatedata, sharedata, graph, columnnames) + return names + _styleneedingpointpos.columnnames(self, privatedata, sharedata, graph, columnnames, dataaxisnames) def selectstyle(self, privatedata, sharedata, graph, selectindex, selecttotal): if self.textattrs is not None: @@ -927,7 +928,7 @@ class arrow(_styleneedingpointpos): raise ValueError("size missing") if "angle" not in columnnames: raise ValueError("angle missing") - return ["size", "angle"] + _styleneedingpointpos.columnnames(self, privatedata, sharedata, graph, columnnames) + return ["size", "angle"] + _styleneedingpointpos.columnnames(self, privatedata, sharedata, graph, columnnames, dataaxisnames) def selectstyle(self, privatedata, sharedata, graph, selectindex, selecttotal): if self.lineattrs is not None: -- 2.11.4.GIT