Added FILL_TYPE_OUTLINE_NO_HOLES

This commit is contained in:
Arjan Mels
2022-06-26 15:45:12 +02:00
parent 9c4e414ef3
commit 89dca8193a
3 changed files with 8 additions and 6 deletions

View File

@ -109,6 +109,7 @@ class FillArea:
FILL_TYPE_STAR = "Star" FILL_TYPE_STAR = "Star"
FILL_TYPE_CONCENTRIC = "Concentric" FILL_TYPE_CONCENTRIC = "Concentric"
FILL_TYPE_OUTLINE = "Outline" FILL_TYPE_OUTLINE = "Outline"
FILL_TYPE_OUTLINE_NO_HOLES = "Outline (No Holes)"
def __init__(self, filename=None): def __init__(self, filename=None):
self.filename = None self.filename = None
@ -435,9 +436,10 @@ STEP = '-'
outline = poly_set.Outline(i) outline = poly_set.Outline(i)
via_placed += self.AddViasAlongOutline(outline, all_vias, off) via_placed += self.AddViasAlongOutline(outline, all_vias, off)
for k in range(0, poly_set.HoleCount(i)): if self.fill_type != self.FILL_TYPE_OUTLINE_NO_HOLES:
hole = poly_set.Hole(i,k) for k in range(0, poly_set.HoleCount(i)):
via_placed += self.AddViasAlongOutline(hole, all_vias, off) hole = poly_set.Hole(i,k)
via_placed += self.AddViasAlongOutline(hole, all_vias, off)
# Size the polygons to place the next ring # Size the polygons to place the next ring
if self.fill_type == self.FILL_TYPE_CONCENTRIC: if self.fill_type == self.FILL_TYPE_CONCENTRIC:
@ -488,7 +490,7 @@ STEP = '-'
self.pcb_group.SetName(VIA_GROUP_NAME) self.pcb_group.SetName(VIA_GROUP_NAME)
self.pcb.Add(self.pcb_group) 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() self.ConcentricFillVias()
if self.filename: if self.filename:
self.pcb.Save(self.filename) self.pcb.Save(self.filename)

View File

@ -81,7 +81,7 @@ class FillAreaDialog ( wx.Dialog ):
fgSizer1.Add( self.m_staticText42, 0, wx.ALL, 5 ) 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 ) 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 ) fgSizer1.Add( self.m_cbFillType, 0, wx.ALL, 5 )

View File

@ -850,7 +850,7 @@
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="choices">&quot;Concentric&quot; &quot;Outline&quot; &quot;Rectangular&quot; &quot;Star&quot;</property> <property name="choices">&quot;Concentric&quot; &quot;Outline&quot; &quot;Outline (No Holes)&quot; &quot;Rectangular&quot; &quot;Star&quot;</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>