From d4ed81735985993f3887216fdde88c096e0d304d Mon Sep 17 00:00:00 2001 From: Drewler Date: Wed, 15 Jul 2020 03:16:11 +0200 Subject: [PATCH 1/2] Fixes JTechPhotonics/J-Tech-Photonics-Laser-Tool#4 --- laser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/laser.py b/laser.py index d971933..a241be5 100644 --- a/laser.py +++ b/laser.py @@ -26,6 +26,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ import inkex +from inkex.transforms import Transform +from inkex.paths import Path import simpletransform import os @@ -935,7 +937,7 @@ class LaserGcode(inkex.Effect): def apply_transforms(self, g, csp): trans = self.get_transforms(g) if trans != []: - simpletransform.applyTransformToPath(trans, csp) + csp = Path(csp).transform(Transform(trans)).to_superpath() return csp From e19a069d5b3b2742c45528fdda96c71cf944d904 Mon Sep 17 00:00:00 2001 From: Drewler Date: Wed, 15 Jul 2020 03:23:49 +0200 Subject: [PATCH 2/2] Fix simpletransform deprecation warnings --- laser.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/laser.py b/laser.py index a241be5..0ca28d0 100644 --- a/laser.py +++ b/laser.py @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import inkex from inkex.transforms import Transform from inkex.paths import Path -import simpletransform import os import math @@ -927,8 +926,8 @@ class LaserGcode(inkex.Effect): while (g != root): if 'transform' in list(g.keys()): t = g.get('transform') - t = simpletransform.parseTransform(t) - trans = simpletransform.composeTransform(t, trans) if trans != [] else t + t = [list(row) for row in Transform(t).matrix] + trans = [list(row) for row in (Transform(t) * Transform(trans)).matrix] if trans != [] else t print_(trans) g = g.getparent() return trans