Merge pull request #2349 from inkstitch/george-steel/export-panel

* Add panelization options to zip export
* Add input field for custom file names (inside the zip archive)

4 files changed, 75 insertions, 6 deletions

diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py
index e80bc34c..b3183a9a 100644
--- a/lib/extensions/zip.py
+++ b/lib/extensions/zip.py
@@ -9,15 +9,17 @@ import tempfile
 from copy import deepcopy
 from zipfile import ZipFile
 
+from inkex import Boolean
 from lxml import etree
 
 import pyembroidery
-from inkex import Boolean
 
 from ..i18n import _
 from ..output import write_embroidery_file
 from ..stitch_plan import stitch_groups_to_stitch_plan
+from ..svg import PIXELS_PER_MM
 from ..threads import ThreadCatalog
+from ..utils.geometry import Point
 from .base import InkstitchExtension
 
 
@@ -25,6 +27,11 @@ class Zip(InkstitchExtension):
     def __init__(self, *args, **kwargs):
         InkstitchExtension.__init__(self)
 
+        self.arg_parser.add_argument('--notebook', type=Boolean, default=True)
+        self.arg_parser.add_argument('--file-formats', type=Boolean, default=True)
+        self.arg_parser.add_argument('--panelization', type=Boolean, default=True)
+        self.arg_parser.add_argument('--output-options', type=Boolean, default=True)
+
         # it's kind of obnoxious that I have to do this...
         self.formats = []
         for format in pyembroidery.supported_formats():
@@ -33,10 +40,17 @@ class Zip(InkstitchExtension):
                 self.arg_parser.add_argument('--format-%s' % extension, type=Boolean, dest=extension)
                 self.formats.append(extension)
         self.arg_parser.add_argument('--format-svg', type=Boolean, dest='svg')
-        self.arg_parser.add_argument('--format-threadlist', type=Boolean, dest='threadlist')
         self.formats.append('svg')
+        self.arg_parser.add_argument('--format-threadlist', type=Boolean, dest='threadlist')
         self.formats.append('threadlist')
 
+        self.arg_parser.add_argument('--x-repeats', type=int, dest='x_repeats', default=1)
+        self.arg_parser.add_argument('--y-repeats', type=int, dest='y_repeats', default=1)
+        self.arg_parser.add_argument('--x-spacing', type=float, dest='x_spacing', default=100)
+        self.arg_parser.add_argument('--y-spacing', type=float, dest='y_spacing', default=100)
+
+        self.arg_parser.add_argument('--custom-file-name', type=str, dest='custom_file_name', default='')
+
     def effect(self):
         if not self.get_elements():
             return
@@ -47,7 +61,10 @@ class Zip(InkstitchExtension):
         patches = self.elements_to_stitch_groups(self.elements)
         stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len, min_stitch_len=min_stitch_len)
 
-        base_file_name = self.get_base_file_name()
+        if self.options.x_repeats != 1 or self.options.y_repeats != 1:
+            stitch_plan = self._make_offsets(stitch_plan)
+
+        base_file_name = self._get_file_name()
         path = tempfile.mkdtemp()
 
         files = []
@@ -93,6 +110,22 @@ class Zip(InkstitchExtension):
         # don't let inkex output the SVG!
         sys.exit(0)
 
+    def _get_file_name(self):
+        if self.options.custom_file_name:
+            base_file_name = self.options.custom_file_name
+        else:
+            base_file_name = self.get_base_file_name()
+        return base_file_name
+
+    def _make_offsets(self, stitch_plan):
+        dx = self.options.x_spacing * PIXELS_PER_MM
+        dy = self.options.y_spacing * PIXELS_PER_MM
+        offsets = []
+        for x in range(self.options.x_repeats):
+            for y in range(self.options.y_repeats):
+                offsets.append(Point(x * dx, y * dy))
+        return stitch_plan.make_offsets(offsets)
+
     def get_threadlist(self, stitch_plan, design_name):
         ThreadCatalog().match_and_apply_palette(stitch_plan, self.get_inkstitch_metadata()['thread-palette'])
         thread_used = []
diff --git a/lib/stitch_plan/color_block.py b/lib/stitch_plan/color_block.py
index 9d474f80..fdef5eb8 100644
--- a/lib/stitch_plan/color_block.py
+++ b/lib/stitch_plan/color_block.py
@@ -3,10 +3,12 @@
 # Copyright (c) 2010 Authors
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
-from .stitch import Stitch
+from typing import List
+
+from ..svg import PIXELS_PER_MM
 from ..threads import ThreadColor
 from ..utils.geometry import Point
-from ..svg import PIXELS_PER_MM
+from .stitch import Stitch
 
 
 class ColorBlock(object):
@@ -155,3 +157,20 @@ class ColorBlock(object):
         maxy = max(stitch.y for stitch in self)
 
         return minx, miny, maxx, maxy
+
+    def make_offsets(self, offsets: List[Point]):
+        first_final_stitch = len(self.stitches)
+        while (first_final_stitch > 0 and self.stitches[first_final_stitch-1].is_terminator):
+            first_final_stitch -= 1
+        if first_final_stitch == 0:
+            return self
+        final_stitches = self.stitches[first_final_stitch:]
+        block_stitches = self.stitches[:first_final_stitch]
+
+        out = ColorBlock(self.color)
+        for i, offset in enumerate(offsets):
+            out.add_stitches([s.offset(offset) for s in block_stitches])
+            if i != len(offsets) - 1:
+                out.add_stitch(trim=True)
+        out.add_stitches(final_stitches)
+        return out
diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py
index 90af58c0..8ad699c7 100644
--- a/lib/stitch_plan/stitch.py
+++ b/lib/stitch_plan/stitch.py
@@ -68,6 +68,10 @@ class Stitch(Point):
         if value or base_stitch is None:
             setattr(self, attribute, value)
 
+    @property
+    def is_terminator(self) -> bool:
+        return self.trim or self.stop or self.color_change
+
     def add_tags(self, tags):
         for tag in tags:
             self.add_tag(tag)
@@ -93,6 +97,12 @@ class Stitch(Point):
     def copy(self):
         return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.tags)
 
+    def offset(self, offset: Point):
+        out = self.copy()
+        out.x += offset.x
+        out.y += offset.y
+        return out
+
     def __json__(self):
         attributes = dict(vars(self))
         attributes['tags'] = list(attributes['tags'])
diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index 25571578..caea9c09 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -4,13 +4,15 @@
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
 from sys import exit
+from typing import List
 
 from inkex import errormsg
 
 from ..i18n import _
 from ..svg import PIXELS_PER_MM
-from .color_block import ColorBlock
+from ..utils.geometry import Point
 from ..utils.threading import check_stop_flag
+from .color_block import ColorBlock
 
 
 def stitch_groups_to_stitch_plan(stitch_groups, collapse_len=None, min_stitch_len=0.1, disable_ties=False):  # noqa: C901
@@ -207,3 +209,8 @@ class StitchPlan(object):
             return self.color_blocks[-1]
         else:
             return None
+
+    def make_offsets(self, offsets: List[Point]):
+        out = StitchPlan()
+        out.color_blocks = [block.make_offsets(offsets) for block in self]
+        return out