From 1a921db33cb28e1097eb9f6c86bfb1c0ed2ca34b Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Sun, 4 Apr 2021 01:51:59 +0200 Subject: [PATCH] small updates --- extensions/fablabchemnitz/CardLayoutGuides.py | 2 +- extensions/fablabchemnitz/affine_spirals.py | 4 ++-- extensions/fablabchemnitz/anotherperspective.py | 2 +- extensions/fablabchemnitz/archimedesspiral.py | 2 +- extensions/fablabchemnitz/attributes_cleaner.py | 2 +- extensions/fablabchemnitz/attributes_editor.py | 2 +- extensions/fablabchemnitz/attributes_import.py | 2 +- extensions/fablabchemnitz/bezierenvelope.py | 2 +- extensions/fablabchemnitz/blobs.py | 2 +- extensions/fablabchemnitz/blueprint_maker.py | 2 +- extensions/fablabchemnitz/boundingbox.py | 2 +- extensions/fablabchemnitz/bouwkamp_code.py | 2 +- extensions/fablabchemnitz/can_generator.py | 2 +- extensions/fablabchemnitz/chain_paths.py | 2 +- extensions/fablabchemnitz/checkerboard.py | 2 +- extensions/fablabchemnitz/chipScratches.py | 2 +- extensions/fablabchemnitz/cleanup.py | 2 +- extensions/fablabchemnitz/clonesperspective.py | 2 +- extensions/fablabchemnitz/close_paths.py | 2 +- extensions/fablabchemnitz/color_alpha_replace.py | 2 +- extensions/fablabchemnitz/conic_box.py | 2 +- extensions/fablabchemnitz/convert_polylines.py | 2 +- extensions/fablabchemnitz/convexhull.py | 2 +- extensions/fablabchemnitz/createtuckbox.py | 2 +- extensions/fablabchemnitz/delete_above.py | 2 +- extensions/fablabchemnitz/destructiveclip.py | 2 +- extensions/fablabchemnitz/dimensioning.py | 2 +- extensions/fablabchemnitz/distortion.py | 2 +- extensions/fablabchemnitz/dots2pathpoints.py | 2 +- extensions/fablabchemnitz/drawdirections.py | 2 +- extensions/fablabchemnitz/eggbot_maze.py | 2 +- extensions/fablabchemnitz/eggbot_sineandlace.py | 2 +- extensions/fablabchemnitz/eggbot_twist.py | 2 +- extensions/fablabchemnitz/ellipse_5pts.py | 2 +- extensions/fablabchemnitz/elliptical_cone_box.py | 2 +- extensions/fablabchemnitz/eraser_layer.py | 2 +- extensions/fablabchemnitz/exponential_distort.py | 2 +- extensions/fablabchemnitz/exportxy.py | 2 +- extensions/fablabchemnitz/fibonaccipattern.py | 2 +- extensions/fablabchemnitz/fill_circle.py | 6 +++--- extensions/fablabchemnitz/filletchamfer.py | 2 +- extensions/fablabchemnitz/filter_layer.py | 2 +- extensions/fablabchemnitz/flevobezier.py | 2 +- extensions/fablabchemnitz/fretboard.py | 2 +- extensions/fablabchemnitz/gears_dev.py | 2 +- extensions/fablabchemnitz/globe.py | 2 +- extensions/fablabchemnitz/grid_perspect2.py | 2 +- extensions/fablabchemnitz/gridstrip_creator.py | 2 +- extensions/fablabchemnitz/group_to_layer.py | 2 +- 49 files changed, 52 insertions(+), 52 deletions(-) diff --git a/extensions/fablabchemnitz/CardLayoutGuides.py b/extensions/fablabchemnitz/CardLayoutGuides.py index eb53189d..57da89ca 100644 --- a/extensions/fablabchemnitz/CardLayoutGuides.py +++ b/extensions/fablabchemnitz/CardLayoutGuides.py @@ -432,7 +432,7 @@ class LineGeneratorForHorizontalCards(LineGeneratorBase): return lines -class FoldedCardLayoutGuidesEffect(inkex.Effect): +class FoldedCardLayoutGuidesEffect(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/affine_spirals.py b/extensions/fablabchemnitz/affine_spirals.py index 46e996ca..97af4500 100644 --- a/extensions/fablabchemnitz/affine_spirals.py +++ b/extensions/fablabchemnitz/affine_spirals.py @@ -40,7 +40,7 @@ def pts2curve(cplxs): pth = [ '%.2f, %.2f '%z for z in data] return 'M '+ ''.join(pth) -class AffineTorus(inkex.Effect): # choose a better name +class AffineSpirals(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) @@ -96,4 +96,4 @@ class AffineTorus(inkex.Effect): # choose a better name etree.SubElement(topgroup, inkex.addNS('path','svg'), curve_attribs) if __name__ == '__main__': - AffineTorus().run() \ No newline at end of file + AffineSpirals().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/anotherperspective.py b/extensions/fablabchemnitz/anotherperspective.py index b881e9e2..88a11ca4 100644 --- a/extensions/fablabchemnitz/anotherperspective.py +++ b/extensions/fablabchemnitz/anotherperspective.py @@ -239,7 +239,7 @@ def projection(path_object,coords): def complex2tulpe(complexNb): return (complexNb.real,complexNb.imag) ''' -class AnotherPerspective(inkex.Effect): +class AnotherPerspective(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/archimedesspiral.py b/extensions/fablabchemnitz/archimedesspiral.py index 7f925478..abd78e59 100644 --- a/extensions/fablabchemnitz/archimedesspiral.py +++ b/extensions/fablabchemnitz/archimedesspiral.py @@ -17,7 +17,7 @@ import inkex from lxml import etree from math import cos, sin, pi, log, sqrt -class Archimedes(inkex.Effect): +class Archimedes(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('--r', type = int, default = '50') diff --git a/extensions/fablabchemnitz/attributes_cleaner.py b/extensions/fablabchemnitz/attributes_cleaner.py index b3f0de52..2f509d59 100644 --- a/extensions/fablabchemnitz/attributes_cleaner.py +++ b/extensions/fablabchemnitz/attributes_cleaner.py @@ -17,7 +17,7 @@ element.attrib.pop("{http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd}absref", import inkex import sys -class AbsrefRemover(inkex.Effect): +class AbsrefRemover(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("-a", "--removeAbsref", type=inkex.Boolean, default=True, help="Remove sodipodi:absref") diff --git a/extensions/fablabchemnitz/attributes_editor.py b/extensions/fablabchemnitz/attributes_editor.py index c4481ff2..e6653c5d 100644 --- a/extensions/fablabchemnitz/attributes_editor.py +++ b/extensions/fablabchemnitz/attributes_editor.py @@ -3,7 +3,7 @@ import inkex import sys -class AttribEditor(inkex.Effect): +class AttribEditor(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("-a", "--attributeName", help="attribute name to set") diff --git a/extensions/fablabchemnitz/attributes_import.py b/extensions/fablabchemnitz/attributes_import.py index d2935696..d1e912ad 100644 --- a/extensions/fablabchemnitz/attributes_import.py +++ b/extensions/fablabchemnitz/attributes_import.py @@ -2,7 +2,7 @@ import inkex -class AttribImport(inkex.Effect): +class AttribImport(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--data", default="", help="data file") diff --git a/extensions/fablabchemnitz/bezierenvelope.py b/extensions/fablabchemnitz/bezierenvelope.py index fc36a722..f35d152c 100644 --- a/extensions/fablabchemnitz/bezierenvelope.py +++ b/extensions/fablabchemnitz/bezierenvelope.py @@ -69,7 +69,7 @@ import sys import ffgeom -class BezierEnvelope(inkex.Effect): +class BezierEnvelope(inkex.EffectExtension): segmentTypes = ["move","line","quad","cubic","close"] diff --git a/extensions/fablabchemnitz/blobs.py b/extensions/fablabchemnitz/blobs.py index 7c64e3e3..5630b6e8 100644 --- a/extensions/fablabchemnitz/blobs.py +++ b/extensions/fablabchemnitz/blobs.py @@ -8,7 +8,7 @@ from simplestyle import * import random from lxml import etree -class blobsEffect(inkex.Effect): +class blobsEffect(inkex.EffectExtension): """ Creates a random blob from a convex hull over n points. The expected degree of the polygon is sqrt(n). The corners diff --git a/extensions/fablabchemnitz/blueprint_maker.py b/extensions/fablabchemnitz/blueprint_maker.py index a24a7e94..2480bcf8 100644 --- a/extensions/fablabchemnitz/blueprint_maker.py +++ b/extensions/fablabchemnitz/blueprint_maker.py @@ -56,7 +56,7 @@ class bluePrintMakerData(): self.allowed_ids.append(current_id) self.allowed_nodes.append(node) -class bluePrintMaker(inkex.Effect): +class bluePrintMaker(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/boundingbox.py b/extensions/fablabchemnitz/boundingbox.py index ebd687b5..1ab7f124 100644 --- a/extensions/fablabchemnitz/boundingbox.py +++ b/extensions/fablabchemnitz/boundingbox.py @@ -4,7 +4,7 @@ import inkex import math from lxml import etree -class DrawBBoxes(inkex.Effect): +class DrawBBoxes(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('--offset', type=float, default=0.0, help='Offset from object (all directions)') diff --git a/extensions/fablabchemnitz/bouwkamp_code.py b/extensions/fablabchemnitz/bouwkamp_code.py index 0fed41b3..5abf028b 100644 --- a/extensions/fablabchemnitz/bouwkamp_code.py +++ b/extensions/fablabchemnitz/bouwkamp_code.py @@ -38,7 +38,7 @@ import re import inkex from lxml import etree -class BouwkampCodeExtension(inkex.Effect): +class BouwkampCodeExtension(inkex.EffectExtension): """ This Inkscape extension allows you to generate squared squares and squared rectangles from Bouwkamp codes and table codes. diff --git a/extensions/fablabchemnitz/can_generator.py b/extensions/fablabchemnitz/can_generator.py index 92ccc5ec..7845df5c 100644 --- a/extensions/fablabchemnitz/can_generator.py +++ b/extensions/fablabchemnitz/can_generator.py @@ -34,7 +34,7 @@ def punkte_erstellen(punkte, x, y): ###Schreibt die aktuellen Koordinaten in die Punkteliste punkte.append((x, y)) -class Dose(inkex.Effect): +class Dose(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--height", type=int, default = 50, help="Höhe der Dose") diff --git a/extensions/fablabchemnitz/chain_paths.py b/extensions/fablabchemnitz/chain_paths.py index b1e16c52..fcfc3b50 100644 --- a/extensions/fablabchemnitz/chain_paths.py +++ b/extensions/fablabchemnitz/chain_paths.py @@ -36,7 +36,7 @@ from inkex.paths import CubicSuperPath, Path from optparse import SUPPRESS_HELP debug = False -class ChainPaths(inkex.Effect): +class ChainPaths(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/checkerboard.py b/extensions/fablabchemnitz/checkerboard.py index 4996bcab..b19fa7c1 100644 --- a/extensions/fablabchemnitz/checkerboard.py +++ b/extensions/fablabchemnitz/checkerboard.py @@ -61,7 +61,7 @@ def draw_grid(x, y, rows, cols, size, color1, color2, parent): id_ = 'cell{0}x{1}'.format(col, row) draw_square(x + col * size, y + row * size, size, size, color, group, id_) -class Checkerboard(inkex.Effect): +class Checkerboard(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--tab") diff --git a/extensions/fablabchemnitz/chipScratches.py b/extensions/fablabchemnitz/chipScratches.py index 2b14a5da..444e4075 100644 --- a/extensions/fablabchemnitz/chipScratches.py +++ b/extensions/fablabchemnitz/chipScratches.py @@ -75,7 +75,7 @@ global /inxGen/ =1 and run the file stand-alone. - AK Sept 2018 """ -class noiseEffect(inkex.Effect): +class noiseEffect(inkex.EffectExtension): """ Creates visual noise. 3 kinds: Scratches, chips, specks. 50, 100, 100 instances are predefined. These are chosen diff --git a/extensions/fablabchemnitz/cleanup.py b/extensions/fablabchemnitz/cleanup.py index 440f6c0a..b285dbea 100644 --- a/extensions/fablabchemnitz/cleanup.py +++ b/extensions/fablabchemnitz/cleanup.py @@ -21,7 +21,7 @@ Based on coloreffect.py by Jos Hirth and Aaron C. Spike import inkex -class Cleanup(inkex.Effect): +class Cleanup(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--stroke_width", type=float, default=0.1, help="Stroke width") diff --git a/extensions/fablabchemnitz/clonesperspective.py b/extensions/fablabchemnitz/clonesperspective.py index 92b2f386..5a883e84 100644 --- a/extensions/fablabchemnitz/clonesperspective.py +++ b/extensions/fablabchemnitz/clonesperspective.py @@ -4,7 +4,7 @@ import math import inkex from lxml import etree -class clonesPerspectiveEffect(inkex.Effect): +class clonesPerspectiveEffect(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('--num', type = int, default = 5, help = 'Drag out center of rotation before calling') diff --git a/extensions/fablabchemnitz/close_paths.py b/extensions/fablabchemnitz/close_paths.py index 57708223..0a4f855b 100644 --- a/extensions/fablabchemnitz/close_paths.py +++ b/extensions/fablabchemnitz/close_paths.py @@ -28,7 +28,7 @@ import inkex import re from inkex.paths import Path -class CloseCurves(inkex.Effect): +class CloseCurves(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) def effect(self): diff --git a/extensions/fablabchemnitz/color_alpha_replace.py b/extensions/fablabchemnitz/color_alpha_replace.py index e1ccab69..6ca90763 100644 --- a/extensions/fablabchemnitz/color_alpha_replace.py +++ b/extensions/fablabchemnitz/color_alpha_replace.py @@ -32,7 +32,7 @@ import sys import re from lxml import etree -class ReplaceColorAlpha(inkex.Effect): +class ReplaceColorAlpha(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--from_color", default="000000", help="Replace color") diff --git a/extensions/fablabchemnitz/conic_box.py b/extensions/fablabchemnitz/conic_box.py index 7d5105e6..b939fb03 100644 --- a/extensions/fablabchemnitz/conic_box.py +++ b/extensions/fablabchemnitz/conic_box.py @@ -225,7 +225,7 @@ def gen_cercle(diametre, nombre_pas, epaisseur, xOffset, yOffset, parent): index_pas += 1 path.GenPath() -class ConicalBox(inkex.Effect): +class ConicalBox(inkex.EffectExtension): """ Creates a new layer with the drawings for a parametrically generaded box. """ diff --git a/extensions/fablabchemnitz/convert_polylines.py b/extensions/fablabchemnitz/convert_polylines.py index 00dd1188..dd964ba6 100644 --- a/extensions/fablabchemnitz/convert_polylines.py +++ b/extensions/fablabchemnitz/convert_polylines.py @@ -15,7 +15,7 @@ License: GNU GPL v3 import inkex from inkex.paths import Path -class ConvertToPolylines(inkex.Effect): +class ConvertToPolylines(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/convexhull.py b/extensions/fablabchemnitz/convexhull.py index c4a07711..21f51004 100644 --- a/extensions/fablabchemnitz/convexhull.py +++ b/extensions/fablabchemnitz/convexhull.py @@ -57,7 +57,7 @@ def qhull(sample): else: return sample -class ConvexHull(inkex.Effect): +class ConvexHull(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.paths = {} diff --git a/extensions/fablabchemnitz/createtuckbox.py b/extensions/fablabchemnitz/createtuckbox.py index 059f105e..882138a5 100644 --- a/extensions/fablabchemnitz/createtuckbox.py +++ b/extensions/fablabchemnitz/createtuckbox.py @@ -535,7 +535,7 @@ class MatcboxDrawer(BoxBase): else: self._CreateRectangleInMillimetres(self.Height, fudgeDepth, col5, row3) -class TuckboxCreateEffect(inkex.Effect): +class TuckboxCreateEffect(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('-t', '--type', type = str, dest = 'BoxType') diff --git a/extensions/fablabchemnitz/delete_above.py b/extensions/fablabchemnitz/delete_above.py index a0c5f3b6..f96ae9c7 100644 --- a/extensions/fablabchemnitz/delete_above.py +++ b/extensions/fablabchemnitz/delete_above.py @@ -30,7 +30,7 @@ def contains(outer, inner): inner.br.x <= outer.br.x and inner.br.y <= outer.br.y -class DeleteAboveEffect(inkex.Effect): +class DeleteAboveEffect(inkex.EffectExtension): """ Delete the selected node and everything above it """ node_info = None diff --git a/extensions/fablabchemnitz/destructiveclip.py b/extensions/fablabchemnitz/destructiveclip.py index 4363f56a..554e996e 100644 --- a/extensions/fablabchemnitz/destructiveclip.py +++ b/extensions/fablabchemnitz/destructiveclip.py @@ -28,7 +28,7 @@ import sys from inkex.paths import Path -class DestructiveClip(inkex.Effect): +class DestructiveClip(inkex.EffectExtension): def __init__(self): self.tolerance = 0.0001 # arbitrary fudge factor diff --git a/extensions/fablabchemnitz/dimensioning.py b/extensions/fablabchemnitz/dimensioning.py index 953448c7..448f927b 100644 --- a/extensions/fablabchemnitz/dimensioning.py +++ b/extensions/fablabchemnitz/dimensioning.py @@ -40,7 +40,7 @@ def rotate(tangentvec, point): return 'rotate(' + str(angle/np.pi*180) + ',' + str(point[0]) + ',' + str(point[1]) + ')' -class Dimensioning(inkex.Effect): +class Dimensioning(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) # the options given in the dialouge diff --git a/extensions/fablabchemnitz/distortion.py b/extensions/fablabchemnitz/distortion.py index d62e27d5..8cc66e80 100644 --- a/extensions/fablabchemnitz/distortion.py +++ b/extensions/fablabchemnitz/distortion.py @@ -4,7 +4,7 @@ import inkex from inkex import bezier from inkex.paths import Path, CubicSuperPath -class DistortionExtension(inkex.Effect): +class DistortionExtension(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--lambda_coef", type=float, default=-5.0, help="command line help") diff --git a/extensions/fablabchemnitz/dots2pathpoints.py b/extensions/fablabchemnitz/dots2pathpoints.py index 8f58e7f4..e73bf824 100644 --- a/extensions/fablabchemnitz/dots2pathpoints.py +++ b/extensions/fablabchemnitz/dots2pathpoints.py @@ -24,7 +24,7 @@ Foundation, Inc., 51 Fraanklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import inkex -class Pathpoints2Dots(inkex.Effect): +class Pathpoints2Dots(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--tab") diff --git a/extensions/fablabchemnitz/drawdirections.py b/extensions/fablabchemnitz/drawdirections.py index d03968da..a33c253e 100644 --- a/extensions/fablabchemnitz/drawdirections.py +++ b/extensions/fablabchemnitz/drawdirections.py @@ -4,7 +4,7 @@ import inkex from inkex.paths import Path from inkex import Circle -class StartEndPoints(inkex.Effect): +class StartEndPoints(inkex.EffectExtension): def drawCircle(self, group, color, point): style = inkex.Style({'stroke': 'none', 'fill': color}) diff --git a/extensions/fablabchemnitz/eggbot_maze.py b/extensions/fablabchemnitz/eggbot_maze.py index 2097d4b2..b8d40487 100644 --- a/extensions/fablabchemnitz/eggbot_maze.py +++ b/extensions/fablabchemnitz/eggbot_maze.py @@ -97,7 +97,7 @@ def draw_SVG_rect(x, y, w, h, c, t, fill, parent): etree.SubElement(parent, inkex.addNS('rect', 'svg'), rect_attribs) -class Maze(inkex.Effect): +class Maze(inkex.EffectExtension): """ Each cell in the maze is represented using 9 bits: diff --git a/extensions/fablabchemnitz/eggbot_sineandlace.py b/extensions/fablabchemnitz/eggbot_sineandlace.py index b21cb6ef..945412b2 100644 --- a/extensions/fablabchemnitz/eggbot_sineandlace.py +++ b/extensions/fablabchemnitz/eggbot_sineandlace.py @@ -249,7 +249,7 @@ def drawSine(cycles=8, rn=0, rm=0, nPoints=50, offset=None, return path_data, path_desc -class SpiroSine(inkex.Effect): +class SpiroSine(inkex.EffectExtension): nsURI = 'http://sample.com/ns' nsPrefix = 'doof' diff --git a/extensions/fablabchemnitz/eggbot_twist.py b/extensions/fablabchemnitz/eggbot_twist.py index 60c5231b..6e87a57e 100644 --- a/extensions/fablabchemnitz/eggbot_twist.py +++ b/extensions/fablabchemnitz/eggbot_twist.py @@ -88,7 +88,7 @@ def distanceSquared(p1, p2): return dx * dx + dy * dy -class Twist(inkex.Effect): +class Twist(inkex.EffectExtension): def __init__(self): diff --git a/extensions/fablabchemnitz/ellipse_5pts.py b/extensions/fablabchemnitz/ellipse_5pts.py index 5cff53cd..f64cb276 100644 --- a/extensions/fablabchemnitz/ellipse_5pts.py +++ b/extensions/fablabchemnitz/ellipse_5pts.py @@ -31,7 +31,7 @@ from copy import deepcopy import math from math import sqrt -class EllipseSolveEffect(inkex.Effect): +class EllipseSolveEffect(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/elliptical_cone_box.py b/extensions/fablabchemnitz/elliptical_cone_box.py index 72ef58b5..abb5c202 100644 --- a/extensions/fablabchemnitz/elliptical_cone_box.py +++ b/extensions/fablabchemnitz/elliptical_cone_box.py @@ -67,7 +67,7 @@ class inkcape_polar: line_attribs = {'style': objStyle, 'd': self.Path} etree.SubElement(self.group, inkex.addNS('path', 'svg'), line_attribs) -class EllConicalBox(inkex.Effect): +class EllConicalBox(inkex.EffectExtension): """ Creates a new layer with the drawings for a parametrically generaded box. """ diff --git a/extensions/fablabchemnitz/eraser_layer.py b/extensions/fablabchemnitz/eraser_layer.py index 3b7f1646..ad379842 100644 --- a/extensions/fablabchemnitz/eraser_layer.py +++ b/extensions/fablabchemnitz/eraser_layer.py @@ -32,7 +32,7 @@ import inkex import sys from lxml import etree -class EraserLayer(inkex.Effect): +class EraserLayer(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/exponential_distort.py b/extensions/fablabchemnitz/exponential_distort.py index 04aff1af..449c9817 100644 --- a/extensions/fablabchemnitz/exponential_distort.py +++ b/extensions/fablabchemnitz/exponential_distort.py @@ -6,7 +6,7 @@ import math import inkex from inkex.paths import CubicSuperPath -class TransformExponential(inkex.Effect): +class TransformExponential(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) #self.arg_parser.add_argument('-a', '--axis', default='x', help='distortion axis. Valid values are "x", "y", or "xy". Default is "x"') diff --git a/extensions/fablabchemnitz/exportxy.py b/extensions/fablabchemnitz/exportxy.py index f1eaaed4..c87d699c 100644 --- a/extensions/fablabchemnitz/exportxy.py +++ b/extensions/fablabchemnitz/exportxy.py @@ -24,7 +24,7 @@ def warn(*args, **kwargs): import warnings warnings.warn = warn -class ExportXY(inkex.Effect): +class ExportXY(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) def effect(self): diff --git a/extensions/fablabchemnitz/fibonaccipattern.py b/extensions/fablabchemnitz/fibonaccipattern.py index e2a30462..e8fdf79e 100644 --- a/extensions/fablabchemnitz/fibonaccipattern.py +++ b/extensions/fablabchemnitz/fibonaccipattern.py @@ -63,7 +63,7 @@ def drawKthCircle(k,firstRadius,lastRadius,numNodes,spreadFactor,parent): draw_SVG_ellipse(nodeRadiusTxt,nodeRadiusTxt,x,y,parent) -class FibonacciSpiral(inkex.Effect): +class FibonacciSpiral(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("-f", "--FirstRadius", type=int, default="5", help="The radius of the first layer of circles in pixels.") diff --git a/extensions/fablabchemnitz/fill_circle.py b/extensions/fablabchemnitz/fill_circle.py index 27550d50..37595a1b 100644 --- a/extensions/fablabchemnitz/fill_circle.py +++ b/extensions/fablabchemnitz/fill_circle.py @@ -13,7 +13,7 @@ import inkex from lxml import etree -def recup(selection,attrib): +def recup(selection, attrib): l = [] for i in selection: selec = i @@ -21,7 +21,7 @@ def recup(selection,attrib): l.append(valr) return l -def generCircle(y,x,r): +def generCircle(y, x, r): circle = etree.Element('{http://www.w3.org/2000/svg}circle') circle.set('cy',str(y)) circle.set('cx',str(x)) @@ -36,7 +36,7 @@ def toFloat(l): l[i] = float(l[i]) return l -class Circle(inkex.Effect): +class Circle(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('--radius', type = float, default = 3.0, help = 'Radius to enter') diff --git a/extensions/fablabchemnitz/filletchamfer.py b/extensions/fablabchemnitz/filletchamfer.py index 7b508b01..a5dacbf7 100644 --- a/extensions/fablabchemnitz/filletchamfer.py +++ b/extensions/fablabchemnitz/filletchamfer.py @@ -158,7 +158,7 @@ def d_str(self, useSandT=False, use_closed_attrib=False, rel=False): s = ' '.join(parts) return s if not rel else s.lower() -class FilletChamfer(inkex.Effect): +class FilletChamfer(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("-t", "--fillet_type", default="fillet", help="Selects whether using fillet or chamfer") diff --git a/extensions/fablabchemnitz/filter_layer.py b/extensions/fablabchemnitz/filter_layer.py index d1a62eb2..69d8154b 100644 --- a/extensions/fablabchemnitz/filter_layer.py +++ b/extensions/fablabchemnitz/filter_layer.py @@ -31,7 +31,7 @@ import inkex import sys import re -class FilterAndLiveEffectsLayer(inkex.Effect): +class FilterAndLiveEffectsLayer(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/flevobezier.py b/extensions/fablabchemnitz/flevobezier.py index 00fd3a18..6c013b13 100644 --- a/extensions/fablabchemnitz/flevobezier.py +++ b/extensions/fablabchemnitz/flevobezier.py @@ -12,7 +12,7 @@ from inkex.paths import Path import sys def pout(t): sys.exit((gettext.gettext(t))) -class root(inkex.Effect): +class root(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/fretboard.py b/extensions/fablabchemnitz/fretboard.py index 609c8d92..af0c4ff8 100644 --- a/extensions/fablabchemnitz/fretboard.py +++ b/extensions/fablabchemnitz/fretboard.py @@ -111,7 +111,7 @@ class Fretboard: return hline_cross_path, vline_cross_path -class Inxfb(inkex.Effect): +class Inxfb(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("-s", "--scale", default="25in", help="The fingerboard scalelenght") diff --git a/extensions/fablabchemnitz/gears_dev.py b/extensions/fablabchemnitz/gears_dev.py index 8a9ddc31..9d45add3 100644 --- a/extensions/fablabchemnitz/gears_dev.py +++ b/extensions/fablabchemnitz/gears_dev.py @@ -346,7 +346,7 @@ def generate_spokes_path(root_radius, spoke_width, spoke_count, mount_radius, mo return (path, messages) -class Gears(inkex.Effect): +class Gears(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) # an alternate way to get debug info: diff --git a/extensions/fablabchemnitz/globe.py b/extensions/fablabchemnitz/globe.py index add06c62..731ce125 100644 --- a/extensions/fablabchemnitz/globe.py +++ b/extensions/fablabchemnitz/globe.py @@ -108,7 +108,7 @@ def draw_ellipse_segment_rotated(cx,cy,rx,ry, width, fill, name, parent, rotatio etree.SubElement(parent, inkex.addNS('path','svg'), circle_attribs) -class Globe(inkex.Effect): +class Globe(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--longitudeLineCount", type=int, default=15, help="Number of longitude lines") diff --git a/extensions/fablabchemnitz/grid_perspect2.py b/extensions/fablabchemnitz/grid_perspect2.py index a16c4065..d91ab449 100644 --- a/extensions/fablabchemnitz/grid_perspect2.py +++ b/extensions/fablabchemnitz/grid_perspect2.py @@ -49,7 +49,7 @@ def colorString(pickerColor): longcolor = longcolor & 0xFFFFFFFF return '#' + format(longcolor >> 8, '06X') -class Grid_Perspective(inkex.Effect): +class Grid_Perspective(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument("--size_unit", default="", help="Units for geometry") diff --git a/extensions/fablabchemnitz/gridstrip_creator.py b/extensions/fablabchemnitz/gridstrip_creator.py index 67480c50..92f50e70 100644 --- a/extensions/fablabchemnitz/gridstrip_creator.py +++ b/extensions/fablabchemnitz/gridstrip_creator.py @@ -29,7 +29,7 @@ from lxml import etree def printDebug(string): inkex.errormsg(string) -class GridStrip_Creator(inkex.Effect): +class GridStrip_Creator(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) diff --git a/extensions/fablabchemnitz/group_to_layer.py b/extensions/fablabchemnitz/group_to_layer.py index 8c3df98e..8a4ad0e1 100644 --- a/extensions/fablabchemnitz/group_to_layer.py +++ b/extensions/fablabchemnitz/group_to_layer.py @@ -24,7 +24,7 @@ import inkex -class GroupToLayerEffect(inkex.Effect): +class GroupToLayerEffect(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) self.arg_parser.add_argument('-d', '--depth', type = int, default = 1, help = 'Convert nested group up to DEPTH layers deep')