AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 09:01:42 +00:00
Files Issues Releases Activity

Flip schematic paste/paste special behavior

Browse Source 
Be default, we want to keep the existing data for a symbol that is cut
when pasting it back into the sheet.  This should keep both the KIID and
the reference designator as this will ensure that the symbol remains
connected to the footprint in the layout

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19301
This commit is contained in:
Seth Hillbrand 2025-01-07 14:44:06 -08:00
parent f665760a8e
commit 19e5ca3430
1 changed files with 31 additions and 8 deletions

39
eeschema/tools/sch_editor_control.cpp
View File

@ -1706,8 +1706,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
EESCHEMA_SETTINGS::PANEL_ANNOTATE& annotate = m_frame->eeconfig()->m_AnnotatePanel;
int annotateStartNum = m_frame->Schematic().Settings().m_AnnotateStartNum;
PASTE_MODE pasteMode = annotate.automatic ? PASTE_MODE::RESPECT_OPTIONS
: PASTE_MODE::REMOVE_ANNOTATIONS;
PASTE_MODE pasteMode = PASTE_MODE::UNIQUE_ANNOTATIONS;
if( aEvent.IsAction( &ACTIONS::pasteSpecial ) )
{
@ -1750,6 +1749,11 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
hierarchy.GetSymbols( existingRefs );
existingRefs.SortByReferenceOnly();
std::set<wxString> existingRefsSet;
for( const SCH_REFERENCE& ref : existingRefs )
existingRefsSet.insert( ref.GetRef() );
// Build UUID map for fetching last-resolved-properties
std::map<KIID, EDA_ITEM*> itemMap;
hierarchy.FillItemMap( itemMap );
@ -1850,14 +1854,33 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
for( SCH_SHEET_PATH& sheetPath : sheetPathsForScreen )
updatePastedSymbol( symbol, sheetPath, clipPath, forceKeepAnnotations );
// Assign a new KIID
const_cast<KIID&>( item->m_Uuid ) = KIID();
// Most modes will need new KIIDs for the symbol and its pins
// However, if we are pasting unique annotations, we need to check if the symbol
// is not already in the hierarchy. If we don't already have a copy of the
// symbol, we just keep the existing KIID data as it is likely the same symbol
// being moved around the schematic
bool needsNewKiid = ( pasteMode != PASTE_MODE::UNIQUE_ANNOTATIONS );
// Make sure pins get a new UUID
for( SCH_PIN* pin : symbol->GetPins() )
for( const SCH_SYMBOL_INSTANCE& instance : symbol->GetInstances() )
{
const_cast<KIID&>( pin->m_Uuid ) = KIID();
pin->SetConnectivityDirty();
if( existingRefsSet.contains( instance.m_Reference ) )
{
needsNewKiid = true;
break;
}
}
if( needsNewKiid )
{
// Assign a new KIID
const_cast<KIID&>( item->m_Uuid ) = KIID();
// Make sure pins get a new UUID
for( SCH_PIN* pin : symbol->GetPins() )
{
const_cast<KIID&>( pin->m_Uuid ) = KIID();
pin->SetConnectivityDirty();
}
}
for( SCH_SHEET_PATH& sheetPath : sheetPathsForScreen )