From 2bec4ded16b16b33d8979abf22fc00bc8eb0ea5d Mon Sep 17 00:00:00 2001
From: Mario Voigt <mario.voigt@stadtfabrikanten.org>
Date: Tue, 13 Jul 2021 02:53:51 +0200
Subject: [PATCH] added shifting for puzzle pieces

---
 .../lasercut_jigsaw/lasercut_jigsaw.inx       |  1 +
 .../lasercut_jigsaw/lasercut_jigsaw.py        | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.inx b/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.inx
index 7aea3e54..d7d0de2b 100644
--- a/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.inx
+++ b/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.inx
@@ -40,6 +40,7 @@
          <param name="use_seed" type="bool" gui-text="Random jigsaw" gui-description="Use the kerf value as the drawn line width">true</param>
          <param name="seed" type="int" min="0" max="99999999" gui-text="or Jigsaw pattern (seed)" gui-description="Random seed for repeatability">12345</param>
          <param name="pieces" type="bool" gui-text="Create separated pieces">false</param>
+         <param name="shift" type="float" min="0.0" max="100.0" precision="2" gui-text="Shifting for each piece (%)">0</param>
       </page>
       <page name="Usage" gui-text="Usage">
         <label xml:space="preserve">Jigsaw lines are single for minimal laser cutting.
diff --git a/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.py b/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.py
index 8574fed4..dc4890c2 100644
--- a/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.py
+++ b/extensions/fablabchemnitz/lasercut_jigsaw/lasercut_jigsaw.py
@@ -133,8 +133,9 @@ class LasercutJigsaw(inkex.EffectExtension):
         pars.add_argument("--smooth_edges", type=inkex.Boolean, default=False, help="Allow pieces with smooth edges.")
         pars.add_argument("--use_seed", type=inkex.Boolean, default=False, help="Use the kerf value as the drawn line width")
         pars.add_argument("--seed", type=int, default=12345, help="Random seed for repeatability")
-        pars.add_argument("--pieces", type=inkex.Boolean, default=False, help="Make extra pieces for manual boolean separation.")
-  
+        pars.add_argument("--pieces", type=inkex.Boolean, default=False, help="Create separated pieces")
+        pars.add_argument("--shift", type=float, default=0.0, help="Shifting for each piece (%)")
+
     def add_jigsaw_horiz_line(self, startx, starty, stepx, steps, width, style, name, parent):
         """ complex version All C smooth
             - get ctrl pt offset and use on both sides of each node (negate for smooth)"""
@@ -325,6 +326,8 @@ class LasercutJigsaw(inkex.EffectExtension):
         g_attribs = {inkex.addNS('label','inkscape'):'JigsawPieces:X' + \
                      str( self.pieces_W )+':Y'+str( self.pieces_H ) }
         jigsaw_pieces = etree.SubElement(jigsaw, 'g', g_attribs)
+        jigsaw_pieces_id = self.svg.get_unique_id("pieces-")
+        jigsaw_pieces.attrib['id'] = jigsaw_pieces_id
         borderLineStyle = str(inkex.Style(self.borderLineStyle))
         
         xblocks = self.create_horiz_blocks(jigsaw_pieces, gridy, borderLineStyle)
@@ -350,7 +353,7 @@ class LasercutJigsaw(inkex.EffectExtension):
             puzzlePartNo += 1
             jigsaw_pieces.append(pair[0])
             jigsaw_pieces.append(pair[1])
-        
+             
         for pathToDelete in allPathsToDelete:
             pathToDelete.delete()
         
@@ -383,6 +386,22 @@ class LasercutJigsaw(inkex.EffectExtension):
         # update self.svg
         self.svg = self.document.getroot()
     
+        row = 1
+        col = 1      
+        offsetW = self.options.shift / 100 * (self.options.width / self.options.pieces_W)     
+        offsetH = self.options.shift / 100 * (self.options.height / self.options.pieces_H)     
+        for jigsaw_piece in self.svg.getElementById(jigsaw_pieces_id).getchildren():      
+            jigsaw_piece.apply_transform()
+            jigsaw_piece.set('transform', 'translate(%f,%f)' % (-col * offsetH, 0))
+            jigsaw_piece.apply_transform()
+            jigsaw_piece.set('transform', 'translate(%f,%f)' % (0, row * offsetW))
+            jigsaw_piece.apply_transform()
+            currentPiece = int(jigsaw_piece.get('id').split('_')[0])   
+            #self.msg("piece {} zeile {} Spalte {}".format(currentPiece, row, col))
+            if currentPiece % self.options.pieces_W == 0:
+                row += 1
+                col -= self.options.pieces_W
+            col += 1
 
     def effect(self):