From c86d320b5a21fcafd19dd6671ad1ef35e20c355f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Wed, 21 Apr 2004 09:31:42 +0000 Subject: [PATCH] splitted drawpoints into initdrawpoints/drawpoint/donedrawpoints git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@1697 069f4177-920e-0410-937b-c2a4a81bcd90 --- pyx/graph/data.py | 8 +++++++- pyx/graph/style.py | 23 ++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pyx/graph/data.py b/pyx/graph/data.py index 9d64a048..12826d4a 100644 --- a/pyx/graph/data.py +++ b/pyx/graph/data.py @@ -112,7 +112,13 @@ class _data: def draw(self, graph): for style in self.styles: - style.drawpoints(self.points, graph, self.styledata) + style.initdrawpoints(graph, self.styledata) + for point in self.points: + self.styledata.point = point + for style in self.styles: + style.drawpoint(graph, self.styledata) + for style in self.styles: + style.donedrawpoints(graph, self.styledata) class list(_data): diff --git a/pyx/graph/style.py b/pyx/graph/style.py index d52a9d34..72d04a1e 100644 --- a/pyx/graph/style.py +++ b/pyx/graph/style.py @@ -435,7 +435,7 @@ class symbolline(_style): if len(errorpath.path): styledata.errorbarcanvas.stroke(errorpath, styledata.errorbarattrs) - def drawpoints(self, points, graph, styledata): + def initdrawpoints(self, graph, styledata): if styledata.lineattrs is not None: # TODO: bbox shortcut linecanvas = graph.insert(canvas.canvas()) @@ -454,16 +454,17 @@ class symbolline(_style): styledata.errorlist.append((axisname, axisindex)) axisindex += 1 - for point in points: - styledata.point = point - self.vpos(styledata) - if styledata.drawsymbol: - styledata.xpos, styledata.ypos = graph.vpos_pt(*styledata.vpos) - self.drawsymbol_pt(graph, styledata.xpos, styledata.ypos, styledata, point=styledata.point) - self.appendlinebasepoints(styledata) - if not styledata.validvpos: - self.addpointstopath(styledata) - self.doerrorbars(styledata) + def drawpoint(self, graph, styledata): + self.vpos(styledata) + if styledata.drawsymbol: + styledata.xpos, styledata.ypos = graph.vpos_pt(*styledata.vpos) + self.drawsymbol_pt(graph, styledata.xpos, styledata.ypos, styledata, point=styledata.point) + self.appendlinebasepoints(styledata) + if not styledata.validvpos: + self.addpointstopath(styledata) + self.doerrorbars(styledata) + + def donedrawpoints(self, graph, styledata): self.addpointstopath(styledata) # stroke styledata.path -- 2.11.4.GIT