test/kicad-action-scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ViaStitching/FillArea.py: fix no vias placed under KiCad 7.0

Browse Source 
- Call the API corresponding to kicad according to different versions

Closes: https://github.com/jsreynaud/kicad-action-scripts/issues/62
Signed-off-by: Huang Rui <vowstar@gmail.com>
This commit is contained in:
Huang Rui
2023-04-06 19:57:07 +08:00
parent 64a689d6c5
commit 438f38c3a6
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ViaStitching/FillArea.py
View File

@ -300,8 +300,17 @@ STEP = '-'
point_to_test = wxPoint(via.PosX + dx, via.PosY + dy) point_to_test = wxPoint(via.PosX + dx, via.PosY + dy)
hit_test_area = False hit_test_area = False
for layer_id in area.GetLayerSet().CuStack(): if pcbnew.Version() < '7':
hit_test_area = hit_test_area or area.HitTestFilledArea(layer_id, VECTOR2I(point_to_test)) # Collides with a filled area # below 7.0.0
for layer_id in area.GetLayerSet().CuStack():
hit_test_area = hit_test_area or area.HitTestFilledArea(layer_id, VECTOR2I(point_to_test)) # Collides with a filled area
else:
# 7.0.0 and above
for layer_id in area.GetLayerSet().CuStack():
for i in range(0, area.Outline().OutlineCount()):
area_outline = area.Outline().Outline(i)
if area.GetLayerSet().Contains(layer_id) and (layer_id != Edge_Cuts):
hit_test_area = hit_test_area or area_outline.PointInside(VECTOR2I(point_to_test))
hit_test_edge = area.HitTestForEdge(VECTOR2I(point_to_test), 1) # Collides with an edge/corner hit_test_edge = area.HitTestForEdge(VECTOR2I(point_to_test), 1) # Collides with an edge/corner
try: try:
hit_test_zone = area.HitTestInsideZone(VECTOR2I(point_to_test)) # Is inside a zone (e.g. KeepOut/Rules) hit_test_zone = area.HitTestInsideZone(VECTOR2I(point_to_test)) # Is inside a zone (e.g. KeepOut/Rules)
@ -423,7 +432,12 @@ STEP = '-'
for zone in zones: for zone in zones:
if zone.IsOnLayer(layer_id): if zone.IsOnLayer(layer_id):
if poly_set is not None or not self.only_selected_area or zone.IsSelected(): if poly_set is not None or not self.only_selected_area or zone.IsSelected():
poly_set_layer.Append(zone.RawPolysList(layer_id)) if pcbnew.Version() < '7':
# below 7.0.0
poly_set_layer.Append(zone.RawPolysList(layer_id))
else:
# 7.0.0 and above
poly_set_layer.Append(zone.Outline())
if poly_set is None: if poly_set is None:
poly_set = poly_set_layer poly_set = poly_set_layer
@ -608,8 +622,16 @@ STEP = '-'
# Offset is half the size of the via plus the clearance of the via or the area # Offset is half the size of the via plus the clearance of the via or the area
offset = 0 # Use an exact zone match offset = 0 # Use an exact zone match
point_to_test = wxPoint(int(current_x), int(current_y)) point_to_test = wxPoint(int(current_x), int(current_y))
hit_test_area = area.HitTestFilledArea( hit_test_area = False
area.GetLayer(), VECTOR2I(point_to_test), int(offset)) # Collides with a filled area if pcbnew.Version() < '7':
# below 7.0.0
hit_test_area = area.HitTestFilledArea(
area.GetLayer(), VECTOR2I(point_to_test), int(offset)) # Collides with a filled area
else:
# 7.0.0 and above
for i in range(0, area.Outline().OutlineCount()):
area_outline = area.Outline().Outline(i)
hit_test_area = hit_test_area or area_outline.PointInside(VECTOR2I(point_to_test))
# Collides with an edge/corner # Collides with an edge/corner
hit_test_edge = area.HitTestForEdge(VECTOR2I(point_to_test), int(max(area_clearance, offset))) hit_test_edge = area.HitTestForEdge(VECTOR2I(point_to_test), int(max(area_clearance, offset)))
# test_result only remains true if the via is inside an area and not on an edge # test_result only remains true if the via is inside an area and not on an edge