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

Set project footprint library table path environment variable before loading table.

This commit is contained in:
Wayne Stambaugh 2013-11-06 11:10:44 -05:00
parent 0d69a817e6
commit b35fbc0a77
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cvpcb/cfg.cpp
View File

@ -101,11 +101,11 @@ void CVPCB_MAINFRAME::LoadProjectFile( const wxString& aFileName )
wxFileName projectFpLibTableFileName; wxFileName projectFpLibTableFileName;
projectFpLibTableFileName = FP_LIB_TABLE::GetProjectFileName( fn ); projectFpLibTableFileName = FP_LIB_TABLE::GetProjectFileName( fn );
FP_LIB_TABLE::SetProjectPathEnvVariable( projectFpLibTableFileName );
try try
{ {
m_footprintLibTable->Load( projectFpLibTableFileName, m_globalFootprintTable ); m_footprintLibTable->Load( projectFpLibTableFileName, m_globalFootprintTable );
FP_LIB_TABLE::SetProjectPathEnvVariable( projectFpLibTableFileName );
} }
catch( IO_ERROR ioe ) catch( IO_ERROR ioe )
{ {

4
pcbnew/pcbnew_config.cpp
View File

@ -249,6 +249,8 @@ bool PCB_EDIT_FRAME::LoadProjectSettings( const wxString& aProjectFileName )
// Check if a project footprint table is defined and load it. If no project footprint // Check if a project footprint table is defined and load it. If no project footprint
// table is defined, then the global library table is the footprint library table. // table is defined, then the global library table is the footprint library table.
#if defined( USE_FP_LIB_TABLE ) #if defined( USE_FP_LIB_TABLE )
FP_LIB_TABLE::SetProjectPathEnvVariable( fn );
delete m_footprintLibTable; delete m_footprintLibTable;
wxFileName projectFpLibTableFileName; wxFileName projectFpLibTableFileName;
@ -274,8 +276,6 @@ bool PCB_EDIT_FRAME::LoadProjectSettings( const wxString& aProjectFileName )
if( viewFrame ) if( viewFrame )
viewFrame->SetFootprintLibTable( m_footprintLibTable ); viewFrame->SetFootprintLibTable( m_footprintLibTable );
FP_LIB_TABLE::SetProjectPathEnvVariable( fn );
#endif #endif
// Load the page layout decr file, from the filename stored in // Load the page layout decr file, from the filename stored in