Merge branch 'Phara0h-master'
This commit is contained in:
Jean-Samuel Reynaud
@ -77,9 +77,9 @@ class FillArea:
|
|||||||
# Step between via
|
# Step between via
|
||||||
self.SetStepMM(2.54)
|
self.SetStepMM(2.54)
|
||||||
# Size of the via (diameter of copper)
|
# Size of the via (diameter of copper)
|
||||||
self.SetSizeMM(0.35)
|
self.SetSizeMM(0.46)
|
||||||
# Size of the drill (diameter)
|
# Size of the drill (diameter)
|
||||||
self.SetDrillMM(0.30)
|
self.SetDrillMM(0.20)
|
||||||
# Isolation between via and other elements
|
# Isolation between via and other elements
|
||||||
# ie: radius from the border of the via
|
# ie: radius from the border of the via
|
||||||
self.SetClearanceMM(0.2)
|
self.SetClearanceMM(0.2)
|
||||||
@ -93,6 +93,7 @@ class FillArea:
|
|||||||
self.netname = None
|
self.netname = None
|
||||||
self.debug = False
|
self.debug = False
|
||||||
self.random = False
|
self.random = False
|
||||||
|
self.star = False
|
||||||
if self.netname is None:
|
if self.netname is None:
|
||||||
self.SetNetname("GND")
|
self.SetNetname("GND")
|
||||||
|
|
||||||
@ -112,6 +113,10 @@ class FillArea:
|
|||||||
self.random = True
|
self.random = True
|
||||||
return self
|
return self
|
||||||
|
|
||||||
|
def SetStar(self):
|
||||||
|
self.star = True
|
||||||
|
return self
|
||||||
|
|
||||||
def SetPCB(self, pcb):
|
def SetPCB(self, pcb):
|
||||||
self.pcb = pcb
|
self.pcb = pcb
|
||||||
if self.pcb is not None:
|
if self.pcb is not None:
|
||||||
@ -156,36 +161,6 @@ class FillArea:
|
|||||||
print()
|
print()
|
||||||
print()
|
print()
|
||||||
|
|
||||||
def PrepareFootprint(self):
|
|
||||||
"""Don't use via since it's not possible to force a Net.
|
|
||||||
So use a fake footprint (only one THPad)
|
|
||||||
"""
|
|
||||||
self.tmp_dir = tempfile.mkdtemp(".pretty")
|
|
||||||
module_txt = """(module VIA_MATRIX (layer F.Cu) (tedit 5862471A)
|
|
||||||
(fp_text reference REF** (at 0 0) (layer F.SilkS) hide
|
|
||||||
(effects (font (size 0 0) (thickness 0.0)))
|
|
||||||
)
|
|
||||||
(fp_text value VIA_MATRIX (at 0 0) (layer F.Fab) hide
|
|
||||||
(effects (font (size 0 0) (thickness 0.0)))
|
|
||||||
)
|
|
||||||
(pad 1 thru_hole circle (at 0 0) (size 1.5 1.5) (drill 0.762) (layers *.Cu))
|
|
||||||
)"""
|
|
||||||
|
|
||||||
# Create the footprint on a temp directory
|
|
||||||
f = open(os.path.join(self.tmp_dir, "VIA_MATRIX.kicad_mod"), 'w')
|
|
||||||
f.write(module_txt)
|
|
||||||
f.close()
|
|
||||||
|
|
||||||
plugin = IO_MGR.PluginFind(
|
|
||||||
IO_MGR.GuessPluginTypeFromLibPath(self.tmp_dir))
|
|
||||||
module = plugin.FootprintLoad(self.tmp_dir, "VIA_MATRIX")
|
|
||||||
module.FindPadByName("1").SetSize(wxSize(self.size, self.size))
|
|
||||||
module.FindPadByName("1").SetDrillSize(wxSize(self.drill, self.drill))
|
|
||||||
module.FindPadByName("1").SetLocalClearance(int(self.clearance))
|
|
||||||
module.FindPadByName("1").SetNet(self.pcb.FindNet(self.netname))
|
|
||||||
module.FindPadByName("1").SetZoneConnection(PAD_ZONE_CONN_FULL)
|
|
||||||
return module
|
|
||||||
|
|
||||||
def CleanupFootprint(self):
|
def CleanupFootprint(self):
|
||||||
"""
|
"""
|
||||||
cleanup temp footprint
|
cleanup temp footprint
|
||||||
@ -193,16 +168,15 @@ class FillArea:
|
|||||||
if self.tmp_dir and os.path.isdir(self.tmp_dir):
|
if self.tmp_dir and os.path.isdir(self.tmp_dir):
|
||||||
shutil.rmtree(self.tmp_dir)
|
shutil.rmtree(self.tmp_dir)
|
||||||
|
|
||||||
def AddModule(self, module, position, x, y):
|
def AddVia(self, position, x, y):
|
||||||
m = MODULE(module)
|
m = VIA(self.pcb)
|
||||||
m.SetPosition(position)
|
m.SetPosition(position)
|
||||||
m.SetReference("V%s_%s" % (x, y))
|
m.SetNet(self.pcb.FindNet(self.netname))
|
||||||
m.SetValue("AUTO_VIA")
|
m.SetViaType(VIA_THROUGH)
|
||||||
m.SetLastEditTime()
|
m.SetDrill(int(self.drill))
|
||||||
m.SetAttributes(MOD_VIRTUAL)
|
m.SetWidth(int(self.size))
|
||||||
m.thisown = 0
|
m.SetTimeStamp(33) # USE 33 as timestamp to mark this via as generated
|
||||||
self.pcb.AddNative(m, ADD_APPEND)
|
self.pcb.Add(m)
|
||||||
m.SetFlag(IS_NEW)
|
|
||||||
|
|
||||||
def RefillBoardAreas(self):
|
def RefillBoardAreas(self):
|
||||||
for i in range(self.pcb.GetAreaCount()):
|
for i in range(self.pcb.GetAreaCount()):
|
||||||
@ -218,18 +192,18 @@ class FillArea:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if self.delete_vias:
|
if self.delete_vias:
|
||||||
for module in self.pcb.GetModules():
|
for via in self.pcb.GetTracks():
|
||||||
|
if via.Type() == PCB_VIA_T:
|
||||||
|
if via.GetTimeStamp() == 33:
|
||||||
if self.debug:
|
if self.debug:
|
||||||
print("* Deleting module: %s" % module.GetValue())
|
print("* Deleting via %u" % via.GetTimeStamp())
|
||||||
if module.GetValue() == "AUTO_VIA":
|
self.pcb.RemoveNative(via)
|
||||||
self.pcb.RemoveNative(module)
|
|
||||||
self.RefillBoardAreas()
|
self.RefillBoardAreas()
|
||||||
return # no need to run the rest of logic
|
return # no need to run the rest of logic
|
||||||
|
|
||||||
lboard = self.pcb.ComputeBoundingBox()
|
lboard = self.pcb.ComputeBoundingBox()
|
||||||
rectangle = []
|
rectangle = []
|
||||||
origin = lboard.GetPosition()
|
origin = lboard.GetPosition()
|
||||||
module = self.PrepareFootprint()
|
|
||||||
|
|
||||||
# Create an initial rectangle: all is off
|
# Create an initial rectangle: all is off
|
||||||
# get a margin to avoid out of range
|
# get a margin to avoid out of range
|
||||||
@ -265,7 +239,7 @@ class FillArea:
|
|||||||
for y in range(rectangle[0].__len__()):
|
for y in range(rectangle[0].__len__()):
|
||||||
for x in range(rectangle.__len__()):
|
for x in range(rectangle.__len__()):
|
||||||
testResult = not keepOutMode # = False if is Keepout
|
testResult = not keepOutMode # = False if is Keepout
|
||||||
offset = self.clearance + self.size / 2
|
offset = (self.clearance) + self.size / 2
|
||||||
# For keepout area: Deny Via
|
# For keepout area: Deny Via
|
||||||
# For same net area: Allow if not denied by keepout
|
# For same net area: Allow if not denied by keepout
|
||||||
current_x = origin.x + (x * self.step)
|
current_x = origin.x + (x * self.step)
|
||||||
@ -404,8 +378,20 @@ class FillArea:
|
|||||||
(self.step / 4.0)
|
(self.step / 4.0)
|
||||||
ran_y = (random.random() * self.step / 2.0) - \
|
ran_y = (random.random() * self.step / 2.0) - \
|
||||||
(self.step / 4.0)
|
(self.step / 4.0)
|
||||||
self.AddModule(
|
if self.star:
|
||||||
module, wxPoint(origin.x + (self.step * x) + ran_x,
|
if y % 2:
|
||||||
|
if ((x + 1) % 2):
|
||||||
|
self.AddVia(
|
||||||
|
wxPoint(origin.x + (self.step * x) + ran_x,
|
||||||
|
origin.y + (self.step * y) + ran_y), x, y)
|
||||||
|
else:
|
||||||
|
if (x % 2):
|
||||||
|
self.AddVia(
|
||||||
|
wxPoint(origin.x + (self.step * x) + ran_x,
|
||||||
|
origin.y + (self.step * y) + ran_y), x, y)
|
||||||
|
else:
|
||||||
|
self.AddVia(
|
||||||
|
wxPoint(origin.x + (self.step * x) + ran_x,
|
||||||
origin.y + (self.step * y) + ran_y), x, y)
|
origin.y + (self.step * y) + ran_y), x, y)
|
||||||
|
|
||||||
self.RefillBoardAreas()
|
self.RefillBoardAreas()
|
||||||
|
|||||||
@ -38,11 +38,12 @@ class FillAreaAction(pcbnew.ActionPlugin):
|
|||||||
|
|
||||||
def Run(self):
|
def Run(self):
|
||||||
a = FillAreaDialogEx(None)
|
a = FillAreaDialogEx(None)
|
||||||
a.m_SizeMM.SetValue("0.35")
|
a.m_SizeMM.SetValue("0.46")
|
||||||
a.m_StepMM.SetValue("2.54")
|
a.m_StepMM.SetValue("2.54")
|
||||||
a.m_DrillMM.SetValue("0.3")
|
a.m_DrillMM.SetValue("0.2")
|
||||||
a.m_Netname.SetValue("auto")
|
a.m_Netname.SetValue("auto")
|
||||||
a.m_ClearanceMM.SetValue("0.2")
|
a.m_ClearanceMM.SetValue("0.2")
|
||||||
|
a.m_Star.SetValue(True)
|
||||||
modal_result = a.ShowModal()
|
modal_result = a.ShowModal()
|
||||||
if modal_result == wx.ID_OK:
|
if modal_result == wx.ID_OK:
|
||||||
fill = FillArea.FillArea()
|
fill = FillArea.FillArea()
|
||||||
@ -57,6 +58,8 @@ class FillAreaAction(pcbnew.ActionPlugin):
|
|||||||
fill.SetDebug()
|
fill.SetDebug()
|
||||||
if a.m_Random.IsChecked():
|
if a.m_Random.IsChecked():
|
||||||
fill.SetRandom()
|
fill.SetRandom()
|
||||||
|
if a.m_Star.IsChecked():
|
||||||
|
fill.SetStar()
|
||||||
if a.m_only_selected.IsChecked():
|
if a.m_only_selected.IsChecked():
|
||||||
fill.OnlyOnSelectedArea()
|
fill.OnlyOnSelectedArea()
|
||||||
fill.Run()
|
fill.Run()
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
## Python code generated with wxFormBuilder (version Feb 16 2016)
|
## Python code generated with wxFormBuilder (version Dec 21 2016)
|
||||||
## http://www.wxformbuilder.org/
|
## http://www.wxformbuilder.org/
|
||||||
##
|
##
|
||||||
## PLEASE DO "NOT" EDIT THIS FILE!
|
## PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
@ -78,6 +78,13 @@ class FillAreaDialog ( wx.Dialog ):
|
|||||||
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_staticText42.Wrap( -1 )
|
||||||
|
fgSizer1.Add( self.m_staticText42, 0, wx.ALL, 5 )
|
||||||
|
|
||||||
|
self.m_Star = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||||
|
fgSizer1.Add( self.m_Star, 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_staticText81 = wx.StaticText( self, wx.ID_ANY, u"Only under selected Zone", wx.DefaultPosition, wx.DefaultSize, 0 )
|
||||||
self.m_staticText81.Wrap( -1 )
|
self.m_staticText81.Wrap( -1 )
|
||||||
fgSizer1.Add( self.m_staticText81, 0, wx.ALL, 5 )
|
fgSizer1.Add( self.m_staticText81, 0, wx.ALL, 5 )
|
||||||
|
|||||||
@ -1321,6 +1321,177 @@
|
|||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
</object>
|
</object>
|
||||||
</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="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>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</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>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
<object class="sizeritem" expanded="0">
|
<object class="sizeritem" expanded="0">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxALL</property>
|
<property name="flag">wxALL</property>
|
||||||
|
|||||||
Reference in New Issue
Block a user