From f9d57f6ea51ea8da186c41b70950b7d87fa2c20b Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sun, 24 Apr 2022 08:27:42 +0200 Subject: Fix lettering scale, etc. (#1620) * fix lettering scale * adapt to updated inkex: transform operator, selections * fix #1597 * no traceback error message on broken satin columns * highlight troubleshoot "steps to solve" through additional headline * set a minimum value for running stitch repeats * rename "import" thread list to "apply" thread list --- lib/svg/path.py | 4 ++-- lib/svg/units.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/svg') diff --git a/lib/svg/path.py b/lib/svg/path.py index 53cf80f2..c33a7a8f 100644 --- a/lib/svg/path.py +++ b/lib/svg/path.py @@ -24,7 +24,7 @@ def compose_parent_transforms(node, mat): trans = node.get('transform') if trans: - mat = inkex.transforms.Transform(trans) * mat + mat = inkex.transforms.Transform(trans) @ mat if node.getparent() is not None: if node.getparent().tag in [SVG_GROUP_TAG, SVG_LINK_TAG]: mat = compose_parent_transforms(node.getparent(), mat) @@ -47,7 +47,7 @@ def get_node_transform(node): # add in the transform implied by the viewBox viewbox_transform = get_viewbox_transform(node.getroottree().getroot()) - transform = viewbox_transform * transform + transform = viewbox_transform @ transform return transform diff --git a/lib/svg/units.py b/lib/svg/units.py index f229c2c3..e8a21c18 100644 --- a/lib/svg/units.py +++ b/lib/svg/units.py @@ -149,7 +149,7 @@ def get_viewbox_transform(node): sx = sy = max(sx, sy) if 'slice' in aspect_ratio else min(sx, sy) scale_transform = inkex.transforms.Transform("scale(%f, %f)" % (sx, sy)) - transform = transform * scale_transform + transform = transform @ scale_transform except ZeroDivisionError: pass -- cgit v1.2.3