haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cli gerbers output path and add job file

This commit is contained in:
Marek Roszko 2023-01-08 23:03:30 -05:00
parent 684941e4b6
commit 82a1175d72
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -48,6 +48,7 @@
#include <gendrill_gerber_writer.h>
#include <wildcards_and_files_ext.h>
#include <plugins/kicad/pcb_plugin.h>
#include <gerber_jobfile_writer.h>
#include "pcbnew_scripting_helpers.h"
@ -262,7 +263,8 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
BOARD* brd = LoadBoard( aGerberJob->m_filename );
PCB_PLOT_PARAMS boardPlotOptions = brd->GetPlotOptions();
LSET plotOnAllLayersSelection = boardPlotOptions.GetPlotOnAllLayersSelection();
LSET plotOnAllLayersSelection = boardPlotOptions.GetPlotOnAllLayersSelection();
GERBER_JOBFILE_WRITER jobfile_writer( brd );
wxString fileExt;
@ -313,9 +315,11 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
BuildPlotFileName( &fn, aGerberJob->m_outputFile, brd->GetLayerName( layer ), fileExt );
wxString fullname = fn.GetFullName();
jobfile_writer.AddGbrFile( layer, fullname );
// We are feeding it one layer at the start here to silence a logic check
GERBER_PLOTTER* plotter = (GERBER_PLOTTER*) StartPlotBoard(
brd, &plotOpts, layer, fullname, wxEmptyString, wxEmptyString );
brd, &plotOpts, layer, fn.GetFullPath(), wxEmptyString, wxEmptyString );
if( plotter )
{
@ -327,6 +331,11 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
delete plotter;
}
wxFileName fn( aGerberJob->m_filename );
// Build gerber job file from basename
BuildPlotFileName( &fn, aGerberJob->m_outputFile, wxT( "job" ), GerberJobFileExtension );
jobfile_writer.CreateJobFile( fn.GetFullPath() );
return CLI::EXIT_CODES::OK;
}