From acf6bedda868636c3eac98da6be7b33aa121e59b Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Sun, 12 Jul 2020 15:55:25 -0300 Subject: [PATCH] Defined %i as 'job' for gerber job files. --- kiplot/out_any_layer.py | 2 +- kiplot/out_gerber.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kiplot/out_any_layer.py b/kiplot/out_any_layer.py index 54283230..129a4218 100644 --- a/kiplot/out_any_layer.py +++ b/kiplot/out_any_layer.py @@ -96,7 +96,7 @@ class AnyLayerOptions(BaseOptions): jobfile_writer.AddGbrFile(id, os.path.basename(filename)) if create_job: - job_fn = self.expand_filename(po.gerber_job_file, ext='gbrjob') + job_fn = self.expand_filename(po.gerber_job_file, 'job', 'gbrjob') jobfile_writer.CreateJobFile(os.path.abspath(os.path.join(output_dir, job_fn))) def read_vals_from_po(self, po): diff --git a/kiplot/out_gerber.py b/kiplot/out_gerber.py index 6d379444..513d333f 100644 --- a/kiplot/out_gerber.py +++ b/kiplot/out_gerber.py @@ -22,8 +22,8 @@ class GerberOptions(AnyLayerOptions): self.create_gerber_job_file = True """ creates a file with information about all the generated gerbers. You can use it in gerbview to load all gerbers at once """ - self.gerber_job_file = '%f-job.%x' - """ name for the gerber job file """ + self.gerber_job_file = '%f-%i.%x' + """ name for the gerber job file (%i='job', %x='gbrjob') """ self.use_gerber_x2_attributes = True """ use the extended X2 format """ self.use_gerber_net_attributes = True