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

Show KIPRJMOD in DIALOG_FP_LIB_TABLE even if it has not been referenced by a URI.

This commit is contained in:
Dick Hollenbeck 2013-11-15 08:11:46 -06:00
parent c1429f2824
commit 7196e7bc98
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/fp_lib_table.cpp
View File

@ -49,9 +49,6 @@ using namespace FP_LIB_TABLE_T;
*/
static const wxString traceFpLibTable( wxT( "KicadFpLibTable" ) );
/// The evinronment variable name for the current project path. This is used interanally
/// at run time and is not exposed outside of the current process.
static wxString projectPathEnvVariableName( wxT( "KIPRJMOD" ) );
/// The footprint library table name used when no project file is passed to Pcbnew or CvPcb.
/// This is used temporarily to store the project specific library table until the project
@ -726,14 +723,14 @@ void FP_LIB_TABLE::SetProjectPathEnvVariable( const wxFileName& aPath )
path = aPath.GetPath();
wxLogTrace( traceFpLibTable, wxT( "Setting env %s to <%s>." ),
GetChars( projectPathEnvVariableName ), GetChars( path ) );
wxSetEnv( projectPathEnvVariableName, path );
GetChars( ProjectPathEnvVariableName() ), GetChars( path ) );
wxSetEnv( ProjectPathEnvVariableName(), path );
}
const wxString& FP_LIB_TABLE::GetProjectPathEnvVariableName() const
const wxString FP_LIB_TABLE::ProjectPathEnvVariableName()
{
return projectPathEnvVariableName;
return wxT( "KIPRJMOD" );
}

7
include/fp_lib_table.h
View File

@ -567,7 +567,12 @@ public:
static void SetProjectPathEnvVariable( const wxFileName& aPath );
const wxString& GetProjectPathEnvVariableName() const;
/**
* Function ProjectPathEnvVarVariableName
* returns the name of the environment variable used to hold the directory of
* the current project on program startup.
*/
static const wxString ProjectPathEnvVariableName();
static wxString GetProjectFileName( const wxFileName& aPath );

5
pcbnew/dialogs/dialog_fp_lib_table.cpp
View File

@ -692,6 +692,11 @@ private:
}
}
// Make sure this special environment variable shows up even if it was
// not used yet. It is automatically set by KiCad to the directory holding
// the current project.
unique.insert( FP_LIB_TABLE::ProjectPathEnvVariableName() );
m_path_subs_grid->AppendRows( unique.size() );
row = 0;