Added circle support outside of pads

Author: JarrettR

Stretch/kiplug/board.py

@@ -241,12 +241,12 @@ def To_SVG(self):
             # layer = item.layer
             base.svg.find('g', {'inkscape:label': 'Modules'}, recursive=False).append(tag)
 
-        for item in self.gr_line:
+        for item in self.gr_poly:
             tag = BeautifulSoup(item.To_SVG(), 'html.parser')
             layer = item.layer
             base.svg.find('g', {'inkscape:label': layer}, recursive=False).append(tag)
 
-        for item in self.gr_poly:
+        for item in self.gr_line:
             tag = BeautifulSoup(item.To_SVG(), 'html.parser')
             layer = item.layer
             base.svg.find('g', {'inkscape:label': layer}, recursive=False).append(tag)

Stretch/kiplug/circle.py

@@ -33,12 +33,11 @@ class Circle(object):
     def __init__(self):
         self.center = []
         self.end = []
-        self.width = 0
-        self.angle = 0
+        self.width = '0'
         self.layer = ''
         self.fill = ''
         self.tstamp = ''
-        self.status = 0
+        self.status = ''
 
 
     def From_PCB(self, input):
@@ -59,9 +58,9 @@ def From_PCB(self, input):
                 self.end.append(float(item[1]))
                 self.end.append(float(item[2]))
 
-            if item[0] == 'angle':
-                self.angle = item[1]
-                assert False,"Gr_circle: Please report this! Never seen before."
+            # if item[0] == 'angle':
+                # self.angle = item[1]
+                # assert False,"Gr_circle: Please report this! Never seen before."
 
             if item[0] == 'layer':
                 self.layer = item[1]
@@ -88,15 +87,20 @@ def To_PCB(self, fp = False):
         pcb.append(['center'] + self.center)
         pcb.append(['end'] + self.end)
         pcb.append(['width', self.width])
-        pcb.append(['angle', self.angle])
+        # pcb.append(['angle', self.angle])
         pcb.append(['layer', self.layer])
-        pcb.append(['fill', self.fill])
+        if self.fill != '':
+            pcb.append(['fill', self.fill])
         pcb.append(['tstamp', self.tstamp])
         pcb.append(['status', self.status])
 
         return pcb
 
-    def To_SVG(self):
+    def To_SVG(self, fp = False):
+        if fp:
+            circletype = 'fp_circle'
+        else:
+            circletype = 'gr_circle'
         tstamp = ''
         status = ''
         fill = ''
@@ -118,11 +122,44 @@ def To_SVG(self):
         parameters += 'cy="' + str(self.center[1] * pxToMM) + '" '
         parameters += 'r="' + str(r * pxToMM) + '" '
         parameters += 'layer="' + self.layer + '" '
-        parameters += 'type="gr_circle" '
+        parameters += 'type="' + circletype + '" '
         parameters += fill
         parameters += tstamp
         parameters += status
         parameters += '/>'
 
         return parameters
 
+        
+        
+    def From_SVG(self, tag):
+        style = tag['style']
+
+        width = style[style.find('stroke-width:') + 13:]
+        self.width = width[0:width.find('mm')]
+        
+        if tag.has_attr('layer'):
+            self.layer = tag['layer']
+        elif tag.parent.has_attr('inkscape:label'):
+            #XML metadata trashed, try to recover from parent tag
+            self.layer = tag.parent['inkscape:label']
+        else:
+            assert False, "Circle not in layer"
+
+
+        r = str((float(tag['r']) +float(tag['cx'] )) / pxToMM)
+        x = str(float(tag['cx']) / pxToMM)
+        y = str(float(tag['cy']) / pxToMM)
+        self.center = [x, y]
+        self.end = [r, y]
+            
+        if tag.has_attr('fill') == True:
+            self.fill = tag['fill']
+            
+        if tag.has_attr('status') == True:
+            self.status = tag['status']
+            
+        if tag.has_attr('tstamp') == True:
+            self.tstamp = tag['tstamp']
+
+

Stretch/kiplug/module.py

@@ -200,6 +200,11 @@ def From_PCB(self, pcblist):
                 arc.From_PCB(item)
                 self.fp_arc.append(arc)
 
+            if item[0] == 'fp_circle':
+                circle = Circle()
+                circle.From_PCB(item)
+                self.fp_circle.append(circle)
+                
             # if item[0] == 'fp_circle':
             # if item[0] == 'fp_curve':
             # if item[0] == 'fp_rect':
@@ -573,6 +578,10 @@ def From_SVG(self, tag):
                 pad = Pad()
                 pad.From_SVG(tagpath, rotate)
                 self.pad.append(pad)
+            elif tagpath.has_attr('type') == True and tagpath['type'] == 'fp_circle':
+                circle = Circle()
+                circle.From_SVG(tagpath)
+                self.fp_circle.append(circle)
 
         for tagpath in tag.find_all('ellipse'):
             if tagpath.has_attr('type') == True and tagpath['type'] == 'pad':

Stretch/kiplug/pad.py

@@ -207,20 +207,20 @@ def To_SVG(self, angle = 0.0):
             svgsize += 'width="' + str(float(self.size[0])  * pxToMM) + '" '
             svgsize += 'height="' + str(float(self.size[1])  * pxToMM) + '" '
 
-        elif self.shape == 'circle':
-            parameters += '<circle style="stroke:none;stroke-linecap:round;stroke-linejoin:miter;fill-opacity:1'
-            svgsize += 'cx="' + str(self.at[0] * pxToMM) + '" '
-            svgsize += 'cy="' + str(self.at[1] * pxToMM) + '" '
-            svgsize += 'r="' + str(float(self.size[0])  * (pxToMM / 2)) + '" '
-            svgsize += 'height="' + str(float(self.size[1])  * pxToMM) + '" '
-            
         elif self.shape == 'oval':
             parameters += '<ellipse style="stroke:none;stroke-linecap:round;stroke-linejoin:miter;fill-opacity:1'
             svgsize += 'cx="' + str(self.at[0] * pxToMM) + '" '
             svgsize += 'cy="' + str(self.at[1] * pxToMM) + '" '
             svgsize += 'rx="' + str(float(self.size[0])  * (pxToMM / 2)) + '" '
             svgsize += 'ry="' + str(float(self.size[1])  * (pxToMM / 2)) + '" '
 
+        elif self.shape == 'circle':
+            parameters += '<circle style="stroke:none;stroke-linecap:round;stroke-linejoin:miter;fill-opacity:1'
+            svgsize += 'cx="' + str(self.at[0] * pxToMM) + '" '
+            svgsize += 'cy="' + str(self.at[1] * pxToMM) + '" '
+            svgsize += 'r="' + str(float(self.size[0])  * (pxToMM / 2)) + '" '
+            svgsize += 'height="' + str(float(self.size[1])  * pxToMM) + '" '
+            
         elif self.shape == 'custom':
             parameters += '<rect style="stroke:none;stroke-linecap:round;stroke-linejoin:miter;fill-opacity:1'
             svgsize += 'x="' + str(x * pxToMM) + '" '