Implemented Concentric and Outline fill modes

ViaStitching/FillArea.py

@@ -105,6 +105,11 @@ class FillArea:
     REASON_DRAWING = 6
     REASON_STEP = 7
 
+    FILL_TYPE_RECTANGULAR = "Rectangular"
+    FILL_TYPE_STAR = "Star"
+    FILL_TYPE_CONCENTRIC = "Concentric"
+    FILL_TYPE_OUTLINE = "Outline"
+
     def __init__(self, filename=None):
         self.filename = None
         self.clearance = 0
@@ -131,7 +136,7 @@ class FillArea:
         self.netname = None
         self.debug = False
         self.random = False
-        self.star = False
+        self.fill_type = self.FILL_TYPE_RECTANGULAR
         if self.netname is None:
             self.SetNetname("GND")
 
@@ -155,8 +160,8 @@ class FillArea:
         self.random = r
         return self
 
-    def SetStar(self):
+    def SetType(self, type):
-        self.star = True
+        self.fill_type = type
         return self
 
     def SetPCB(self, pcb):
@@ -252,6 +257,7 @@ STEP         = '-'
             # wx.LogMessage('adding vias')
             self.pcb.Add(m)
             self.pcb_group.AddItem(m)
+            return m
         else:
             wxPrint("\nUnable to find a valid parent area (zone)")
 
@@ -343,13 +349,111 @@ STEP         = '-'
         '''
         for x_pos in range(x-distance, x+distance+1):
             if (x_pos >= 0) and (x_pos < len(rectangle)):
-                distance_y = distance-abs(x-x_pos) if self.star else distance       # Star or Standard shape
+                # Star or Standard shape
+                distance_y = distance-abs(x-x_pos) if self.fill_type==self.FILL_TYPE_STAR else distance
                 for y_pos in range(y-distance_y, y+distance_y+1):
                     if (y_pos >= 0) and (y_pos < len(rectangle[0])):
                         if (x_pos == x) and (y_pos == y):
                             continue
                         rectangle[x_pos][y_pos] = self.REASON_STEP
 
+
+    """
+    Check if vias would not overlap and if in same outline then apply at minimum 60% of self.step
+    """
+    def CheckViaDistance(self, p, via, outline):
+        p2 = VECTOR2I(via.GetPosition())
+
+        dist = 2*self.clearance + self.size/2 + via.GetWidth()/2
+        
+        # If via in same outline, then apply bigger space
+        if outline.Collide(p2):
+            dist = max(dist, self.step*0.6)
+
+        return (p-p2).EuclideanNorm() > dist
+
+    """
+    Add via along outline (SHAPE_LINE_CHAIN), starting at offset (fraction between 0.0 and 1.0)
+    Avoid placing vias to close to via present in all_vias
+    """
+    def AddViasAlongOutline(self, outline, all_vias, offset=0):
+        via_placed = 0
+        len = int(outline.Length())
+        steps = len // self.step
+        steps = 1 if steps == 0 else steps
+        stepsize = int(len//steps)
+        for l in range (int(stepsize*offset), len, stepsize):
+            p = outline.PointAlong(l)
+
+            if all( self.CheckViaDistance(p, via, outline) for via in all_vias):
+                via = self.AddVia(p.getWxPoint(), 0, 0)
+                all_vias.append(via)
+                via_placed+=1
+        return via_placed
+
+    def ConcentricFillVias(self): 
+        wxPrint("Refill all zones")
+        self.RefillBoardAreas()
+
+        wxPrint("Calculate placement areas")
+
+        zones = [zone for zone in self.pcb.Zones() if zone.GetNetname() == self.netname]
+        self.parent_area = zones[0]
+
+        # Create set of polygons where fill zones overlap on all layers
+        poly_set = None
+        for layer_id in self.pcb.GetEnabledLayers().CuStack():
+            poly_set_layer = SHAPE_POLY_SET()
+            for zone in zones:
+                if zone.IsOnLayer(layer_id):
+                    if poly_set is not None or not self.only_selected_area or zone.IsSelected():
+                        poly_set_layer.Append(zone.RawPolysList(layer_id))
+
+            if poly_set is None:
+                poly_set = poly_set_layer
+            else:
+                poly_set.BooleanIntersection(poly_set_layer,SHAPE_POLY_SET.PM_FAST)
+                poly_set.Simplify(SHAPE_POLY_SET.PM_FAST)
+
+            if poly_set.OutlineCount()==0:
+                wxPrint("No areas to fill")
+                return
+
+
+        # Size the polygons so the vias fit inside
+        poly_set.Inflate(int(-(1*self.clearance + 0.5*self.size)),12,SHAPE_POLY_SET.CHAMFER_ALL_CORNERS)
+
+        wxPrint("Generating concentric via placement")
+        # Get all vias from the selected net
+        all_vias = [track for track in self.pcb.GetTracks() if (track.GetClass()=="PCB_VIA" and track.GetNetname()==self.netname)]
+
+        off = 0
+        via_placed = 0
+        # Place vias along all outlines and holes
+        while poly_set.OutlineCount() > 0:
+            for i in range(0, poly_set.OutlineCount()):
+                outline = poly_set.Outline(i)
+                via_placed += self.AddViasAlongOutline(outline, all_vias, off)
+
+                for k in range(0, poly_set.HoleCount(i)):
+                    hole = poly_set.Hole(i,k)
+                    via_placed += self.AddViasAlongOutline(hole, all_vias, off)
+
+            # Size the polygons to place the next ring
+            if self.fill_type == self.FILL_TYPE_CONCENTRIC:
+                poly_set.Inflate(int(-self.step),12,SHAPE_POLY_SET.CHAMFER_ALL_CORNERS)
+                off = 0.5 if off == 0 else 0
+            else:
+                poly_set = SHAPE_POLY_SET()
+
+        wxPrint("Refill all zones")
+        self.RefillBoardAreas()
+
+        msg = "{:d} vias placed\n".format(via_placed)
+        wxPrint(msg+"Done!")
+
+        return via_placed
+
     def Run(self):
 
         VIA_GROUP_NAME = "ViaStitching {}".format(self.netname)
@@ -377,6 +481,13 @@ STEP         = '-'
             self.pcb_group.SetName(VIA_GROUP_NAME)
             self.pcb.Add(self.pcb_group)
 
+        if self.fill_type==self.FILL_TYPE_OUTLINE or self.fill_type==self.FILL_TYPE_CONCENTRIC:
+            self.ConcentricFillVias()
+            if self.filename:
+                self.pcb.Save(self.filename)
+
+            return
+
         if self.debug:
             print("%s: Line %u" % (time.time(), currentframe().f_lineno))
         target_tracks = self.pcb.GetTracks()
@@ -615,7 +726,7 @@ STEP         = '-'
             self.PrintRect(rectangle)
 
         clear_distance = 0
-        if self.step != 0.0 and self.star:
+        if self.step != 0.0 and self.fill_type == self.FILL_TYPE_STAR:
             # How much "via steps" should be removed around a via (round up)
             clear_distance = int((self.step+l_clearance) / l_clearance)
 

ViaStitching/FillAreaAction.py

@@ -26,11 +26,9 @@ import os
 
 
 def PopulateNets(anet, dlg):
-    zones = pcbnew.GetBoard().Zones()
+    netnames = list(set([zone.GetNetname() for zone in pcbnew.GetBoard().Zones()]))
-    for zone in zones:
+    netnames.sort()
-        netname = zone.GetNetname()
+    dlg.m_cbNet.Set(netnames)
-        if netname is not None and netname != "":
-            dlg.m_cbNet.Append(netname)
     if anet is not None:
         index = dlg.m_cbNet.FindString(anet)
         dlg.m_cbNet.Select(index)
@@ -59,7 +57,6 @@ class FillAreaAction(pcbnew.ActionPlugin):
         # a.m_DrillMM.SetValue("0.3")
         # a.m_Netname.SetValue("GND")
         # a.m_ClearanceMM.SetValue("0.2")
-        # a.m_Star.SetValue(True)
         a.m_bitmapStitching.SetBitmap(wx.Bitmap(os.path.join(os.path.dirname(os.path.realpath(__file__)), "stitching-vias-help.png")))
         self.board = pcbnew.GetBoard()
         self.boardDesignSettings = self.board.GetDesignSettings()
@@ -84,8 +81,7 @@ class FillAreaAction(pcbnew.ActionPlugin):
                 if a.m_Debug.IsChecked():
                     fill.SetDebug()
                 fill.SetRandom(a.m_Random.IsChecked())
-                if a.m_Star.IsChecked():
+                fill.SetType(a.m_cbFillType.GetStringSelection())
-                    fill.SetStar()
                 if a.m_only_selected.IsChecked():
                     fill.OnlyOnSelectedArea()
                 fill.Run()

ViaStitching/FillAreaDialog.py

@@ -1,147 +1,151 @@
 # -*- coding: utf-8 -*-
 
 ###########################################################################
-# Python code generated with wxFormBuilder (version 3.9.0 Jul  3 2021)
+## Python code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
-# http://www.wxformbuilder.org/
+## http://www.wxformbuilder.org/
 ##
-# PLEASE DO *NOT* EDIT THIS FILE!
+## PLEASE DO *NOT* EDIT THIS FILE!
 ###########################################################################
 
 import wx
 import wx.xrc
 
 ###########################################################################
-# Class FillAreaDialog
+## Class FillAreaDialog
 ###########################################################################
 
+class FillAreaDialog ( wx.Dialog ):
 
-class FillAreaDialog (wx.Dialog):
+	def __init__( self, parent ):
+		wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Fill Area parameters", pos = wx.DefaultPosition, size = wx.Size( 402,580 ), style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER )
 
-    def __init__(self, parent):
+		self.SetSizeHints( wx.DefaultSize, wx.DefaultSize )
-        wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title=u"Fill Area parameters", pos=wx.DefaultPosition,
-                           size=wx.Size(402, 580), style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
-        self.SetSizeHints(wx.DefaultSize, wx.DefaultSize)
+		bSizer3 = wx.BoxSizer( wx.VERTICAL )
 
-        bSizer3 = wx.BoxSizer(wx.VERTICAL)
+		fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 )
+		fgSizer1.SetFlexibleDirection( wx.BOTH )
+		fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
 
-        fgSizer1 = wx.FlexGridSizer(0, 2, 0, 0)
+		self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Via copper size (mm)", wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.SetFlexibleDirection(wx.BOTH)
+		self.m_staticText3.Wrap( -1 )
-        fgSizer1.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
 
-        self.m_staticText3 = wx.StaticText(self, wx.ID_ANY, u"Via copper size (mm)", wx.DefaultPosition, wx.DefaultSize, 0)
+		fgSizer1.Add( self.m_staticText3, 1, wx.ALL|wx.EXPAND, 5 )
-        self.m_staticText3.Wrap(-1)
 
-        fgSizer1.Add(self.m_staticText3, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_SizeMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_SizeMM.SetMinSize( wx.Size( 1000,-1 ) )
 
-        self.m_SizeMM = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		fgSizer1.Add( self.m_SizeMM, 1, wx.ALL|wx.EXPAND, 5 )
-        self.m_SizeMM.SetMinSize(wx.Size(1000, -1))
 
-        fgSizer1.Add(self.m_SizeMM, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_staticText9 = wx.StaticText( self, wx.ID_ANY, u"Via drill size (mm)", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText9.Wrap( -1 )
 
-        self.m_staticText9 = wx.StaticText(self, wx.ID_ANY, u"Via drill size (mm)", wx.DefaultPosition, wx.DefaultSize, 0)
+		fgSizer1.Add( self.m_staticText9, 1, wx.ALL|wx.EXPAND, 5 )
-        self.m_staticText9.Wrap(-1)
 
-        fgSizer1.Add(self.m_staticText9, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_DrillMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+		fgSizer1.Add( self.m_DrillMM, 1, wx.ALL|wx.EXPAND, 5 )
 
-        self.m_DrillMM = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Via clearance (mm)", wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_DrillMM, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_staticText5.Wrap( -1 )
 
-        self.m_staticText5 = wx.StaticText(self, wx.ID_ANY, u"Via clearance (mm)", wx.DefaultPosition, wx.DefaultSize, 0)
+		fgSizer1.Add( self.m_staticText5, 1, wx.ALL|wx.EXPAND, 5 )
-        self.m_staticText5.Wrap(-1)
 
-        fgSizer1.Add(self.m_staticText5, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_ClearanceMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+		fgSizer1.Add( self.m_ClearanceMM, 1, wx.ALL|wx.EXPAND, 5 )
 
-        self.m_ClearanceMM = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Via grid (mm)", wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_ClearanceMM, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_staticText2.Wrap( -1 )
 
-        self.m_staticText2 = wx.StaticText(self, wx.ID_ANY, u"Via grid (mm)", wx.DefaultPosition, wx.DefaultSize, 0)
+		fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 )
-        self.m_staticText2.Wrap(-1)
 
-        fgSizer1.Add(self.m_staticText2, 0, wx.ALL, 5)
+		self.m_StepMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+		fgSizer1.Add( self.m_StepMM, 1, wx.ALL|wx.EXPAND, 5 )
 
-        self.m_StepMM = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
-        fgSizer1.Add(self.m_StepMM, 1, wx.ALL | wx.EXPAND, 5)
 
-        fgSizer1.Add((0, 0), 1, wx.EXPAND, 5)
+		fgSizer1.Add( ( 0, 0), 1, wx.EXPAND, 5 )
 
-        self.m_bitmapStitching = wx.StaticBitmap(self, wx.ID_ANY, wx.NullBitmap, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_bitmapStitching = wx.StaticBitmap( self, wx.ID_ANY, wx.NullBitmap, wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_bitmapStitching, 0, wx.EXPAND, 5)
+		fgSizer1.Add( self.m_bitmapStitching, 0, wx.EXPAND, 5 )
 
-        self.m_staticText6 = wx.StaticText(self, wx.ID_ANY, u"Net name", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Net name", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText6.Wrap(-1)
+		self.m_staticText6.Wrap( -1 )
 
-        fgSizer1.Add(self.m_staticText6, 1, wx.ALL | wx.EXPAND, 5)
+		fgSizer1.Add( self.m_staticText6, 1, wx.ALL|wx.EXPAND, 5 )
 
-        m_cbNetChoices = []
+		m_cbNetChoices = []
-        self.m_cbNet = wx.ComboBox(self, wx.ID_ANY, u"GND", wx.DefaultPosition, wx.DefaultSize, m_cbNetChoices, wx.CB_READONLY)
+		self.m_cbNet = wx.ComboBox( self, wx.ID_ANY, u"GND", wx.DefaultPosition, wx.DefaultSize, m_cbNetChoices, wx.CB_READONLY )
-        fgSizer1.Add(self.m_cbNet, 1, wx.ALL | wx.EXPAND, 5)
+		fgSizer1.Add( self.m_cbNet, 1, wx.ALL|wx.EXPAND, 5 )
 
-        self.m_staticText7 = wx.StaticText(self, wx.ID_ANY, u"Debug mode", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText42 = wx.StaticText( self, wx.ID_ANY, u"Star Pattern", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText7.Wrap(-1)
+		self.m_staticText42.Wrap( -1 )
 
-        fgSizer1.Add(self.m_staticText7, 1, wx.ALL | wx.EXPAND, 5)
+		fgSizer1.Add( self.m_staticText42, 0, wx.ALL, 5 )
 
-        self.m_Debug = wx.CheckBox(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		m_cbFillTypeChoices = [ u"Concentric", u"Outline", u"Rectangular", u"Star" ]
-        fgSizer1.Add(self.m_Debug, 1, wx.ALL | wx.EXPAND, 5)
+		self.m_cbFillType = wx.ComboBox( self, wx.ID_ANY, u"Concentric", wx.DefaultPosition, wx.DefaultSize, m_cbFillTypeChoices, wx.CB_READONLY )
+		fgSizer1.Add( self.m_cbFillType, 0, wx.ALL, 5 )
 
-        self.m_staticText8 = wx.StaticText(self, wx.ID_ANY, u"Random it", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText8 = wx.StaticText( self, wx.ID_ANY, u"Random it", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText8.Wrap(-1)
+		self.m_staticText8.Wrap( -1 )
 
-        fgSizer1.Add(self.m_staticText8, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_staticText8, 0, wx.ALL, 5 )
 
-        self.m_Random = wx.CheckBox(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_Random = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_Random, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_Random, 0, wx.ALL, 5 )
 
-        self.m_staticText42 = wx.StaticText(self, wx.ID_ANY, u"Star Pattern", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText81 = wx.StaticText( self, wx.ID_ANY, u"Only under selected Zone", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText42.Wrap(-1)
+		self.m_staticText81.Wrap( -1 )
 
-        fgSizer1.Add(self.m_staticText42, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_staticText81, 0, wx.ALL, 5 )
 
-        self.m_Star = wx.CheckBox(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_only_selected = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_Star, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_only_selected, 0, wx.ALL, 5 )
 
-        self.m_staticText81 = wx.StaticText(self, wx.ID_ANY, u"Only under selected Zone", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_staticText7 = wx.StaticText( self, wx.ID_ANY, u"Debug mode", wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.m_staticText81.Wrap(-1)
+		self.m_staticText7.Wrap( -1 )
 
-        fgSizer1.Add(self.m_staticText81, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_staticText7, 1, wx.ALL|wx.EXPAND, 5 )
 
-        self.m_only_selected = wx.CheckBox(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_Debug = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add(self.m_only_selected, 0, wx.ALL, 5)
+		fgSizer1.Add( self.m_Debug, 1, wx.ALL|wx.EXPAND, 5 )
 
-        bSizer3.Add(fgSizer1, 1, wx.EXPAND, 5)
 
-        bSizer1 = wx.BoxSizer(wx.HORIZONTAL)
+		bSizer3.Add( fgSizer1, 1, wx.EXPAND, 5 )
 
-        self.m_staticText101 = wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
+		bSizer1 = wx.BoxSizer( wx.HORIZONTAL )
-        self.m_staticText101.Wrap(-1)
 
-        bSizer1.Add(self.m_staticText101, 1, wx.ALL, 5)
+		self.m_staticText101 = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText101.Wrap( -1 )
 
-        self.m_button1 = wx.Button(self, wx.ID_OK, u"Run", wx.DefaultPosition, wx.DefaultSize, 0)
+		bSizer1.Add( self.m_staticText101, 1, wx.ALL, 5 )
 
-        self.m_button1.SetDefault()
+		self.m_button1 = wx.Button( self, wx.ID_OK, u"Run", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer1.Add(self.m_button1, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
-        self.m_button2 = wx.Button(self, wx.ID_CANCEL, u"Cancel", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_button1.SetDefault()
-        bSizer1.Add(self.m_button2, 0, wx.ALL, 5)
+		bSizer1.Add( self.m_button1, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
 
-        self.m_button3_delete = wx.Button(self, wx.ID_DELETE, u"Delete Vias", wx.DefaultPosition, wx.DefaultSize, 0)
+		self.m_button2 = wx.Button( self, wx.ID_CANCEL, u"Cancel", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer1.Add(self.m_button3_delete, 0, wx.ALL, 5)
+		bSizer1.Add( self.m_button2, 0, wx.ALL, 5 )
 
-        bSizer3.Add(bSizer1, 0, wx.EXPAND | wx.ALIGN_RIGHT, 5)
+		self.m_button3_delete = wx.Button( self, wx.ID_DELETE, u"Delete Vias", wx.DefaultPosition, wx.DefaultSize, 0 )
+		bSizer1.Add( self.m_button3_delete, 0, wx.ALL, 5 )
 
-        self.SetSizer(bSizer3)
-        self.Layout()
 
-        self.Centre(wx.BOTH)
+		bSizer3.Add( bSizer1, 0, wx.EXPAND|wx.ALIGN_RIGHT, 5 )
 
-        # Connect Events
-        self.m_button3_delete.Bind(wx.EVT_BUTTON, self.onDeleteClick)
 
-    def __del__(self):
+		self.SetSizer( bSizer3 )
-        pass
+		self.Layout()
 
-    # Virtual event handlers, override them in your derived class
+		self.Centre( wx.BOTH )
-    def onDeleteClick(self, event):
+
-        event.Skip()
+		# Connect Events
+		self.m_button3_delete.Bind( wx.EVT_BUTTON, self.onDeleteClick )
+
+	def __del__( self ):
+		pass
+
+
+	# Virtual event handlers, override them in your derived class
+	def onDeleteClick( self, event ):
+		event.Skip()

ViaStitching/FillAreaTpl.fbp

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="15" />
+    <FileVersion major="1" minor="16" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">Python</property>
@@ -14,6 +14,7 @@
         <property name="file">FillAreaDialog</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">0</property>
         <property name="name">FillAreaDialog</property>
@@ -25,6 +26,7 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -50,6 +52,7 @@
             <property name="subclass"></property>
             <property name="title">Fill Area parameters</property>
             <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
             <property name="window_style"></property>
@@ -768,11 +771,11 @@
                                 <property name="window_style"></property>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="0">
+                        <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="flag">wxALL</property>
-                            <property name="proportion">1</property>
+                            <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="0">
+                            <object class="wxStaticText" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -800,7 +803,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Debug mode</property>
+                                <property name="label">Star Pattern</property>
                                 <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
@@ -809,7 +812,7 @@
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size"></property>
                                 <property name="moveable">1</property>
-                                <property name="name">m_staticText7</property>
+                                <property name="name">m_staticText42</property>
                                 <property name="pane_border">1</property>
                                 <property name="pane_position"></property>
                                 <property name="pane_size"></property>
@@ -829,11 +832,11 @@
                                 <property name="wrap">-1</property>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="0">
+                        <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="flag">wxALL</property>
-                            <property name="proportion">1</property>
+                            <property name="proportion">0</property>
-                            <object class="wxCheckBox" expanded="0">
+                            <object class="wxComboBox" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -847,7 +850,7 @@
                                 <property name="caption"></property>
                                 <property name="caption_visible">1</property>
                                 <property name="center_pane">0</property>
-                                <property name="checked">0</property>
+                                <property name="choices">&quot;Concentric&quot; &quot;Outline&quot; &quot;Rectangular&quot; &quot;Star&quot;</property>
                                 <property name="close_button">1</property>
                                 <property name="context_help"></property>
                                 <property name="context_menu">1</property>
@@ -862,7 +865,6 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label"></property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -870,7 +872,7 @@
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size"></property>
                                 <property name="moveable">1</property>
-                                <property name="name">m_Debug</property>
+                                <property name="name">m_cbFillType</property>
                                 <property name="pane_border">1</property>
                                 <property name="pane_position"></property>
                                 <property name="pane_size"></property>
@@ -878,9 +880,10 @@
                                 <property name="pin_button">1</property>
                                 <property name="pos"></property>
                                 <property name="resize">Resizable</property>
+                                <property name="selection">-1</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style"></property>
+                                <property name="style">wxCB_READONLY</property>
                                 <property name="subclass"></property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
@@ -888,6 +891,7 @@
                                 <property name="validator_style">wxFILTER_NONE</property>
                                 <property name="validator_type">wxDefaultValidator</property>
                                 <property name="validator_variable"></property>
+                                <property name="value">Concentric</property>
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
@@ -1018,131 +1022,6 @@
                                 <property name="window_style"></property>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Star Pattern</property>
-                                <property name="markup">0</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_staticText42</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <property name="wrap">-1</property>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxCheckBox" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="checked">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label"></property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_Star</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                            </object>
-                        </object>
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxALL</property>
@@ -1268,6 +1147,131 @@
                                 <property name="window_style"></property>
                             </object>
                         </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxStaticText" expanded="0">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Debug mode</property>
+                                <property name="markup">0</property>
+                                <property name="max_size"></property>
+                                <property name="maximize_button">0</property>
+                                <property name="maximum_size"></property>
+                                <property name="min_size"></property>
+                                <property name="minimize_button">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="moveable">1</property>
+                                <property name="name">m_staticText7</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxCheckBox" expanded="0">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="checked">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label"></property>
+                                <property name="max_size"></property>
+                                <property name="maximize_button">0</property>
+                                <property name="maximum_size"></property>
+                                <property name="min_size"></property>
+                                <property name="minimize_button">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="moveable">1</property>
+                                <property name="name">m_Debug</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                            </object>
+                        </object>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
@@ -1353,6 +1357,7 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>
@@ -1425,6 +1430,7 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>
@@ -1497,6 +1503,7 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
+                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>