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

step exporter: fix missing initialization of a member (m_pcbBaseName) 

EXPORTER_STEP: rename m_pcbName to m_pcbBaseName.
From master.
This commit is contained in:
jean-pierre charras 2023-03-21 09:52:41 +01:00
parent b3de5aa08e
commit 30dbfc33a4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/exporters/step/exporter_step.cpp
View File

@ -115,12 +115,16 @@ EXPORTER_STEP::EXPORTER_STEP( BOARD* aBoard, const EXPORTER_STEP_PARAMS& aParams
m_hasGridOrigin( false ), m_hasGridOrigin( false ),
m_board( aBoard ), m_board( aBoard ),
m_pcbModel( nullptr ), m_pcbModel( nullptr ),
m_pcbName(),
m_minDistance( STEPEXPORT_MIN_DISTANCE ), m_minDistance( STEPEXPORT_MIN_DISTANCE ),
m_boardThickness( DEFAULT_BOARD_THICKNESS ) m_boardThickness( DEFAULT_BOARD_THICKNESS )
{ {
m_solderMaskColor = COLOR4D( 0.08, 0.20, 0.14, 0.83 ); m_solderMaskColor = COLOR4D( 0.08, 0.20, 0.14, 0.83 );
// Init m_pcbBaseName to the board short filename (no path, no ext)
// m_pcbName is used later to identify items in step file
wxFileName fn( aBoard->GetFileName() );
m_pcbBaseName = fn.GetName();
m_resolver = std::make_unique<FILENAME_RESOLVER>(); m_resolver = std::make_unique<FILENAME_RESOLVER>();
m_resolver->Set3DConfigDir( wxT( "" ) ); m_resolver->Set3DConfigDir( wxT( "" ) );
// needed to add the project to the search stack // needed to add the project to the search stack
@ -257,7 +261,7 @@ bool EXPORTER_STEP::composePCB()
else else
origin = m_params.m_origin; origin = m_params.m_origin;
m_pcbModel = std::make_unique<STEP_PCB_MODEL>( m_pcbName ); m_pcbModel = std::make_unique<STEP_PCB_MODEL>( m_pcbBaseName );
// TODO: Handle when top & bottom soldermask colours are different... // TODO: Handle when top & bottom soldermask colours are different...
m_pcbModel->SetBoardColor( m_solderMaskColor.r, m_solderMaskColor.g, m_solderMaskColor.b ); m_pcbModel->SetBoardColor( m_solderMaskColor.r, m_solderMaskColor.g, m_solderMaskColor.b );

5
pcbnew/exporters/step/exporter_step.h
View File

@ -91,7 +91,10 @@ private:
bool m_hasGridOrigin; bool m_hasGridOrigin;
BOARD* m_board; BOARD* m_board;
std::unique_ptr<STEP_PCB_MODEL> m_pcbModel; std::unique_ptr<STEP_PCB_MODEL> m_pcbModel;
wxString m_pcbName;
/// the name of the project (board short filename (no path, no ext)
/// used to identify items in step file
wxString m_pcbBaseName;
// minimum distance between points to treat them as separate entities (mm) // minimum distance between points to treat them as separate entities (mm)
double m_minDistance; double m_minDistance;