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

Provide power axis for DC-sweep analyses. 

Fixes https://gitlab.com/kicad/code/kicad/issues/14087
This commit is contained in:
Jeff Young 2023-02-25 23:10:19 +00:00
parent 8c8c5e1824
commit 23c1a23faf
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/sim/sim_plot_panel.cpp
View File

@ -488,7 +488,7 @@ void SIM_PLOT_PANEL::updateAxes( SIM_TRACE_TYPE aNewTraceType )
break; break;
case ST_DC: case ST_DC:
prepareDCAxes(); prepareDCAxes( aNewTraceType );
break; break;
case ST_NOISE: case ST_NOISE:
@ -549,7 +549,7 @@ void SIM_PLOT_PANEL::updateAxes( SIM_TRACE_TYPE aNewTraceType )
} }
} }
void SIM_PLOT_PANEL::prepareDCAxes() void SIM_PLOT_PANEL::prepareDCAxes( SIM_TRACE_TYPE aNewTraceType )
{ {
wxString sim_cmd = GetSimCommand().Lower(); wxString sim_cmd = GetSimCommand().Lower();
wxString rem; wxString rem;
@ -634,6 +634,19 @@ void SIM_PLOT_PANEL::prepareDCAxes()
m_axis_y1->SetName( _( "Voltage (measured)" ) ); m_axis_y1->SetName( _( "Voltage (measured)" ) );
m_axis_y2->SetName( _( "Current" ) ); m_axis_y2->SetName( _( "Current" ) );
if( ( aNewTraceType & SPT_POWER ) && !m_axis_y3 )
{
m_plotWin->SetMargins( 35, 140, 35, 70 );
m_axis_y3 = new LIN_SCALE<mpScaleY>( wxEmptyString, wxT( "W" ), mpALIGN_FAR_RIGHT );
m_axis_y3->SetNameAlign( mpALIGN_FAR_RIGHT );
m_axis_y3->SetMasterScale( m_axis_y1 );
m_plotWin->AddLayer( m_axis_y3 );
}
if( m_axis_y3 )
m_axis_y3->SetName( _( "Power" ) );
} }
} }
@ -688,7 +701,7 @@ TRACE* SIM_PLOT_PANEL::AddTrace( const wxString& aTitle, const wxString& aName,
updateAxes( aType ); updateAxes( aType );
if( GetType() == ST_TRANSIENT ) if( GetType() == ST_TRANSIENT || GetType() == ST_DC )
{ {
bool hasVoltageTraces = false; bool hasVoltageTraces = false;

2
eeschema/sim/sim_plot_panel.h
View File

@ -309,7 +309,7 @@ public:
private: private:
///< @brief Construct the plot axes for DC simulation plot. ///< @brief Construct the plot axes for DC simulation plot.
void prepareDCAxes(); void prepareDCAxes( SIM_TRACE_TYPE aNewTraceType );
///> Create/Ensure axes are available for plotting ///> Create/Ensure axes are available for plotting
void updateAxes( SIM_TRACE_TYPE aNewTraceType = SIM_TRACE_TYPE::SPT_UNKNOWN ); void updateAxes( SIM_TRACE_TYPE aNewTraceType = SIM_TRACE_TYPE::SPT_UNKNOWN );