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

Manually cherry-pick some fixes back from master. 

Fixes https://gitlab.com/kicad/code/kicad/issues/14424
This commit is contained in:
Jeff Young 2023-03-26 10:59:31 +01:00
parent abb6404ab2
commit 7931f315b1
1 changed files with 13 additions and 6 deletions

19
eeschema/sim/ngspice_circuit_model.cpp
View File

@ -33,17 +33,24 @@
SIM_PLOT_TYPE NGSPICE_CIRCUIT_MODEL::VectorToSignal( const std::string& aVector, SIM_PLOT_TYPE NGSPICE_CIRCUIT_MODEL::VectorToSignal( const std::string& aVector,
wxString& aSignal ) const wxString& aSignal ) const
{ {
using namespace std; static wxString BRANCH( wxS( "#branch" ) );
// See ngspice manual chapt. 31.1 "Accessing internal device parameters" // See ngspice manual chapt. 31.1 "Accessing internal device parameters"
wxRegEx internalDevParameter( "^@(\\w*[\\.\\w+]*)\\[(\\w*)\\]$", wxRE_ADVANCED ); static wxRegEx internalDevParameter( wxS( "^@(\\w*[\\.\\w+]*)\\[(\\w*)\\]$" ), wxRE_ADVANCED );
wxString vector( aVector ); wxString vector( aVector );
if( !internalDevParameter.Matches( vector ) ) if( !internalDevParameter.Matches( vector ) )
{ {
// any text is a node name, which returns voltage if( vector.EndsWith( BRANCH ) )
aSignal = wxT( "V(" ) + aVector + wxT( ")" ); {
return SPT_VOLTAGE; aSignal = wxT( "I(" ) + vector.Left( vector.Length() - BRANCH.Length() ) + wxT( ")" );
return SPT_CURRENT;
}
else
{
aSignal = wxT( "V(" ) + vector + wxT( ")" );
return SPT_VOLTAGE;
}
} }
else else
{ {