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

Eeschema: Fix multiple net label ERC after sorting changes 

Fixes: lp:1831003
* https://bugs.launchpad.net/kicad/+bug/1831003
This commit is contained in:
Jon Evans 2019-05-31 21:55:43 -04:00
parent d47cac12c3
commit 27a2b840ec
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/connection_graph.cpp
View File

@ -138,12 +138,14 @@ bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
{ {
// First check if all the candidates are actually the same // First check if all the candidates are actually the same
bool same = true; bool same = true;
auto first = GetNameForDriver( candidates[0] ); wxString first = GetNameForDriver( candidates[0] );
SCH_ITEM* second_item = nullptr;
for( unsigned i = 1; i < candidates.size(); i++ ) for( unsigned i = 1; i < candidates.size(); i++ )
{ {
if( GetNameForDriver( candidates[i] ) != first ) if( GetNameForDriver( candidates[i] ) != first )
{ {
second_item = candidates[i];
same = false; same = false;
break; break;
} }
@ -155,18 +157,18 @@ bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
msg.Printf( _( "%s and %s are both attached to the same wires. " msg.Printf( _( "%s and %s are both attached to the same wires. "
"%s was picked as the label to use for netlisting." ), "%s was picked as the label to use for netlisting." ),
candidates[0]->GetSelectMenuText( m_frame->GetUserUnits() ), candidates[0]->GetSelectMenuText( m_frame->GetUserUnits() ),
candidates[1]->GetSelectMenuText( m_frame->GetUserUnits() ), second_item->GetSelectMenuText( m_frame->GetUserUnits() ),
candidates[0]->Connection( m_sheet )->Name() ); candidates[0]->Connection( m_sheet )->Name() );
wxASSERT( candidates[0] != candidates[1] ); wxASSERT( candidates[0] != second_item );
auto p0 = ( candidates[0]->Type() == SCH_PIN_T ) ? auto p0 = ( candidates[0]->Type() == SCH_PIN_T ) ?
static_cast<SCH_PIN*>( candidates[0] )->GetTransformedPosition() : static_cast<SCH_PIN*>( candidates[0] )->GetTransformedPosition() :
candidates[0]->GetPosition(); candidates[0]->GetPosition();
auto p1 = ( candidates[1]->Type() == SCH_PIN_T ) ? auto p1 = ( second_item->Type() == SCH_PIN_T ) ?
static_cast<SCH_PIN*>( candidates[1] )->GetTransformedPosition() : static_cast<SCH_PIN*>( second_item )->GetTransformedPosition() :
candidates[1]->GetPosition(); second_item->GetPosition();
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetTimeStamp( GetNewTimeStamp() ); marker->SetTimeStamp( GetNewTimeStamp() );