diff options
| author | Lex Neva <github@lexneva.name> | 2016-10-27 21:59:46 -0400 |
|---|---|---|
| committer | Lex Neva <github@lexneva.name> | 2016-10-27 21:59:46 -0400 |
| commit | 696e3802ba47d4f5eb7d4cbca2976c7da3ec2cdb (patch) | |
| tree | 5b299fbed424f5c3bd638302b27ab24314ab4e78 | |
| parent | dbda3ed3e31d7eee5ea5a147a7dc62089173e731 (diff) | |
remove hatching option
| -rw-r--r-- | embroider.inx | 1 | ||||
| -rw-r--r-- | embroider.py | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/embroider.inx b/embroider.inx index 2f11c0ef..67922103 100644 --- a/embroider.inx +++ b/embroider.inx @@ -9,7 +9,6 @@ <param name="max_stitch_len_mm" type="float" min="0.1" max="100.0" _gui-text="Maximum stitch length (mm)">3.0</param> <param name="running_stitch_len_mm" type="float" min="0.1" max="100.0" _gui-text="Running stitch length (mm)">3.0</param> <param name="collapse_len_mm" type="float" min="0.0" max="10.0" _gui-text="Maximum collapse length (mm)">0.0</param> - <param name="hatch_filled_paths" type="boolean" _gui-text="Hatch filled paths" description="If false, filled paths are filled using equally-spaced lines. If true, filled paths are filled using hatching lines.">false</param> <param name="hide_layers" type="boolean" _gui-text="Hide other layers" description="Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernable.">true</param> <param name="order" type="optiongroup" _gui-text="Stitch Order" appearance="minimal"> <_option value="automatic">Automatic</_option> diff --git a/embroider.py b/embroider.py index 857d2be0..b4434742 100644 --- a/embroider.py +++ b/embroider.py @@ -287,11 +287,6 @@ class Embroider(inkex.Effect): choices=["automatic", "layer", "object"], dest="order", default="automatic", help="patch stitching order") - self.OptionParser.add_option("-H", "--hatch_filled_paths", - action="store", type="choice", - choices=["true","false"], - dest="hatch_filled_paths", default="false", - help="Use hatching lines instead of equally-spaced lines to fill paths") self.OptionParser.add_option("--hide_layers", action="store", type="choice", choices=["true","false"], @@ -315,7 +310,6 @@ class Embroider(inkex.Effect): def process_one_path(self, node, shpath, threadcolor, angle): #self.add_shapely_geo_to_svg(shpath.boundary, color="#c0c000") - hatching = get_boolean_param(node, "hatching", self.hatching) flip = get_boolean_param(node, "flip", False) row_spacing_px = get_float_param(node, "row_spacing", self.row_spacing_px) max_stitch_len_px = get_float_param(node, "max_stitch_length", self.max_stitch_len_px) @@ -400,9 +394,7 @@ class Embroider(inkex.Effect): patch.addStitch(end) last_end = end - - if not hatching: - swap = not swap + swap = not swap patches.append(patch) return patches @@ -469,9 +461,6 @@ class Embroider(inkex.Effect): runs.reverse() runs = map(reverseTuple, runs) - if self.hatching and len(rows) > 0: - rows.append([(rows[-1][0][1], runs[0][0])]) - rows.append(runs) start += row_spacing_px @@ -498,9 +487,6 @@ class Embroider(inkex.Effect): return shgeo.Polygon((segment1[0], segment1[1], segment2[1], segment2[0], segment1[0])) def is_same_run(segment1, segment2): - if self.options.hatch_filled_paths: - return True - if shgeo.LineString(segment1).distance(shgeo.LineString(segment1)) > row_spacing_px * 1.1: return False @@ -621,7 +607,6 @@ class Embroider(inkex.Effect): self.max_stitch_len_px = self.options.max_stitch_len_mm*pixels_per_millimeter self.running_stitch_len_px = self.options.running_stitch_len_mm*pixels_per_millimeter self.collapse_len_px = self.options.collapse_len_mm*pixels_per_millimeter - self.hatching = self.options.hatch_filled_paths == "true" self.svgpath = inkex.addNS('path', 'svg') self.svgdefs = inkex.addNS('defs', 'svg') |
