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

Handle power operating points. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15689
This commit is contained in:
Jeff Young 2023-09-19 17:37:20 +01:00
parent ff88ed76f0
commit 8672cdb3bd
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
eeschema/sim/simulator_frame_ui.cpp
View File

@ -1301,26 +1301,28 @@ void SIMULATOR_FRAME_UI::UpdateMeasurement( int aRow )
{ {
switch( plotTab->GetSimType() ) switch( plotTab->GetSimType() )
{ {
case SIM_TYPE::ST_TRAN: case ST_TRAN:
if ( signalType.StartsWith( 'P' ) ) if ( signalType.StartsWith( 'P' ) )
units = wxS( "J" ); units = wxS( "J" );
else else
units += wxS( ".s" ); units += wxS( ".s" );
break; break;
case SIM_TYPE::ST_AC:
case SIM_TYPE::ST_SP: case ST_AC:
case SIM_TYPE::ST_DISTO: case ST_SP:
case SIM_TYPE::ST_NOISE: case ST_DISTO:
case SIM_TYPE::ST_FFT: case ST_NOISE:
case SIM_TYPE::ST_SENS: // If there is a vector, it is frequency case ST_FFT:
case ST_SENS: // If there is a vector, it is frequency
units += wxS( "·Hz" ); units += wxS( "·Hz" );
break; break;
case SIM_TYPE::ST_DC: // Could be a lot of things : V, A, deg C, ohm, ...
case SIM_TYPE::ST_OP: // There is no vector for integration
case SIM_TYPE::ST_PZ: // There is no vector for integration
case SIM_TYPE::ST_TF: // There is no vector for integration
default:
case ST_DC: // Could be a lot of things : V, A, deg C, ohm, ...
case ST_OP: // There is no vector for integration
case ST_PZ: // There is no vector for integration
case ST_TF: // There is no vector for integration
default:
units += wxS( "·?" ); units += wxS( "·?" );
break; break;
} }
@ -2713,7 +2715,20 @@ void SIMULATOR_FRAME_UI::OnSimRefresh( bool aFinal )
const size_t tab = 25; //characters const size_t tab = 25; //characters
size_t padding = ( signal.length() < tab ) ? ( tab - signal.length() ) : 1; size_t padding = ( signal.length() < tab ) ? ( tab - signal.length() ) : 1;
value.Append( type == SPT_CURRENT ? wxS( "A" ) : wxS( "V" ) ); switch( type )
{
case SPT_VOLTAGE:
value.Append( wxS( "V" ) );
break;
case SPT_CURRENT:
value.Append( wxS( "A" ) );
break;
case SPT_POWER:
value.Append( wxS( "W" ) );
break;
}
msg.Printf( wxT( "%s%s\n" ), msg.Printf( wxT( "%s%s\n" ),
( signal + wxT( ":" ) ).Pad( padding, wxUniChar( ' ' ) ), ( signal + wxT( ":" ) ).Pad( padding, wxUniChar( ' ' ) ),

7
eeschema/sim/spice_circuit_model.cpp
View File

@ -34,6 +34,8 @@ SIM_TRACE_TYPE SPICE_CIRCUIT_MODEL::VectorToSignal( const std::string& aVector,
wxString& aSignal ) const wxString& aSignal ) const
{ {
static wxString BRANCH( wxS( "#branch" ) ); static wxString BRANCH( wxS( "#branch" ) );
static wxString POWER( wxS( ":power" ) );
// See ngspice manual chapt. 31.1 "Accessing internal device parameters" // See ngspice manual chapt. 31.1 "Accessing internal device parameters"
static wxRegEx internalDevParameter( wxS( "^@(\\w*[\\.\\w+]*)\\[(\\w*)\\]$" ), wxRE_ADVANCED ); static wxRegEx internalDevParameter( wxS( "^@(\\w*[\\.\\w+]*)\\[(\\w*)\\]$" ), wxRE_ADVANCED );
@ -46,6 +48,11 @@ SIM_TRACE_TYPE SPICE_CIRCUIT_MODEL::VectorToSignal( const std::string& aVector,
aSignal = wxT( "I(" ) + vector.Left( vector.Length() - BRANCH.Length() ) + wxT( ")" ); aSignal = wxT( "I(" ) + vector.Left( vector.Length() - BRANCH.Length() ) + wxT( ")" );
return SPT_CURRENT; return SPT_CURRENT;
} }
else if( vector.EndsWith( POWER ) )
{
aSignal = wxT( "P(" ) + vector.Left( vector.Length() - POWER.Length() ) + wxT( ")" );
return SPT_POWER;
}
else else
{ {
aSignal = wxT( "V(" ) + vector + wxT( ")" ); aSignal = wxT( "V(" ) + vector + wxT( ")" );