realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-13 17:53:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber SCH_SCREEN paths when adding new sheet from existing file.

Browse Source 
The screen path will always be the correct absolute path.  Otherwise it
would not be possible to load it.

Don't reset the first sheet file path to relative if the user did not
request it.

Don't use results of a failed call to wxFileName::MakeRelative() to set
sub-sheet file paths.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20502
This commit is contained in:
Wayne Stambaugh 2025-03-31 11:17:00 -04:00
parent 9b71102dd8
commit d52d0d0aad
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/sheet.cpp
View File

@ -248,9 +248,14 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
for( const SCH_SHEET_PATH& sheetPath : loadedSheets )
{
// Skip the loaded sheet since the user already determined if the file path should
// be relative or absolute.
if( sheetPath.size() == 1 )
continue;
wxString lastSheetPath = Prj().GetProjectPath();
for( unsigned i = 0; i < sheetPath.size(); i++ )
for( unsigned i = 1; i < sheetPath.size(); i++ )
{
SCH_SHEET* sheet = sheetPath.at( i );
wxCHECK2( sheet, continue );
@ -258,14 +263,6 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
SCH_SCREEN* screen = sheet->GetScreen();
wxCHECK2( screen, continue );
// Fix screen path to be based on the current project path.
// Basically, make an absolute screen path relative to the schematic file
// we started with, then make it absolute again using the current project path.
wxFileName screenFileName = screen->GetFileName();
screenFileName.MakeRelativeTo( fileName.GetPath() );
screenFileName.MakeAbsolute( Prj().GetProjectPath() );
screen->SetFileName( screenFileName.GetFullPath() );
// Use the screen file name which should always be absolute.
wxFileName loadedSheetFileName = screen->GetFileName();
wxCHECK2( loadedSheetFileName.IsAbsolute(), continue );
@ -278,6 +275,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
else
sheetFileName = loadedSheetFileName.GetFullPath();
sheetFileName.Replace( wxT( "\\" ), wxT( "/" ) );
sheet->SetFileName( sheetFileName );
lastSheetPath = loadedSheetFileName.GetPath();
}