From 1e6ac697f06f48a14ce1f56a25d40e985a89db3e Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 1 Dec 2021 16:07:08 -0300 Subject: [PATCH] Fixed gerber job files not using the output defined in global. --- CHANGELOG.md | 1 + kibot/out_gerber.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3685d41..99e966cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 exist when no variant is selected. (#105) - PCB Print: to show the real name of the PCB file. (#102) - Compress: not expanding %VALUES in target dirs. (#111) +- Gerber: job file didn't use the global output pattern. (#116) ## [0.11.0] - 2021-04-25 diff --git a/kibot/out_gerber.py b/kibot/out_gerber.py index f8f9b461..7f7c7b05 100644 --- a/kibot/out_gerber.py +++ b/kibot/out_gerber.py @@ -39,6 +39,8 @@ class GerberOptions(AnyLayerOptions): """ Disable aperture macros (workaround for buggy CAM software) (KiCad 6) """ super().__init__() self._plot_format = PLOT_FORMAT_GERBER + if GS.global_output is not None: + self.gerber_job_file = GS.global_output @property def gerber_precision(self): @@ -64,7 +66,7 @@ class GerberOptions(AnyLayerOptions): po.SetLineWidth(FromMM(self.line_width)) else: po.SetDisableGerberMacros(self.disable_aperture_macros) # pragma: no cover (Ki6) - setattr(po, 'gerber_job_file', self.gerber_job_file) + po.gerber_job_file = self.gerber_job_file def read_vals_from_po(self, po): super().read_vals_from_po(po)