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

sch_symbol: always require sheet path for text variable resolution

This commit is contained in:
Mike Williams 2023-05-06 14:22:14 -04:00
parent b0c5993f93
commit 5d116245c6
6 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/sch_field.cpp
View File

@ -178,8 +178,7 @@ wxString SCH_FIELD::GetShownText( const SCH_SHEET_PATH* aPath, bool aAllowExtraT
std::function<bool( wxString* )> symbolResolver =
[&]( wxString* token ) -> bool
{
return static_cast<SCH_SYMBOL*>( m_parent )->ResolveTextVar( token, aDepth + 1,
aPath );
return static_cast<SCH_SYMBOL*>( m_parent )->ResolveTextVar( aPath, token, aDepth + 1 );
};
std::function<bool( wxString* )> sheetResolver =

4
eeschema/sch_painter.cpp
View File

@ -2339,12 +2339,12 @@ static void orientSymbol( LIB_SYMBOL* symbol, int orientation )
}
wxString expandLibItemTextVars( const wxString& aSourceText, const SCH_SYMBOL* aSymbolContext )
wxString SCH_PAINTER::expandLibItemTextVars( const wxString& aSourceText, const SCH_SYMBOL* aSymbolContext )
{
std::function<bool( wxString* )> symbolResolver =
[&]( wxString* token ) -> bool
{
return aSymbolContext->ResolveTextVar( token, 0 );
return aSymbolContext->ResolveTextVar( &m_schematic->CurrentSheet(), token );
};
return ExpandTextVars( aSourceText, &symbolResolver );

2
eeschema/sch_painter.h
View File

@ -203,6 +203,8 @@ private:
void boxText( const wxString& aText, const VECTOR2D& aPosition,
const TEXT_ATTRIBUTES& aAttrs );
wxString expandLibItemTextVars( const wxString& aSourceText, const SCH_SYMBOL* aSymbolContext );
public:
static std::vector<KICAD_T> g_ScaledSelectionTypes;

34
eeschema/sch_symbol.cpp
View File

@ -1187,7 +1187,7 @@ void SCH_SYMBOL::GetContextualTextVars( wxArrayString* aVars ) const
}
bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PATH* aPath ) const
bool SCH_SYMBOL::ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, int aDepth ) const
{
static wxRegEx operatingPoint( wxT( "^"
"OP"
@ -1197,19 +1197,17 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
SCHEMATIC* schematic = Schematic();
// SCH_SYMOL object has no context outside a schematic.
if( !schematic )
// SCH_SYMBOL object has no context outside a schematic and the instance on a path.
if( !schematic || !aPath )
return false;
SCH_SHEET* sheet = aPath ? aPath->Last() : schematic->CurrentSheet().Last();
if( operatingPoint.Matches( *token ) )
{
wxString port( operatingPoint.GetMatch( *token, 1 ) );
wxString precisionStr( operatingPoint.GetMatch( *token, 3 ) );
wxString range( operatingPoint.GetMatch( *token, 4 ) );
wxString signal = GetRef( &schematic->CurrentSheet() ) + port;
wxString signal = GetRef( aPath ) + port;
int precision = 3;
if( !precisionStr.IsEmpty() )
@ -1223,7 +1221,7 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
range = wxS( "~A" );
}
*token = Schematic()->GetOperatingPoint( signal.Lower(), precision, range );
*token = schematic->GetOperatingPoint( signal.Lower(), precision, range );
return true;
}
@ -1239,7 +1237,7 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
if( token->IsSameAs( m_fields[ i ].GetCanonicalName().Upper() ) )
{
if( i == REFERENCE_FIELD )
*token = GetRef( &schematic->CurrentSheet(), true );
*token = GetRef( aPath, true );
else if( i == VALUE_FIELD )
*token = GetValueFieldText( true, aPath, false );
else if( i == FOOTPRINT_FIELD )
@ -1276,9 +1274,7 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
if( token->IsSameAs( wxT( "FOOTPRINT_LIBRARY" ) ) )
{
wxString footprint;
footprint = GetFootprintFieldText( true, aPath, false );
wxString footprint = GetFootprintFieldText( true, aPath, false );
wxArrayString parts = wxSplit( footprint, ':' );
@ -1287,9 +1283,7 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
}
else if( token->IsSameAs( wxT( "FOOTPRINT_NAME" ) ) )
{
wxString footprint;
footprint = GetFootprintFieldText( true, aPath, false );
wxString footprint = GetFootprintFieldText( true, aPath, false );
wxArrayString parts = wxSplit( footprint, ':' );
@ -1298,9 +1292,7 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
}
else if( token->IsSameAs( wxT( "UNIT" ) ) )
{
int unit;
unit = GetUnitSelection( &schematic->CurrentSheet() );
int unit = GetUnitSelection( aPath );
*token = LIB_SYMBOL::SubReference( unit );
return true;
@ -1344,12 +1336,8 @@ bool SCH_SYMBOL::ResolveTextVar( wxString* token, int aDepth, const SCH_SHEET_PA
}
// See if parent can resolve it (this will recurse to ancestors)
if( sheet )
{
if( sheet->ResolveTextVar( aPath, token, aDepth + 1 ) )
return true;
}
if( aPath->Last()->ResolveTextVar( aPath, token, aDepth + 1 ) )
return true;
return false;
}

3
eeschema/sch_symbol.h
View File

@ -330,8 +330,7 @@ public:
*
* @param aDepth a counter to limit recursion and circular references.
*/
bool ResolveTextVar( wxString* token, int aDepth = 0,
const SCH_SHEET_PATH* aPath = nullptr ) const;
bool ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, int aDepth = 0 ) const;
void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;

2
eeschema/schematic.cpp
View File

@ -334,7 +334,7 @@ bool SCHEMATIC::ResolveCrossReference( wxString* token, int aDepth ) const
{
SCH_SYMBOL* refSymbol = static_cast<SCH_SYMBOL*>( refItem );
if( refSymbol->ResolveTextVar( &remainder, aDepth + 1 ) )
if( refSymbol->ResolveTextVar( &sheetPath, &remainder, aDepth + 1 ) )
*token = remainder;
else
*token = refSymbol->GetRef( &sheetPath, true ) + wxS( ":" ) + remainder;