From 5d87b2cd13fc10a687a08bd2de1c3797a30d8008 Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Sat, 24 Apr 2021 22:06:25 +0200 Subject: [PATCH] added unit selector for polyhedra; merged polyhedra inx into one --- .../fablabchemnitz/polyhedra/polyhedra.inx | 67 +++++++++++++++++++ .../fablabchemnitz/polyhedra/polyhedra.py | 12 ++-- .../polyhedra/polyhedra_archimedean.inx | 38 ----------- .../polyhedra/polyhedra_archimedeandual.inx | 38 ----------- .../polyhedra/polyhedra_other.inx | 27 -------- .../polyhedra/polyhedra_platonic.inx | 30 --------- .../polyhedra/polyhedrondata.py | 2 +- 7 files changed, 74 insertions(+), 140 deletions(-) create mode 100644 extensions/fablabchemnitz/polyhedra/polyhedra.inx delete mode 100644 extensions/fablabchemnitz/polyhedra/polyhedra_archimedean.inx delete mode 100644 extensions/fablabchemnitz/polyhedra/polyhedra_archimedeandual.inx delete mode 100644 extensions/fablabchemnitz/polyhedra/polyhedra_other.inx delete mode 100644 extensions/fablabchemnitz/polyhedra/polyhedra_platonic.inx diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra.inx b/extensions/fablabchemnitz/polyhedra/polyhedra.inx new file mode 100644 index 00000000..c094a39b --- /dev/null +++ b/extensions/fablabchemnitz/polyhedra/polyhedra.inx @@ -0,0 +1,67 @@ + + + Polyhedra + fablabchemnitz.de.polyhedra + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100.0 + + + + + + + + + + + + + + + + + all + + + + + + + + \ No newline at end of file diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra.py b/extensions/fablabchemnitz/polyhedra/polyhedra.py index 6132c97f..daed4573 100644 --- a/extensions/fablabchemnitz/polyhedra/polyhedra.py +++ b/extensions/fablabchemnitz/polyhedra/polyhedra.py @@ -57,9 +57,10 @@ slotStyle = [{\ class Polyhedra(inkex.EffectExtension): def add_arguments(self, pars): - pars.add_argument("-p", "--poly", default='Cube', help="polygon net to render") - pars.add_argument("-s", "--size", type=float, default=100.0, help="size of first edge, in px") - pars.add_argument("-t", "--tabs", type=int, default=0, help="tab style") + pars.add_argument("-p", "--poly", default='Cube', help="Polygon net to render") + pars.add_argument("-s", "--size", type=float, default=100.0, help="Size of first edge") + pars.add_argument("-u", "--unit", default= 'mm', help="Units") + pars.add_argument("-t", "--tabs", type=int, default=0, help="Tab style") def get_tab(self, limitAngle): return(self.get_connector('tab', limitAngle)) @@ -132,14 +133,13 @@ class Polyhedra(inkex.EffectExtension): def effect(self): poly = self.options.poly - size = self.options.size + size = self.svg.unittouu(str(self.options.size) + self.options.unit) eC = polyhedronData[poly]['edgeCoordinates'] iEI = polyhedronData[poly]['insideEdgeIndices'] oEI = polyhedronData[poly]['outsideEdgeIndices'] oED = polyhedronData[poly]['outsideEdgeDegrees'] - sidelen = sqrt((eC[oEI[0][0]-1][0] - eC[oEI[0][1]-1][0])**2 + \ - (eC[oEI[0][0]-1][1] - eC[oEI[0][1]-1][1])**2) + sidelen = sqrt((eC[oEI[0][0]-1][0] - eC[oEI[0][1]-1][0])**2 + (eC[oEI[0][0]-1][1] - eC[oEI[0][1]-1][1])**2) scale = size / sidelen # Translate group, Rotate path. diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra_archimedean.inx b/extensions/fablabchemnitz/polyhedra/polyhedra_archimedean.inx deleted file mode 100644 index 0c978db3..00000000 --- a/extensions/fablabchemnitz/polyhedra/polyhedra_archimedean.inx +++ /dev/null @@ -1,38 +0,0 @@ - - - Polyhedra - Archimedean - fablabchemnitz.de.polyhedra.archimedean - - - - - - - - - - - - - - - - 100.0 - - - - - - - - all - - - - - - - - \ No newline at end of file diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra_archimedeandual.inx b/extensions/fablabchemnitz/polyhedra/polyhedra_archimedeandual.inx deleted file mode 100644 index 5384b64f..00000000 --- a/extensions/fablabchemnitz/polyhedra/polyhedra_archimedeandual.inx +++ /dev/null @@ -1,38 +0,0 @@ - - - Polyhedra - Archimedean Dual - fablabchemnitz.de.polyhedra.archimedeandual - - - - - - - - - - - - - - - - 100.0 - - - - - - - - all - - - - - - - - \ No newline at end of file diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra_other.inx b/extensions/fablabchemnitz/polyhedra/polyhedra_other.inx deleted file mode 100644 index 666ad022..00000000 --- a/extensions/fablabchemnitz/polyhedra/polyhedra_other.inx +++ /dev/null @@ -1,27 +0,0 @@ - - - Polyhedra - Other - fablabchemnitz.de.polyhedra.other - - - - - 100.0 - - - - - - - - all - - - - - - - - \ No newline at end of file diff --git a/extensions/fablabchemnitz/polyhedra/polyhedra_platonic.inx b/extensions/fablabchemnitz/polyhedra/polyhedra_platonic.inx deleted file mode 100644 index 28f48e3c..00000000 --- a/extensions/fablabchemnitz/polyhedra/polyhedra_platonic.inx +++ /dev/null @@ -1,30 +0,0 @@ - - - Polyhedra - Platonic - fablabchemnitz.de.polyhedra.platonic - - - - - - - - 100.0 - - - - - - - - all - - - - - - - - \ No newline at end of file diff --git a/extensions/fablabchemnitz/polyhedra/polyhedrondata.py b/extensions/fablabchemnitz/polyhedra/polyhedrondata.py index 8e86330e..248cdd8f 100644 --- a/extensions/fablabchemnitz/polyhedra/polyhedrondata.py +++ b/extensions/fablabchemnitz/polyhedra/polyhedrondata.py @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# net data produced with Mathematica using the notebook at http://jmantonfablab.googlecode.com/svn/trunk/papercuts/polyhedra/autonets/polydatagen.nb +# net data produced with Mathematica using the notebook at https://github.com/vmario89/fablab-polyhedra/tree/master/autonets # angle overrides manually produced, with help from debugging mode on net generation that also outputs the vertex number of the outer edges of the nets. angleOverride = {\