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

Fix pasting of items from board to Footprint Editor. 

In particular, map the netlist info to the orphaned item, and
adjust the position of module graphic items to no longer be
module-relative.

Fixes https://gitlab.com/kicad/code/kicad/issues/4032
This commit is contained in:
Jeff Young 2020-03-10 23:05:34 +00:00
parent 437f888c25
commit 51b9944667
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/board_connected_item.h
View File

@ -89,7 +89,7 @@ public:
*/ */
void SetNet( NETINFO_ITEM* aNetInfo ) void SetNet( NETINFO_ITEM* aNetInfo )
{ {
assert( aNetInfo->GetBoard() == GetBoard() ); wxASSERT( aNetInfo->GetBoard() == GetBoard() || aNetInfo == NETINFO_LIST::OrphanedItem() );
m_netinfo = aNetInfo; m_netinfo = aNetInfo;
} }

4
pcbnew/class_board.cpp
View File

@ -1771,14 +1771,14 @@ const std::vector<BOARD_CONNECTED_ITEM*> BOARD::AllConnectedItems()
void BOARD::ClearAllNetCodes() void BOARD::ClearAllNetCodes()
{ {
for ( BOARD_CONNECTED_ITEM* item : AllConnectedItems() ) for( BOARD_CONNECTED_ITEM* item : AllConnectedItems() )
item->SetNetCode( 0 ); item->SetNetCode( 0 );
} }
void BOARD::MapNets( const BOARD* aDestBoard ) void BOARD::MapNets( const BOARD* aDestBoard )
{ {
for ( BOARD_CONNECTED_ITEM* item : AllConnectedItems() ) for( BOARD_CONNECTED_ITEM* item : AllConnectedItems() )
{ {
NETINFO_ITEM* netInfo = aDestBoard->FindNet( item->GetNetname() ); NETINFO_ITEM* netInfo = aDestBoard->FindNet( item->GetNetname() );

3
pcbnew/netinfo.h
View File

@ -205,8 +205,7 @@ public:
*/ */
int GetClearance() int GetClearance()
{ {
wxASSERT( m_NetClass ); return m_NetClass ? m_NetClass->GetClearance() : 0;
return m_NetClass->GetClearance();
} }
#endif #endif

15
pcbnew/tools/pcbnew_control.cpp
View File

@ -628,11 +628,19 @@ int PCBNEW_CONTROL::Paste( const TOOL_EVENT& aEvent )
if( !clipItem ) if( !clipItem )
return 0; return 0;
if( clipItem->Type() == PCB_T )
static_cast<BOARD*>( clipItem )->MapNets( m_frame->GetBoard() );
bool editModules = m_editModules || frame()->IsType( FRAME_FOOTPRINT_EDITOR ); bool editModules = m_editModules || frame()->IsType( FRAME_FOOTPRINT_EDITOR );
if( clipItem->Type() == PCB_T )
{
if( editModules )
{
for( BOARD_CONNECTED_ITEM* item : static_cast<BOARD*>( clipItem )->AllConnectedItems() )
item->SetNet( NETINFO_LIST::OrphanedItem() );
}
else
static_cast<BOARD*>( clipItem )->MapNets( m_frame->GetBoard() );
}
// The clipboard can contain two different things, an entire kicad_pcb // The clipboard can contain two different things, an entire kicad_pcb
// or a single module // or a single module
@ -667,6 +675,7 @@ int PCBNEW_CONTROL::Paste( const TOOL_EVENT& aEvent )
for( auto item : clipModule->GraphicalItems() ) for( auto item : clipModule->GraphicalItems() )
{ {
item->Move( clipModule->GetPosition() );
item->SetParent( editModule ); item->SetParent( editModule );
pastedItems.push_back( item ); pastedItems.push_back( item );
} }