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

Keep track of COMPONENT -> FOOTPRINT map. 

Changed footprints will still only be found in the COMMIT, so
searching for them in the board won't work.

Fixes https://gitlab.com/kicad/code/kicad/issues/6363
This commit is contained in:
Jeff Young 2020-11-13 17:04:34 +00:00
parent 592cd99fd5
commit 49402fe760
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/netlist_reader/board_netlist_updater.cpp
View File

@ -234,7 +234,9 @@ FOOTPRINT* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, FOOTPRINT
return newFootprint; return newFootprint;
} }
else else
{
delete newFootprint; delete newFootprint;
}
return nullptr; return nullptr;
} }
@ -740,22 +742,21 @@ bool BOARD_NETLIST_UPDATER::deleteSinglePadNets()
} }
bool BOARD_NETLIST_UPDATER::testConnectivity( NETLIST& aNetlist ) bool BOARD_NETLIST_UPDATER::testConnectivity( NETLIST& aNetlist,
std::map<COMPONENT*, FOOTPRINT*>& aFootprintMap )
{ {
// Verify that board contains all pads in netlist: if it doesn't then footprints are // Verify that board contains all pads in netlist: if it doesn't then footprints are
// wrong or missing. // wrong or missing.
// Note that we use references to find the footprints as they're already updated by this
// point (whether by-reference or by-timestamp).
wxString msg; wxString msg;
wxString padname; wxString padname;
for( int i = 0; i < (int) aNetlist.GetCount(); i++ ) for( int i = 0; i < (int) aNetlist.GetCount(); i++ )
{ {
const COMPONENT* component = aNetlist.GetComponent( i ); COMPONENT* component = aNetlist.GetComponent( i );
FOOTPRINT* footprint = m_board->FindFootprintByReference( component->GetReference() ); FOOTPRINT* footprint = aFootprintMap[component];
if( footprint == NULL ) // It can be missing in partial designs if( !footprint ) // It can be missing in partial designs
continue; continue;
// Explore all pins/pads in component // Explore all pins/pads in component
@ -787,8 +788,12 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
m_errorCount = 0; m_errorCount = 0;
m_warningCount = 0; m_warningCount = 0;
m_newFootprintsCount = 0; m_newFootprintsCount = 0;
FOOTPRINT* lastPreexistingFootprint = m_board->Footprints().empty() ? NULL FOOTPRINT* lastPreexistingFootprint = nullptr;
: m_board->Footprints().back();
std::map<COMPONENT*, FOOTPRINT*> footprintMap;
if( !m_board->Footprints().empty() )
lastPreexistingFootprint = m_board->Footprints().back();
cacheCopperZoneConnections(); cacheCopperZoneConnections();
@ -837,6 +842,8 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
if( tmp ) if( tmp )
{ {
footprintMap[ component ] = tmp;
updateComponentParameters( tmp, component ); updateComponentParameters( tmp, component );
updateComponentPadConnections( tmp, component ); updateComponentPadConnections( tmp, component );
} }
@ -857,6 +864,8 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
if( tmp ) if( tmp )
{ {
footprintMap[ component ] = tmp;
updateComponentParameters( tmp, component ); updateComponentParameters( tmp, component );
updateComponentPadConnections( tmp, component ); updateComponentPadConnections( tmp, component );
} }
@ -877,7 +886,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
if( !m_isDryRun ) if( !m_isDryRun )
{ {
m_board->GetConnectivity()->Build( m_board ); m_board->GetConnectivity()->Build( m_board );
testConnectivity( aNetlist ); testConnectivity( aNetlist, footprintMap );
// Now the connectivity data is rebuilt, we can delete single pads nets // Now the connectivity data is rebuilt, we can delete single pads nets
if( m_deleteSinglePadNets ) if( m_deleteSinglePadNets )
@ -897,10 +906,12 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
m_commit.Push( _( "Update netlist" ) ); m_commit.Push( _( "Update netlist" ) );
} }
else if( m_deleteSinglePadNets && !m_newFootprintsCount ) else if( m_deleteSinglePadNets && !m_newFootprintsCount )
{
// We can delete single net pads in dry run mode only if no new footprints // We can delete single net pads in dry run mode only if no new footprints
// are added, because these new footprints are not actually added to the board // are added, because these new footprints are not actually added to the board
// and the current pad list is wrong in this case. // and the current pad list is wrong in this case.
deleteSinglePadNets(); deleteSinglePadNets();
}
if( m_isDryRun ) if( m_isDryRun )
{ {

2
pcbnew/netlist_reader/board_netlist_updater.h
View File

@ -159,7 +159,7 @@ private:
bool deleteSinglePadNets(); bool deleteSinglePadNets();
bool testConnectivity( NETLIST& aNetlist ); bool testConnectivity( NETLIST& aNetlist, std::map<COMPONENT*, FOOTPRINT*>& aFootprintMap );
PCB_EDIT_FRAME* m_frame; PCB_EDIT_FRAME* m_frame;
BOARD_COMMIT m_commit; BOARD_COMMIT m_commit;