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

Update PCB from schematic or Read netlist doesn't add new footprints when the board has no existing footprints (empty board) 

Fixes: lp:1793396
https://bugs.launchpad.net/kicad/+bug/1793396
This commit is contained in:
jean-pierre charras 2018-09-21 09:58:50 +02:00
parent 8c3a82e526
commit 0be52a68fe
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/board_netlist_updater.cpp
View File

@ -639,15 +639,20 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
component->GetFPID().Format().wx_str() );
m_reporter->Report( msg, REPORTER::RPT_INFO );
for( MODULE* footprint = m_board->m_Modules; footprint; footprint = footprint->Next() )
// This loop must be executed at least once to add new footprints even
// if the board has no existing footprints:
for( MODULE* footprint = m_board->m_Modules; ; footprint = footprint->Next() )
{
bool match;
bool match = false;
MODULE* tmp;
if( aNetlist.IsFindByTimeStamp() )
match = footprint->GetPath() == component->GetTimeStamp();
else
match = footprint->GetReference().CmpNoCase( component->GetReference() );
if( footprint )
{
if( aNetlist.IsFindByTimeStamp() )
match = footprint->GetPath() == component->GetTimeStamp();
else
match = footprint->GetReference().CmpNoCase( component->GetReference() );
}
if( match )
{
@ -680,7 +685,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
matchCount++;
}
// No sense going through the newly-created footprints
// No sense going through the newly-created footprints: end of loop
break;
}
}

19
pcbnew/class_board.cpp
View File

@ -2568,15 +2568,20 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
GetChars( component->GetFPID().Format() ) );
aReporter.Report( msg, REPORTER::RPT_INFO );
for( MODULE* footprint = m_Modules; footprint; footprint = footprint->Next() )
// This loop must be executed at least once to add new footprints even
// if the board has no existing footprints:
for( MODULE* footprint = m_Modules; ; footprint = footprint->Next() )
{
bool match;
bool match = false;
MODULE* tmp;
if( aNetlist.IsFindByTimeStamp() )
match = footprint->GetPath() == component->GetTimeStamp();
else
match = footprint->GetReference().CmpNoCase( component->GetReference() );
if( footprint )
{
if( aNetlist.IsFindByTimeStamp() )
match = footprint->GetPath() == component->GetTimeStamp();
else
match = footprint->GetReference().CmpNoCase( component->GetReference() );
}
if( match )
{
@ -2718,7 +2723,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
matchCount++;
}
// No sense going through the newly-created footprints
// No sense going through the newly-created footprints: end loop
break;
}
}