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

Less repetition in pin numbers.

This commit is contained in:
Jeff Young 2022-10-28 12:21:40 +01:00
parent d1e2acd3d8
commit a42c60d493
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -893,21 +893,19 @@ template <typename T>
wxString DIALOG_SIM_MODEL<T>::getSymbolPinString( int symbolPinIndex ) const wxString DIALOG_SIM_MODEL<T>::getSymbolPinString( int symbolPinIndex ) const
{ {
LIB_PIN* pin = m_sortedSymbolPins.at( symbolPinIndex ); LIB_PIN* pin = m_sortedSymbolPins.at( symbolPinIndex );
wxString number; wxString pinNumber;
wxString name; wxString pinName;
if( pin ) if( pin )
{ {
number = pin->GetShownNumber(); pinNumber = pin->GetShownNumber();
name = pin->GetShownName(); pinName = pin->GetShownName();
} }
LOCALE_IO toggle; if( !pinName.IsEmpty() && pinName != pinNumber )
pinNumber += wxString::Format( wxT( " (%s)" ), pinName );
if( name == "" ) return pinNumber;
return wxString::Format( "%s", number );
else
return wxString::Format( "%s (%s)", number, name );
} }
@ -918,10 +916,12 @@ wxString DIALOG_SIM_MODEL<T>::getModelPinString( int aModelPinIndex ) const
LOCALE_IO toggle; LOCALE_IO toggle;
if( pinName == "" ) wxString pinNumber = wxString::Format( "%d", aModelPinIndex + 1 );
return wxString::Format( "%d", aModelPinIndex + 1, pinName );
else if( !pinName.IsEmpty() && pinName != pinNumber )
return wxString::Format( "%d (%s)", aModelPinIndex + 1, pinName ); pinNumber += wxString::Format( wxT( " (%s)" ), pinName );
return pinNumber;
} }