diff --git a/extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.inx b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx similarity index 92% rename from extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.inx rename to extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx index c9a83b0c..1898e5e6 100644 --- a/extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.inx +++ b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx @@ -1,7 +1,7 @@ About/Upgrade MightyScape - fablabchemnitz.de.upgrade_mightyscape + fablabchemnitz.de.about_upgrade_mightyscape false @@ -35,6 +35,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.py b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py similarity index 98% rename from extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.py rename to extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py index 2b5868de..1eef233a 100644 --- a/extensions/fablabchemnitz/upgrade_mightyscape/upgrade_mightyscape.py +++ b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py @@ -16,7 +16,7 @@ import os import warnings from datetime import datetime -class Upgrade(inkex.EffectExtension): +class AboutUpgradeMightyScape(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument("--tab") @@ -109,4 +109,4 @@ class Upgrade(inkex.EffectExtension): exit(1) if __name__ == '__main__': - Upgrade().run() \ No newline at end of file + AboutUpgradeMightyScape().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/ai_eps_output/ai_eps_output.inx b/extensions/fablabchemnitz/ai_compatible_eps_output/ai_compatible_eps_output.inx similarity index 73% rename from extensions/fablabchemnitz/ai_eps_output/ai_eps_output.inx rename to extensions/fablabchemnitz/ai_compatible_eps_output/ai_compatible_eps_output.inx index 4b31f1c2..07a59481 100644 --- a/extensions/fablabchemnitz/ai_eps_output/ai_eps_output.inx +++ b/extensions/fablabchemnitz/ai_compatible_eps_output/ai_compatible_eps_output.inx @@ -1,7 +1,7 @@ AI compatible EPS output - fablabchemnitz.de.ai_eps_output + fablabchemnitz.de.ai_compatible_eps_output .eps application/eps @@ -9,6 +9,6 @@ Adobe Illustrator 7 compatible EPS \ No newline at end of file diff --git a/extensions/fablabchemnitz/ai_eps_output/ai_eps_output.py b/extensions/fablabchemnitz/ai_compatible_eps_output/ai_compatible_eps_output.py similarity index 100% rename from extensions/fablabchemnitz/ai_eps_output/ai_eps_output.py rename to extensions/fablabchemnitz/ai_compatible_eps_output/ai_compatible_eps_output.py diff --git a/extensions/fablabchemnitz/animate_order/animate_order.py b/extensions/fablabchemnitz/animate_order/animate_order.py index f0b706df..19d00dc3 100644 --- a/extensions/fablabchemnitz/animate_order/animate_order.py +++ b/extensions/fablabchemnitz/animate_order/animate_order.py @@ -33,7 +33,7 @@ ToDo: """ DETACHED_PROCESS = 0x00000008 -class AnimateOrder (inkex.EffectExtension): +class AnimateOrder(inkex.EffectExtension): def spawnIndependentProcess(self, args): #function to spawn non-blocking inkscape instance. the inkscape command is available because it is added to ENVIRONMENT when Inkscape main instance is started warnings.simplefilter('ignore', ResourceWarning) #suppress "enable tracemalloc to get the object allocation traceback" diff --git a/extensions/fablabchemnitz/anotherperspective/anotherperspective.inx b/extensions/fablabchemnitz/another_perspective/another_perspective.inx similarity index 76% rename from extensions/fablabchemnitz/anotherperspective/anotherperspective.inx rename to extensions/fablabchemnitz/another_perspective/another_perspective.inx index 21dfb663..c1a7d1c3 100644 --- a/extensions/fablabchemnitz/anotherperspective/anotherperspective.inx +++ b/extensions/fablabchemnitz/another_perspective/another_perspective.inx @@ -1,7 +1,7 @@ Another Perspective - fablabchemnitz.de.anotherperspective + fablabchemnitz.de.another_perspective path @@ -11,6 +11,6 @@ diff --git a/extensions/fablabchemnitz/anotherperspective/anotherperspective.py b/extensions/fablabchemnitz/another_perspective/another_perspective.py similarity index 100% rename from extensions/fablabchemnitz/anotherperspective/anotherperspective.py rename to extensions/fablabchemnitz/another_perspective/another_perspective.py diff --git a/extensions/fablabchemnitz/apollonian/apollon.py b/extensions/fablabchemnitz/apollonian_gasket/apollon.py similarity index 100% rename from extensions/fablabchemnitz/apollonian/apollon.py rename to extensions/fablabchemnitz/apollonian_gasket/apollon.py diff --git a/extensions/fablabchemnitz/apollonian/apollonian.inx b/extensions/fablabchemnitz/apollonian_gasket/apollonian_gasket.inx similarity index 89% rename from extensions/fablabchemnitz/apollonian/apollonian.inx rename to extensions/fablabchemnitz/apollonian_gasket/apollonian_gasket.inx index 0268b5d3..47bc22da 100644 --- a/extensions/fablabchemnitz/apollonian/apollonian.inx +++ b/extensions/fablabchemnitz/apollonian_gasket/apollonian_gasket.inx @@ -1,7 +1,7 @@ Apollonian Gasket - fablabchemnitz.de.apollonian + fablabchemnitz.de.apollonian_gasket 3 @@ -27,6 +27,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/apollonian/apollonian.py b/extensions/fablabchemnitz/apollonian_gasket/apollonian_gasket.py similarity index 100% rename from extensions/fablabchemnitz/apollonian/apollonian.py rename to extensions/fablabchemnitz/apollonian_gasket/apollonian_gasket.py diff --git a/extensions/fablabchemnitz/apollonian/apolloniangasket_func.py b/extensions/fablabchemnitz/apollonian_gasket/apolloniangasket_func.py similarity index 100% rename from extensions/fablabchemnitz/apollonian/apolloniangasket_func.py rename to extensions/fablabchemnitz/apollonian_gasket/apolloniangasket_func.py diff --git a/extensions/fablabchemnitz/applytransform/applytransform.inx b/extensions/fablabchemnitz/apply_transformations/apply_transformations.inx similarity index 74% rename from extensions/fablabchemnitz/applytransform/applytransform.inx rename to extensions/fablabchemnitz/apply_transformations/apply_transformations.inx index 1a48b04f..cdcde283 100644 --- a/extensions/fablabchemnitz/applytransform/applytransform.inx +++ b/extensions/fablabchemnitz/apply_transformations/apply_transformations.inx @@ -1,7 +1,7 @@ Apply Transformations - fablabchemnitz.de.applytransform + fablabchemnitz.de.apply_transformations all @@ -11,6 +11,6 @@ diff --git a/extensions/fablabchemnitz/applytransform/applytransform.py b/extensions/fablabchemnitz/apply_transformations/apply_transformations.py similarity index 97% rename from extensions/fablabchemnitz/applytransform/applytransform.py rename to extensions/fablabchemnitz/apply_transformations/apply_transformations.py index a0dcaca9..c90b80ef 100644 --- a/extensions/fablabchemnitz/applytransform/applytransform.py +++ b/extensions/fablabchemnitz/apply_transformations/apply_transformations.py @@ -15,9 +15,7 @@ from inkex.styles import Style NULL_TRANSFORM = Transform([[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]) -class ApplyTransform(inkex.EffectExtension): - def __init__(self): - super(ApplyTransform, self).__init__() +class ApplyTransformations(inkex.EffectExtension): def effect(self): if self.svg.selected: @@ -64,7 +62,7 @@ class ApplyTransform(inkex.EffectExtension): if 'transform' in element.attrib: del element.attrib['transform'] - element = ApplyTransform.objectToPath(element) + element = ApplyTransformations.objectToPath(element) if transf == NULL_TRANSFORM: # Don't do anything if there is effectively no transform applied @@ -205,4 +203,4 @@ class ApplyTransform(inkex.EffectExtension): self.recursiveFuseTransform(child, transf) if __name__ == '__main__': - ApplyTransform().run() \ No newline at end of file + ApplyTransformations().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/archimedesspiral/archimedesspiral.inx b/extensions/fablabchemnitz/archimedes_spiral/archimedes_spiral.inx similarity index 92% rename from extensions/fablabchemnitz/archimedesspiral/archimedesspiral.inx rename to extensions/fablabchemnitz/archimedes_spiral/archimedes_spiral.inx index e31f69eb..b39692a9 100644 --- a/extensions/fablabchemnitz/archimedesspiral/archimedesspiral.inx +++ b/extensions/fablabchemnitz/archimedes_spiral/archimedes_spiral.inx @@ -1,7 +1,7 @@ - The Spiral Of Archimedes - fablabchemnitz.de.archimedesspiral + Archimedes Spiral + fablabchemnitz.de.archimedes_spiral @@ -16,7 +16,7 @@ 5 - + @@ -50,6 +50,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/archimedesspiral/archimedesspiral.py b/extensions/fablabchemnitz/archimedes_spiral/archimedes_spiral.py similarity index 100% rename from extensions/fablabchemnitz/archimedesspiral/archimedesspiral.py rename to extensions/fablabchemnitz/archimedes_spiral/archimedes_spiral.py diff --git a/extensions/fablabchemnitz/distortion/distortion.inx b/extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.inx similarity index 77% rename from extensions/fablabchemnitz/distortion/distortion.inx rename to extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.inx index 54fb9169..bb6d8563 100644 --- a/extensions/fablabchemnitz/distortion/distortion.inx +++ b/extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.inx @@ -1,7 +1,7 @@ Barrel Distortion - fablabchemnitz.de.distorsion + fablabchemnitz.de.barrel_distorsion -1.0 all @@ -12,6 +12,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/distortion/distortion.py b/extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.py similarity index 98% rename from extensions/fablabchemnitz/distortion/distortion.py rename to extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.py index a23ee0ad..107ecf84 100644 --- a/extensions/fablabchemnitz/distortion/distortion.py +++ b/extensions/fablabchemnitz/barrel_distorsion/barrel_distorsion.py @@ -4,7 +4,7 @@ import inkex from inkex import bezier from inkex.paths import Path, CubicSuperPath -class DistortionExtension(inkex.EffectExtension): +class BarrelDistorsion(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument("--lambda_coef", type=float, default=-5.0, help="command line help") @@ -97,4 +97,4 @@ class DistortionExtension(inkex.EffectExtension): if __name__ == '__main__': - DistortionExtension().run() \ No newline at end of file + BarrelDistorsion().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/bezierenvelope/bezierenvelope.inx b/extensions/fablabchemnitz/bezier_envelope/bezier_envelope.inx similarity index 72% rename from extensions/fablabchemnitz/bezierenvelope/bezierenvelope.inx rename to extensions/fablabchemnitz/bezier_envelope/bezier_envelope.inx index cbd0f35f..d632b4ed 100644 --- a/extensions/fablabchemnitz/bezierenvelope/bezierenvelope.inx +++ b/extensions/fablabchemnitz/bezier_envelope/bezier_envelope.inx @@ -1,7 +1,7 @@ Bezier Envelope - fablabchemnitz.de.envelope + fablabchemnitz.de.bezier_envelope path @@ -11,6 +11,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/bezierenvelope/bezierenvelope.py b/extensions/fablabchemnitz/bezier_envelope/bezier_envelope.py similarity index 100% rename from extensions/fablabchemnitz/bezierenvelope/bezierenvelope.py rename to extensions/fablabchemnitz/bezier_envelope/bezier_envelope.py diff --git a/extensions/fablabchemnitz/blobs/blobs.py b/extensions/fablabchemnitz/blobs/blobs.py index cecdac6d..0ab642e6 100644 --- a/extensions/fablabchemnitz/blobs/blobs.py +++ b/extensions/fablabchemnitz/blobs/blobs.py @@ -7,7 +7,7 @@ import inkex import random from lxml import etree -class blobsEffect(inkex.EffectExtension): +class Blobs(inkex.EffectExtension): """ Creates a random blob from a convex hull over n points. The expected degree of the polygon is sqrt(n). The corners @@ -166,4 +166,4 @@ def findall(a, f): return r if __name__ == '__main__': - blobsEffect().run() \ No newline at end of file + Blobs().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/blueprint_maker/blueprint_maker.py b/extensions/fablabchemnitz/blueprint_maker/blueprint_maker.py index 2480bcf8..d0e26153 100644 --- a/extensions/fablabchemnitz/blueprint_maker/blueprint_maker.py +++ b/extensions/fablabchemnitz/blueprint_maker/blueprint_maker.py @@ -56,7 +56,7 @@ class bluePrintMakerData(): self.allowed_ids.append(current_id) self.allowed_nodes.append(node) -class bluePrintMaker(inkex.EffectExtension): +class BluePrintMaker(inkex.EffectExtension): def __init__(self): inkex.Effect.__init__(self) @@ -114,4 +114,4 @@ class bluePrintMaker(inkex.EffectExtension): return None if __name__ == '__main__': - program=bluePrintMaker().run() \ No newline at end of file + BluePrintMaker().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/bobbinlace/lace_circular_ground.inx b/extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.inx similarity index 93% rename from extensions/fablabchemnitz/bobbinlace/lace_circular_ground.inx rename to extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.inx index e8e67478..7a9a58d2 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_circular_ground.inx +++ b/extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.inx @@ -1,7 +1,7 @@ Circular Ground from Template - fablabchemnitz.de.lace_circular_ground + fablabchemnitz.de.circular_ground_from_template ./templates/ @@ -49,6 +49,6 @@ diff --git a/extensions/fablabchemnitz/bobbinlace/lace_circular_ground.py b/extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.py similarity index 99% rename from extensions/fablabchemnitz/bobbinlace/lace_circular_ground.py rename to extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.py index 0824f6c6..32c2f511 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_circular_ground.py +++ b/extensions/fablabchemnitz/bobbinlace/circular_ground_from_template.py @@ -70,7 +70,7 @@ class Vector: self.theta = _theta -class CircularGround(inkex.EffectExtension): +class CircularGroundFromTemplate(inkex.EffectExtension): def unitToUu(self,param): """ Convert units. @@ -431,4 +431,4 @@ class CircularGround(inkex.EffectExtension): self.draw(points,line=lambda a: self.line(a)) if __name__ == '__main__': - CircularGround().run() \ No newline at end of file + CircularGroundFromTemplate().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/bobbinlace/lace_ground.inx b/extensions/fablabchemnitz/bobbinlace/ground_from_template.inx similarity index 93% rename from extensions/fablabchemnitz/bobbinlace/lace_ground.inx rename to extensions/fablabchemnitz/bobbinlace/ground_from_template.inx index 4575bd6d..c508542d 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_ground.inx +++ b/extensions/fablabchemnitz/bobbinlace/ground_from_template.inx @@ -1,7 +1,7 @@ - Ground from Template - fablabchemnitz.de.lace_ground + Ground From Template + fablabchemnitz.de.ground_from_template ./templates/ @@ -55,6 +55,6 @@ diff --git a/extensions/fablabchemnitz/bobbinlace/lace_ground.py b/extensions/fablabchemnitz/bobbinlace/ground_from_template.py similarity index 98% rename from extensions/fablabchemnitz/bobbinlace/lace_ground.py rename to extensions/fablabchemnitz/bobbinlace/ground_from_template.py index 1e29674c..696115e7 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_ground.py +++ b/extensions/fablabchemnitz/bobbinlace/ground_from_template.py @@ -31,7 +31,7 @@ __author__ = 'Veronika Irvine' __credits__ = ['Ben Connors', 'Veronika Irvine', 'Mark Shafer'] __license__ = 'Simplified BSD' -class LaceGround(inkex.EffectExtension): +class GroundFromTemplate(inkex.EffectExtension): def loadFile(self): # Ensure that file exists and has the proper extension @@ -169,4 +169,4 @@ class LaceGround(inkex.EffectExtension): self.draw(result['data'],result['rowCount'],result['colCount']) if __name__ == '__main__': - LaceGround().run() \ No newline at end of file + GroundFromTemplate().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/bobbinlace/lace_polar.inx b/extensions/fablabchemnitz/bobbinlace/polar_grid.inx similarity index 96% rename from extensions/fablabchemnitz/bobbinlace/lace_polar.inx rename to extensions/fablabchemnitz/bobbinlace/polar_grid.inx index 97f13241..0ecd631c 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_polar.inx +++ b/extensions/fablabchemnitz/bobbinlace/polar_grid.inx @@ -1,7 +1,7 @@ Polar Grid - fablabchemnitz.de.lace_polar + fablabchemnitz.de.polar_grid @@ -66,6 +66,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/bobbinlace/lace_polar.py b/extensions/fablabchemnitz/bobbinlace/polar_grid.py similarity index 100% rename from extensions/fablabchemnitz/bobbinlace/lace_polar.py rename to extensions/fablabchemnitz/bobbinlace/polar_grid.py diff --git a/extensions/fablabchemnitz/bobbinlace/lace_grid.inx b/extensions/fablabchemnitz/bobbinlace/regular_grid.inx similarity index 94% rename from extensions/fablabchemnitz/bobbinlace/lace_grid.inx rename to extensions/fablabchemnitz/bobbinlace/regular_grid.inx index 8e80fa4b..96fc0f31 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_grid.inx +++ b/extensions/fablabchemnitz/bobbinlace/regular_grid.inx @@ -1,7 +1,7 @@ Regular Grid - fablabchemnitz.de.lace_grid + fablabchemnitz.de.regular_grid @@ -55,6 +55,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/bobbinlace/lace_grid.py b/extensions/fablabchemnitz/bobbinlace/regular_grid.py similarity index 98% rename from extensions/fablabchemnitz/bobbinlace/lace_grid.py rename to extensions/fablabchemnitz/bobbinlace/regular_grid.py index 67e4a73f..3e54d0b4 100644 --- a/extensions/fablabchemnitz/bobbinlace/lace_grid.py +++ b/extensions/fablabchemnitz/bobbinlace/regular_grid.py @@ -31,7 +31,7 @@ __author__ = 'Veronika Irvine' __credits__ = ['Ben Connors', 'Veronika Irvine', 'Mark Shafer'] __license__ = 'Simplified BSD' -class LaceGrid(inkex.EffectExtension): +class RegularGrid(inkex.EffectExtension): def circle(self, x, y, r, fill): # define the stroke style s = {'fill': fill} @@ -104,4 +104,4 @@ class LaceGrid(inkex.EffectExtension): self.draw() if __name__ == '__main__': - LaceGrid().run() \ No newline at end of file + RegularGrid().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/boukamp_code/bouwkamp_code.py b/extensions/fablabchemnitz/boukamp_code/bouwkamp_code.py index a5713b90..8493f916 100644 --- a/extensions/fablabchemnitz/boukamp_code/bouwkamp_code.py +++ b/extensions/fablabchemnitz/boukamp_code/bouwkamp_code.py @@ -38,7 +38,7 @@ import re import inkex from lxml import etree -class BouwkampCodeExtension(inkex.EffectExtension): +class BouwkampCode(inkex.EffectExtension): """ This Inkscape extension allows you to generate squared squares and squared rectangles from Bouwkamp codes and table codes. @@ -160,4 +160,4 @@ class BouwkampCodeExtension(inkex.EffectExtension): etree.SubElement(parent, inkex.addNS('rect', 'svg'), rectangle_attributes) if __name__ == '__main__': - BouwkampCodeExtension().run() \ No newline at end of file + BouwkampCode().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/boundingbox/boundingbox.inx b/extensions/fablabchemnitz/bounding_box/bounding_box.inx similarity index 86% rename from extensions/fablabchemnitz/boundingbox/boundingbox.inx rename to extensions/fablabchemnitz/bounding_box/bounding_box.inx index 51a3ebda..9f10668b 100644 --- a/extensions/fablabchemnitz/boundingbox/boundingbox.inx +++ b/extensions/fablabchemnitz/bounding_box/bounding_box.inx @@ -1,7 +1,7 @@ Bounding Box - fablabchemnitz.de.boundingbox + fablabchemnitz.de.bounding_box 0.0 true @@ -16,6 +16,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/boundingbox/boundingbox.py b/extensions/fablabchemnitz/bounding_box/bounding_box.py similarity index 97% rename from extensions/fablabchemnitz/boundingbox/boundingbox.py rename to extensions/fablabchemnitz/bounding_box/bounding_box.py index b01ed812..216e59a7 100644 --- a/extensions/fablabchemnitz/boundingbox/boundingbox.py +++ b/extensions/fablabchemnitz/bounding_box/bounding_box.py @@ -4,7 +4,7 @@ import inkex import math from lxml import etree -class DrawBBoxes(inkex.EffectExtension): +class BoundingBox(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument('--offset', type=float, default=0.0, help='Offset from object (all directions)') @@ -47,4 +47,4 @@ class DrawBBoxes(inkex.EffectExtension): return if __name__ == '__main__': - DrawBBoxes().run() \ No newline at end of file + BoundingBox().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/conic_box/conic_box.inx b/extensions/fablabchemnitz/box_maker_conical/box_maker_conical.inx similarity index 90% rename from extensions/fablabchemnitz/conic_box/conic_box.inx rename to extensions/fablabchemnitz/box_maker_conical/box_maker_conical.inx index d4a11a4e..910b63ac 100644 --- a/extensions/fablabchemnitz/conic_box/conic_box.inx +++ b/extensions/fablabchemnitz/box_maker_conical/box_maker_conical.inx @@ -1,7 +1,7 @@ Box Maker - Conical - fablabchemnitz.de.conic_box + fablabchemnitz.de.box_maker_conical @@ -29,6 +29,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/conic_box/conic_box.py b/extensions/fablabchemnitz/box_maker_conical/box_maker_conical.py similarity index 99% rename from extensions/fablabchemnitz/conic_box/conic_box.py rename to extensions/fablabchemnitz/box_maker_conical/box_maker_conical.py index b939fb03..e7cfd8ee 100644 --- a/extensions/fablabchemnitz/conic_box/conic_box.py +++ b/extensions/fablabchemnitz/box_maker_conical/box_maker_conical.py @@ -225,7 +225,7 @@ def gen_cercle(diametre, nombre_pas, epaisseur, xOffset, yOffset, parent): index_pas += 1 path.GenPath() -class ConicalBox(inkex.EffectExtension): +class BoxMakerConical(inkex.EffectExtension): """ Creates a new layer with the drawings for a parametrically generaded box. """ @@ -350,4 +350,4 @@ class ConicalBox(inkex.EffectExtension): gen_cercle(d1, nombre_pas, thickness, -xmax - d1/2 + xOffset + 10, d1/2 + yOffset - ymin + 10, layer) if __name__ == '__main__': - ConicalBox().run() \ No newline at end of file + BoxMakerConical().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/elliptical_box/elliptical_box.inx b/extensions/fablabchemnitz/box_maker_elliptical_box/box_maker_elliptical_box.inx similarity index 92% rename from extensions/fablabchemnitz/elliptical_box/elliptical_box.inx rename to extensions/fablabchemnitz/box_maker_elliptical_box/box_maker_elliptical_box.inx index c9800e43..76c27e32 100644 --- a/extensions/fablabchemnitz/elliptical_box/elliptical_box.inx +++ b/extensions/fablabchemnitz/box_maker_elliptical_box/box_maker_elliptical_box.inx @@ -1,7 +1,7 @@ Box Maker - Elliptical Box - fablabchemnitz.de.elliptical_box + fablabchemnitz.de.box_maker_elliptical_box @@ -34,6 +34,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/elliptical_box/elliptical_box.py b/extensions/fablabchemnitz/box_maker_elliptical_box/box_maker_elliptical_box.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/elliptical_box.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/box_maker_elliptical_box.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/BezierCurve.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/BezierCurve.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/BezierCurve.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/BezierCurve.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/Coordinate.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Coordinate.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/Coordinate.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Coordinate.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/Effect.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Effect.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/Effect.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Effect.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/Ellipse.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Ellipse.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/Ellipse.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Ellipse.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/EllipticArc.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/EllipticArc.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/EllipticArc.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/EllipticArc.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/Line.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Line.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/Line.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Line.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/Matrix.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Matrix.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/Matrix.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/Matrix.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/PathSegment.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/PathSegment.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/PathSegment.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/PathSegment.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/SVG.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/SVG.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/SVG.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/SVG.py diff --git a/extensions/fablabchemnitz/elliptical_box/inkscape_helper/__init__.py b/extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/__init__.py similarity index 100% rename from extensions/fablabchemnitz/elliptical_box/inkscape_helper/__init__.py rename to extensions/fablabchemnitz/box_maker_elliptical_box/inkscape_helper/__init__.py diff --git a/extensions/fablabchemnitz/box_maker_elliptical_cone/.gitignore b/extensions/fablabchemnitz/box_maker_elliptical_cone/.gitignore new file mode 100644 index 00000000..6b112149 --- /dev/null +++ b/extensions/fablabchemnitz/box_maker_elliptical_cone/.gitignore @@ -0,0 +1 @@ +/DebugEllConicBox.txt diff --git a/extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.inx b/extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.inx similarity index 91% rename from extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.inx rename to extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.inx index 17e30d91..94c79e2c 100644 --- a/extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.inx +++ b/extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.inx @@ -1,7 +1,7 @@ Box Maker - Elliptical Cone - fablabchemnitz.de.elliptical_cone_box + fablabchemnitz.de.box_maker_elliptical_cone @@ -32,6 +32,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.py b/extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.py similarity index 99% rename from extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.py rename to extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.py index abb5c202..8c4a8f8d 100644 --- a/extensions/fablabchemnitz/elliptical_cone_box/elliptical_cone_box.py +++ b/extensions/fablabchemnitz/box_maker_elliptical_cone/box_maker_elliptical_cone.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.EffectExtension): +class BoxMakerEllipticalCone(inkex.EffectExtension): """ Creates a new layer with the drawings for a parametrically generaded box. """ @@ -700,4 +700,4 @@ class EllConicalBox(inkex.EffectExtension): self.fDebug.close() if __name__ == '__main__': - EllConicalBox().run() \ No newline at end of file + BoxMakerEllipticalCone().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/box_maker_generic_generator/.gitignore b/extensions/fablabchemnitz/box_maker_generic_generator/.gitignore new file mode 100644 index 00000000..f85c5081 --- /dev/null +++ b/extensions/fablabchemnitz/box_maker_generic_generator/.gitignore @@ -0,0 +1 @@ +/DebugGenericBox.txt diff --git a/extensions/fablabchemnitz/boxmaker_generic/gen_box.inx b/extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.inx similarity index 95% rename from extensions/fablabchemnitz/boxmaker_generic/gen_box.inx rename to extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.inx index 47fa7b85..a4962a54 100644 --- a/extensions/fablabchemnitz/boxmaker_generic/gen_box.inx +++ b/extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.inx @@ -1,7 +1,7 @@ Box Maker - Generic Generator - fablabchemnitz.de.gen_box + fablabchemnitz.de.box_maker_generic_generator @@ -67,6 +67,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/boxmaker_generic/gen_box.py b/extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.py similarity index 99% rename from extensions/fablabchemnitz/boxmaker_generic/gen_box.py rename to extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.py index 1605c3c3..6a743bfc 100644 --- a/extensions/fablabchemnitz/boxmaker_generic/gen_box.py +++ b/extensions/fablabchemnitz/box_maker_generic_generator/box_maker_generic_generator.py @@ -1827,7 +1827,7 @@ class BoxFace: -class GenericBox(inkex.Effect): +class BoxMakerGenericGenerator(inkex.Effect): """ Creates a new layer with the drawings for a parametrically generated box. """ @@ -3053,4 +3053,4 @@ class GenericBox(inkex.Effect): if __name__ == '__main__': - GenericBox().run() \ No newline at end of file + BoxMakerGenericGenerator().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/boxmaker_generic/inkscape_path.py b/extensions/fablabchemnitz/box_maker_generic_generator/inkscape_path.py similarity index 100% rename from extensions/fablabchemnitz/boxmaker_generic/inkscape_path.py rename to extensions/fablabchemnitz/box_maker_generic_generator/inkscape_path.py diff --git a/extensions/fablabchemnitz/lasercut_box/lasercut_box.inx b/extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.inx similarity index 96% rename from extensions/fablabchemnitz/lasercut_box/lasercut_box.inx rename to extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.inx index be4cb68d..a96565fc 100644 --- a/extensions/fablabchemnitz/lasercut_box/lasercut_box.inx +++ b/extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.inx @@ -1,7 +1,7 @@ Box Maker - Lasercut Box - fablabchemnitz.de.lasercut_box + fablabchemnitz.de.box_maker_lasercut_box \ No newline at end of file diff --git a/extensions/fablabchemnitz/lasercut_box/lasercut_box.py b/extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.py similarity index 90% rename from extensions/fablabchemnitz/lasercut_box/lasercut_box.py rename to extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.py index 80db869c..25ab8760 100644 --- a/extensions/fablabchemnitz/lasercut_box/lasercut_box.py +++ b/extensions/fablabchemnitz/box_maker_lasercut_box/box_maker_lasercut_box.py @@ -42,28 +42,27 @@ import inkex from inkex.paths import Path from lxml import etree -class LasercutBox(inkex.Effect): +class BoxMakerLasercutBox(inkex.EffectExtension): - def __init__(self): - super().__init__() - self.arg_parser.add_argument("-i", "--int_ext", type = inkex.Boolean, default=False, help="Are the Dimensions for External or Internal sizing.") - self.arg_parser.add_argument("-x", "--width", type=float, default=50.0, help="The Box Width - in the X dimension") - self.arg_parser.add_argument("-y", "--height", type=float, default=30.0, help="The Box Height - in the Y dimension") - self.arg_parser.add_argument("-z", "--depth", type=float, default=15.0, help="The Box Depth - in the Z dimension") - self.arg_parser.add_argument("-t", "--thickness", type=float, default=3.0, help="Material Thickness - critical to know") - self.arg_parser.add_argument("-u", "--units", default="cm", help="The unit of the box dimensions") - self.arg_parser.add_argument("-c", "--corners", type = inkex.Boolean, default=True, help="The corner cubes can be removed for a different look") - self.arg_parser.add_argument("-H", "--halftabs", type = inkex.Boolean, default=True, help="Start/End with half-sized tabs - Avoid with very small tabs") - self.arg_parser.add_argument("-p", "--ntab_W", type=int, default=11, help="Number of tabs in Width") - self.arg_parser.add_argument("-q", "--ntab_H", type=int, default=11, help="Number of tabs in Height") - self.arg_parser.add_argument("-r", "--ntab_D", type=int, default=6, help="Number of tabs in Depth") - self.arg_parser.add_argument("-k", "--kerf_size", type=float,default=0.0, help="Kerf size - amount lost to laser for this material. 0 = loose fit") - self.arg_parser.add_argument("-d", "--dimples", type=inkex.Boolean, default=False, help="Add dimples for press fitting wooden materials") - self.arg_parser.add_argument("-s", "--dstyle", type=inkex.Boolean, default=False, help="Dimples can be triangles(cheaper) or half rounds(better)") - self.arg_parser.add_argument("-g", "--linewidth", type=inkex.Boolean, default=False, help="Use the kerf value as the drawn line width") - self.arg_parser.add_argument("-j", "--annotation", type=inkex.Boolean, default=True, help="Show Kerf value as annotation") + def add_arguments(self, pars): + pars.add_argument("-i", "--int_ext", type = inkex.Boolean, default=False, help="Are the Dimensions for External or Internal sizing.") + pars.add_argument("-x", "--width", type=float, default=50.0, help="The Box Width - in the X dimension") + pars.add_argument("-y", "--height", type=float, default=30.0, help="The Box Height - in the Y dimension") + pars.add_argument("-z", "--depth", type=float, default=15.0, help="The Box Depth - in the Z dimension") + pars.add_argument("-t", "--thickness", type=float, default=3.0, help="Material Thickness - critical to know") + pars.add_argument("-u", "--units", default="cm", help="The unit of the box dimensions") + pars.add_argument("-c", "--corners", type = inkex.Boolean, default=True, help="The corner cubes can be removed for a different look") + pars.add_argument("-H", "--halftabs", type = inkex.Boolean, default=True, help="Start/End with half-sized tabs - Avoid with very small tabs") + pars.add_argument("-p", "--ntab_W", type=int, default=11, help="Number of tabs in Width") + pars.add_argument("-q", "--ntab_H", type=int, default=11, help="Number of tabs in Height") + pars.add_argument("-r", "--ntab_D", type=int, default=6, help="Number of tabs in Depth") + pars.add_argument("-k", "--kerf_size", type=float,default=0.0, help="Kerf size - amount lost to laser for this material. 0 = loose fit") + pars.add_argument("-d", "--dimples", type=inkex.Boolean, default=False, help="Add dimples for press fitting wooden materials") + pars.add_argument("-s", "--dstyle", type=inkex.Boolean, default=False, help="Dimples can be triangles(cheaper) or half rounds(better)") + pars.add_argument("-g", "--linewidth", type=inkex.Boolean, default=False, help="Use the kerf value as the drawn line width") + pars.add_argument("-j", "--annotation", type=inkex.Boolean, default=True, help="Show Kerf value as annotation") #dummy for the doc tab - which is named - self.arg_parser.add_argument("--tab", default="use", help="The selected UI-tab when OK was pressed") + pars.add_argument("--tab", default="use", help="The selected UI-tab when OK was pressed") #internal useful variables self.stroke_width = 0.1 #default for visiblity self.line_style = {'stroke': '#0000FF', # Ponoko blue @@ -468,4 +467,4 @@ class LasercutBox(inkex.Effect): #self.thin(g) # remove short straight lines if __name__ == '__main__': - LasercutBox().run() \ No newline at end of file + BoxMakerLasercutBox().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/living_hinge2/living_hinge2.inx b/extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.inx similarity index 94% rename from extensions/fablabchemnitz/living_hinge2/living_hinge2.inx rename to extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.inx index e195dd1d..c19bf706 100644 --- a/extensions/fablabchemnitz/living_hinge2/living_hinge2.inx +++ b/extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.inx @@ -1,7 +1,7 @@ Box Maker - Living Hinge - fablabchemnitz.de.living_hinge2 + fablabchemnitz.de.box_maker_living_hinge @@ -46,6 +46,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/living_hinge2/living_hinge2.py b/extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.py similarity index 93% rename from extensions/fablabchemnitz/living_hinge2/living_hinge2.py rename to extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.py index 4fa166b2..950b8e4c 100644 --- a/extensions/fablabchemnitz/living_hinge2/living_hinge2.py +++ b/extensions/fablabchemnitz/box_maker_living_hinge/box_maker_living_hinge.py @@ -191,26 +191,24 @@ def side(rx,ry,sox,soy,eox,eoy,tabVec,length, dirx, diry, isTab, isLongSide, tru return s #God class. Makes poor design, but not much object oriented in this guy... -class LivingHinge(inkex.Effect): - def __init__(self): - # Call the base class constructor. - inkex.Effect.__init__(self) - # Define options - self.arg_parser.add_argument('--unit',default='mm',help='Measure Units') - self.arg_parser.add_argument('--inside',type=int,default=0,help='Int/Ext Dimension') - self.arg_parser.add_argument('--length',type=float,default=100,help='Length of Box') - self.arg_parser.add_argument('--width',type=float,default=100,help='Width of Box') - self.arg_parser.add_argument('--height',type=float,default=100,help='Height of Box') - self.arg_parser.add_argument('--tab',type=float,default=25,help='Nominal Tab Width') - self.arg_parser.add_argument('--equal',type=int,default=0,help='Equal/Prop Tabs') - self.arg_parser.add_argument('--thickness',type=float,default=10,help='Thickness of Material') - self.arg_parser.add_argument('--kerf',type=float,default=0.5,help='Kerf (width) of cut') - self.arg_parser.add_argument('--clearance',type=float,default=0.01,help='Clearance of joints') - self.arg_parser.add_argument('--style',type=int,default=25,help='Layout/Style') - self.arg_parser.add_argument('--spacing',type=float,default=25,help='Part Spacing') - self.arg_parser.add_argument('--hingeOpt',type=int,default=0,help='Hinge type') - self.arg_parser.add_argument('--hingeThick',type=float,default=0,help='Hinge thickness') - self.arg_parser.add_argument('--thumbTab',default=0,help='Add a thumb tab') +class BoxMakerLivingHinge(inkex.EffectExtension): + + def add_arguments(self, pars): + pars.add_argument('--unit',default='mm',help='Measure Units') + pars.add_argument('--inside',type=int,default=0,help='Int/Ext Dimension') + pars.add_argument('--length',type=float,default=100,help='Length of Box') + pars.add_argument('--width',type=float,default=100,help='Width of Box') + pars.add_argument('--height',type=float,default=100,help='Height of Box') + pars.add_argument('--tab',type=float,default=25,help='Nominal Tab Width') + pars.add_argument('--equal',type=int,default=0,help='Equal/Prop Tabs') + pars.add_argument('--thickness',type=float,default=10,help='Thickness of Material') + pars.add_argument('--kerf',type=float,default=0.5,help='Kerf (width) of cut') + pars.add_argument('--clearance',type=float,default=0.01,help='Clearance of joints') + pars.add_argument('--style',type=int,default=25,help='Layout/Style') + pars.add_argument('--spacing',type=float,default=25,help='Part Spacing') + pars.add_argument('--hingeOpt',type=int,default=0,help='Hinge type') + pars.add_argument('--hingeThick',type=float,default=0,help='Hinge thickness') + pars.add_argument('--thumbTab',default=0,help='Add a thumb tab') """ Traditional multi-slit design. @@ -510,4 +508,4 @@ class LivingHinge(inkex.Effect): self.livingHinge4(x+(Z/2), y + (dy/2) - thickness, (x+(Z/2)+(EllipseCircumference(X/2, Z/2)/4)), y + dy, True, 1, hingeThick) if __name__ == '__main__': - LivingHinge().run() \ No newline at end of file + BoxMakerLivingHinge().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/mehrbox/mehrbox.inx b/extensions/fablabchemnitz/box_maker_mehr_boxes/box_maker_mehr_boxes.inx similarity index 96% rename from extensions/fablabchemnitz/mehrbox/mehrbox.inx rename to extensions/fablabchemnitz/box_maker_mehr_boxes/box_maker_mehr_boxes.inx index 759e7dd5..f3da275f 100644 --- a/extensions/fablabchemnitz/mehrbox/mehrbox.inx +++ b/extensions/fablabchemnitz/box_maker_mehr_boxes/box_maker_mehr_boxes.inx @@ -1,7 +1,7 @@ Box Maker - Mehr Boxes - fablabchemnitz.de.mehrbox + fablabchemnitz.de.box_maker_mehr_boxes @@ -69,6 +69,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/mehrbox/mehrbox.py b/extensions/fablabchemnitz/box_maker_mehr_boxes/box_maker_mehr_boxes.py similarity index 100% rename from extensions/fablabchemnitz/mehrbox/mehrbox.py rename to extensions/fablabchemnitz/box_maker_mehr_boxes/box_maker_mehr_boxes.py diff --git a/extensions/fablabchemnitz/mehrbox/mehr_plate.py b/extensions/fablabchemnitz/box_maker_mehr_boxes/mehr_plate.py similarity index 100% rename from extensions/fablabchemnitz/mehrbox/mehr_plate.py rename to extensions/fablabchemnitz/box_maker_mehr_boxes/mehr_plate.py diff --git a/extensions/fablabchemnitz/box_maker_path_to_flex/.gitignore b/extensions/fablabchemnitz/box_maker_path_to_flex/.gitignore new file mode 100644 index 00000000..e394608d --- /dev/null +++ b/extensions/fablabchemnitz/box_maker_path_to_flex/.gitignore @@ -0,0 +1 @@ +/DebugPath2Flex.txt diff --git a/extensions/fablabchemnitz/path2flex/path2flex.inx b/extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.inx similarity index 89% rename from extensions/fablabchemnitz/path2flex/path2flex.inx rename to extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.inx index 92a9de82..7f2acae2 100644 --- a/extensions/fablabchemnitz/path2flex/path2flex.inx +++ b/extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.inx @@ -1,7 +1,7 @@ Box Maker - Path To Flex - fablabchemnitz.de.path2flex + fablabchemnitz.de.box_maker_path_to_flex @@ -28,6 +28,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/path2flex/path2flex.py b/extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.py similarity index 98% rename from extensions/fablabchemnitz/path2flex/path2flex.py rename to extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.py index 632690a6..50e1ea8a 100644 --- a/extensions/fablabchemnitz/path2flex/path2flex.py +++ b/extensions/fablabchemnitz/box_maker_path_to_flex/box_maker_path_to_flex.py @@ -294,17 +294,16 @@ def Solve2nd(a, b, c): def distance2points(x0, y0, x1, y1): return math.hypot(x0-x1,y0-y1) -class Path2Flex(inkex.Effect): +class BoxMakerPathToFlex(inkex.EffectExtension): - def __init__(self): - inkex.Effect.__init__(self) + def add_arguments(self, pars): self.knownUnits = ['in', 'pt', 'px', 'mm', 'cm', 'm', 'km', 'pc', 'yd', 'ft'] - self.arg_parser.add_argument('--unit', default = 'mm', help = 'Unit, should be one of ') - self.arg_parser.add_argument('--thickness', type = float, default = '3.0', help = 'Material thickness') - self.arg_parser.add_argument('--zc', type = float, default = '50.0', help = 'Flex height') - self.arg_parser.add_argument('--notch_interval', type = int, default = '2', help = 'Interval between notches') - self.arg_parser.add_argument('--max_size_flex', type = float, default = '1000.0', help = 'Max size of a single band of flex, above this limit it will be cut') - self.arg_parser.add_argument('--Mode_Debug', type = inkex.Boolean, default = 'false', help = 'Output Debug information in file') + pars.add_argument('--unit', default = 'mm', help = 'Unit, should be one of ') + pars.add_argument('--thickness', type = float, default = '3.0', help = 'Material thickness') + pars.add_argument('--zc', type = float, default = '50.0', help = 'Flex height') + pars.add_argument('--notch_interval', type = int, default = '2', help = 'Interval between notches') + pars.add_argument('--max_size_flex', type = float, default = '1000.0', help = 'Max size of a single band of flex, above this limit it will be cut') + pars.add_argument('--Mode_Debug', type = inkex.Boolean, default = 'false', help = 'Output Debug information in file') # Dictionary of paths we will construct. It's keyed by the SVG node # it came from. Such keying isn't too useful in this specific case, @@ -1352,4 +1351,4 @@ class Path2Flex(inkex.Effect): self.fDebug.close() if __name__ == '__main__': - Path2Flex().run() \ No newline at end of file + BoxMakerPathToFlex().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/boxmaker_tabbed/boxmaker.inx b/extensions/fablabchemnitz/boxmaker_tabbed/box_maker_tabbed.inx similarity index 96% rename from extensions/fablabchemnitz/boxmaker_tabbed/boxmaker.inx rename to extensions/fablabchemnitz/boxmaker_tabbed/box_maker_tabbed.inx index 2f80fc14..0b11135d 100644 --- a/extensions/fablabchemnitz/boxmaker_tabbed/boxmaker.inx +++ b/extensions/fablabchemnitz/boxmaker_tabbed/box_maker_tabbed.inx @@ -1,7 +1,7 @@ Box Maker - Tabbed - fablabchemnitz.de.boxmaker.tabbed + fablabchemnitz.de.box_maker_tabbed @@ -83,6 +83,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/boxmaker_tabbed/boxmaker.py b/extensions/fablabchemnitz/boxmaker_tabbed/box_maker_tabbed.py similarity index 100% rename from extensions/fablabchemnitz/boxmaker_tabbed/boxmaker.py rename to extensions/fablabchemnitz/boxmaker_tabbed/box_maker_tabbed.py diff --git a/extensions/fablabchemnitz/boxmaker_tabbed/schroffmaker.inx b/extensions/fablabchemnitz/boxmaker_tabbed/schroffmaker.inx index de4cb03f..2a9f647b 100644 --- a/extensions/fablabchemnitz/boxmaker_tabbed/schroffmaker.inx +++ b/extensions/fablabchemnitz/boxmaker_tabbed/schroffmaker.inx @@ -1,7 +1,7 @@ Box Maker - Schroff - fablabchemnitz.de.boxmaker.schroff + fablabchemnitz.de.box_maker_schroff mm 1 1 @@ -43,6 +43,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.inx b/extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.inx similarity index 97% rename from extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.inx rename to extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.inx index e10b9da8..1731336a 100644 --- a/extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.inx +++ b/extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.inx @@ -63,6 +63,6 @@ These patterns allow otherwise rigid materials (eg wood, acrylic) to have bends diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.py b/extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.py similarity index 99% rename from extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.py rename to extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.py index 637bcf44..6299e800 100755 --- a/extensions/fablabchemnitz/buxtronix_living_hinge/living_hinge.py +++ b/extensions/fablabchemnitz/buxtronix_living_hinges/buxtronix_living_hinges.py @@ -344,7 +344,7 @@ class WavyLatticeGenerator(Generator): ) -class LivingHingeEffect(inkex.EffectExtension): +class BuxtronixLivingHinges(inkex.EffectExtension): """ Extension to create laser cut bend lattices. """ @@ -447,4 +447,4 @@ class LivingHingeEffect(inkex.EffectExtension): y = bbox.y.minimum draw_one(x, y) -LivingHingeEffect().run() \ No newline at end of file +BuxtronixLivingHinges().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/about.png b/extensions/fablabchemnitz/buxtronix_living_hinges/images/about.png similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/about.png rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/about.png diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/cross-lattice.png b/extensions/fablabchemnitz/buxtronix_living_hinges/images/cross-lattice.png similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/cross-lattice.png rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/cross-lattice.png diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/diamond-lattice.png b/extensions/fablabchemnitz/buxtronix_living_hinges/images/diamond-lattice.png similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/diamond-lattice.png rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/diamond-lattice.png diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/diamond-lattice.svg b/extensions/fablabchemnitz/buxtronix_living_hinges/images/diamond-lattice.svg similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/diamond-lattice.svg rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/diamond-lattice.svg diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/straight-lattice.png b/extensions/fablabchemnitz/buxtronix_living_hinges/images/straight-lattice.png similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/straight-lattice.png rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/straight-lattice.png diff --git a/extensions/fablabchemnitz/buxtronix_living_hinge/images/wavy-lattice.png b/extensions/fablabchemnitz/buxtronix_living_hinges/images/wavy-lattice.png similarity index 100% rename from extensions/fablabchemnitz/buxtronix_living_hinge/images/wavy-lattice.png rename to extensions/fablabchemnitz/buxtronix_living_hinges/images/wavy-lattice.png diff --git a/extensions/fablabchemnitz/can_generator/can_generator.inx b/extensions/fablabchemnitz/can_generator/can_generator.inx index c23bea05..a296cfc3 100644 --- a/extensions/fablabchemnitz/can_generator/can_generator.inx +++ b/extensions/fablabchemnitz/can_generator/can_generator.inx @@ -1,4 +1,4 @@ - + Can Generator fablabchemnitz.de.can_generator diff --git a/extensions/fablabchemnitz/can_generator/can_generator.py b/extensions/fablabchemnitz/can_generator/can_generator.py index de6b31b3..6b3361d4 100644 --- a/extensions/fablabchemnitz/can_generator/can_generator.py +++ b/extensions/fablabchemnitz/can_generator/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.EffectExtension): +class CanGenerator(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument("--height", type=int, default = 50, help="Höhe der Dose") @@ -368,4 +368,4 @@ class Dose(inkex.EffectExtension): branding_line.text = 'Die Einschnitte nur zu 70 Prozent in das Material lasern' if __name__ == '__main__': - Dose().run() \ No newline at end of file + CanGenerator().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.inx b/extensions/fablabchemnitz/card_layout_guides/card_layout_guides.inx similarity index 89% rename from extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.inx rename to extensions/fablabchemnitz/card_layout_guides/card_layout_guides.inx index 3e1b8617..2a231164 100644 --- a/extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.inx +++ b/extensions/fablabchemnitz/card_layout_guides/card_layout_guides.inx @@ -1,7 +1,7 @@ Cards Layout Guides - fablabchemnitz.de.CardLayoutGuides + fablabchemnitz.de.card_layout_guides @@ -24,6 +24,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.py b/extensions/fablabchemnitz/card_layout_guides/card_layout_guides.py similarity index 99% rename from extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.py rename to extensions/fablabchemnitz/card_layout_guides/card_layout_guides.py index 361a2cce..b4fd0d5a 100644 --- a/extensions/fablabchemnitz/CardLayoutGuides/CardLayoutGuides.py +++ b/extensions/fablabchemnitz/card_layout_guides/card_layout_guides.py @@ -432,7 +432,7 @@ class LineGeneratorForHorizontalCards(LineGeneratorBase): return lines -class FoldedCardLayoutGuidesEffect(inkex.EffectExtension): +class CardLayoutGuides(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument('-l', '--layout') @@ -477,4 +477,4 @@ class FoldedCardLayoutGuidesEffect(inkex.EffectExtension): gen.GenerateCropMarks(layer) if __name__ == '__main__': - FoldedCardLayoutGuidesEffect().run() \ No newline at end of file + CardLayoutGuides().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/chipScratches/chipScratches.inx b/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx similarity index 95% rename from extensions/fablabchemnitz/chipScratches/chipScratches.inx rename to extensions/fablabchemnitz/chip_scratches/chip_scratches.inx index 0fcbc177..b791fecf 100644 --- a/extensions/fablabchemnitz/chipScratches/chipScratches.inx +++ b/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx @@ -1,7 +1,7 @@ Chip Scratches - fablabchemnitz.de.chipScratches + fablabchemnitz.de.chip_scratches @@ -45,6 +45,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/chipScratches/chipScratches.py b/extensions/fablabchemnitz/chip_scratches/chip_scratches.py similarity index 99% rename from extensions/fablabchemnitz/chipScratches/chipScratches.py rename to extensions/fablabchemnitz/chip_scratches/chip_scratches.py index 025a6315..2d721a1f 100644 --- a/extensions/fablabchemnitz/chipScratches/chipScratches.py +++ b/extensions/fablabchemnitz/chip_scratches/chip_scratches.py @@ -74,7 +74,7 @@ global /inxGen/ =1 and run the file stand-alone. - AK Sept 2018 """ -class noiseEffect(inkex.EffectExtension): +class ChipScratches(inkex.EffectExtension): """ Creates visual noise. 3 kinds: Scratches, chips, specks. 50, 100, 100 instances are predefined. These are chosen @@ -109,27 +109,16 @@ for number and size, as well as some specific to each type. def effect(self): # Get access to main SVG document element and get its dimensions. - svg = self.document.getroot() if self.options.pgsizep: - rx = self.svg.unittouu(svg.get('width')) - ry = self.svg.unittouu(svg.attrib['height']) + rx = self.svg.unittouu(self.svg.get('width')) + ry = self.svg.unittouu(self.svg.attrib['height']) else: rx = self.options.rx ry = self.options.ry - - svg = self.document.getroot() - - seld = self.svg.selected - if len(seld) : - id = seld.keys()[0] - sel = seld[id] - parent = self.getParentNode(sel) - else : - parent = svg + parent = self.document.getroot() #Create scratches - pdic = { 'rx' : rx, 'ry' : ry, @@ -779,4 +768,4 @@ def addparms( p ) : return s if __name__ == '__main__': - noiseEffect().run() \ No newline at end of file + ChipScratches().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/tangent/tangent.inx b/extensions/fablabchemnitz/circle_tangents/circle_tangents.inx similarity index 75% rename from extensions/fablabchemnitz/tangent/tangent.inx rename to extensions/fablabchemnitz/circle_tangents/circle_tangents.inx index 54a81978..82e4950b 100644 --- a/extensions/fablabchemnitz/tangent/tangent.inx +++ b/extensions/fablabchemnitz/circle_tangents/circle_tangents.inx @@ -1,7 +1,7 @@ Circle Tangents - fablabchemnitz.de.tangent + fablabchemnitz.de.circle_tangents @@ -11,6 +11,7 @@ + true all @@ -20,6 +21,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/tangent/tangent.py b/extensions/fablabchemnitz/circle_tangents/circle_tangents.py similarity index 88% rename from extensions/fablabchemnitz/tangent/tangent.py rename to extensions/fablabchemnitz/circle_tangents/circle_tangents.py index 58c4ea4d..4678fa75 100644 --- a/extensions/fablabchemnitz/tangent/tangent.py +++ b/extensions/fablabchemnitz/circle_tangents/circle_tangents.py @@ -104,12 +104,13 @@ def getPathData(obj): return data -class Tangent(inkex.Effect): - def __init__(self): - inkex.Effect.__init__(self) - self.arg_parser.add_argument("--position", default="inner", help="Choose either inner or outer tangent lines") - self.arg_parser.add_argument("--selector", default="both", help="Choose which tangents you want to get") - +class CircleTangents(inkex.EffectExtension): + + def add_arguments(self, pars): + pars.add_argument("--position", default="inner", help="Choose either inner or outer tangent lines") + pars.add_argument("--selector", default="both", help="Choose which tangents you want to get") + pars.add_argument("--use_style_from_first", type=inkex.Boolean, default=False, help="Use style from first selected") + def effect(self): if len(self.options.ids) != 2: inkex.errormsg("Please select exactly two circles and try again!") @@ -118,6 +119,10 @@ class Tangent(inkex.Effect): c1object = self.svg.selected[self.options.ids[0]] c2object = self.svg.selected[self.options.ids[1]] + if c1object.tag != inkex.addNS('circle','svg') or c2object.tag != inkex.addNS('circle','svg'): + self.msg("One or both objects are not svg:circle elements!") + return + c1 = getPathData(c1object) c2 = getPathData(c2object) @@ -196,7 +201,10 @@ class Tangent(inkex.Effect): # Draw a line llx1 = cyfA[0] lly1 = cyfA[1] - llsteil = (c1object.get("style")) + if self.options.use_style_from_first is True: + llsteil = (c1object.get("style")) #note: if the selected objects do not contain a stroke width the tangents will be invisible! + else: + llsteil = "stroke:#000000; stroke-width:1px; fill:none;" # Line 1 if self.options.selector == "first" or self.options.selector == "both": @@ -219,4 +227,4 @@ class Tangent(inkex.Effect): etree.SubElement(parent, inkex.addNS('path','svg'), attribsLine1 ) if __name__ == '__main__': - Tangent().run() \ No newline at end of file + CircleTangents().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/cleanup_styles/cleanup_styles.py b/extensions/fablabchemnitz/cleanup_styles/cleanup_styles.py index 29b81484..ccaf147c 100644 --- a/extensions/fablabchemnitz/cleanup_styles/cleanup_styles.py +++ b/extensions/fablabchemnitz/cleanup_styles/cleanup_styles.py @@ -32,7 +32,7 @@ Notes: import inkex import re -class Cleanup(inkex.EffectExtension): +class CleanupStyles(inkex.EffectExtension): groups = [] @@ -184,4 +184,4 @@ class Cleanup(inkex.EffectExtension): self.groups.append(node) if __name__ == '__main__': - Cleanup().run() \ No newline at end of file + CleanupStyles().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/clonesperspective/clonesperspective.inx b/extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.inx similarity index 78% rename from extensions/fablabchemnitz/clonesperspective/clonesperspective.inx rename to extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.inx index 4e4b0204..35b66d60 100644 --- a/extensions/fablabchemnitz/clonesperspective/clonesperspective.inx +++ b/extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.inx @@ -1,7 +1,7 @@ Clones In Perspective - fablabchemnitz.de.clonesperspective + fablabchemnitz.de.clones_in_perspective 5 0.8 @@ -13,6 +13,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/clonesperspective/clonesperspective.py b/extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.py similarity index 96% rename from extensions/fablabchemnitz/clonesperspective/clonesperspective.py rename to extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.py index fd7bfee3..d3ebf8f2 100644 --- a/extensions/fablabchemnitz/clonesperspective/clonesperspective.py +++ b/extensions/fablabchemnitz/clones_in_perspective/clones_in_perspective.py @@ -4,7 +4,7 @@ import math import inkex from lxml import etree -class clonesPerspectiveEffect(inkex.EffectExtension): +class clonesInPerspective(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument('--num', type = int, default = 5, help = 'Drag out center of rotation before calling') @@ -60,4 +60,4 @@ class clonesPerspectiveEffect(inkex.EffectExtension): parent.insert(j, etree.Element('use', att)) if __name__ == '__main__': - clonesPerspectiveEffect().run() \ No newline at end of file + clonesInPerspective().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/close_paths/close_paths.py b/extensions/fablabchemnitz/close_paths/close_paths.py index 861cfb35..17d22439 100644 --- a/extensions/fablabchemnitz/close_paths/close_paths.py +++ b/extensions/fablabchemnitz/close_paths/close_paths.py @@ -28,7 +28,7 @@ import inkex import re from inkex.paths import Path -class CloseCurves(inkex.EffectExtension): +class ClosePaths(inkex.EffectExtension): def effect(self): for id, node in self.svg.selected.items(): @@ -40,4 +40,4 @@ class CloseCurves(inkex.EffectExtension): node.set('d', d) if __name__ == '__main__': - CloseCurves().run() \ No newline at end of file + ClosePaths().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/pathselection/pathselection.inx b/extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.inx similarity index 90% rename from extensions/fablabchemnitz/pathselection/pathselection.inx rename to extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.inx index 79ac44e3..cfeb03be 100644 --- a/extensions/fablabchemnitz/pathselection/pathselection.inx +++ b/extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.inx @@ -1,7 +1,7 @@ Colorize Path Lengths - fablabchemnitz.de.pathselection + fablabchemnitz.de.colorize_path_lengths @@ -23,6 +23,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/pathselection/pathselection.py b/extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.py similarity index 98% rename from extensions/fablabchemnitz/pathselection/pathselection.py rename to extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.py index bd74e18f..5e191f6b 100644 --- a/extensions/fablabchemnitz/pathselection/pathselection.py +++ b/extensions/fablabchemnitz/colorize_path_lengths/colorize_path_lengths.py @@ -55,7 +55,7 @@ def roughBBox(path): tn=(yMax-ymin)/(xMax-xmin) return tn -class Length(inkex.EffectExtension): +class ColorizePathLengths(inkex.EffectExtension): def add_arguments(self, pars): pars.add_argument("-s", "--selection", default=True, help="select path with length or slant") @@ -135,4 +135,4 @@ class Length(inkex.EffectExtension): return if __name__ == '__main__': - Length().run() \ No newline at end of file + ColorizePathLengths().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/contourscannerandtrimmer/contour_scanner_and_trimmer.inx b/extensions/fablabchemnitz/contour_scanner_and_trimmer/contour_scanner_and_trimmer.inx similarity index 100% rename from extensions/fablabchemnitz/contourscannerandtrimmer/contour_scanner_and_trimmer.inx rename to extensions/fablabchemnitz/contour_scanner_and_trimmer/contour_scanner_and_trimmer.inx diff --git a/extensions/fablabchemnitz/contourscannerandtrimmer/contour_scanner_and_trimmer.py b/extensions/fablabchemnitz/contour_scanner_and_trimmer/contour_scanner_and_trimmer.py similarity index 100% rename from extensions/fablabchemnitz/contourscannerandtrimmer/contour_scanner_and_trimmer.py rename to extensions/fablabchemnitz/contour_scanner_and_trimmer/contour_scanner_and_trimmer.py diff --git a/extensions/fablabchemnitz/contourscannerandtrimmer/poly_point_isect.py b/extensions/fablabchemnitz/contour_scanner_and_trimmer/poly_point_isect.py similarity index 100% rename from extensions/fablabchemnitz/contourscannerandtrimmer/poly_point_isect.py rename to extensions/fablabchemnitz/contour_scanner_and_trimmer/poly_point_isect.py diff --git a/extensions/fablabchemnitz/convert_polylines/convert_polylines.inx b/extensions/fablabchemnitz/convert_to_polylines/convert_to_polylines.inx similarity index 75% rename from extensions/fablabchemnitz/convert_polylines/convert_polylines.inx rename to extensions/fablabchemnitz/convert_to_polylines/convert_to_polylines.inx index 9978f491..70f25c04 100644 --- a/extensions/fablabchemnitz/convert_polylines/convert_polylines.inx +++ b/extensions/fablabchemnitz/convert_to_polylines/convert_to_polylines.inx @@ -1,7 +1,7 @@ Convert To Polylines - fablabchemnitz.de.convert_polylines + fablabchemnitz.de.convert_to_polylines path @@ -11,6 +11,6 @@ diff --git a/extensions/fablabchemnitz/convert_polylines/convert_polylines.py b/extensions/fablabchemnitz/convert_to_polylines/convert_to_polylines.py similarity index 100% rename from extensions/fablabchemnitz/convert_polylines/convert_polylines.py rename to extensions/fablabchemnitz/convert_to_polylines/convert_to_polylines.py diff --git a/extensions/fablabchemnitz/vh_to_line/vh_to_line.inx b/extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.inx similarity index 69% rename from extensions/fablabchemnitz/vh_to_line/vh_to_line.inx rename to extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.inx index c0643114..7c2c9b80 100644 --- a/extensions/fablabchemnitz/vh_to_line/vh_to_line.inx +++ b/extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.inx @@ -1,7 +1,7 @@ Convert Vertical/Horizontal To Line - fablabchemnitz.de.vh_to_line + fablabchemnitz.de.convert_vertical_horizontal_to_line path @@ -11,6 +11,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/vh_to_line/vh_to_line.py b/extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.py similarity index 96% rename from extensions/fablabchemnitz/vh_to_line/vh_to_line.py rename to extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.py index e5c99f89..ef789cb3 100644 --- a/extensions/fablabchemnitz/vh_to_line/vh_to_line.py +++ b/extensions/fablabchemnitz/convert_vertical_horizontal_to_line/convert_vertical_horizontal_to_line.py @@ -23,7 +23,7 @@ from math import * import inkex from inkex.paths import Path, CubicSuperPath -class VHToLine(inkex.EffectExtension): +class ConvertVerticalHorizontalToLine(inkex.EffectExtension): def effect(self): if len(self.svg.selected) == 0: exit("Please select at least one path.") @@ -61,4 +61,4 @@ class VHToLine(inkex.EffectExtension): else: inkex.utils.debug("Object " + obj.get('id') + " is not a path. Please convert it to a path first.") if __name__ == '__main__': - VHToLine().run() \ No newline at end of file + ConvertVerticalHorizontalToLine().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/convexhull/convexhull.inx b/extensions/fablabchemnitz/convex_hull/convex_hull.inx similarity index 75% rename from extensions/fablabchemnitz/convexhull/convexhull.inx rename to extensions/fablabchemnitz/convex_hull/convex_hull.inx index af324e2e..941efdb1 100644 --- a/extensions/fablabchemnitz/convexhull/convexhull.inx +++ b/extensions/fablabchemnitz/convex_hull/convex_hull.inx @@ -1,7 +1,7 @@ Convex Hull - fablabchemnitz.de.convexhull + fablabchemnitz.de.convex_hull all @@ -11,6 +11,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/convexhull/convexhull.py b/extensions/fablabchemnitz/convex_hull/convex_hull.py similarity index 100% rename from extensions/fablabchemnitz/convexhull/convexhull.py rename to extensions/fablabchemnitz/convex_hull/convex_hull.py diff --git a/extensions/fablabchemnitz/hexmap/hexmap.inx b/extensions/fablabchemnitz/create_hexmap/create_hexmap.inx similarity index 96% rename from extensions/fablabchemnitz/hexmap/hexmap.inx rename to extensions/fablabchemnitz/create_hexmap/create_hexmap.inx index b2fcd6a4..6c63643e 100644 --- a/extensions/fablabchemnitz/hexmap/hexmap.inx +++ b/extensions/fablabchemnitz/create_hexmap/create_hexmap.inx @@ -1,7 +1,7 @@ Create Hexmap - fablabchemnitz.de.hexmap + fablabchemnitz.de.create_hexmap @@ -58,6 +58,6 @@ \ No newline at end of file diff --git a/extensions/fablabchemnitz/hexmap/hexmap.py b/extensions/fablabchemnitz/create_hexmap/create_hexmap.py similarity index 83% rename from extensions/fablabchemnitz/hexmap/hexmap.py rename to extensions/fablabchemnitz/create_hexmap/create_hexmap.py index e4ca17ef..18670079 100644 --- a/extensions/fablabchemnitz/hexmap/hexmap.py +++ b/extensions/fablabchemnitz/create_hexmap/create_hexmap.py @@ -44,39 +44,39 @@ COORD_SIZE_PART_OF_HEX_HEIGHT = 0.1 COORD_YOFFSET_PART = 75 CENTERDOT_SIZE_FACTOR = 1.1690625 -class HexmapEffect(inkex.Effect): - def __init__(self): - inkex.Effect.__init__(self) - self.arg_parser.add_argument('--tab') - self.arg_parser.add_argument('--generatelog', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--logfilepath', default = "debug.txt") - self.arg_parser.add_argument("--units", default='mm', help="Units this dialog is using") - self.arg_parser.add_argument('--cols', type = int, default = '10', help = 'Number of columns.') - self.arg_parser.add_argument('--rows', type = int, default = '10', help = 'Number of columns.') - self.arg_parser.add_argument('--hexsize', type = float, default = 0.0) - self.arg_parser.add_argument('--strokewidth', type = float, default = 1.0) - self.arg_parser.add_argument('--coordrows', type = int, default = '1') - self.arg_parser.add_argument('--coordcolstart', type = int, default = '1') - self.arg_parser.add_argument('--coordrowstart', type = int, default = '1') - self.arg_parser.add_argument('--bricks', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--squarebricks', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--rotate', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--coordseparator', default = '') - self.arg_parser.add_argument('--layersingroup', type = inkex.Boolean, default = False, help = 'Put all layers in a layer group.') - self.arg_parser.add_argument('--coordalphacol', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') - self.arg_parser.add_argument('--coordrevrow', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') - self.arg_parser.add_argument('--coordzeros', type = inkex.Boolean, default = True) - self.arg_parser.add_argument('--coordrowfirst', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') - self.arg_parser.add_argument('--xshift', type = inkex.Boolean, default = False, help = 'Shift grid half hex and wrap.') - self.arg_parser.add_argument('--firstcoldown', type = inkex.Boolean, default = False, help = 'Make first column half-hex down.') - self.arg_parser.add_argument('--halfhexes', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--verticesize', type = float,default = 1.0) - self.arg_parser.add_argument('--layer_grid', type = inkex.Boolean, default = True) - self.arg_parser.add_argument('--layer_fill', type = inkex.Boolean, default = True) - self.arg_parser.add_argument('--layer_coordinates', type = inkex.Boolean, default = True) - self.arg_parser.add_argument('--layer_centerdots', type = inkex.Boolean, default = True) - self.arg_parser.add_argument('--layer_vertices', type = inkex.Boolean, default = False) - self.arg_parser.add_argument('--layer_circles', type = inkex.Boolean, default = False) +class CreateHexmap(inkex.EffectExtension): + + def add_arguments(self, pars): + pars.add_argument('--tab') + pars.add_argument('--generatelog', type = inkex.Boolean, default = False) + pars.add_argument('--logfilepath', default = "debug.txt") + pars.add_argument("--units", default='mm', help="Units this dialog is using") + pars.add_argument('--cols', type = int, default = '10', help = 'Number of columns.') + pars.add_argument('--rows', type = int, default = '10', help = 'Number of columns.') + pars.add_argument('--hexsize', type = float, default = 0.0) + pars.add_argument('--strokewidth', type = float, default = 1.0) + pars.add_argument('--coordrows', type = int, default = '1') + pars.add_argument('--coordcolstart', type = int, default = '1') + pars.add_argument('--coordrowstart', type = int, default = '1') + pars.add_argument('--bricks', type = inkex.Boolean, default = False) + pars.add_argument('--squarebricks', type = inkex.Boolean, default = False) + pars.add_argument('--rotate', type = inkex.Boolean, default = False) + pars.add_argument('--coordseparator', default = '') + pars.add_argument('--layersingroup', type = inkex.Boolean, default = False, help = 'Put all layers in a layer group.') + pars.add_argument('--coordalphacol', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') + pars.add_argument('--coordrevrow', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') + pars.add_argument('--coordzeros', type = inkex.Boolean, default = True) + pars.add_argument('--coordrowfirst', type = inkex.Boolean, default = False, help = 'Reverse row coordinates.') + pars.add_argument('--xshift', type = inkex.Boolean, default = False, help = 'Shift grid half hex and wrap.') + pars.add_argument('--firstcoldown', type = inkex.Boolean, default = False, help = 'Make first column half-hex down.') + pars.add_argument('--halfhexes', type = inkex.Boolean, default = False) + pars.add_argument('--verticesize', type = float,default = 1.0) + pars.add_argument('--layer_grid', type = inkex.Boolean, default = True) + pars.add_argument('--layer_fill', type = inkex.Boolean, default = True) + pars.add_argument('--layer_coordinates', type = inkex.Boolean, default = True) + pars.add_argument('--layer_centerdots', type = inkex.Boolean, default = True) + pars.add_argument('--layer_vertices', type = inkex.Boolean, default = False) + pars.add_argument('--layer_circles', type = inkex.Boolean, default = False) def createLayer(self, name): layer = etree.Element(inkex.addNS('g', 'svg')) @@ -417,4 +417,4 @@ class HexmapEffect(inkex.Effect): svg.append(layer) if __name__ == '__main__': - HexmapEffect().run() \ No newline at end of file + CreateHexmap().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/cutting_optimizer/.gitignore b/extensions/fablabchemnitz/cutting_optimizer/.gitignore new file mode 100644 index 00000000..99ee6b15 --- /dev/null +++ b/extensions/fablabchemnitz/cutting_optimizer/.gitignore @@ -0,0 +1 @@ +/Debug_CutOptim.txt diff --git a/extensions/fablabchemnitz/cutoptim/CutOptim b/extensions/fablabchemnitz/cutting_optimizer/CutOptim similarity index 100% rename from extensions/fablabchemnitz/cutoptim/CutOptim rename to extensions/fablabchemnitz/cutting_optimizer/CutOptim diff --git a/extensions/fablabchemnitz/cutoptim/CutOptim.exe b/extensions/fablabchemnitz/cutting_optimizer/CutOptim.exe similarity index 100% rename from extensions/fablabchemnitz/cutoptim/CutOptim.exe rename to extensions/fablabchemnitz/cutting_optimizer/CutOptim.exe diff --git a/extensions/fablabchemnitz/cutoptim/cutoptim.inx b/extensions/fablabchemnitz/cutting_optimizer/cutting_optimizer.inx similarity index 94% rename from extensions/fablabchemnitz/cutoptim/cutoptim.inx rename to extensions/fablabchemnitz/cutting_optimizer/cutting_optimizer.inx index 9779dddb..c3c3468e 100644 --- a/extensions/fablabchemnitz/cutoptim/cutoptim.inx +++ b/extensions/fablabchemnitz/cutting_optimizer/cutting_optimizer.inx @@ -1,7 +1,7 @@ Cutting Optimizer (Nesting) - fablabchemnitz.de.cutoptim + fablabchemnitz.de.cutting_optimizer