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

More fixes for initializing imported filenames.

This commit is contained in:
Jeff Young 2020-11-06 01:32:40 +00:00
parent b78e2c8c28
commit 670fc645de
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sch_plugins/altium/sch_altium_plugin.cpp
View File

@ -171,7 +171,7 @@ SCH_SHEET* SCH_ALTIUM_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchem
else else
{ {
m_rootSheet = new SCH_SHEET( aSchematic ); m_rootSheet = new SCH_SHEET( aSchematic );
m_rootSheet->SetFileName( aFileName ); m_rootSheet->SetFileName( fileName.GetFullPath() );
} }
if( !m_rootSheet->GetScreen() ) if( !m_rootSheet->GetScreen() )

7
eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
View File

@ -413,6 +413,9 @@ SCH_SHEET* SCH_EAGLE_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchema
// Delete on exception, if I own m_rootSheet, according to aAppendToMe // Delete on exception, if I own m_rootSheet, according to aAppendToMe
unique_ptr<SCH_SHEET> deleter( aAppendToMe ? nullptr : m_rootSheet ); unique_ptr<SCH_SHEET> deleter( aAppendToMe ? nullptr : m_rootSheet );
wxFileName newFilename( m_filename );
newFilename.SetExt( "kicad_sch" );
if( aAppendToMe ) if( aAppendToMe )
{ {
wxCHECK_MSG( aSchematic->IsValid(), nullptr, "Can't append to a schematic with no root!" ); wxCHECK_MSG( aSchematic->IsValid(), nullptr, "Can't append to a schematic with no root!" );
@ -421,13 +424,13 @@ SCH_SHEET* SCH_EAGLE_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchema
else else
{ {
m_rootSheet = new SCH_SHEET( aSchematic ); m_rootSheet = new SCH_SHEET( aSchematic );
m_rootSheet->SetFileName( aFileName ); m_rootSheet->SetFileName( newFilename.GetFullPath() );
} }
if( !m_rootSheet->GetScreen() ) if( !m_rootSheet->GetScreen() )
{ {
SCH_SCREEN* screen = new SCH_SCREEN( m_schematic ); SCH_SCREEN* screen = new SCH_SCREEN( m_schematic );
screen->SetFileName( aFileName ); screen->SetFileName( newFilename.GetFullPath() );
m_rootSheet->SetScreen( screen ); m_rootSheet->SetScreen( screen );
} }