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

Added support for v6 GetAuxOrigin change to out_position.py

This commit is contained in:
Diego Capusotto 2021-12-17 16:31:08 -03:00
parent bed617f72f
commit 69189e661e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kibot/gs.py
View File

@ -161,6 +161,13 @@ class GS(object):
return board.GetFootprints() return board.GetFootprints()
return board.GetModules() return board.GetModules()
@staticmethod
def get_aux_origin():
if GS.ki6(): # pragma: no cover (Ki6)
settings = GS.board.GetDesignSettings()
return settings.GetAuxOrigin()
return GS.board.GetAuxOrigin()
@staticmethod @staticmethod
def ki6(): def ki6():
return GS.kicad_version_n >= KICAD_VERSION_5_99 return GS.kicad_version_n >= KICAD_VERSION_5_99

9
kibot/out_any_drill.py
View File

@ -35,13 +35,6 @@ class DrillReport(Optionable):
self._unkown_is_error = True self._unkown_is_error = True
def get_aux_origin(board):
if GS.ki6(): # pragma: no cover (Ki6)
settings = board.GetDesignSettings()
return settings.GetAuxOrigin()
return board.GetAuxOrigin()
class AnyDrill(BaseOptions): class AnyDrill(BaseOptions):
def __init__(self): def __init__(self):
# Options # Options
@ -132,7 +125,7 @@ class AnyDrill(BaseOptions):
output_dir = os.path.dirname(output_dir) output_dir = os.path.dirname(output_dir)
# dialog_gendrill.cpp:357 # dialog_gendrill.cpp:357
if self.use_aux_axis_as_origin: if self.use_aux_axis_as_origin:
offset = get_aux_origin(GS.board) offset = GS.get_aux_origin()
else: else:
offset = wxPoint(0, 0) offset = wxPoint(0, 0)
drill_writer = self._configure_writer(GS.board, offset) drill_writer = self._configure_writer(GS.board, offset)

2
kibot/out_position.py
View File

@ -230,7 +230,7 @@ class PositionOptions(VariantOptions):
x_origin = 0.0 x_origin = 0.0
y_origin = 0.0 y_origin = 0.0
if self.use_aux_axis_as_origin: if self.use_aux_axis_as_origin:
(x_origin, y_origin) = GS.board.GetAuxOrigin() (x_origin, y_origin) = GS.get_aux_origin()
logger.debug('Using auxiliar origin: x={} y={}'.format(x_origin, y_origin)) logger.debug('Using auxiliar origin: x={} y={}'.format(x_origin, y_origin))
for m in sorted(GS.get_modules(), key=lambda c: _ref_key(c.GetReference())): for m in sorted(GS.get_modules(), key=lambda c: _ref_key(c.GetReference())):
ref = m.GetReference() ref = m.GetReference()