From 718cdec4b3feb60b54c5d825c7e3056621ed0938 Mon Sep 17 00:00:00 2001
From: Mario Voigt <mario.voigt@stadtfabrikanten.org>
Date: Sun, 30 May 2021 11:14:40 +0200
Subject: [PATCH] fixes in polygon and netting extension

---
 extensions/fablabchemnitz/netting/netting.py | 16 ++++++++++++----
 extensions/fablabchemnitz/polygon/polygon.py | 10 +++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/extensions/fablabchemnitz/netting/netting.py b/extensions/fablabchemnitz/netting/netting.py
index 886dce8a..14c43236 100644
--- a/extensions/fablabchemnitz/netting/netting.py
+++ b/extensions/fablabchemnitz/netting/netting.py
@@ -51,13 +51,21 @@ class Netting(inkex.EffectExtension):
         
             if self.options.netting_type == "allwithall":
                 allnet_group = inkex.Group(id="g" + element.get('id'))
+                pathsCollection = []
                 self.svg.get_current_layer().append(allnet_group)
                 for segment1 in range(0, len(old_segments)):
                     for segment2 in range(1, len(old_segments)):
-                        allnet_path = inkex.PathElement()
-                        allnet_path.style = style
-                        allnet_path.path = Path('M' + old_segments[segment1] + ' L' + old_segments[segment2])
-                        allnet_group.append(allnet_path)
+                        if old_segments[segment1] != old_segments[segment2]:
+                            pathVariant1 = Path('M' + old_segments[segment1] + ' L' + old_segments[segment2])
+                            pathVariant2 = Path('M' + old_segments[segment2] + ' L' + old_segments[segment1]) #the reversed one  
+                            if pathVariant1 not in pathsCollection and pathVariant2 not in pathsCollection:
+                                pathsCollection.append(pathVariant1)
+                        
+                for p in pathsCollection:
+                    allnet_path = inkex.PathElement()
+                    allnet_path.style = style
+                    allnet_path.path = p
+                    allnet_group.append(allnet_path)
 
             elif self.options.netting_type == "alternatingly":
                 #build up the net path between the path points alternatingly
diff --git a/extensions/fablabchemnitz/polygon/polygon.py b/extensions/fablabchemnitz/polygon/polygon.py
index daa37171..c745a60a 100644
--- a/extensions/fablabchemnitz/polygon/polygon.py
+++ b/extensions/fablabchemnitz/polygon/polygon.py
@@ -87,11 +87,6 @@ class Polygon(inkex.EffectExtension):
         widthDoc  = self.svg.unittouu(svg.get('width'))
         heightDoc = self.svg.unittouu(svg.get('height'))
         
-        # Create a new layer.
-        layer = etree.SubElement(svg, 'g')
-        layer.set(inkex.addNS('label', 'inkscape'), 'newlayer')
-        layer.set(inkex.addNS('groupmode', 'inkscape'), 'layer')
-        
         parent=self.svg.get_current_layer()
         
         # Get script's option values.
@@ -166,6 +161,11 @@ class Polygon(inkex.EffectExtension):
         groupdraw(s,[color1,color2])
         
         if self.options.displaylasertag:
+            # Create a new layer.
+            layer = etree.SubElement(svg, 'g')
+            layer.set(inkex.addNS('label', 'inkscape'), 'lasertag')
+            layer.set(inkex.addNS('groupmode', 'inkscape'), 'layer')
+        
             tag_1=lasertag
             tag_1=tag_1.replace("%n",str(pass_offset+1)).replace("%s",str(speed)).replace("%i",str(intensity)).replace("%c",str(color2))
             tag_2=lasertag