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

Give group the right parent when pasting. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12954
This commit is contained in:
Jeff Young 2022-11-20 22:51:28 +00:00
parent 48f97bfec3
commit 0120df014e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/board_item.cpp
View File

@ -168,9 +168,6 @@ void BOARD_ITEM::SwapItemData( BOARD_ITEM* aImage )
if( aImage == nullptr )
return;
wxASSERT( Type() == aImage->Type() );
wxASSERT( m_Uuid == aImage->m_Uuid );
EDA_ITEM* parent = GetParent();
PCB_GROUP* group = GetParentGroup();

8
pcbnew/tools/pcb_control.cpp
View File

@ -770,6 +770,10 @@ void PCB_CONTROL::pruneItemLayers( std::vector<BOARD_ITEM*>& aItems )
if( fp->GraphicalItems().size() || fp->Pads().size() || fp->Zones().size() )
returnItems.push_back( fp );
}
else if( item->Type() == PCB_GROUP_T )
{
returnItems.push_back( item );
}
else
{
LSET allowed = item->GetLayerSet() & enabledLayers;
@ -850,7 +854,7 @@ int PCB_CONTROL::Paste( const TOOL_EVENT& aEvent )
for( PCB_GROUP* group : clipBoard->Groups() )
{
group->SetParent( nullptr );
group->SetParent( editorFootprint );
pastedItems.push_back( group );
}
@ -1148,7 +1152,7 @@ int PCB_CONTROL::placeBoardItems( std::vector<BOARD_ITEM*>& aItems, bool aIsNew,
m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &itemsToSel );
// Reannotate duplicate footprints (make sense only in board editor )
if( aReannotateDuplicates && m_frame->IsType( FRAME_PCB_EDITOR ) )
if( aReannotateDuplicates && m_isBoardEditor )
m_toolMgr->GetTool<BOARD_REANNOTATE_TOOL>()->ReannotateDuplicatesInSelection();
for( BOARD_ITEM* item : aItems )