yair/drawbot_LY
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5 from drewler/fix/path-transform

Browse Source 
Fix path transform and deprecation warnings
This commit is contained in:
Alex Padula
2020-07-26 18:24:31 +02:00
committed by GitHub
parent a94b4c3016 e19a069d5b
commit f78be04a07
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
laser.py
View File

@@ -26,7 +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 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
""" """
import inkex import inkex
import simpletransform from inkex.transforms import Transform
from inkex.paths import Path
import os import os
import math import math
@@ -925,8 +926,8 @@ class LaserGcode(inkex.Effect):
while (g != root): while (g != root):
if 'transform' in list(g.keys()): if 'transform' in list(g.keys()):
t = g.get('transform') t = g.get('transform')
t = simpletransform.parseTransform(t) t = [list(row) for row in Transform(t).matrix]
trans = simpletransform.composeTransform(t, trans) if trans != [] else t trans = [list(row) for row in (Transform(t) * Transform(trans)).matrix] if trans != [] else t
print_(trans) print_(trans)
g = g.getparent() g = g.getparent()
return trans return trans
@@ -935,7 +936,7 @@ class LaserGcode(inkex.Effect):
def apply_transforms(self, g, csp): def apply_transforms(self, g, csp):
trans = self.get_transforms(g) trans = self.get_transforms(g)
if trans != []: if trans != []:
simpletransform.applyTransformToPath(trans, csp) csp = Path(csp).transform(Transform(trans)).to_superpath()
return csp return csp