Footprint Wizards Update

pcbnew/python/plugins/circular_pad_array_wizard.py

@@ -18,11 +18,11 @@ from __future__ import division
 import math
 
 import pcbnew
-import HelpfulFootprintWizardPlugin as HFPW
+import FootprintWizardBase
 import PadArray as PA
 
 
-class circular_pad_array_wizard(HFPW.HelpfulFootprintWizardPlugin):
+class circular_pad_array_wizard(FootprintWizardBase.FootprintWizard):
 
     def GetName(self):
         return "Circular Pad Array"
@@ -32,52 +32,84 @@ class circular_pad_array_wizard(HFPW.HelpfulFootprintWizardPlugin):
 
     def GenerateParameterList(self):
 
-        self.AddParam("Pads", "n", self.uNatural, 6)
-        self.AddParam("Pads", "pad width", self.uMM, 1.5)
-        self.AddParam("Pads", "drill", self.uMM, 1)
-        self.AddParam("Pads", "circle diameter", self.uMM, 5)
-        self.AddParam("Pads", "first pad angle", self.uNatural, 0)
-        self.AddParam("Pads", "number clockwise", self.uBool, True)
-        self.AddParam("Pads", "first pad number", self.uNatural, 1)
+        self.AddParam("Pads", "count", self.uInteger, 6, min_value=1, designator='n')
+        self.AddParam("Pads", "center diameter", self.uMM, 5, min_value=0, designator='r', hint="Centre distance between pads")
+        self.AddParam("Pads", "diameter", self.uMM, 1.5)
+        self.AddParam("Pads", "drill", self.uMM, 0.8)
+        self.AddParam("Pads", "angle", self.uDegrees, 0, designator='a')
+
+        self.AddParam("Numbering", "initial", self.uInteger, 1, min_value=1)
+        #self.AddParam("Numbering", "increment", self.uInteger, 1, min_value=1)
+        self.AddParam("Numbering", "clockwise", self.uBool, True)
+
+        self.AddParam("Outline", "diameter", self.uMM, 7, designator='D')
+        self.AddParam("Outline", "margin", self.uMM, 0.25, min_value=0.2)
 
     def CheckParameters(self):
 
-        self.CheckParamInt("Pads", "*n")
-        self.CheckParamInt("Pads", "*first pad number")
-        self.CheckParamBool("Pads", "*number clockwise")
+        pads = self.parameters['Pads']
+        numbering = self.parameters['Numbering']
+        outline = self.parameters['Outline']
+
+        # Check that pads do not overlap
+        pad_dia = pcbnew.ToMM(pads['diameter'])
+        centres = pcbnew.ToMM(pads['center diameter'])
+        n_pads = pads['count']
+
+        self.CheckParam('Pads','diameter',max_value=centres*math.pi/n_pads,info="Pads overlap")
+
+        # Check that the pads fit inside the outline
+        d_min = pad_dia + centres
+
+        self.CheckParam("Outline","diameter",min_value=d_min, info="Outline diameter is too small")
+
 
     def GetValue(self):
-        pins = self.parameters["Pads"]["*n"]
+        pins = self.parameters["Pads"]["count"]
         return "CPA_%d" % pins
 
     def BuildThisFootprint(self):
 
-        prm = self.parameters['Pads']
+        pads = self.parameters['Pads']
+        numbering = self.parameters['Numbering']
+        outline = self.parameters['Outline']
 
-        pad_size = prm['pad width']
+        pad_size = pads['diameter']
 
-        pad = PA.PadMaker(self.module).THPad(
-            prm['pad width'], prm['pad width'], prm['drill'])
+        pad = PA.PadMaker(self.module).THPad(pads['diameter'], pads['diameter'], pads['drill'])
 
         array = PA.PadCircleArray(
-            pad, prm['*n'], prm['circle diameter'] / 2,
-            angle_offset=prm["*first pad angle"],
+            pad, pads['count'], pads['center diameter'] / 2,
+            angle_offset=pads["angle"],
             centre=pcbnew.wxPoint(0, 0),
-            clockwise=prm["*number clockwise"])
+            clockwise=numbering["clockwise"])
 
-        array.SetFirstPadInArray(prm["*first pad number"])
+        array.SetFirstPadInArray(numbering["initial"])
 
         array.AddPadsToModule(self.draw)
 
-        body_radius = (prm['circle diameter'] + prm['pad width'])/2 + self.draw.GetLineThickness()
+        # Draw the outline
+        body_radius = outline['diameter'] / 2
+        self.draw.SetLayer(pcbnew.F_Fab)
+        self.draw.GetLineThickness()
         self.draw.Circle(0, 0, body_radius)
 
+        #silkscreen
+        body_radius += pcbnew.FromMM(0.15)
+        self.draw.SetLayer(pcbnew.F_SilkS)
+        self.draw.Circle(0, 0, body_radius)
+
+        # courtyard
+        self.draw.SetLayer(pcbnew.F_CrtYd)
+        self.draw.SetLineThickness(pcbnew.FromMM(0.05))
+        self.draw.Circle(0, 0, body_radius + outline['margin'])
+
+        # Text size
+
         text_size = self.GetTextSize()  # IPC nominal
         thickness = self.GetTextThickness()
-        textposy = body_radius + self.draw.GetLineThickness()/2 + self.GetTextSize()/2 + thickness
+        textposy = body_radius + self.draw.GetLineThickness()/2 + self.GetTextSize()/2 + thickness + + outline['margin']
         self.draw.Value( 0, textposy, text_size )
         self.draw.Reference( 0, -textposy, text_size )
 
-
-
 circular_pad_array_wizard().register()