Fix schematic append clear annotation bug.

Clear the annotation of only the appended schematic and any sheets in it's
hierarchy.  Do not clear the annotation of the symbols in the target sheet.

Fixes lp:1805695

https://bugs.launchpad.net/kicad/+bug/1805695

(cherry picked from commit 07ebc4df14)
This commit is contained in:
Wayne Stambaugh 2018-12-01 13:42:51 -05:00
parent 61b94c8c2c
commit 385eb49cb2
1 changed files with 3 additions and 1 deletions

View File

@ -590,6 +590,8 @@ bool SCH_EDIT_FRAME::AppendSchematic()
}
}
newScreens.ClearAnnotation();
// Check for duplicate sheet names in the current page.
wxArrayString duplicateSheetNames;
SCH_TYPE_COLLECTOR sheets;
@ -638,7 +640,7 @@ bool SCH_EDIT_FRAME::AppendSchematic()
// Clear all annotation in the imported schematic to prevent clashes with existing annotation.
// Must be done after updating the symbol links as we need to know about multi-unit parts.
screens.ClearAnnotation();
// screens.ClearAnnotation();
GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId );
Zoom_Automatique( false );