templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support to cross components on KiCad 7 PCBs 

- Not the most elegant solution, but the less impact
This commit is contained in:
Salvador E. Tropea 2023-02-10 13:24:23 -03:00
parent 6bb9a0796e
commit 2f903633e6
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kibot/gs.py
View File

@ -495,6 +495,13 @@ class GS(object):
return pcbnew.BOX2I(pcbnew.VECTOR2I(tlx, tly), pcbnew.VECTOR2I(brx-tlx, bry-tly)) return pcbnew.BOX2I(pcbnew.VECTOR2I(tlx, tly), pcbnew.VECTOR2I(brx-tlx, bry-tly))
return pcbnew.EDA_RECT(pcbnew.wxPoint(tlx, tly), pcbnew.wxSize(brx-tlx, bry-tly)) return pcbnew.EDA_RECT(pcbnew.wxPoint(tlx, tly), pcbnew.wxSize(brx-tlx, bry-tly))
@staticmethod
def get_rect_for(bound):
if GS.ki7:
pos = bound.GetPosition()
return pcbnew.wxRect(pcbnew.wxPoint(pos.x, pos.y), pcbnew.wxSize(bound.GetWidth(), bound.GetHeight()))
return bound.getWxRect()
# @staticmethod # @staticmethod
# def create_wxpoint(x, y): # def create_wxpoint(x, y):
# return pcbnew.wxPoint(x, y) # return pcbnew.wxPoint(x, y)

14
kibot/out_base.py
View File

@ -291,15 +291,15 @@ class VariantOptions(BaseOptions):
The layer is which layer id will be used. """ The layer is which layer id will be used. """
seg1 = VariantOptions.create_module_element(m) seg1 = VariantOptions.create_module_element(m)
seg1.SetWidth(120000) seg1.SetWidth(120000)
seg1.SetStart(wxPoint(rect.x1, rect.y1)) seg1.SetStart(GS.p2v_k7(wxPoint(rect.x1, rect.y1)))
seg1.SetEnd(wxPoint(rect.x2, rect.y2)) seg1.SetEnd(GS.p2v_k7(wxPoint(rect.x2, rect.y2)))
seg1.SetLayer(layer) seg1.SetLayer(layer)
seg1.SetLocalCoord() # Update the local coordinates seg1.SetLocalCoord() # Update the local coordinates
m.Add(seg1) m.Add(seg1)
seg2 = VariantOptions.create_module_element(m) seg2 = VariantOptions.create_module_element(m)
seg2.SetWidth(120000) seg2.SetWidth(120000)
seg2.SetStart(wxPoint(rect.x1, rect.y2)) seg2.SetStart(GS.p2v_k7(wxPoint(rect.x1, rect.y2)))
seg2.SetEnd(wxPoint(rect.x2, rect.y1)) seg2.SetEnd(GS.p2v_k7(wxPoint(rect.x2, rect.y1)))
seg2.SetLayer(layer) seg2.SetLayer(layer)
seg2.SetLocalCoord() # Update the local coordinates seg2.SetLocalCoord() # Update the local coordinates
m.Add(seg2) m.Add(seg2)
@ -326,9 +326,9 @@ class VariantOptions(BaseOptions):
if gi.GetClass() == 'MGRAPHIC': if gi.GetClass() == 'MGRAPHIC':
l_gi = gi.GetLayer() l_gi = gi.GetLayer()
if l_gi == ffab: if l_gi == ffab:
frect.Union(gi.GetBoundingBox().getWxRect()) frect.Union(GS.get_rect_for(gi.GetBoundingBox()))
if l_gi == bfab: if l_gi == bfab:
brect.Union(gi.GetBoundingBox().getWxRect()) brect.Union(GS.get_rect_for(gi.GetBoundingBox()))
# Cross the graphics in *.Fab # Cross the graphics in *.Fab
if frect.x1 is not None: if frect.x1 is not None:
extra_ffab_lines.append(self.cross_module(m, frect, ffab)) extra_ffab_lines.append(self.cross_module(m, frect, ffab))
@ -676,7 +676,7 @@ class VariantOptions(BaseOptions):
if gi.GetClass() == 'MGRAPHIC': if gi.GetClass() == 'MGRAPHIC':
l_gi = gi.GetLayer() l_gi = gi.GetLayer()
if l_gi == fcrtyd or l_gi == bcrtyd: if l_gi == fcrtyd or l_gi == bcrtyd:
bbox.Union(gi.GetBoundingBox().getWxRect()) bbox.Union(GS.get_rect_for(gi.GetBoundingBox()))
return bbox return bbox
def highlight_3D_models(self, board, highlight): def highlight_3D_models(self, board, highlight):