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

Implement cross-references for labels. 

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

(cherry picked from commit f9f0f6fe24)
This commit is contained in:
Jeff Young 2022-05-07 21:09:06 +01:00
parent 5b24003f6c
commit 8524042352
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/dialogs/dialog_text_and_label_properties.cpp
View File

@ -176,17 +176,22 @@ bool DIALOG_TEXT_AND_LABEL_PROPERTIES::TransferDataToWindow()
if( !wxDialog::TransferDataToWindow() ) if( !wxDialog::TransferDataToWindow() )
return false; return false;
SCHEMATIC& schematic = m_Parent->Schematic();
if( m_CurrentText->Type() == SCH_TEXT_T ) if( m_CurrentText->Type() == SCH_TEXT_T )
{ {
SCHEMATIC& schematic = m_Parent->Schematic();
// show text variable cross-references in a human-readable format // show text variable cross-references in a human-readable format
m_valueMultiLine->SetValue( schematic.ConvertKIIDsToRefs( m_CurrentText->GetText() ) ); m_valueMultiLine->SetValue( schematic.ConvertKIIDsToRefs( m_CurrentText->GetText() ) );
} }
else else
{ {
// show control characters in a human-readable format // show control characters in a human-readable format
m_activeTextEntry->SetValue( UnescapeString( m_CurrentText->GetText() ) ); wxString text = UnescapeString( m_CurrentText->GetText() );
// show text variable cross-references in a human-readable format
text = schematic.ConvertKIIDsToRefs( text );
m_activeTextEntry->SetValue( text );
} }
if( m_valueCombo->IsShown() ) if( m_valueCombo->IsShown() )
@ -315,7 +320,8 @@ bool DIALOG_TEXT_AND_LABEL_PROPERTIES::TransferDataFromWindow()
if( !m_textSize.Validate( 0.01, 1000.0, EDA_UNITS::MILLIMETRES ) ) if( !m_textSize.Validate( 0.01, 1000.0, EDA_UNITS::MILLIMETRES ) )
return false; return false;
wxString text; SCHEMATIC& schematic = m_Parent->Schematic();
wxString text;
/* save old text in undo list if not already in edit */ /* save old text in undo list if not already in edit */
if( m_CurrentText->GetEditFlags() == 0 ) if( m_CurrentText->GetEditFlags() == 0 )
@ -325,8 +331,7 @@ bool DIALOG_TEXT_AND_LABEL_PROPERTIES::TransferDataFromWindow()
if( m_CurrentText->Type() == SCH_TEXT_T ) if( m_CurrentText->Type() == SCH_TEXT_T )
{ {
// convert any text variable cross-references to their UUIDs text = m_valueMultiLine->GetValue();
text = m_Parent->Schematic().ConvertRefsToKIIDs( m_valueMultiLine->GetValue() );
} }
else else
{ {
@ -334,6 +339,9 @@ bool DIALOG_TEXT_AND_LABEL_PROPERTIES::TransferDataFromWindow()
text = EscapeString( m_activeTextEntry->GetValue(), CTX_NETNAME ); text = EscapeString( m_activeTextEntry->GetValue(), CTX_NETNAME );
} }
// convert any text variable cross-references to their UUIDs
text = schematic.ConvertRefsToKIIDs( text );
if( !text.IsEmpty() ) if( !text.IsEmpty() )
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__

23
eeschema/sch_text.cpp
View File

@ -619,21 +619,18 @@ wxString SCH_TEXT::GetShownText( int aDepth ) const
return true; return true;
} }
if( Type() == SCH_TEXT_T ) if( token->Contains( ':' ) )
{ {
if( token->Contains( ':' ) ) if( Schematic()->ResolveCrossReference( token, aDepth ) )
{ return true;
if( Schematic()->ResolveCrossReference( token, aDepth ) ) }
return true; else
} {
else SCHEMATIC* schematic = Schematic();
{ SCH_SHEET* sheet = schematic ? schematic->CurrentSheet().Last() : nullptr;
SCHEMATIC* schematic = Schematic();
SCH_SHEET* sheet = schematic ? schematic->CurrentSheet().Last() : nullptr;
if( sheet && sheet->ResolveTextVar( token, aDepth + 1 ) ) if( sheet && sheet->ResolveTextVar( token, aDepth + 1 ) )
return true; return true;
}
} }
return false; return false;