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

Handle case where multiple pins are moved 

When synchronized, if multiple pins are selected to be moved, we need to
match each to a matching pin in the new unit

Fixes https://gitlab.com/kicad/code/kicad/issues/2589
This commit is contained in:
Seth Hillbrand 2020-12-18 15:26:37 -08:00
parent 0fd920a94c
commit 489db6adde
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
eeschema/tools/symbol_editor_move_tool.cpp
View File

@ -111,35 +111,47 @@ int SYMBOL_EDITOR_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
{ {
if( !m_moveInProgress ) // Prepare to start moving/dragging if( !m_moveInProgress ) // Prepare to start moving/dragging
{ {
LIB_ITEM* lib_item = (LIB_ITEM*) selection.Front(); LIB_ITEM* lib_item = static_cast<LIB_ITEM*>( selection.Front() );
// Pick up any synchronized pins // Pick up any synchronized pins
// //
// Careful when pasting. The pasted pin will be at the same location as it // Careful when pasting. The pasted pin will be at the same location as it
// was copied from, leading us to believe it's a synchronized pin. It's not. // was copied from, leading us to believe it's a synchronized pin. It's not.
if( selection.GetSize() == 1 && lib_item->Type() == LIB_PIN_T if( m_frame->SynchronizePins()
&& m_frame->SynchronizePins()
&& ( lib_item->GetEditFlags() & IS_PASTED ) == 0 ) && ( lib_item->GetEditFlags() & IS_PASTED ) == 0 )
{ {
LIB_PIN* cur_pin = (LIB_PIN*) lib_item; std::set<LIB_PIN*> sync_pins;
LIB_PART* part = m_frame->GetCurPart();
std::vector<bool> got_unit( part->GetUnitCount() );
got_unit[cur_pin->GetUnit()] = true; for( EDA_ITEM* sel_item : selection )
for( LIB_PIN* pin = part->GetNextPin(); pin; pin = part->GetNextPin( pin ) )
{ {
if( !got_unit[pin->GetUnit()] lib_item = static_cast<LIB_ITEM*>( sel_item );
&& pin->GetPosition() == cur_pin->GetPosition()
&& pin->GetOrientation() == cur_pin->GetOrientation() if( lib_item->Type() == LIB_PIN_T )
&& pin->GetConvert() == cur_pin->GetConvert()
&& pin->GetType() == cur_pin->GetType()
&& pin->GetName() == cur_pin->GetName() )
{ {
m_selectionTool->AddItemToSel( pin, true /*quiet mode*/ ); LIB_PIN* cur_pin = static_cast<LIB_PIN*>( lib_item );
got_unit[pin->GetUnit()] = true; LIB_PART* part = m_frame->GetCurPart();
std::vector<bool> got_unit( part->GetUnitCount() );
got_unit[cur_pin->GetUnit()] = true;
for( LIB_PIN* pin = part->GetNextPin(); pin; pin = part->GetNextPin( pin ) )
{
if( !got_unit[pin->GetUnit()]
&& pin->GetPosition() == cur_pin->GetPosition()
&& pin->GetOrientation() == cur_pin->GetOrientation()
&& pin->GetConvert() == cur_pin->GetConvert()
&& pin->GetType() == cur_pin->GetType()
&& pin->GetName() == cur_pin->GetName() )
{
if( sync_pins.insert( pin ).second )
got_unit[pin->GetUnit()] = true;
}
}
} }
} }
for( LIB_PIN* pin : sync_pins )
m_selectionTool->AddItemToSel( pin, true /*quiet mode*/ );
} }
// Apply any initial offset in case we're coming from a previous command. // Apply any initial offset in case we're coming from a previous command.