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

Disable all use of the default instance reference prefix for annotation. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11385
This commit is contained in:
Jeff Young 2022-04-14 17:55:08 +01:00
parent 6ef6e37edb
commit 4ee6cfe5b6
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/annotate.cpp
View File

@ -87,14 +87,12 @@ void SCH_EDIT_FRAME::DeleteAnnotation( ANNOTATE_SCOPE_T aAnnotateScope, bool* aA
case ANNOTATE_ALL: case ANNOTATE_ALL:
{ {
for( const SCH_SHEET_PATH& sheet : Schematic().GetSheets() ) for( const SCH_SHEET_PATH& sheet : Schematic().GetSheets() )
clearSheetAnnotation( sheet.LastScreen(), nullptr, true ); clearSheetAnnotation( sheet.LastScreen(), nullptr, false );
break; break;
} }
case ANNOTATE_CURRENT_SHEET: case ANNOTATE_CURRENT_SHEET:
{ {
// One could make an argument that this should clear prefixes. I have no idea what
// the right answer is.
clearSheetAnnotation( screen, &currentSheet, false ); clearSheetAnnotation( screen, &currentSheet, false );
break; break;
} }
@ -107,11 +105,7 @@ void SCH_EDIT_FRAME::DeleteAnnotation( ANNOTATE_SCOPE_T aAnnotateScope, bool* aA
for( EDA_ITEM* item : selection.Items() ) for( EDA_ITEM* item : selection.Items() )
{ {
if( item->Type() == SCH_SYMBOL_T ) if( item->Type() == SCH_SYMBOL_T )
{
// One could make an argument that this should clear prefixes. I have no idea
// what the right answer is.
clearSymbolAnnotation( item, screen, &currentSheet, false ); clearSymbolAnnotation( item, screen, &currentSheet, false );
}
} }
break; break;
} }