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

A couple of missed "footprint" terminology updates.

This commit is contained in:
Jeff Young 2020-12-07 15:50:04 +00:00
parent 893f1bb4c1
commit c7bd8fc987
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pcbnew/netlist_reader/board_netlist_updater.cpp
View File

@ -242,92 +242,92 @@ FOOTPRINT* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, FOOTPRINT
} }
bool BOARD_NETLIST_UPDATER::updateComponentParameters( FOOTPRINT* aPcbComponent, bool BOARD_NETLIST_UPDATER::updateFootprintParameters( FOOTPRINT* aPcbFootprint,
COMPONENT* aNewComponent ) COMPONENT* aNetlistComponent )
{ {
wxString msg; wxString msg;
// Create a copy only if the footprint has not been added during this update // Create a copy only if the footprint has not been added during this update
FOOTPRINT* copy = m_commit.GetStatus( aPcbComponent ) ? nullptr FOOTPRINT* copy = m_commit.GetStatus( aPcbFootprint ) ? nullptr
: (FOOTPRINT*) aPcbComponent->Clone(); : (FOOTPRINT*) aPcbFootprint->Clone();
bool changed = false; bool changed = false;
// Test for reference designator field change. // Test for reference designator field change.
if( aPcbComponent->GetReference() != aNewComponent->GetReference() ) if( aPcbFootprint->GetReference() != aNetlistComponent->GetReference() )
{ {
msg.Printf( _( "Change %s reference designator to %s." ), msg.Printf( _( "Change %s reference designator to %s." ),
aPcbComponent->GetReference(), aPcbFootprint->GetReference(),
aNewComponent->GetReference() ); aNetlistComponent->GetReference() );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
if ( !m_isDryRun ) if ( !m_isDryRun )
{ {
changed = true; changed = true;
aPcbComponent->SetReference( aNewComponent->GetReference() ); aPcbFootprint->SetReference( aNetlistComponent->GetReference() );
} }
} }
// Test for value field change. // Test for value field change.
if( aPcbComponent->GetValue() != aNewComponent->GetValue() ) if( aPcbFootprint->GetValue() != aNetlistComponent->GetValue() )
{ {
msg.Printf( _( "Change %s value from %s to %s." ), msg.Printf( _( "Change %s value from %s to %s." ),
aPcbComponent->GetReference(), aPcbFootprint->GetReference(),
aPcbComponent->GetValue(), aPcbFootprint->GetValue(),
aNewComponent->GetValue() ); aNetlistComponent->GetValue() );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
if( !m_isDryRun ) if( !m_isDryRun )
{ {
changed = true; changed = true;
aPcbComponent->SetValue( aNewComponent->GetValue() ); aPcbFootprint->SetValue( aNetlistComponent->GetValue() );
} }
} }
// Test for time stamp change. // Test for time stamp change.
if( aPcbComponent->GetPath() != aNewComponent->GetPath() ) if( aPcbFootprint->GetPath() != aNetlistComponent->GetPath() )
{ {
msg.Printf( _( "Update %s symbol association from %s to %s." ), msg.Printf( _( "Update %s symbol association from %s to %s." ),
aPcbComponent->GetReference(), aPcbFootprint->GetReference(),
aPcbComponent->GetPath().AsString(), aPcbFootprint->GetPath().AsString(),
aNewComponent->GetPath().AsString() ); aNetlistComponent->GetPath().AsString() );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
if( !m_isDryRun ) if( !m_isDryRun )
{ {
changed = true; changed = true;
aPcbComponent->SetPath( aNewComponent->GetPath() ); aPcbFootprint->SetPath( aNetlistComponent->GetPath() );
} }
} }
if( aPcbComponent->GetProperties() != aNewComponent->GetProperties() ) if( aPcbFootprint->GetProperties() != aNetlistComponent->GetProperties() )
{ {
msg.Printf( _( "Update %s properties." ), msg.Printf( _( "Update %s properties." ),
aPcbComponent->GetReference() ); aPcbFootprint->GetReference() );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
if( !m_isDryRun ) if( !m_isDryRun )
{ {
changed = true; changed = true;
aPcbComponent->SetProperties( aNewComponent->GetProperties() ); aPcbFootprint->SetProperties( aNetlistComponent->GetProperties() );
} }
} }
if( ( aNewComponent->GetProperties().count( "exclude_from_bom" ) > 0 ) if( ( aNetlistComponent->GetProperties().count( "exclude_from_bom" ) > 0 )
!= ( ( aPcbComponent->GetAttributes() & FP_EXCLUDE_FROM_BOM ) > 0 ) ) != ( ( aPcbFootprint->GetAttributes() & FP_EXCLUDE_FROM_BOM ) > 0 ) )
{ {
int attributes = aPcbComponent->GetAttributes(); int attributes = aPcbFootprint->GetAttributes();
if( aNewComponent->GetProperties().count( "exclude_from_bom" ) ) if( aNetlistComponent->GetProperties().count( "exclude_from_bom" ) )
{ {
attributes |= FP_EXCLUDE_FROM_BOM; attributes |= FP_EXCLUDE_FROM_BOM;
msg.Printf( _( "Setting %s 'exclude from BOM' fabrication attribute." ), msg.Printf( _( "Setting %s 'exclude from BOM' fabrication attribute." ),
aPcbComponent->GetReference() ); aPcbFootprint->GetReference() );
} }
else else
{ {
attributes &= ~FP_EXCLUDE_FROM_BOM; attributes &= ~FP_EXCLUDE_FROM_BOM;
msg.Printf( _( "Removing %s 'exclude from BOM' fabrication attribute." ), msg.Printf( _( "Removing %s 'exclude from BOM' fabrication attribute." ),
aPcbComponent->GetReference() ); aPcbFootprint->GetReference() );
} }
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
@ -335,12 +335,12 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( FOOTPRINT* aPcbComponent,
if( !m_isDryRun ) if( !m_isDryRun )
{ {
changed = true; changed = true;
aPcbComponent->SetAttributes( attributes ); aPcbFootprint->SetAttributes( attributes );
} }
} }
if( changed && copy ) if( changed && copy )
m_commit.Modified( aPcbComponent, copy ); m_commit.Modified( aPcbFootprint, copy );
else else
delete copy; delete copy;
@ -844,7 +844,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
{ {
footprintMap[ component ] = tmp; footprintMap[ component ] = tmp;
updateComponentParameters( tmp, component ); updateFootprintParameters( tmp, component );
updateComponentPadConnections( tmp, component ); updateComponentPadConnections( tmp, component );
} }
@ -866,7 +866,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
{ {
footprintMap[ component ] = tmp; footprintMap[ component ] = tmp;
updateComponentParameters( tmp, component ); updateFootprintParameters( tmp, component );
updateComponentPadConnections( tmp, component ); updateComponentPadConnections( tmp, component );
} }
} }

2
pcbnew/netlist_reader/board_netlist_updater.h
View File

@ -147,7 +147,7 @@ private:
FOOTPRINT* replaceComponent( NETLIST& aNetlist, FOOTPRINT* aPcbComponent, FOOTPRINT* replaceComponent( NETLIST& aNetlist, FOOTPRINT* aPcbComponent,
COMPONENT* aNewComponent ); COMPONENT* aNewComponent );
bool updateComponentParameters( FOOTPRINT* aPcbComponent, COMPONENT* aNewComponent ); bool updateFootprintParameters( FOOTPRINT* aPcbFootprint, COMPONENT* aNetlistComponent );
bool updateComponentPadConnections( FOOTPRINT* aPcbComponent, COMPONENT* aNewComponent ); bool updateComponentPadConnections( FOOTPRINT* aPcbComponent, COMPONENT* aNewComponent );