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

Show correct description and units for AC/SP measurements. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15429
This commit is contained in:
Jeff Young 2023-08-17 12:22:25 +01:00
parent bf0592ad53
commit 981089bbd3
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/sim/simulator_frame_ui.cpp
View File

@ -146,8 +146,18 @@ void SIGNALS_GRID_TRICKS::showPopupMenu( wxMenu& menu, wxGridEvent& aEvent )
menu.Append( MYID_MEASURE_AVG, _( "Measure Average" ) ); menu.Append( MYID_MEASURE_AVG, _( "Measure Average" ) );
menu.Append( MYID_MEASURE_RMS, _( "Measure RMS" ) ); menu.Append( MYID_MEASURE_RMS, _( "Measure RMS" ) );
menu.Append( MYID_MEASURE_PP, _( "Measure Peak-to-peak" ) ); menu.Append( MYID_MEASURE_PP, _( "Measure Peak-to-peak" ) );
if( panel->GetSimType() == ST_AC || panel->GetSimType() == ST_SP )
{
menu.Append( MYID_MEASURE_MIN_AT, _( "Measure Frequency of Min" ) );
menu.Append( MYID_MEASURE_MAX_AT, _( "Measure Frequency of Max" ) );
}
else
{
menu.Append( MYID_MEASURE_MIN_AT, _( "Measure Time of Min" ) ); menu.Append( MYID_MEASURE_MIN_AT, _( "Measure Time of Min" ) );
menu.Append( MYID_MEASURE_MAX_AT, _( "Measure Time of Max" ) ); menu.Append( MYID_MEASURE_MAX_AT, _( "Measure Time of Max" ) );
}
menu.Append( MYID_MEASURE_INTEGRAL, _( "Measure Integral" ) ); menu.Append( MYID_MEASURE_INTEGRAL, _( "Measure Integral" ) );
if( panel->GetSimType() == ST_TRAN ) if( panel->GetSimType() == ST_TRAN )
@ -1266,7 +1276,12 @@ void SIMULATOR_FRAME_UI::UpdateMeasurement( int aRow )
units = wxS( "V" ); units = wxS( "V" );
if( func.EndsWith( wxS( "_AT" ) ) ) if( func.EndsWith( wxS( "_AT" ) ) )
{
if( plotTab->GetSimType() == ST_AC || plotTab->GetSimType() == ST_SP )
units = wxS( "Hz" );
else
units = wxS( "s" ); units = wxS( "s" );
}
else if( func.StartsWith( wxS( "INTEG" ) ) ) else if( func.StartsWith( wxS( "INTEG" ) ) )
{ {
switch( plotTab->GetSimType() ) switch( plotTab->GetSimType() )