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

Hook up excluded ERC marker persistence. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6425
This commit is contained in:
Jeff Young 2020-11-19 18:22:26 +00:00
parent 876b87b64e
commit 826e47dde3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/files-io.cpp
View File

@ -533,6 +533,9 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
GetScreen()->m_Initialized = true; GetScreen()->m_Initialized = true;
} }
// Load any exclusions from the project file
ResolveERCExclusions();
m_toolManager->RunAction( ACTIONS::zoomFitScreen, true ); m_toolManager->RunAction( ACTIONS::zoomFitScreen, true );
SetSheetNumberAndCount(); SetSheetNumberAndCount();

13
eeschema/sch_edit_frame.cpp
View File

@ -648,6 +648,8 @@ void SCH_EDIT_FRAME::doCloseWindow()
if( m_toolManager ) if( m_toolManager )
m_toolManager->ShutdownAllTools(); m_toolManager->ShutdownAllTools();
RecordERCExclusions();
// Close the find dialog and preserve it's setting if it is displayed. // Close the find dialog and preserve it's setting if it is displayed.
if( m_findReplaceDialog ) if( m_findReplaceDialog )
{ {
@ -719,10 +721,17 @@ void SCH_EDIT_FRAME::RecordERCExclusions()
void SCH_EDIT_FRAME::ResolveERCExclusions() void SCH_EDIT_FRAME::ResolveERCExclusions()
{ {
SCH_SHEET_LIST sheetList = Schematic().GetSheets();
for( SCH_MARKER* marker : Schematic().ResolveERCExclusions() ) for( SCH_MARKER* marker : Schematic().ResolveERCExclusions() )
{ {
// JEY TODO: need to get the right screen.... SCH_SHEET_PATH errorPath;
GetScreen()->Append( marker ); (void) sheetList.GetItem( marker->GetRCItem()->GetMainItemID(), &errorPath );
if( errorPath.LastScreen() )
errorPath.LastScreen()->Append( marker );
else
Schematic().RootScreen()->Append( marker );
} }
// Update the view for the current screen // Update the view for the current screen