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

PNS: don't lose track of pad offset when dragging footprints 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/7500
This commit is contained in:
Jon Evans 2021-02-16 19:47:42 -05:00
parent dbbe9cdee4
commit 0198d5a3bd
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/router/pns_kicad_iface.cpp
View File

@ -1398,7 +1398,7 @@ void PNS_KICAD_IFACE::RemoveItem( PNS::ITEM* aItem )
{ {
BOARD_ITEM* parent = aItem->Parent(); BOARD_ITEM* parent = aItem->Parent();
if ( aItem->OfKind(PNS::ITEM::SOLID_T) ) if( aItem->OfKind( PNS::ITEM::SOLID_T ) )
{ {
PAD* pad = static_cast<PAD*>( parent ); PAD* pad = static_cast<PAD*>( parent );
VECTOR2I pos = static_cast<PNS::SOLID*>( aItem )->Pos(); VECTOR2I pos = static_cast<PNS::SOLID*>( aItem )->Pos();
@ -1471,6 +1471,7 @@ void PNS_KICAD_IFACE::UpdateItem( PNS::ITEM* aItem )
PAD* pad = static_cast<PAD*>( aItem->Parent() ); PAD* pad = static_cast<PAD*>( aItem->Parent() );
VECTOR2I pos = static_cast<PNS::SOLID*>( aItem )->Pos(); VECTOR2I pos = static_cast<PNS::SOLID*>( aItem )->Pos();
m_fpOffsets[ pad ].p_old = pad->GetPosition();
m_fpOffsets[ pad ].p_new = pos; m_fpOffsets[ pad ].p_new = pos;
break; break;
} }
@ -1566,18 +1567,18 @@ void PNS_KICAD_IFACE::Commit()
for( auto fpOffset : m_fpOffsets ) for( auto fpOffset : m_fpOffsets )
{ {
auto offset = fpOffset.second.p_new - fpOffset.second.p_old; VECTOR2I offset = fpOffset.second.p_new - fpOffset.second.p_old;
auto mod = fpOffset.first->GetParent(); FOOTPRINT* footprint = fpOffset.first->GetParent();
VECTOR2I p_orig = mod->GetPosition(); VECTOR2I p_orig = footprint->GetPosition();
VECTOR2I p_new = p_orig + offset; VECTOR2I p_new = p_orig + offset;
if( processedMods.find( mod ) != processedMods.end() ) if( processedMods.find( footprint ) != processedMods.end() )
continue; continue;
processedMods.insert( mod ); processedMods.insert( footprint );
m_commit->Modify( mod ); m_commit->Modify( footprint );
mod->SetPosition( wxPoint( p_new.x, p_new.y )); footprint->SetPosition( wxPoint( p_new.x, p_new.y ) );
} }
m_fpOffsets.clear(); m_fpOffsets.clear();