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

Formatting.

This commit is contained in:
Jeff Young 2024-02-02 17:54:12 +00:00
parent c3496e4af6
commit 3282e4bb66
2 changed files with 90 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
eeschema/eeschema_jobs_handler.cpp
View File

@ -104,15 +104,15 @@ void EESCHEMA_JOBS_HANDLER::InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRen
// Load the drawing sheet from the filename stored in BASE_SCREEN::m_DrawingSheetFileName.
// If empty, or not existing, the default drawing sheet is loaded.
auto loadSheet = [&]( const wxString& path ) -> bool
auto loadSheet =
[&]( const wxString& path ) -> bool
{
wxString resolvedSheetPath =
DS_DATA_MODEL::ResolvePath( path, aSch->Prj().GetProjectPath() );
wxString absolutePath = DS_DATA_MODEL::ResolvePath( path,
aSch->Prj().GetProjectPath() );
if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( resolvedSheetPath ) )
if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( absolutePath ) )
{
m_reporter->Report(
wxString::Format( _( "Error loading drawing sheet '%s'." ) + wxS( "\n" ),
m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." ),
path ),
RPT_SEVERITY_ERROR );
return false;
@ -123,9 +123,7 @@ void EESCHEMA_JOBS_HANDLER::InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRen
// try to load the override first
if( !aDrawingSheetOverride.IsEmpty() && loadSheet( aDrawingSheetOverride ) )
{
return;
}
// no override or failed override continues here
loadSheet( aSch->Settings().m_SchDrawingSheetFileName );
@ -189,7 +187,6 @@ int EESCHEMA_JOBS_HANDLER::JobExportPlot( JOB* aJob )
case JOB_HPGL_PLOT_ORIGIN_AND_UNITS::PLOTTER_BOT_LEFT:
hpglOrigin = HPGL_PLOT_ORIGIN_AND_UNITS::PLOTTER_BOT_LEFT;
break;
case JOB_HPGL_PLOT_ORIGIN_AND_UNITS::PLOTTER_CENTER:
hpglOrigin = HPGL_PLOT_ORIGIN_AND_UNITS::PLOTTER_CENTER;
break;
@ -269,10 +266,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
ERC_TESTER erc( sch );
if( erc.TestDuplicateSheetNames( false ) > 0 )
{
m_reporter->Report( _( "Warning: duplicate sheet names.\n" ), RPT_SEVERITY_WARNING );
}
std::unique_ptr<NETLIST_EXPORTER_BASE> helper;
unsigned netlistOption = 0;
@ -311,6 +305,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
fileExt = wxS( "xml" );
helper = std::make_unique<NETLIST_EXPORTER_XML>( sch );
break;
default:
m_reporter->Report( _( "Unknown netlist format.\n" ), RPT_SEVERITY_ERROR );
return CLI::EXIT_CODES::ERR_UNKNOWN;
@ -328,9 +323,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
bool res = helper->WriteNetlist( aNetJob->m_outputFile, netlistOption, *m_reporter );
if( !res )
{
return CLI::EXIT_CODES::ERR_UNKNOWN;
}
return CLI::EXIT_CODES::OK;
}
@ -380,9 +373,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
ERC_TESTER erc( sch );
if( erc.TestDuplicateSheetNames( false ) > 0 )
{
m_reporter->Report( _( "Warning: duplicate sheet names.\n" ), RPT_SEVERITY_WARNING );
}
// Build our data model
FIELDS_EDITOR_GRID_DATA_MODEL dataModel( referenceList );
@ -411,9 +402,11 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
sch->Settings().m_TemplateFieldNames.GetTemplateFieldNames() )
{
if( userFieldNames.count( templateFieldname.m_Name ) == 0 )
{
dataModel.AddColumn( templateFieldname.m_Name, GetTextVars( templateFieldname.m_Name ),
false );
}
}
BOM_PRESET preset;
@ -500,6 +493,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
field.groupBy = std::find( aBomJob->m_fieldsGroupBy.begin(),
aBomJob->m_fieldsGroupBy.end(), field.name )
!= aBomJob->m_fieldsGroupBy.end();
if( ( aBomJob->m_fieldsLabels.size() > i ) && !aBomJob->m_fieldsLabels[i].IsEmpty() )
field.label = aBomJob->m_fieldsLabels[i];
else if( IsTextVar( field.name ) )
@ -533,10 +527,9 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
if( !f.Open( aBomJob->m_outputFile, wxFile::write ) )
{
m_reporter->Report( wxString::Format( _( "Unable to open destination '%s'" ) + wxS( "\n" ),
m_reporter->Report( wxString::Format( _( "Unable to open destination '%s'" ),
aBomJob->m_outputFile ),
RPT_SEVERITY_ERROR
);
RPT_SEVERITY_ERROR );
return CLI::EXIT_CODES::ERR_INVALID_INPUT_FILE;
}
@ -587,9 +580,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
bool res = f.Write( dataModel.Export( fmt ) );
if( !res )
{
return CLI::EXIT_CODES::ERR_UNKNOWN;
}
return CLI::EXIT_CODES::OK;
}
@ -912,9 +903,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
try
{
if( !upgradeJob->m_outputLibraryPath.IsEmpty() )
{
schLibrary.SetFileName( upgradeJob->m_outputLibraryPath );
}
schLibrary.SetModified();
schLibrary.Save();
@ -969,15 +958,10 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
switch( ercJob->m_units )
{
case JOB_SCH_ERC::UNITS::INCHES:
units = EDA_UNITS::INCHES;
break;
case JOB_SCH_ERC::UNITS::MILS:
units = EDA_UNITS::MILS;
break;
case JOB_SCH_ERC::UNITS::MILLIMETERS:
default:
units = EDA_UNITS::MILLIMETRES; break;
case JOB_SCH_ERC::UNITS::INCHES: units = EDA_UNITS::INCHES; break;
case JOB_SCH_ERC::UNITS::MILS: units = EDA_UNITS::MILS; break;
case JOB_SCH_ERC::UNITS::MILLIMETERS: units = EDA_UNITS::MILLIMETRES; break;
default: units = EDA_UNITS::MILLIMETRES; break;
}
std::shared_ptr<SHEETLIST_ERC_ITEMS_PROVIDER> markersProvider =
@ -993,8 +977,8 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
markersProvider->SetSeverities( ercJob->m_severity );
m_reporter->Report(
wxString::Format( _( "Found %d violations\n" ), markersProvider->GetCount() ),
m_reporter->Report( wxString::Format( _( "Found %d violations\n" ),
markersProvider->GetCount() ),
RPT_SEVERITY_INFO );
ERC_REPORT reportWriter( sch, units );
@ -1008,8 +992,8 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
if( !wroteReport )
{
m_reporter->Report(
wxString::Format( _( "Unable to save ERC report to %s\n" ), ercJob->m_outputFile ),
m_reporter->Report( wxString::Format( _( "Unable to save ERC report to %s\n" ),
ercJob->m_outputFile ),
RPT_SEVERITY_INFO );
return CLI::EXIT_CODES::ERR_INVALID_OUTPUT_CONFLICT;
}
@ -1020,10 +1004,8 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
if( ercJob->m_exitCodeViolations )
{
if( markersProvider->GetCount() > 0 )
{
return CLI::EXIT_CODES::ERR_RC_VIOLATIONS;
}
}
return CLI::EXIT_CODES::SUCCESS;
}

66
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -123,7 +123,8 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
break;
case JOB_EXPORT_PCB_3D::FORMAT::GLB: fn.SetExt( FILEEXT::GltfBinaryFileExtension );
break;
default: return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
default:
return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
}
aStepJob->m_outputFile = fn.GetFullName();
@ -161,7 +162,8 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
if ( success )
{
m_reporter->Report( wxString::Format( _( "Successfully exported VRML to %s" ), aStepJob->m_outputFile ),
m_reporter->Report( wxString::Format( _( "Successfully exported VRML to %s" ),
aStepJob->m_outputFile ),
RPT_SEVERITY_INFO );
}
else
@ -194,17 +196,16 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
case JOB_EXPORT_PCB_3D::FORMAT::GLB:
params.m_format = EXPORTER_STEP_PARAMS::FORMAT::GLB;
break;
default: return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
default:
return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
}
EXPORTER_STEP stepExporter( brd, params );
stepExporter.m_outputFile = aStepJob->m_outputFile;
if( !stepExporter.Export() )
{
return CLI::EXIT_CODES::ERR_UNKNOWN;
}
}
return CLI::EXIT_CODES::OK;
}
@ -276,13 +277,9 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
plotOpts.SetDXFPlotPolygonMode( aDxfJob->m_plotGraphicItemsUsingContours );
if( aDxfJob->m_dxfUnits == JOB_EXPORT_PCB_DXF::DXF_UNITS::MILLIMETERS )
{
plotOpts.SetDXFPlotUnits( DXF_UNITS::MILLIMETERS );
}
else
{
plotOpts.SetDXFPlotUnits( DXF_UNITS::INCHES );
}
plotOpts.SetPlotFrameRef( aDxfJob->m_plotBorderTitleBlocks );
plotOpts.SetPlotValue( aDxfJob->m_plotFootprintValues );
@ -345,17 +342,9 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
switch( aPdfJob->m_drillShapeOption )
{
default:
case 0:
plotOpts.SetDrillMarksType( DRILL_MARKS::NO_DRILL_SHAPE );
break;
case 1:
plotOpts.SetDrillMarksType( DRILL_MARKS::SMALL_DRILL_SHAPE );
break;
case 2:
plotOpts.SetDrillMarksType( DRILL_MARKS::FULL_DRILL_SHAPE );
break;
case 0: plotOpts.SetDrillMarksType( DRILL_MARKS::NO_DRILL_SHAPE ); break;
case 1: plotOpts.SetDrillMarksType( DRILL_MARKS::SMALL_DRILL_SHAPE ); break;
case 2: plotOpts.SetDrillMarksType( DRILL_MARKS::FULL_DRILL_SHAPE ); break;
}
PDF_PLOTTER* plotter = (PDF_PLOTTER*) StartPlotBoard(
@ -576,6 +565,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
// ensure output dir exists
wxFileName fn( aDrillJob->m_outputDir + wxT( "/" ) );
if( !fn.Mkdir( wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) )
{
m_reporter->Report( _( "Failed to create output directory\n" ), RPT_SEVERITY_ERROR );
@ -585,13 +575,9 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
std::unique_ptr<GENDRILL_WRITER_BASE> drillWriter;
if( aDrillJob->m_format == JOB_EXPORT_PCB_DRILL::DRILL_FORMAT::EXCELLON )
{
drillWriter = std::make_unique<EXCELLON_WRITER>( brd );
}
else
{
drillWriter = std::make_unique<GERBER_WRITER>( brd );
}
VECTOR2I offset;
@ -981,17 +967,13 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob )
}
EDA_UNITS units;
switch( drcJob->m_units )
{
case JOB_PCB_DRC::UNITS::INCHES:
units = EDA_UNITS::INCHES;
break;
case JOB_PCB_DRC::UNITS::MILS:
units = EDA_UNITS::MILS;
break;
case JOB_PCB_DRC::UNITS::MILLIMETERS:
default:
units = EDA_UNITS::MILLIMETRES; break;
case JOB_PCB_DRC::UNITS::INCHES: units = EDA_UNITS::INCHES; break;
case JOB_PCB_DRC::UNITS::MILS: units = EDA_UNITS::MILS; break;
case JOB_PCB_DRC::UNITS::MILLIMETERS: units = EDA_UNITS::MILLIMETRES; break;
default: units = EDA_UNITS::MILLIMETRES; break;
}
std::shared_ptr<DRC_ENGINE> drcEngine = brd->GetDesignSettings().m_DRCEngine;
@ -1096,6 +1078,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob )
DRC_REPORT reportWriter( brd, units, markersProvider, ratsnestProvider, fpWarningsProvider );
bool wroteReport = false;
if( drcJob->m_format == JOB_PCB_DRC::OUTPUT_FORMAT::JSON )
wroteReport = reportWriter.WriteJsonReport( drcJob->m_outputFile );
else
@ -1103,12 +1086,14 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob )
if( !wroteReport )
{
m_reporter->Report( wxString::Format( _( "Unable to save DRC report to %s\n" ), drcJob->m_outputFile ),
m_reporter->Report( wxString::Format( _( "Unable to save DRC report to %s\n" ),
drcJob->m_outputFile ),
RPT_SEVERITY_INFO );
return CLI::EXIT_CODES::ERR_INVALID_OUTPUT_CONFLICT;
}
m_reporter->Report( wxString::Format( _( "Saved DRC Report to %s\n" ), drcJob->m_outputFile ),
m_reporter->Report( wxString::Format( _( "Saved DRC Report to %s\n" ),
drcJob->m_outputFile ),
RPT_SEVERITY_INFO );
if( drcJob->m_exitCodeViolations )
@ -1146,8 +1131,8 @@ int PCBNEW_JOBS_HANDLER::JobExportIpc2581( JOB* aJob )
}
STRING_UTF8_MAP props;
props["units"] =
job->m_units == JOB_EXPORT_PCB_IPC2581::IPC2581_UNITS::MILLIMETERS ? "mm" : "inch";
props["units"] = job->m_units == JOB_EXPORT_PCB_IPC2581::IPC2581_UNITS::MILLIMETERS ? "mm"
: "inch";
props["sigfig"] = wxString::Format( "%d", job->m_units );
props["version"] = job->m_version == JOB_EXPORT_PCB_IPC2581::IPC2581_VERSION::C ? "C" : "B";
props["OEMRef"] = job->m_colInternalId;
@ -1232,14 +1217,17 @@ void PCBNEW_JOBS_HANDLER::loadOverrideDrawingSheet( BOARD* aBrd, const wxString&
if( aSheetPath.IsEmpty() )
return;
auto loadSheet = [&]( const wxString& path ) -> bool
auto loadSheet =
[&]( const wxString& path ) -> bool
{
BASE_SCREEN::m_DrawingSheetFileName = path;
wxString filename = DS_DATA_MODEL::ResolvePath( BASE_SCREEN::m_DrawingSheetFileName,
aBrd->GetProject()->GetProjectPath() );
if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( filename ) )
{
m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." )+ wxS( "\n" ), path ),
m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." ) + wxS( "\n" ),
path ),
RPT_SEVERITY_ERROR );
return false;
}