From 89dca8193a8662752c18ab9f14aa3a3715b9668a Mon Sep 17 00:00:00 2001 From: Arjan Mels Date: Sun, 26 Jun 2022 15:45:12 +0200 Subject: [PATCH] Added FILL_TYPE_OUTLINE_NO_HOLES --- ViaStitching/FillArea.py | 10 ++++++---- ViaStitching/FillAreaDialog.py | 2 +- ViaStitching/FillAreaTpl.fbp | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ViaStitching/FillArea.py b/ViaStitching/FillArea.py index e08002f..36b83ef 100644 --- a/ViaStitching/FillArea.py +++ b/ViaStitching/FillArea.py @@ -109,6 +109,7 @@ class FillArea: FILL_TYPE_STAR = "Star" FILL_TYPE_CONCENTRIC = "Concentric" FILL_TYPE_OUTLINE = "Outline" + FILL_TYPE_OUTLINE_NO_HOLES = "Outline (No Holes)" def __init__(self, filename=None): self.filename = None @@ -435,9 +436,10 @@ STEP = '-' 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) + if self.fill_type != self.FILL_TYPE_OUTLINE_NO_HOLES: + 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: @@ -488,7 +490,7 @@ 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: + if self.fill_type==self.FILL_TYPE_CONCENTRIC or self.fill_type==self.FILL_TYPE_OUTLINE or self.fill_type==self.FILL_TYPE_OUTLINE_NO_HOLES: self.ConcentricFillVias() if self.filename: self.pcb.Save(self.filename) diff --git a/ViaStitching/FillAreaDialog.py b/ViaStitching/FillAreaDialog.py index 9d21b14..0220ae0 100644 --- a/ViaStitching/FillAreaDialog.py +++ b/ViaStitching/FillAreaDialog.py @@ -81,7 +81,7 @@ class FillAreaDialog ( wx.Dialog ): fgSizer1.Add( self.m_staticText42, 0, wx.ALL, 5 ) - m_cbFillTypeChoices = [ u"Concentric", u"Outline", u"Rectangular", u"Star" ] + m_cbFillTypeChoices = [ u"Concentric", u"Outline", u"Outline (No Holes)", u"Rectangular", u"Star" ] 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 ) diff --git a/ViaStitching/FillAreaTpl.fbp b/ViaStitching/FillAreaTpl.fbp index b68c33e..51bd564 100644 --- a/ViaStitching/FillAreaTpl.fbp +++ b/ViaStitching/FillAreaTpl.fbp @@ -850,7 +850,7 @@ 1 0 - "Concentric" "Outline" "Rectangular" "Star" + "Concentric" "Outline" "Outline (No Holes)" "Rectangular" "Star" 1 1