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

Use resolved fields when generating LIB_TREE info. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13737

(cherry picked from commit 2fb24347ad)
This commit is contained in:
Jeff Young 2023-03-03 17:22:29 +00:00
parent e487ca8bd8
commit bbdb5eb6e3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/generate_alias_info.cpp
View File

@ -158,7 +158,7 @@ protected:
wxString GetHtmlFieldRow( const LIB_FIELD& aField ) const wxString GetHtmlFieldRow( const LIB_FIELD& aField ) const
{ {
wxString name = aField.GetCanonicalName(); wxString name = aField.GetCanonicalName();
wxString text = aField.GetFullText( m_unit > 0 ? m_unit : 1 ); wxString text;
wxString fieldhtml = FieldFormat; wxString fieldhtml = FieldFormat;
fieldhtml.Replace( wxS( "__NAME__" ), EscapeHTML( name ) ); fieldhtml.Replace( wxS( "__NAME__" ), EscapeHTML( name ) );
@ -166,7 +166,7 @@ protected:
switch( aField.GetId() ) switch( aField.GetId() )
{ {
case DATASHEET_FIELD: case DATASHEET_FIELD:
text = m_symbol->GetDatasheetField().GetText(); text = m_symbol->GetDatasheetField().GetShownText( 0, false );
if( text.IsEmpty() || text == wxT( "~" ) ) if( text.IsEmpty() || text == wxT( "~" ) )
{ {
@ -191,7 +191,13 @@ protected:
// showing the value just repeats the name, so that's not much use... // showing the value just repeats the name, so that's not much use...
return wxEmptyString; return wxEmptyString;
case REFERENCE_FIELD:
text = aField.GetFullText( m_unit > 0 ? m_unit : 1 );
fieldhtml.Replace( wxS( "__VALUE__" ), EscapeHTML( text ) );
break;
default: default:
text = aField.GetShownText( 0, false );
fieldhtml.Replace( wxS( "__VALUE__" ), EscapeHTML( text ) ); fieldhtml.Replace( wxS( "__VALUE__" ), EscapeHTML( text ) );
} }