From 3cf7f1547c9162f81afcbfb53df65b0897b43059 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Tue, 18 Dec 2018 20:31:53 -0500 Subject: fix error message --- lib/elements/satin_column.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/elements/satin_column.py') diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 1f9854ed..a1ecfb47 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -1,12 +1,13 @@ -from itertools import chain, izip from copy import deepcopy -from shapely import geometry as shgeo, affinity as shaffinity +from itertools import chain, izip + import cubicsuperpath +from shapely import geometry as shgeo, affinity as shaffinity -from .element import param, EmbroideryElement, Patch from ..i18n import _ -from ..utils import cache, Point, cut, collapse_duplicate_point from ..svg import line_strings_to_csp, point_lists_to_csp +from ..utils import cache, Point, cut, collapse_duplicate_point +from .element import param, EmbroideryElement, Patch class SatinColumn(EmbroideryElement): @@ -255,7 +256,7 @@ class SatinColumn(EmbroideryElement): intersections += len(intersection) break elif not isinstance(intersection, shgeo.Point): - self.fatal("intersection is a: %s %s" % (intersection, intersection.geoms)) + self.fatal("INTERNAL ERROR: intersection is: %s %s" % (intersection, getattr(intersection, 'geoms', None))) else: intersections += 1 -- cgit v1.2.3 From 3d993778524c523cfa96d80d9f1df88a671bbe24 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Thu, 17 Jan 2019 19:55:51 -0500 Subject: don't add jump stitches between satin column fill and top stitching --- lib/elements/satin_column.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/elements/satin_column.py') diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index a1ecfb47..f891e049 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -717,22 +717,22 @@ class SatinColumn(EmbroideryElement): # First, verify that we have valid paths. self.validate_satin_column() - patches = [] + patch = Patch(color=self.color) if self.center_walk_underlay: - patches.append(self.do_center_walk()) + patch += self.do_center_walk() if self.contour_underlay: - patches.append(self.do_contour_underlay()) + patch += self.do_contour_underlay() if self.zigzag_underlay: # zigzag underlay comes after contour walk underlay, so that the # zigzags sit on the contour walk underlay like rail ties on rails. - patches.append(self.do_zigzag_underlay()) + patch += self.do_zigzag_underlay() if self.e_stitch: - patches.append(self.do_e_stitch()) + patch += self.do_e_stitch() else: - patches.append(self.do_satin()) + patch += self.do_satin() - return patches + return [patch] -- cgit v1.2.3