From 447159f61137ee6da808c446a6c3404618f48b11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rg=20Lehmann?= Date: Fri, 7 Mar 2003 09:09:20 +0000 Subject: [PATCH] - remove python2.2ism - simplify arrows size calculation git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@709 069f4177-920e-0410-937b-c2a4a81bcd90 --- pyx/canvas.py | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pyx/canvas.py b/pyx/canvas.py index 9df7243e..c864bcf5 100644 --- a/pyx/canvas.py +++ b/pyx/canvas.py @@ -482,7 +482,8 @@ class arrow(PathDeco): for style in s.styles ] styles = [ style for style in styles - if not isinstance(style, (filled, stroked)) ] + if not (isinstance(style, filled) or + isinstance(style, stroked)) ] return arrow(position=self.position, size=self.size, @@ -560,21 +561,21 @@ class barrow(arrow): strokestyles=strokestyles, fillstyles=fillstyles) -_base = 4 +_base = unit.v_pt(4) -barrow.SMALL = barrow("%f v pt" % (_base/math.sqrt(64))) -barrow.SMALl = barrow("%f v pt" % (_base/math.sqrt(32))) -barrow.SMAll = barrow("%f v pt" % (_base/math.sqrt(16))) -barrow.SMall = barrow("%f v pt" % (_base/math.sqrt(8))) -barrow.Small = barrow("%f v pt" % (_base/math.sqrt(4))) -barrow.small = barrow("%f v pt" % (_base/math.sqrt(2))) -barrow.normal = barrow("%f v pt" % _base) -barrow.large = barrow("%f v pt" % (_base*math.sqrt(2))) -barrow.Large = barrow("%f v pt" % (_base*math.sqrt(4))) -barrow.LArge = barrow("%f v pt" % (_base*math.sqrt(8))) -barrow.LARge = barrow("%f v pt" % (_base*math.sqrt(16))) -barrow.LARGe = barrow("%f v pt" % (_base*math.sqrt(32))) -barrow.LARGE = barrow("%f v pt" % (_base*math.sqrt(64))) +barrow.SMALL = barrow(_base/math.sqrt(64)) +barrow.SMALl = barrow(_base/math.sqrt(32)) +barrow.SMAll = barrow(_base/math.sqrt(16)) +barrow.SMall = barrow(_base/math.sqrt(8)) +barrow.Small = barrow(_base/math.sqrt(4)) +barrow.small = barrow(_base/math.sqrt(2)) +barrow.normal = barrow(_base) +barrow.large = barrow(_base*math.sqrt(2)) +barrow.Large = barrow(_base*math.sqrt(4)) +barrow.LArge = barrow(_base*math.sqrt(8)) +barrow.LARge = barrow(_base*math.sqrt(16)) +barrow.LARGe = barrow(_base*math.sqrt(32)) +barrow.LARGE = barrow(_base*math.sqrt(64)) class earrow(arrow): @@ -593,19 +594,19 @@ class earrow(arrow): fillstyles=fillstyles) -earrow.SMALL = earrow("%f v pt" % (_base/math.sqrt(64))) -earrow.SMALl = earrow("%f v pt" % (_base/math.sqrt(32))) -earrow.SMAll = earrow("%f v pt" % (_base/math.sqrt(16))) -earrow.SMall = earrow("%f v pt" % (_base/math.sqrt(8))) -earrow.Small = earrow("%f v pt" % (_base/math.sqrt(4))) -earrow.small = earrow("%f v pt" % (_base/math.sqrt(2))) -earrow.normal = earrow("%f v pt" % _base) -earrow.large = earrow("%f v pt" % (_base*math.sqrt(2))) -earrow.Large = earrow("%f v pt" % (_base*math.sqrt(4))) -earrow.LArge = earrow("%f v pt" % (_base*math.sqrt(8))) -earrow.LARge = earrow("%f v pt" % (_base*math.sqrt(16))) -earrow.LARGe = earrow("%f v pt" % (_base*math.sqrt(32))) -earrow.LARGE = earrow("%f v pt" % (_base*math.sqrt(64))) +earrow.SMALL = earrow(_base/math.sqrt(64)) +earrow.SMALl = earrow(_base/math.sqrt(32)) +earrow.SMAll = earrow(_base/math.sqrt(16)) +earrow.SMall = earrow(_base/math.sqrt(8)) +earrow.Small = earrow(_base/math.sqrt(4)) +earrow.small = earrow(_base/math.sqrt(2)) +earrow.normal = earrow(_base) +earrow.large = earrow(_base*math.sqrt(2)) +earrow.Large = earrow(_base*math.sqrt(4)) +earrow.LArge = earrow(_base*math.sqrt(8)) +earrow.LARge = earrow(_base*math.sqrt(16)) +earrow.LARGe = earrow(_base*math.sqrt(32)) +earrow.LARGE = earrow(_base*math.sqrt(64)) # # clipping class -- 2.11.4.GIT