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

Eeschema: Add bit that was missing from commit 7ac83ac64 

This part of the check removes recursive sheets from the schematic when
loading and notifies the user that their schematic has been repaired.
This commit is contained in:
Seth Hillbrand 2020-01-27 06:38:14 -08:00
parent 7ac83ac64d
commit 128ec782dd
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sch_sheet_path.cpp
View File

@ -373,6 +373,8 @@ void SCH_SHEET_LIST::BuildSheetList( SCH_SHEET* aSheet )
{ {
wxCHECK_RET( aSheet != NULL, wxT( "Cannot build sheet list from undefined sheet." ) ); wxCHECK_RET( aSheet != NULL, wxT( "Cannot build sheet list from undefined sheet." ) );
std::vector<SCH_SHEET*> badSheets;
if( aSheet == g_RootSheet ) if( aSheet == g_RootSheet )
m_isRootSheet = true; m_isRootSheet = true;
@ -389,7 +391,21 @@ void SCH_SHEET_LIST::BuildSheetList( SCH_SHEET* aSheet )
if( m_currentSheetPath.LastScreen() ) if( m_currentSheetPath.LastScreen() )
{ {
for( auto item : m_currentSheetPath.LastScreen()->Items().OfType( SCH_SHEET_T ) ) for( auto item : m_currentSheetPath.LastScreen()->Items().OfType( SCH_SHEET_T ) )
BuildSheetList( static_cast<SCH_SHEET*>( item ) ); {
auto sheet = static_cast<SCH_SHEET*>( item );
if( !m_currentSheetPath.TestForRecursion(
sheet->GetFileName(), aSheet->GetFileName() ) )
BuildSheetList( sheet );
else
badSheets.push_back( sheet );
}
}
for( auto sheet : badSheets )
{
m_currentSheetPath.LastScreen()->Remove( sheet );
m_currentSheetPath.LastScreen()->SetModify();
} }
m_currentSheetPath.pop_back(); m_currentSheetPath.pop_back();