Separate LIB_PIN and SCH_PIN GetShownName/Number processing.

SCH_PIN wasn't handling the legacy empty string token (~), but
more importantly this will allow text variable resolution specific
to the schematic.

Fixes https://gitlab.com/kicad/code/kicad/issues/8625
This commit is contained in:
Jeff Young
2021-06-17 10:52:46 +01:00
parent b10f156dd0
commit 0484ca5564
8 changed files with 44 additions and 25 deletions
+4 -2
View File
@@ -584,7 +584,7 @@ int ERC_TESTER::TestMultUnitPinConflicts()
continue;
wxString name = pin->GetParentSymbol()->GetRef( &subgraph->m_sheet ) +
+ ":" + pin->GetNumber();
+ ":" + pin->GetShownNumber();
if( !pinToNetMap.count( name ) )
{
@@ -597,7 +597,9 @@ int ERC_TESTER::TestMultUnitPinConflicts()
ercItem->SetErrorMessage( wxString::Format(
_( "Pin %s is connected to both %s and %s" ),
pin->GetNumber(), netName, pinToNetMap[name].first ) );
pin->GetShownNumber(),
netName,
pinToNetMap[name].first ) );
ercItem->SetItems( pin, pinToNetMap[name].second );
ercItem->SetIsSheetSpecific();