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

Create a default file name for cli 3d export if empty 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16547
This commit is contained in:
Marek Roszko 2024-01-08 21:39:20 -05:00
parent 8c7d126ced
commit 00f3a315d2
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -100,8 +100,28 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
BOARD* brd = LoadBoard( aStepJob->m_filename ); BOARD* brd = LoadBoard( aStepJob->m_filename );
brd->GetProject()->ApplyTextVars( aJob->GetVarOverrides() ); brd->GetProject()->ApplyTextVars( aJob->GetVarOverrides() );
if( aStepJob->m_outputFile.IsEmpty() )
{
wxFileName fn = brd->GetFileName();
fn.SetName( fn.GetName() );
switch( aStepJob->m_format )
{
case JOB_EXPORT_PCB_3D::FORMAT::VRML: fn.SetExt( FILEEXT::VrmlFileExtension );
break;
case JOB_EXPORT_PCB_3D::FORMAT::STEP: fn.SetExt( FILEEXT::StepFileExtension );
break;
case JOB_EXPORT_PCB_3D::FORMAT::GLB: fn.SetExt( FILEEXT::GltfBinaryFileExtension );
break;
default: return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
}
aStepJob->m_outputFile = fn.GetFullName();
}
if( aStepJob->m_format == JOB_EXPORT_PCB_3D::FORMAT::VRML ) if( aStepJob->m_format == JOB_EXPORT_PCB_3D::FORMAT::VRML )
{ {
double scale = 0.0; double scale = 0.0;
switch ( aStepJob->m_vrmlUnits ) switch ( aStepJob->m_vrmlUnits )
{ {
@ -164,7 +184,7 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
case JOB_EXPORT_PCB_3D::FORMAT::GLB: case JOB_EXPORT_PCB_3D::FORMAT::GLB:
params.m_format = EXPORTER_STEP_PARAMS::FORMAT::GLB; params.m_format = EXPORTER_STEP_PARAMS::FORMAT::GLB;
break; break;
default: return CLI::EXIT_CODES::ERR_UNKNOWN; // should have gotten here default: return CLI::EXIT_CODES::ERR_UNKNOWN; // shouldnt have gotten here
} }
EXPORTER_STEP stepExporter( brd, params ); EXPORTER_STEP stepExporter( brd, params );