diff options
| author | Alvin Penner <penner@vaxxine.com> | 2014-02-08 13:00:21 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2014-02-08 13:00:21 +0000 |
| commit | e099764f90ea719b1ba330581a080fd1b508cf2b (patch) | |
| tree | 3039e70633b5aa5433e69aa9a17b5ce43a0c222b | |
| parent | DrawingContext: change variable names ct to dc (bug #1272073) (diff) | |
| download | inkscape-e099764f90ea719b1ba330581a080fd1b508cf2b.tar.gz inkscape-e099764f90ea719b1ba330581a080fd1b508cf2b.zip | |
reverting triangle.py and wireframe_sphere.py from rev 13007
(bzr r13010)
| -rwxr-xr-x | share/extensions/triangle.py | 7 | ||||
| -rwxr-xr-x | share/extensions/wireframe_sphere.py | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py index ad26c6891..81945f370 100755 --- a/share/extensions/triangle.py +++ b/share/extensions/triangle.py @@ -82,7 +82,7 @@ def draw_tri_from_3_sides(s_a, s_b, s_c, offset, parent): #draw a triangle from offy = c[1]/2 #c is the highest point offset = ( offset[0]-offx , offset[1]-offy ) #add the centre of the triangle to the offset - draw_SVG_tri(a, b, c , offset, Grid_Polar.unittouu(e, '2px'), 'Triangle', parent) + draw_SVG_tri(a, b, c , offset, 2, 'Triangle', parent) else: sys.stderr.write('Error:Invalid Triangle Specifications.\n') @@ -122,10 +122,7 @@ class Grid_Polar(inkex.Effect): tri = self.current_layer offset = (self.view_center[0],self.view_center[1]) #the offset require to centre the triangle - self.options.s_a = self.unittouu(str(self.options.s_a) + 'px') - self.options.s_b = self.unittouu(str(self.options.s_b) + 'px') - self.options.s_c = self.unittouu(str(self.options.s_c) + 'px') - + if self.options.mode == '3_sides': s_a = self.options.s_a s_b = self.options.s_b diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index b8947869c..5804a1b45 100755 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -66,7 +66,7 @@ inkex.localize() def draw_SVG_ellipse((rx, ry), (cx, cy), parent, start_end=(0,2*pi),transform='' ): style = { 'stroke' : '#000000', - 'stroke-width' : str(Wireframe_Sphere.unittouu(e, '1px')), + 'stroke-width' : '1', 'fill' : 'none' } circ_attribs = {'style':simplestyle.formatStyle(style), inkex.addNS('cx','sodipodi') :str(cx), @@ -120,7 +120,6 @@ class Wireframe_Sphere(inkex.Effect): else: flip = '' #no flip - so.RADIUS = self.unittouu(str(so.RADIUS) + 'px') so.TILT = abs(so.TILT)*(pi/180) #Convert to radians so.ROT_OFFSET = so.ROT_OFFSET*(pi/180) #Convert to radians |