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

Rename export classes to match the scheme

This commit is contained in:
Marek Roszko 2023-08-19 11:51:50 -04:00
parent 32f0f05a98
commit c20cc24400
41 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kicad/cli/command_fp_export_svg.cpp
View File

@ -31,7 +31,7 @@
#define ARG_FOOTPRINT "--footprint" #define ARG_FOOTPRINT "--footprint"
CLI::FP_EXPORT_SVG_COMMAND::FP_EXPORT_SVG_COMMAND() : EXPORT_PCB_BASE_COMMAND( "svg" ) CLI::FP_EXPORT_SVG_COMMAND::FP_EXPORT_SVG_COMMAND() : PCB_EXPORT_BASE_COMMAND( "svg" )
{ {
addLayerArg( false ); addLayerArg( false );
@ -52,7 +52,7 @@ CLI::FP_EXPORT_SVG_COMMAND::FP_EXPORT_SVG_COMMAND() : EXPORT_PCB_BASE_COMMAND( "
int CLI::FP_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway ) int CLI::FP_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
{ {
int baseExit = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int baseExit = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( baseExit != EXIT_CODES::OK ) if( baseExit != EXIT_CODES::OK )
return baseExit; return baseExit;

2
kicad/cli/command_fp_export_svg.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class FP_EXPORT_SVG_COMMAND : public EXPORT_PCB_BASE_COMMAND class FP_EXPORT_SVG_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
FP_EXPORT_SVG_COMMAND(); FP_EXPORT_SVG_COMMAND();

2
kicad/cli/command_fp_upgrade.cpp
View File

@ -30,7 +30,7 @@
#define ARG_FORCE "--force" #define ARG_FORCE "--force"
CLI::FP_UPGRADE_COMMAND::FP_UPGRADE_COMMAND() : EXPORT_PCB_BASE_COMMAND( "upgrade" ) CLI::FP_UPGRADE_COMMAND::FP_UPGRADE_COMMAND() : PCB_EXPORT_BASE_COMMAND( "upgrade" )
{ {
m_argParser.add_argument( ARG_FORCE ) m_argParser.add_argument( ARG_FORCE )
.help( UTF8STDSTR( .help( UTF8STDSTR(

2
kicad/cli/command_fp_upgrade.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class FP_UPGRADE_COMMAND : public EXPORT_PCB_BASE_COMMAND class FP_UPGRADE_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
FP_UPGRADE_COMMAND(); FP_UPGRADE_COMMAND();

2
kicad/cli/command_pcb_drc.cpp
View File

@ -37,7 +37,7 @@
#define ARG_SEVERITY_EXCLUSIONS "--severity-exclusions" #define ARG_SEVERITY_EXCLUSIONS "--severity-exclusions"
#define ARG_EXIT_CODE_VIOLATIONS "--exit-code-violations" #define ARG_EXIT_CODE_VIOLATIONS "--exit-code-violations"
CLI::PCB_DRC_COMMAND::PCB_DRC_COMMAND() : EXPORT_PCB_BASE_COMMAND( "drc" ) CLI::PCB_DRC_COMMAND::PCB_DRC_COMMAND() : PCB_EXPORT_BASE_COMMAND( "drc" )
{ {
m_argParser.add_argument( ARG_FORMAT ) m_argParser.add_argument( ARG_FORMAT )
.default_value( std::string( "report" ) ) .default_value( std::string( "report" ) )

2
kicad/cli/command_pcb_drc.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class PCB_DRC_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_DRC_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
PCB_DRC_COMMAND(); PCB_DRC_COMMAND();

4
kicad/cli/command_pcb_export.h
View File

@ -25,9 +25,9 @@
namespace CLI namespace CLI
{ {
struct EXPORT_PCB_COMMAND : public COMMAND struct PCB_EXPORT_COMMAND : public COMMAND
{ {
EXPORT_PCB_COMMAND() : COMMAND( "export" ) {} PCB_EXPORT_COMMAND() : COMMAND( "export" ) {}
}; };
} }

8
kicad/cli/command_pcb_export_base.cpp
View File

@ -28,7 +28,7 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/crt.h> #include <wx/crt.h>
CLI::EXPORT_PCB_BASE_COMMAND::EXPORT_PCB_BASE_COMMAND( const std::string& aName, CLI::PCB_EXPORT_BASE_COMMAND::PCB_EXPORT_BASE_COMMAND( const std::string& aName,
bool aOutputIsDir ) : bool aOutputIsDir ) :
COMMAND( aName ) COMMAND( aName )
{ {
@ -83,7 +83,7 @@ CLI::EXPORT_PCB_BASE_COMMAND::EXPORT_PCB_BASE_COMMAND( const std::string& aName,
} }
LSET CLI::EXPORT_PCB_BASE_COMMAND::convertLayerStringList( wxString& aLayerString, bool& aLayerArgSet ) const LSET CLI::PCB_EXPORT_BASE_COMMAND::convertLayerStringList( wxString& aLayerString, bool& aLayerArgSet ) const
{ {
LSET layerMask; LSET layerMask;
@ -119,7 +119,7 @@ LSET CLI::EXPORT_PCB_BASE_COMMAND::convertLayerStringList( wxString& aLayerStrin
} }
void CLI::EXPORT_PCB_BASE_COMMAND::addLayerArg( bool aRequire ) void CLI::PCB_EXPORT_BASE_COMMAND::addLayerArg( bool aRequire )
{ {
m_argParser.add_argument( "-l", ARG_LAYERS ) m_argParser.add_argument( "-l", ARG_LAYERS )
.default_value( std::string() ) .default_value( std::string() )
@ -132,7 +132,7 @@ void CLI::EXPORT_PCB_BASE_COMMAND::addLayerArg( bool aRequire )
} }
int CLI::EXPORT_PCB_BASE_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_BASE_COMMAND::doPerform( KIWAY& aKiway )
{ {
if( m_hasLayerArg ) if( m_hasLayerArg )
{ {

4
kicad/cli/command_pcb_export_base.h
View File

@ -43,9 +43,9 @@ namespace CLI
#define ARG_INCLUDE_BORDER_TITLE "--include-border-title" #define ARG_INCLUDE_BORDER_TITLE "--include-border-title"
#define ARG_MIRROR "--mirror" #define ARG_MIRROR "--mirror"
struct EXPORT_PCB_BASE_COMMAND : public COMMAND struct PCB_EXPORT_BASE_COMMAND : public COMMAND
{ {
EXPORT_PCB_BASE_COMMAND( const std::string& aName, bool aOutputIsDir = false ); PCB_EXPORT_BASE_COMMAND( const std::string& aName, bool aOutputIsDir = false );
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

4
kicad/cli/command_pcb_export_drill.cpp
View File

@ -39,7 +39,7 @@
#define ARG_MAP_FORMAT "--map-format" #define ARG_MAP_FORMAT "--map-format"
#define ARG_DRILL_ORIGIN "--drill-origin" #define ARG_DRILL_ORIGIN "--drill-origin"
CLI::EXPORT_PCB_DRILL_COMMAND::EXPORT_PCB_DRILL_COMMAND() : EXPORT_PCB_BASE_COMMAND( "drill" ) CLI::PCB_EXPORT_DRILL_COMMAND::PCB_EXPORT_DRILL_COMMAND() : PCB_EXPORT_BASE_COMMAND( "drill" )
{ {
m_argParser.add_argument( ARG_FORMAT ) m_argParser.add_argument( ARG_FORMAT )
.default_value( std::string( "excellon" ) ) .default_value( std::string( "excellon" ) )
@ -88,7 +88,7 @@ CLI::EXPORT_PCB_DRILL_COMMAND::EXPORT_PCB_DRILL_COMMAND() : EXPORT_PCB_BASE_COMM
} }
int CLI::EXPORT_PCB_DRILL_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway )
{ {
std::unique_ptr<JOB_EXPORT_PCB_DRILL> drillJob( new JOB_EXPORT_PCB_DRILL( true ) ); std::unique_ptr<JOB_EXPORT_PCB_DRILL> drillJob( new JOB_EXPORT_PCB_DRILL( true ) );

4
kicad/cli/command_pcb_export_drill.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_PCB_DRILL_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_EXPORT_DRILL_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_PCB_DRILL_COMMAND(); PCB_EXPORT_DRILL_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

6
kicad/cli/command_pcb_export_dxf.cpp
View File

@ -33,7 +33,7 @@
#define ARG_USE_CONTOURS "--use-contours" #define ARG_USE_CONTOURS "--use-contours"
#define ARG_OUTPUT_UNITS "--output-units" #define ARG_OUTPUT_UNITS "--output-units"
CLI::EXPORT_PCB_DXF_COMMAND::EXPORT_PCB_DXF_COMMAND() : EXPORT_PCB_BASE_COMMAND( "dxf" ) CLI::PCB_EXPORT_DXF_COMMAND::PCB_EXPORT_DXF_COMMAND() : PCB_EXPORT_BASE_COMMAND( "dxf" )
{ {
addLayerArg( true ); addLayerArg( true );
@ -58,9 +58,9 @@ CLI::EXPORT_PCB_DXF_COMMAND::EXPORT_PCB_DXF_COMMAND() : EXPORT_PCB_BASE_COMMAND(
} }
int CLI::EXPORT_PCB_DXF_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_DXF_COMMAND::doPerform( KIWAY& aKiway )
{ {
int baseExit = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int baseExit = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( baseExit != EXIT_CODES::OK ) if( baseExit != EXIT_CODES::OK )
return baseExit; return baseExit;

4
kicad/cli/command_pcb_export_dxf.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_PCB_DXF_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_EXPORT_DXF_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_PCB_DXF_COMMAND(); PCB_EXPORT_DXF_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

12
kicad/cli/command_pcb_export_gerber.cpp
View File

@ -31,8 +31,8 @@
#include <locale_io.h> #include <locale_io.h>
CLI::EXPORT_PCB_GERBER_COMMAND::EXPORT_PCB_GERBER_COMMAND( const std::string& aName ) : CLI::PCB_EXPORT_GERBER_COMMAND::PCB_EXPORT_GERBER_COMMAND( const std::string& aName ) :
EXPORT_PCB_BASE_COMMAND( aName ) PCB_EXPORT_BASE_COMMAND( aName )
{ {
addLayerArg( true ); addLayerArg( true );
@ -88,12 +88,12 @@ CLI::EXPORT_PCB_GERBER_COMMAND::EXPORT_PCB_GERBER_COMMAND( const std::string& aN
} }
CLI::EXPORT_PCB_GERBER_COMMAND::EXPORT_PCB_GERBER_COMMAND() : EXPORT_PCB_GERBER_COMMAND( "gerber" ) CLI::PCB_EXPORT_GERBER_COMMAND::PCB_EXPORT_GERBER_COMMAND() : PCB_EXPORT_GERBER_COMMAND( "gerber" )
{ {
} }
int CLI::EXPORT_PCB_GERBER_COMMAND::populateJob( JOB_EXPORT_PCB_GERBER* aJob ) int CLI::PCB_EXPORT_GERBER_COMMAND::populateJob( JOB_EXPORT_PCB_GERBER* aJob )
{ {
aJob->m_filename = FROM_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() ); aJob->m_filename = FROM_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() );
aJob->m_outputFile = FROM_UTF8( m_argParser.get<std::string>( ARG_OUTPUT ).c_str() ); aJob->m_outputFile = FROM_UTF8( m_argParser.get<std::string>( ARG_OUTPUT ).c_str() );
@ -126,9 +126,9 @@ int CLI::EXPORT_PCB_GERBER_COMMAND::populateJob( JOB_EXPORT_PCB_GERBER* aJob )
} }
int CLI::EXPORT_PCB_GERBER_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_GERBER_COMMAND::doPerform( KIWAY& aKiway )
{ {
int exitCode = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int exitCode = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( exitCode != EXIT_CODES::OK ) if( exitCode != EXIT_CODES::OK )
return exitCode; return exitCode;

6
kicad/cli/command_pcb_export_gerber.h
View File

@ -35,11 +35,11 @@ namespace CLI
#define ARG_PRECISION "--precision" #define ARG_PRECISION "--precision"
#define ARG_NO_PROTEL_EXTENSION "--no-protel-ext" #define ARG_NO_PROTEL_EXTENSION "--no-protel-ext"
class EXPORT_PCB_GERBER_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_EXPORT_GERBER_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_PCB_GERBER_COMMAND( const std::string& aName ); PCB_EXPORT_GERBER_COMMAND( const std::string& aName );
EXPORT_PCB_GERBER_COMMAND(); PCB_EXPORT_GERBER_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

8
kicad/cli/command_pcb_export_gerbers.cpp
View File

@ -34,8 +34,8 @@
#define ARG_USE_BOARD_PLOT_PARAMS "--board-plot-params" #define ARG_USE_BOARD_PLOT_PARAMS "--board-plot-params"
CLI::EXPORT_PCB_GERBERS_COMMAND::EXPORT_PCB_GERBERS_COMMAND() : CLI::PCB_EXPORT_GERBERS_COMMAND::PCB_EXPORT_GERBERS_COMMAND() :
EXPORT_PCB_GERBER_COMMAND( "gerbers" ) PCB_EXPORT_GERBER_COMMAND( "gerbers" )
{ {
m_requireLayers = false; m_requireLayers = false;
@ -52,9 +52,9 @@ CLI::EXPORT_PCB_GERBERS_COMMAND::EXPORT_PCB_GERBERS_COMMAND() :
} }
int CLI::EXPORT_PCB_GERBERS_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_GERBERS_COMMAND::doPerform( KIWAY& aKiway )
{ {
int exitCode = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int exitCode = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( exitCode != EXIT_CODES::OK ) if( exitCode != EXIT_CODES::OK )
return exitCode; return exitCode;

4
kicad/cli/command_pcb_export_gerbers.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_PCB_GERBERS_COMMAND : public EXPORT_PCB_GERBER_COMMAND class PCB_EXPORT_GERBERS_COMMAND : public PCB_EXPORT_GERBER_COMMAND
{ {
public: public:
EXPORT_PCB_GERBERS_COMMAND(); PCB_EXPORT_GERBERS_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

6
kicad/cli/command_pcb_export_pdf.cpp
View File

@ -33,7 +33,7 @@
#define ARG_DRILL_SHAPE_OPTION "--drill-shape-opt" #define ARG_DRILL_SHAPE_OPTION "--drill-shape-opt"
CLI::EXPORT_PCB_PDF_COMMAND::EXPORT_PCB_PDF_COMMAND() : EXPORT_PCB_BASE_COMMAND( "pdf" ) CLI::PCB_EXPORT_PDF_COMMAND::PCB_EXPORT_PDF_COMMAND() : PCB_EXPORT_BASE_COMMAND( "pdf" )
{ {
addLayerArg( true ); addLayerArg( true );
@ -79,9 +79,9 @@ CLI::EXPORT_PCB_PDF_COMMAND::EXPORT_PCB_PDF_COMMAND() : EXPORT_PCB_BASE_COMMAND(
} }
int CLI::EXPORT_PCB_PDF_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_PDF_COMMAND::doPerform( KIWAY& aKiway )
{ {
int baseExit = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int baseExit = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( baseExit != EXIT_CODES::OK ) if( baseExit != EXIT_CODES::OK )
return baseExit; return baseExit;

4
kicad/cli/command_pcb_export_pdf.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_PCB_PDF_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_EXPORT_PDF_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_PCB_PDF_COMMAND(); PCB_EXPORT_PDF_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

6
kicad/cli/command_pcb_export_pos.cpp
View File

@ -40,7 +40,7 @@
#define ARG_GERBER_BOARD_EDGE "--gerber-board-edge" #define ARG_GERBER_BOARD_EDGE "--gerber-board-edge"
CLI::EXPORT_PCB_POS_COMMAND::EXPORT_PCB_POS_COMMAND() : EXPORT_PCB_BASE_COMMAND( "pos" ) CLI::PCB_EXPORT_POS_COMMAND::PCB_EXPORT_POS_COMMAND() : PCB_EXPORT_BASE_COMMAND( "pos" )
{ {
m_argParser.add_description( UTF8STDSTR( _( "Generate Position File" ) ) ); m_argParser.add_description( UTF8STDSTR( _( "Generate Position File" ) ) );
@ -92,9 +92,9 @@ CLI::EXPORT_PCB_POS_COMMAND::EXPORT_PCB_POS_COMMAND() : EXPORT_PCB_BASE_COMMAND(
} }
int CLI::EXPORT_PCB_POS_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_POS_COMMAND::doPerform( KIWAY& aKiway )
{ {
int baseExit = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int baseExit = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( baseExit != EXIT_CODES::OK ) if( baseExit != EXIT_CODES::OK )
return baseExit; return baseExit;

4
kicad/cli/command_pcb_export_pos.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_PCB_POS_COMMAND : public EXPORT_PCB_BASE_COMMAND class PCB_EXPORT_POS_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_PCB_POS_COMMAND(); PCB_EXPORT_POS_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

4
kicad/cli/command_pcb_export_step.cpp
View File

@ -44,7 +44,7 @@
#define REGEX_DELIMITER "(?:[\\s]*x)" #define REGEX_DELIMITER "(?:[\\s]*x)"
#define REGEX_UNIT "([m]{2}|(?:in))" #define REGEX_UNIT "([m]{2}|(?:in))"
CLI::EXPORT_PCB_STEP_COMMAND::EXPORT_PCB_STEP_COMMAND() : COMMAND( "step" ) CLI::PCB_EXPORT_STEP_COMMAND::PCB_EXPORT_STEP_COMMAND() : COMMAND( "step" )
{ {
m_argParser.add_argument( ARG_DRILL_ORIGIN ) m_argParser.add_argument( ARG_DRILL_ORIGIN )
.help( UTF8STDSTR( _( "Use Drill Origin for output origin" ) ) ) .help( UTF8STDSTR( _( "Use Drill Origin for output origin" ) ) )
@ -101,7 +101,7 @@ CLI::EXPORT_PCB_STEP_COMMAND::EXPORT_PCB_STEP_COMMAND() : COMMAND( "step" )
m_argParser.add_argument( ARG_INPUT ).help( UTF8STDSTR( _( "Input file" ) ) ); m_argParser.add_argument( ARG_INPUT ).help( UTF8STDSTR( _( "Input file" ) ) );
} }
int CLI::EXPORT_PCB_STEP_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_STEP_COMMAND::doPerform( KIWAY& aKiway )
{ {
std::unique_ptr<JOB_EXPORT_PCB_STEP> step( new JOB_EXPORT_PCB_STEP( true ) ); std::unique_ptr<JOB_EXPORT_PCB_STEP> step( new JOB_EXPORT_PCB_STEP( true ) );

4
kicad/cli/command_pcb_export_step.h
View File

@ -25,9 +25,9 @@
namespace CLI namespace CLI
{ {
struct EXPORT_PCB_STEP_COMMAND : public COMMAND struct PCB_EXPORT_STEP_COMMAND : public COMMAND
{ {
EXPORT_PCB_STEP_COMMAND(); PCB_EXPORT_STEP_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

6
kicad/cli/command_pcb_export_svg.cpp
View File

@ -36,7 +36,7 @@
#define ARG_DRILL_SHAPE_OPTION "--drill-shape-opt" #define ARG_DRILL_SHAPE_OPTION "--drill-shape-opt"
CLI::EXPORT_PCB_SVG_COMMAND::EXPORT_PCB_SVG_COMMAND() : EXPORT_PCB_BASE_COMMAND( "svg" ) CLI::PCB_EXPORT_SVG_COMMAND::PCB_EXPORT_SVG_COMMAND() : PCB_EXPORT_BASE_COMMAND( "svg" )
{ {
addLayerArg( true ); addLayerArg( true );
@ -78,9 +78,9 @@ CLI::EXPORT_PCB_SVG_COMMAND::EXPORT_PCB_SVG_COMMAND() : EXPORT_PCB_BASE_COMMAND(
} }
int CLI::EXPORT_PCB_SVG_COMMAND::doPerform( KIWAY& aKiway ) int CLI::PCB_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway )
{ {
int baseExit = EXPORT_PCB_BASE_COMMAND::doPerform( aKiway ); int baseExit = PCB_EXPORT_BASE_COMMAND::doPerform( aKiway );
if( baseExit != EXIT_CODES::OK ) if( baseExit != EXIT_CODES::OK )
return baseExit; return baseExit;

4
kicad/cli/command_pcb_export_svg.h
View File

@ -25,9 +25,9 @@
namespace CLI namespace CLI
{ {
struct EXPORT_PCB_SVG_COMMAND : public EXPORT_PCB_BASE_COMMAND struct PCB_EXPORT_SVG_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
EXPORT_PCB_SVG_COMMAND(); PCB_EXPORT_SVG_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

2
kicad/cli/command_sch_erc.cpp
View File

@ -36,7 +36,7 @@
#define ARG_SEVERITY_EXCLUSIONS "--severity-exclusions" #define ARG_SEVERITY_EXCLUSIONS "--severity-exclusions"
#define ARG_EXIT_CODE_VIOLATIONS "--exit-code-violations" #define ARG_EXIT_CODE_VIOLATIONS "--exit-code-violations"
CLI::SCH_ERC_COMMAND::SCH_ERC_COMMAND() : EXPORT_PCB_BASE_COMMAND( "erc" ) CLI::SCH_ERC_COMMAND::SCH_ERC_COMMAND() : PCB_EXPORT_BASE_COMMAND( "erc" )
{ {
m_argParser.add_argument( ARG_FORMAT ) m_argParser.add_argument( ARG_FORMAT )
.default_value( std::string( "report" ) ) .default_value( std::string( "report" ) )

2
kicad/cli/command_sch_erc.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class SCH_ERC_COMMAND : public EXPORT_PCB_BASE_COMMAND class SCH_ERC_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
SCH_ERC_COMMAND(); SCH_ERC_COMMAND();

4
kicad/cli/command_sch_export.h
View File

@ -25,9 +25,9 @@
namespace CLI namespace CLI
{ {
struct EXPORT_SCH_COMMAND : public COMMAND struct SCH_EXPORT_COMMAND : public COMMAND
{ {
EXPORT_SCH_COMMAND() : COMMAND( "export" ) {} SCH_EXPORT_COMMAND() : COMMAND( "export" ) {}
}; };
} }

6
kicad/cli/command_sch_export_bom.cpp
View File

@ -29,7 +29,7 @@
#include <macros.h> #include <macros.h>
CLI::EXPORT_SCH_BOM_COMMAND::EXPORT_SCH_BOM_COMMAND() : EXPORT_PCB_BASE_COMMAND( "bom" ) CLI::SCH_EXPORT_BOM_COMMAND::SCH_EXPORT_BOM_COMMAND() : PCB_EXPORT_BASE_COMMAND( "bom" )
{ {
// Field output options // Field output options
m_argParser.add_argument( ARG_FIELDS ) m_argParser.add_argument( ARG_FIELDS )
@ -91,7 +91,7 @@ CLI::EXPORT_SCH_BOM_COMMAND::EXPORT_SCH_BOM_COMMAND() : EXPORT_PCB_BASE_COMMAND(
} }
std::vector<wxString> CLI::EXPORT_SCH_BOM_COMMAND::convertStringList( const wxString& aList ) std::vector<wxString> CLI::SCH_EXPORT_BOM_COMMAND::convertStringList( const wxString& aList )
{ {
std::vector<wxString> v; std::vector<wxString> v;
@ -106,7 +106,7 @@ std::vector<wxString> CLI::EXPORT_SCH_BOM_COMMAND::convertStringList( const wxSt
return v; return v;
} }
int CLI::EXPORT_SCH_BOM_COMMAND::doPerform( KIWAY& aKiway ) int CLI::SCH_EXPORT_BOM_COMMAND::doPerform( KIWAY& aKiway )
{ {
std::unique_ptr<JOB_EXPORT_SCH_BOM> bomJob = std::make_unique<JOB_EXPORT_SCH_BOM>( true ); std::unique_ptr<JOB_EXPORT_SCH_BOM> bomJob = std::make_unique<JOB_EXPORT_SCH_BOM>( true );

4
kicad/cli/command_sch_export_bom.h
View File

@ -67,10 +67,10 @@ namespace CLI
#define ARG_EXCLUDE_DNP "--exclude-dnp" #define ARG_EXCLUDE_DNP "--exclude-dnp"
#define ARG_EXCLUDE_DNP_DESC "Exclude symbols marked Do-Not-Populate." #define ARG_EXCLUDE_DNP_DESC "Exclude symbols marked Do-Not-Populate."
class EXPORT_SCH_BOM_COMMAND : public EXPORT_PCB_BASE_COMMAND class SCH_EXPORT_BOM_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_SCH_BOM_COMMAND(); SCH_EXPORT_BOM_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

4
kicad/cli/command_sch_export_netlist.cpp
View File

@ -29,7 +29,7 @@
#define ARG_FORMAT "--format" #define ARG_FORMAT "--format"
CLI::EXPORT_SCH_NETLIST_COMMAND::EXPORT_SCH_NETLIST_COMMAND() : EXPORT_PCB_BASE_COMMAND( "netlist" ) CLI::SCH_EXPORT_NETLIST_COMMAND::SCH_EXPORT_NETLIST_COMMAND() : PCB_EXPORT_BASE_COMMAND( "netlist" )
{ {
m_argParser.add_argument( ARG_FORMAT ) m_argParser.add_argument( ARG_FORMAT )
.default_value( std::string( "kicadsexpr" ) ) .default_value( std::string( "kicadsexpr" ) )
@ -37,7 +37,7 @@ CLI::EXPORT_SCH_NETLIST_COMMAND::EXPORT_SCH_NETLIST_COMMAND() : EXPORT_PCB_BASE_
} }
int CLI::EXPORT_SCH_NETLIST_COMMAND::doPerform( KIWAY& aKiway ) int CLI::SCH_EXPORT_NETLIST_COMMAND::doPerform( KIWAY& aKiway )
{ {
std::unique_ptr<JOB_EXPORT_SCH_NETLIST> netJob = std::unique_ptr<JOB_EXPORT_SCH_NETLIST> netJob =
std::make_unique<JOB_EXPORT_SCH_NETLIST>( true ); std::make_unique<JOB_EXPORT_SCH_NETLIST>( true );

4
kicad/cli/command_sch_export_netlist.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_SCH_NETLIST_COMMAND : public EXPORT_PCB_BASE_COMMAND class SCH_EXPORT_NETLIST_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_SCH_NETLIST_COMMAND(); SCH_EXPORT_NETLIST_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

6
kicad/cli/command_sch_export_plot.cpp
View File

@ -40,10 +40,10 @@ const HPGL_PLOT_ORIGIN_AND_UNITS hpgl_origin_ops[4] = {
HPGL_PLOT_ORIGIN_AND_UNITS::USER_FIT_PAGE, HPGL_PLOT_ORIGIN_AND_UNITS::USER_FIT_CONTENT HPGL_PLOT_ORIGIN_AND_UNITS::USER_FIT_PAGE, HPGL_PLOT_ORIGIN_AND_UNITS::USER_FIT_CONTENT
}; };
CLI::EXPORT_SCH_PLOT_COMMAND::EXPORT_SCH_PLOT_COMMAND( const std::string& aName, CLI::SCH_EXPORT_PLOT_COMMAND::SCH_EXPORT_PLOT_COMMAND( const std::string& aName,
PLOT_FORMAT aPlotFormat, PLOT_FORMAT aPlotFormat,
bool aOutputIsDir ) : bool aOutputIsDir ) :
EXPORT_PCB_BASE_COMMAND( aName, aOutputIsDir ), PCB_EXPORT_BASE_COMMAND( aName, aOutputIsDir ),
m_plotFormat( aPlotFormat ), m_useDir( aOutputIsDir ) m_plotFormat( aPlotFormat ), m_useDir( aOutputIsDir )
{ {
m_argParser.add_argument( "-t", ARG_THEME ) m_argParser.add_argument( "-t", ARG_THEME )
@ -86,7 +86,7 @@ CLI::EXPORT_SCH_PLOT_COMMAND::EXPORT_SCH_PLOT_COMMAND( const std::string& aName,
} }
int CLI::EXPORT_SCH_PLOT_COMMAND::doPerform( KIWAY& aKiway ) int CLI::SCH_EXPORT_PLOT_COMMAND::doPerform( KIWAY& aKiway )
{ {
wxString filename = FROM_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() ); wxString filename = FROM_UTF8( m_argParser.get<std::string>( ARG_INPUT ).c_str() );
if( !wxFile::Exists( filename ) ) if( !wxFile::Exists( filename ) )

4
kicad/cli/command_sch_export_plot.h
View File

@ -26,10 +26,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_SCH_PLOT_COMMAND : public EXPORT_PCB_BASE_COMMAND class SCH_EXPORT_PLOT_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_SCH_PLOT_COMMAND( const std::string& aName, PLOT_FORMAT aPlotFormat, SCH_EXPORT_PLOT_COMMAND( const std::string& aName, PLOT_FORMAT aPlotFormat,
bool aOutputIsDir = true ); bool aOutputIsDir = true );
PLOT_FORMAT m_plotFormat; PLOT_FORMAT m_plotFormat;

6
kicad/cli/command_sch_export_pythonbom.cpp
View File

@ -28,13 +28,13 @@
#include <macros.h> #include <macros.h>
CLI::EXPORT_SCH_PYTHONBOM_COMMAND::EXPORT_SCH_PYTHONBOM_COMMAND() : CLI::SCH_EXPORT_PYTHONBOM_COMMAND::SCH_EXPORT_PYTHONBOM_COMMAND() :
EXPORT_PCB_BASE_COMMAND( "python-bom" ) PCB_EXPORT_BASE_COMMAND( "python-bom" )
{ {
} }
int CLI::EXPORT_SCH_PYTHONBOM_COMMAND::doPerform( KIWAY& aKiway ) int CLI::SCH_EXPORT_PYTHONBOM_COMMAND::doPerform( KIWAY& aKiway )
{ {
std::unique_ptr<JOB_EXPORT_SCH_PYTHONBOM> bomJob = std::unique_ptr<JOB_EXPORT_SCH_PYTHONBOM> bomJob =
std::make_unique<JOB_EXPORT_SCH_PYTHONBOM>( true ); std::make_unique<JOB_EXPORT_SCH_PYTHONBOM>( true );

4
kicad/cli/command_sch_export_pythonbom.h
View File

@ -25,10 +25,10 @@
namespace CLI namespace CLI
{ {
class EXPORT_SCH_PYTHONBOM_COMMAND : public EXPORT_PCB_BASE_COMMAND class SCH_EXPORT_PYTHONBOM_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
EXPORT_SCH_PYTHONBOM_COMMAND(); SCH_EXPORT_PYTHONBOM_COMMAND();
protected: protected:
int doPerform( KIWAY& aKiway ) override; int doPerform( KIWAY& aKiway ) override;

2
kicad/cli/command_sym_export_svg.cpp
View File

@ -33,7 +33,7 @@
#define ARG_INC_HIDDEN_PINS "--include-hidden-pins" #define ARG_INC_HIDDEN_PINS "--include-hidden-pins"
#define ARG_INC_HIDDEN_FIELDS "--include-hidden-fields" #define ARG_INC_HIDDEN_FIELDS "--include-hidden-fields"
CLI::SYM_EXPORT_SVG_COMMAND::SYM_EXPORT_SVG_COMMAND() : EXPORT_PCB_BASE_COMMAND( "svg" ) CLI::SYM_EXPORT_SVG_COMMAND::SYM_EXPORT_SVG_COMMAND() : PCB_EXPORT_BASE_COMMAND( "svg" )
{ {
m_argParser.add_argument( "-t", ARG_THEME ) m_argParser.add_argument( "-t", ARG_THEME )
.default_value( std::string() ) .default_value( std::string() )

2
kicad/cli/command_sym_export_svg.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class SYM_EXPORT_SVG_COMMAND : public EXPORT_PCB_BASE_COMMAND class SYM_EXPORT_SVG_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
SYM_EXPORT_SVG_COMMAND(); SYM_EXPORT_SVG_COMMAND();

2
kicad/cli/command_sym_upgrade.cpp
View File

@ -30,7 +30,7 @@
#define ARG_FORCE "--force" #define ARG_FORCE "--force"
CLI::SYM_UPGRADE_COMMAND::SYM_UPGRADE_COMMAND() : EXPORT_PCB_BASE_COMMAND( "upgrade" ) CLI::SYM_UPGRADE_COMMAND::SYM_UPGRADE_COMMAND() : PCB_EXPORT_BASE_COMMAND( "upgrade" )
{ {
m_argParser.add_argument( ARG_FORCE ) m_argParser.add_argument( ARG_FORCE )
.help( UTF8STDSTR( .help( UTF8STDSTR(

2
kicad/cli/command_sym_upgrade.h
View File

@ -25,7 +25,7 @@
namespace CLI namespace CLI
{ {
class SYM_UPGRADE_COMMAND : public EXPORT_PCB_BASE_COMMAND class SYM_UPGRADE_COMMAND : public PCB_EXPORT_BASE_COMMAND
{ {
public: public:
SYM_UPGRADE_COMMAND(); SYM_UPGRADE_COMMAND();

36
kicad/kicad_cli.cpp
View File

@ -128,26 +128,26 @@ struct COMMAND_ENTRY
static CLI::PCB_COMMAND pcbCmd{}; static CLI::PCB_COMMAND pcbCmd{};
static CLI::PCB_DRC_COMMAND pcbDrcCmd{}; static CLI::PCB_DRC_COMMAND pcbDrcCmd{};
static CLI::EXPORT_PCB_DRILL_COMMAND exportPcbDrillCmd{}; static CLI::PCB_EXPORT_DRILL_COMMAND exportPcbDrillCmd{};
static CLI::EXPORT_PCB_DXF_COMMAND exportPcbDxfCmd{}; static CLI::PCB_EXPORT_DXF_COMMAND exportPcbDxfCmd{};
static CLI::EXPORT_PCB_STEP_COMMAND exportPcbStepCmd{}; static CLI::PCB_EXPORT_STEP_COMMAND exportPcbStepCmd{};
static CLI::EXPORT_PCB_SVG_COMMAND exportPcbSvgCmd{}; static CLI::PCB_EXPORT_SVG_COMMAND exportPcbSvgCmd{};
static CLI::EXPORT_PCB_PDF_COMMAND exportPcbPdfCmd{}; static CLI::PCB_EXPORT_PDF_COMMAND exportPcbPdfCmd{};
static CLI::EXPORT_PCB_POS_COMMAND exportPcbPosCmd{}; static CLI::PCB_EXPORT_POS_COMMAND exportPcbPosCmd{};
static CLI::EXPORT_PCB_GERBER_COMMAND exportPcbGerberCmd{}; static CLI::PCB_EXPORT_GERBER_COMMAND exportPcbGerberCmd{};
static CLI::EXPORT_PCB_GERBERS_COMMAND exportPcbGerbersCmd{}; static CLI::PCB_EXPORT_GERBERS_COMMAND exportPcbGerbersCmd{};
static CLI::EXPORT_PCB_COMMAND exportPcbCmd{}; static CLI::PCB_EXPORT_COMMAND exportPcbCmd{};
static CLI::EXPORT_SCH_COMMAND exportSchCmd{}; static CLI::SCH_EXPORT_COMMAND exportSchCmd{};
static CLI::SCH_COMMAND schCmd{}; static CLI::SCH_COMMAND schCmd{};
static CLI::SCH_ERC_COMMAND schErcCmd{}; static CLI::SCH_ERC_COMMAND schErcCmd{};
static CLI::EXPORT_SCH_BOM_COMMAND exportSchBomCmd{}; static CLI::SCH_EXPORT_BOM_COMMAND exportSchBomCmd{};
static CLI::EXPORT_SCH_PYTHONBOM_COMMAND exportSchPythonBomCmd{}; static CLI::SCH_EXPORT_PYTHONBOM_COMMAND exportSchPythonBomCmd{};
static CLI::EXPORT_SCH_NETLIST_COMMAND exportSchNetlistCmd{}; static CLI::SCH_EXPORT_NETLIST_COMMAND exportSchNetlistCmd{};
static CLI::EXPORT_SCH_PLOT_COMMAND exportSchDxfCmd{ "dxf", PLOT_FORMAT::DXF }; static CLI::SCH_EXPORT_PLOT_COMMAND exportSchDxfCmd{ "dxf", PLOT_FORMAT::DXF };
static CLI::EXPORT_SCH_PLOT_COMMAND exportSchHpglCmd{ "hpgl", PLOT_FORMAT::HPGL }; static CLI::SCH_EXPORT_PLOT_COMMAND exportSchHpglCmd{ "hpgl", PLOT_FORMAT::HPGL };
static CLI::EXPORT_SCH_PLOT_COMMAND exportSchPdfCmd{ "pdf", PLOT_FORMAT::PDF, false }; static CLI::SCH_EXPORT_PLOT_COMMAND exportSchPdfCmd{ "pdf", PLOT_FORMAT::PDF, false };
static CLI::EXPORT_SCH_PLOT_COMMAND exportSchPostscriptCmd{ "ps", PLOT_FORMAT::POST }; static CLI::SCH_EXPORT_PLOT_COMMAND exportSchPostscriptCmd{ "ps", PLOT_FORMAT::POST };
static CLI::EXPORT_SCH_PLOT_COMMAND exportSchSvgCmd{ "svg", PLOT_FORMAT::SVG }; static CLI::SCH_EXPORT_PLOT_COMMAND exportSchSvgCmd{ "svg", PLOT_FORMAT::SVG };
static CLI::FP_COMMAND fpCmd{}; static CLI::FP_COMMAND fpCmd{};
static CLI::FP_EXPORT_COMMAND fpExportCmd{}; static CLI::FP_EXPORT_COMMAND fpExportCmd{};
static CLI::FP_EXPORT_SVG_COMMAND fpExportSvgCmd{}; static CLI::FP_EXPORT_SVG_COMMAND fpExportSvgCmd{};