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

Initialize newly imported files with current schematic extension. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6083
This commit is contained in:
Jeff Young 2020-11-05 23:24:29 +00:00
parent 44400ca413
commit 3630f32c26
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,8 @@ SCH_SHEET* SCH_ALTIUM_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchem
{ {
wxASSERT( !aFileName || aSchematic != NULL ); wxASSERT( !aFileName || aSchematic != NULL );
m_filename = aFileName; wxFileName fileName( aFileName );
fileName.SetExt( ".kicad_sch" );
m_schematic = aSchematic; m_schematic = aSchematic;
// Delete on exception, if I own m_rootSheet, according to aAppendToMe // Delete on exception, if I own m_rootSheet, according to aAppendToMe

1
eeschema/sch_plugins/altium/sch_altium_plugin.h
View File

@ -136,7 +136,6 @@ private:
private: private:
SCH_SHEET* m_rootSheet; // The root sheet of the schematic being loaded.. SCH_SHEET* m_rootSheet; // The root sheet of the schematic being loaded..
SCH_SHEET* m_currentSheet; // The current sheet of the schematic being loaded.. SCH_SHEET* m_currentSheet; // The current sheet of the schematic being loaded..
wxFileName m_filename;
SCHEMATIC* m_schematic; // Passed to Load(), the schematic object being loaded SCHEMATIC* m_schematic; // Passed to Load(), the schematic object being loaded
wxString m_libName; // Library name to save symbols wxString m_libName; // Library name to save symbols

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

@ -712,7 +712,7 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
ReplaceIllegalFileNameChars( &filename ); ReplaceIllegalFileNameChars( &filename );
replace( filename.begin(), filename.end(), ' ', '_' ); replace( filename.begin(), filename.end(), ' ', '_' );
wxString fn = wxString( filename + ".sch" ); wxString fn = wxString( filename + ".kicad_sch" );
filenameField.SetText( fn ); filenameField.SetText( fn );
wxFileName fileName( fn ); wxFileName fileName( fn );
m_currentSheet->GetScreen()->SetFileName( fileName.GetFullPath() ); m_currentSheet->GetScreen()->SetFileName( fileName.GetFullPath() );