From 5dce1d5a3107ad08c83998027f7bf339c42d84e6 Mon Sep 17 00:00:00 2001 From: Diego Capusotto Date: Fri, 17 Dec 2021 12:11:10 -0300 Subject: [PATCH] KiCad v6: Adapted gs.py to new API change - title_block.GetCommentX() -> title_block.GetComment(X) - No compat wrapper as usual --- kibot/gs.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/kibot/gs.py b/kibot/gs.py index 1836880a..eaf43d86 100644 --- a/kibot/gs.py +++ b/kibot/gs.py @@ -6,7 +6,7 @@ import os from datetime import datetime, date from sys import exit -from .misc import EXIT_BAD_ARGS, W_DATEFORMAT +from .misc import EXIT_BAD_ARGS, W_DATEFORMAT, KICAD_VERSION_5_99 from .log import get_logger logger = get_logger(__name__) @@ -136,6 +136,19 @@ class GS(object): return dt.strftime(GS.global_date_format) return d + @staticmethod + def get_pcb_comment(title_block, num): + if GS.kicad_version_n >= KICAD_VERSION_5_99: # pragma: no cover (Ki6) + # Backward compatibility ... what's this? + return title_block.GetComment(num) + if num == 1: + return title_block.GetComment1() + if num == 2: + return title_block.GetComment2() + if num == 3: + return title_block.GetComment3() + return title_block.GetComment4() + @staticmethod def load_pcb_title_block(): if GS.pcb_title is not None: @@ -152,10 +165,10 @@ class GS(object): GS.pcb_title = GS.pcb_basename GS.pcb_rev = title_block.GetRevision() GS.pcb_comp = title_block.GetCompany() - GS.pcb_com1 = title_block.GetComment1() - GS.pcb_com2 = title_block.GetComment2() - GS.pcb_com3 = title_block.GetComment3() - GS.pcb_com4 = title_block.GetComment4() + GS.pcb_com1 = GS.get_pcb_comment(title_block, 1) + GS.pcb_com2 = GS.get_pcb_comment(title_block, 2) + GS.pcb_com3 = GS.get_pcb_comment(title_block, 3) + GS.pcb_com4 = GS.get_pcb_comment(title_block, 4) logger.debug("PCB title: `{}`".format(GS.pcb_title)) logger.debug("PCB date: `{}`".format(GS.pcb_date)) logger.debug("PCB revision: `{}`".format(GS.pcb_rev))