electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load input-specific project; don't use default (blank) project

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19176
This commit is contained in:
Jeff Young
2024-11-22 21:29:05 +00:00
parent a76845d1e6
commit 9e7ffc6ff0
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
+6 -12
View File
@@ -87,15 +87,15 @@ void ScriptingOnDestructPcbEditFrame( PCB_EDIT_FRAME* aPcbEditFrame )
}
BOARD* LoadBoard( const wxString& aFileName, bool aSetActive, PROJECT* aProject )
BOARD* LoadBoard( const wxString& aFileName, bool aSetActive )
{
if( aFileName.EndsWith( FILEEXT::KiCadPcbFileExtension ) )
return LoadBoard( aFileName, PCB_IO_MGR::KICAD_SEXP, aSetActive, aProject );
return LoadBoard( aFileName, PCB_IO_MGR::KICAD_SEXP, aSetActive );
else if( aFileName.EndsWith( FILEEXT::LegacyPcbFileExtension ) )
return LoadBoard( aFileName, PCB_IO_MGR::LEGACY, aSetActive, aProject );
return LoadBoard( aFileName, PCB_IO_MGR::LEGACY, aSetActive );
// as fall back for any other kind use the legacy format
return LoadBoard( aFileName, PCB_IO_MGR::LEGACY, aSetActive, aProject );
return LoadBoard( aFileName, PCB_IO_MGR::LEGACY, aSetActive );
}
@@ -148,8 +148,7 @@ BOARD* LoadBoard( const wxString& aFileName, PCB_IO_MGR::PCB_FILE_T aFormat )
}
BOARD* LoadBoard( const wxString& aFileName, PCB_IO_MGR::PCB_FILE_T aFormat, bool aSetActive,
PROJECT* aProject )
BOARD* LoadBoard( const wxString& aFileName, PCB_IO_MGR::PCB_FILE_T aFormat, bool aSetActive )
{
wxFileName pro = aFileName;
pro.SetExt( FILEEXT::ProjectFileExtension );
@@ -166,12 +165,7 @@ BOARD* LoadBoard( const wxString& aFileName, PCB_IO_MGR::PCB_FILE_T aFormat, boo
// It also avoid wxWidget alerts about locale issues, later, when using Python 3
LOCALE_IO dummy;
PROJECT* project = aProject;
if( !project )
{
GetSettingsManager()->GetProject( projectPath );
}
PROJECT* project = GetSettingsManager()->GetProject( projectPath );
if( !project )
{