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

Cleanup jobs handlers (+Fix build)

This commit is contained in:
Roberto Fernandez Bautista 2023-06-11 00:12:32 +02:00
parent 61493b8489
commit 3d1b96d6ca
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/eeschema_jobs_handler.cpp
View File

@ -40,6 +40,7 @@
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <plotters/plotters_pslike.h> #include <plotters/plotters_pslike.h>
#include <drawing_sheet/ds_data_model.h> #include <drawing_sheet/ds_data_model.h>
#include <reporter.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
@ -661,8 +662,9 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
{ {
if( wxFile::Exists( upgradeJob->m_outputLibraryPath ) ) if( wxFile::Exists( upgradeJob->m_outputLibraryPath ) )
{ {
m_reporter->Report( m_reporter->Report( _( "Output path must not conflict with existing path\n" ),
_( "Output path must not conflict with existing path\n", RPT_SEVERITY_ERROR ) ); RPT_SEVERITY_ERROR );
return CLI::EXIT_CODES::ERR_INVALID_OUTPUT_CONFLICT; return CLI::EXIT_CODES::ERR_INVALID_OUTPUT_CONFLICT;
} }
} }
@ -672,7 +674,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
if( shouldSave ) if( shouldSave )
{ {
m_reporter->Report( _( "Saving symbol library in updated format\n", RPT_SEVERITY_ACTION ) ); m_reporter->Report( _( "Saving symbol library in updated format\n" ), RPT_SEVERITY_ACTION );
try try
{ {

7
eeschema/eeschema_jobs_handler.h
View File

@ -23,7 +23,6 @@
#include <jobs/job_dispatcher.h> #include <jobs/job_dispatcher.h>
#include <wx/string.h> #include <wx/string.h>
#include <reporter.h>
namespace KIGFX namespace KIGFX
{ {
@ -48,8 +47,6 @@ public:
int JobSymUpgrade( JOB* aJob ); int JobSymUpgrade( JOB* aJob );
int JobSymExportSvg( JOB* aJob ); int JobSymExportSvg( JOB* aJob );
int doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob, KIGFX::SCH_RENDER_SETTINGS* aRenderSettings, LIB_SYMBOL* symbol );
/** /**
* Configures the SCH_RENDER_SETTINGS object with the correct data to be used with plotting * Configures the SCH_RENDER_SETTINGS object with the correct data to be used with plotting
* *
@ -62,6 +59,10 @@ public:
void InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRenderSettings, const wxString& aTheme, void InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRenderSettings, const wxString& aTheme,
SCHEMATIC* aSch ); SCHEMATIC* aSch );
private:
int doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob, KIGFX::SCH_RENDER_SETTINGS* aRenderSettings,
LIB_SYMBOL* symbol );
}; };
#endif #endif

1
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -48,6 +48,7 @@
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <plugins/kicad/pcb_plugin.h> #include <plugins/kicad/pcb_plugin.h>
#include <gerber_jobfile_writer.h> #include <gerber_jobfile_writer.h>
#include <reporter.h>
#include "pcbnew_scripting_helpers.h" #include "pcbnew_scripting_helpers.h"

1
pcbnew/pcbnew_jobs_handler.h
View File

@ -23,7 +23,6 @@
#include <jobs/job_dispatcher.h> #include <jobs/job_dispatcher.h>
#include <pcb_plot_params.h> #include <pcb_plot_params.h>
#include <reporter.h>
class JOB_EXPORT_PCB_GERBER; class JOB_EXPORT_PCB_GERBER;
class JOB_FP_EXPORT_SVG; class JOB_FP_EXPORT_SVG;