From 9a5410983d31818f8647fbaa37431cfc38198b52 Mon Sep 17 00:00:00 2001
From: Florian Festi <florian@festi.info>
Date: Sat, 4 Mar 2023 16:28:28 +0100
Subject: [PATCH] .polygonWall(s): Allow None at the end to close the polygon

Resolves: #456
---
 boxes/__init__.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/boxes/__init__.py b/boxes/__init__.py
index 89aee6b..9b79b59 100755
--- a/boxes/__init__.py
+++ b/boxes/__init__.py
@@ -2708,6 +2708,50 @@ class Boxes:
 
         return ext
 
+    def _closePolygon(self, borders):
+        posx, posy = 0, 0
+        angle = 0.0
+
+        if borders and borders[-1] is not None:
+            return borders
+
+        borders = borders[:-1]
+
+        for i in range(len(borders)):
+            if i % 2:
+                try:
+                    a, r = borders[i]
+                except TypeError:
+                    angle = (angle + borders[i]) % 360
+                    continue
+                if a > 0:
+                    centerx = posx + r * math.cos(math.radians(angle+90))
+                    centery = posy + r * math.sin(math.radians(angle+90))
+                else:
+                    centerx = posx + r * math.cos(math.radians(angle-90))
+                    centery = posy + r * math.sin(math.radians(angle-90))
+
+                angle = (angle + a) % 360
+                if a > 0:
+                    posx = centerx + r * math.cos(math.radians(angle-90))
+                    posy = centery + r * math.sin(math.radians(angle-90))
+                else:
+                    posx = centerx + r * math.cos(math.radians(angle+90))
+                    posy = centery + r * math.sin(math.radians(angle+90))
+            else:
+                posx += borders[i] * math.cos(math.radians(angle))
+                posy += borders[i] * math.sin(math.radians(angle))
+        if len(borders) % 2 == 0:
+            borders.append(0.0)
+
+        a = math.degrees(math.atan2(-posy, -posx))
+        #print(a, angle, a - angle)
+        borders.append((a - angle + 360) % 360)
+        borders.append((posx**2 + posy**2)**.5)
+        borders.append(-a)
+        #print(borders)
+        return borders
+
     def polygonWall(self, borders, edge="f", turtle=False,
                     callback=None, move=None, label=""):
         """
@@ -2719,6 +2763,8 @@ class Boxes:
         :param callback:  (Default value = None)
         :param move:  (Default value = None)
         :param label: rendered to identify parts, it is not ment to be cut or etched (Default value = "")
+
+        borders is alternating between length of the edge and angle of the corner. For now neither tabs nor radii are supported. None at the end closes the polygon.
         """
         try:
             edges = [self.edges.get(e, e) for e in edge]
@@ -2727,6 +2773,8 @@ class Boxes:
 
         t = self.thickness # XXX edge.margin()
 
+        borders = self._closePolygon(borders)
+
         minx, miny, maxx, maxy = self._polygonWallExtend(borders, edges)
 
         tw, th = maxx - minx, maxy - miny
@@ -2762,6 +2810,7 @@ class Boxes:
         if not borders:
             return
 
+        borders = self._closePolygon(borders)
         bottom = self.edges.get(bottom, bottom)
         top = self.edges.get(top, top)
         t = self.thickness # XXX edge.margin()