From 1b31806423c8fec4040fed6d1009db016860b763 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 1 May 2018 20:37:51 -0400
Subject: rename inkstitch/ to lib/

You can't have a module and a package named the same thing.  PyInstaller wants
to import the main script as if it were a module, and this doesn't work unless
there's no directory of the same name with a __init__.py in it.
---
 lib/elements/auto_fill.py | 108 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 lib/elements/auto_fill.py

(limited to 'lib/elements/auto_fill.py')

diff --git a/lib/elements/auto_fill.py b/lib/elements/auto_fill.py
new file mode 100644
index 00000000..6eb1f10c
--- /dev/null
+++ b/lib/elements/auto_fill.py
@@ -0,0 +1,108 @@
+import math
+from .. import _
+from .element import param, Patch
+from ..utils import cache
+from .fill import Fill
+from shapely import geometry as shgeo
+from ..stitches import auto_fill
+
+
+class AutoFill(Fill):
+    element_name = _("Auto-Fill")
+
+    @property
+    @param('auto_fill', _('Automatically routed fill stitching'), type='toggle', default=True)
+    def auto_fill(self):
+        return self.get_boolean_param('auto_fill', True)
+
+    @property
+    @cache
+    def outline(self):
+        return self.shape.boundary[0]
+
+    @property
+    @cache
+    def outline_length(self):
+        return self.outline.length
+
+    @property
+    def flip(self):
+        return False
+
+    @property
+    @param('running_stitch_length_mm', _('Running stitch length (traversal between sections)'), unit='mm', type='float', default=1.5)
+    def running_stitch_length(self):
+        return max(self.get_float_param("running_stitch_length_mm", 1.5), 0.01)
+
+    @property
+    @param('fill_underlay', _('Underlay'), type='toggle', group=_('AutoFill Underlay'), default=False)
+    def fill_underlay(self):
+        return self.get_boolean_param("fill_underlay", default=False)
+
+    @property
+    @param('fill_underlay_angle', _('Fill angle (default: fill angle + 90 deg)'), unit='deg', group=_('AutoFill Underlay'), type='float')
+    @cache
+    def fill_underlay_angle(self):
+        underlay_angle = self.get_float_param("fill_underlay_angle")
+
+        if underlay_angle:
+            return math.radians(underlay_angle)
+        else:
+            return self.angle + math.pi / 2.0
+
+    @property
+    @param('fill_underlay_row_spacing_mm', _('Row spacing (default: 3x fill row spacing)'), unit='mm', group=_('AutoFill Underlay'), type='float')
+    @cache
+    def fill_underlay_row_spacing(self):
+        return self.get_float_param("fill_underlay_row_spacing_mm") or self.row_spacing * 3
+
+    @property
+    @param('fill_underlay_max_stitch_length_mm', _('Max stitch length'), unit='mm', group=_('AutoFill Underlay'), type='float')
+    @cache
+    def fill_underlay_max_stitch_length(self):
+        return self.get_float_param("fill_underlay_max_stitch_length_mm") or self.max_stitch_length
+
+    @property
+    @param('fill_underlay_inset_mm', _('Inset'), unit='mm', group=_('AutoFill Underlay'), type='float', default=0)
+    def fill_underlay_inset(self):
+        return self.get_float_param('fill_underlay_inset_mm', 0)
+
+    @property
+    def underlay_shape(self):
+        if self.fill_underlay_inset:
+            shape = self.shape.buffer(-self.fill_underlay_inset)
+            if not isinstance(shape, shgeo.MultiPolygon):
+                shape = shgeo.MultiPolygon([shape])
+            return shape
+        else:
+            return self.shape
+
+    def to_patches(self, last_patch):
+        stitches = []
+
+        if last_patch is None:
+            starting_point = None
+        else:
+            starting_point = last_patch.stitches[-1]
+
+        if self.fill_underlay:
+            stitches.extend(auto_fill(self.underlay_shape,
+                                      self.fill_underlay_angle,
+                                      self.fill_underlay_row_spacing,
+                                      self.fill_underlay_row_spacing,
+                                      self.fill_underlay_max_stitch_length,
+                                      self.running_stitch_length,
+                                      self.staggers,
+                                      starting_point))
+            starting_point = stitches[-1]
+
+        stitches.extend(auto_fill(self.shape,
+                                  self.angle,
+                                  self.row_spacing,
+                                  self.end_row_spacing,
+                                  self.max_stitch_length,
+                                  self.running_stitch_length,
+                                  self.staggers,
+                                  starting_point))
+
+        return [Patch(stitches=stitches, color=self.color)]
-- 
cgit v1.2.3


From 05daffb7e01db55879eb24f3c00532324a5d41af Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 1 May 2018 21:21:07 -0400
Subject: refactor everything out of lib/__init__.py

---
 lib/elements/auto_fill.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/elements/auto_fill.py')

diff --git a/lib/elements/auto_fill.py b/lib/elements/auto_fill.py
index 6eb1f10c..08ae67f7 100644
--- a/lib/elements/auto_fill.py
+++ b/lib/elements/auto_fill.py
@@ -1,10 +1,10 @@
 import math
-from .. import _
-from .element import param, Patch
-from ..utils import cache
-from .fill import Fill
 from shapely import geometry as shgeo
+from ..i18n import _
+from ..utils import cache
 from ..stitches import auto_fill
+from .element import param, Patch
+from .fill import Fill
 
 
 class AutoFill(Fill):
-- 
cgit v1.2.3