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

Use KIUI to specify the simulation plot axis fonts. 

Also fixes a bug in generating the x-axis for the first trace.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14997
This commit is contained in:
Jeff Young 2023-06-19 22:52:13 +01:00
parent 840e4b6f72
commit 0b58fdb910
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/sim/sim_plot_panel.cpp
View File

@ -181,8 +181,8 @@ public:
{ {
if( !m_rangeSet ) if( !m_rangeSet )
{ {
m_minV = 0; m_minV = minV;
m_maxV = 0; m_maxV = maxV;
m_rangeSet = true; m_rangeSet = true;
} }
else else
@ -575,8 +575,21 @@ void SIM_PLOT_PANEL::updateAxes( int aNewTraceType )
// suppress warnings // suppress warnings
break; break;
} }
if( m_axis_x )
m_axis_x->SetFont( KIUI::GetStatusFont( m_plotWin ) );
if( m_axis_y1 )
m_axis_y1->SetFont( KIUI::GetStatusFont( m_plotWin ) );
if( m_axis_y2 )
m_axis_y2->SetFont( KIUI::GetStatusFont( m_plotWin ) );
if( m_axis_y3 )
m_axis_y3->SetFont( KIUI::GetStatusFont( m_plotWin ) );
} }
void SIM_PLOT_PANEL::prepareDCAxes( int aNewTraceType ) void SIM_PLOT_PANEL::prepareDCAxes( int aNewTraceType )
{ {
wxString sim_cmd = GetSimCommand().Lower(); wxString sim_cmd = GetSimCommand().Lower();

4
include/widgets/mathplot.h
View File

@ -278,12 +278,12 @@ public:
/** Set layer font /** Set layer font
* @param font Font, will be copied to internal class member * @param font Font, will be copied to internal class member
*/ */
void SetFont( wxFont& font ) { m_font = font; } void SetFont( const wxFont& font ) { m_font = font; }
/** Set layer pen /** Set layer pen
* @param pen Pen, will be copied to internal class member * @param pen Pen, will be copied to internal class member
*/ */
void SetPen( wxPen pen ) { m_pen = pen; } void SetPen( const wxPen& pen ) { m_pen = pen; }
/** Set Draw mode: inside or outside margins. Default is outside, which allows the layer to draw up to the mpWindow border. /** Set Draw mode: inside or outside margins. Default is outside, which allows the layer to draw up to the mpWindow border.
* @param drawModeOutside The draw mode to be set */ * @param drawModeOutside The draw mode to be set */