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

Use a more friendly method of ensuring unique sheet names. 

Also fixes a bug where we were failing to respect the
forceKeepAnnotations flag when processing content nested in
a sheet.

Fixes https://gitlab.com/kicad/code/kicad/issues/3681
This commit is contained in:
Jeff Young 2020-02-29 00:05:50 +00:00
parent 3e0ff72720
commit 3f31d48b5e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/tools/sch_editor_control.cpp
View File

@ -940,6 +940,18 @@ int SCH_EDITOR_CONTROL::Copy( const TOOL_EVENT& aEvent )
} }
bool sheetNameExists( const SCH_SHEET_LIST& hierarchy, const wxString& aName )
{
for( const SCH_SHEET_PATH& sheet : hierarchy )
{
if( sheet.Last()->GetName() == aName )
return true;
}
return false;
}
int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
{ {
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wxWindow::FindFocus() ); wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wxWindow::FindFocus() );
@ -1078,9 +1090,13 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
wxFileName fn = sheet->GetFileName(); wxFileName fn = sheet->GetFileName();
SCH_SCREEN* existingScreen = nullptr; SCH_SCREEN* existingScreen = nullptr;
bool dropSheetAnnotations = false; bool dropSheetAnnotations = false;
wxString sheetName = sheet->GetName();
int uniquifier = 1;
// Duplicate sheet names are not valid. Generate new UUID-based sheet names. while( sheetNameExists( hierarchy, sheetName ) )
sheet->SetName( wxString::Format( wxT( "Sheet%s" ), sheet->m_Uuid.AsString() ) ); sheetName = sheet->GetName() << uniquifier++;
sheet->SetName( sheetName );
sheet->SetParent( g_CurrentSheet->Last() ); sheet->SetParent( g_CurrentSheet->Last() );
sheet->SetScreen( nullptr ); sheet->SetScreen( nullptr );
@ -1093,7 +1109,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
} }
if( g_RootSheet->SearchHierarchy( fn.GetFullPath( wxPATH_UNIX ), &existingScreen ) ) if( g_RootSheet->SearchHierarchy( fn.GetFullPath( wxPATH_UNIX ), &existingScreen ) )
dropSheetAnnotations = true; dropSheetAnnotations = !forceKeepAnnotations;
else else
searchSupplementaryClipboard( sheet->GetFileName(), &existingScreen ); searchSupplementaryClipboard( sheet->GetFileName(), &existingScreen );