Improve default margins.
This commit is contained in:
parent
b401c214f5
commit
ddbefe13cd
|
@ -840,7 +840,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i
|
||||||
m_marginTopLabel->Wrap( -1 );
|
m_marginTopLabel->Wrap( -1 );
|
||||||
fgSizerTopBottom->Add( m_marginTopLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
|
fgSizerTopBottom->Add( m_marginTopLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
|
||||||
|
|
||||||
m_marginTop = new wxTextCtrl( m_panelPlotSetup, wxID_ANY, _("35"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_marginTop = new wxTextCtrl( m_panelPlotSetup, wxID_ANY, _("30"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_marginTop->SetMinSize( wxSize( 60,-1 ) );
|
m_marginTop->SetMinSize( wxSize( 60,-1 ) );
|
||||||
|
|
||||||
fgSizerTopBottom->Add( m_marginTop, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
fgSizerTopBottom->Add( m_marginTop, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
|
@ -849,7 +849,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i
|
||||||
m_marginBottomLabel->Wrap( -1 );
|
m_marginBottomLabel->Wrap( -1 );
|
||||||
fgSizerTopBottom->Add( m_marginBottomLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
|
fgSizerTopBottom->Add( m_marginBottomLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
|
||||||
|
|
||||||
m_marginBottom = new wxTextCtrl( m_panelPlotSetup, wxID_ANY, _("35"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_marginBottom = new wxTextCtrl( m_panelPlotSetup, wxID_ANY, _("45"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_marginBottom->SetMinSize( wxSize( 60,-1 ) );
|
m_marginBottom->SetMinSize( wxSize( 60,-1 ) );
|
||||||
|
|
||||||
fgSizerTopBottom->Add( m_marginBottom, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
fgSizerTopBottom->Add( m_marginBottom, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
|
|
|
@ -9479,7 +9479,7 @@
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
<property name="validator_variable"></property>
|
<property name="validator_variable"></property>
|
||||||
<property name="value">35</property>
|
<property name="value">30</property>
|
||||||
<property name="window_extra_style"></property>
|
<property name="window_extra_style"></property>
|
||||||
<property name="window_name"></property>
|
<property name="window_name"></property>
|
||||||
<property name="window_style"></property>
|
<property name="window_style"></property>
|
||||||
|
@ -9604,7 +9604,7 @@
|
||||||
<property name="validator_style">wxFILTER_NONE</property>
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
<property name="validator_type">wxDefaultValidator</property>
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
<property name="validator_variable"></property>
|
<property name="validator_variable"></property>
|
||||||
<property name="value">35</property>
|
<property name="value">45</property>
|
||||||
<property name="window_extra_style"></property>
|
<property name="window_extra_style"></property>
|
||||||
<property name="window_name"></property>
|
<property name="window_name"></property>
|
||||||
<property name="window_style"></property>
|
<property name="window_style"></property>
|
||||||
|
|
|
@ -431,7 +431,7 @@ SIM_PLOT_TAB::SIM_PLOT_TAB( const wxString& aSimCommand, wxWindow* parent ) :
|
||||||
m_plotWin = new mpWindow( this, wxID_ANY );
|
m_plotWin = new mpWindow( this, wxID_ANY );
|
||||||
|
|
||||||
m_plotWin->LimitView( true );
|
m_plotWin->LimitView( true );
|
||||||
m_plotWin->SetMargins( 35, 70, 35, 70 );
|
m_plotWin->SetMargins( 30, 70, 45, 70 );
|
||||||
|
|
||||||
UpdatePlotColors();
|
UpdatePlotColors();
|
||||||
|
|
||||||
|
@ -643,7 +643,7 @@ void SIM_PLOT_TAB::updateAxes( int aNewTraceType )
|
||||||
|
|
||||||
if( ( aNewTraceType & SPT_POWER ) && !m_axis_y3 )
|
if( ( aNewTraceType & SPT_POWER ) && !m_axis_y3 )
|
||||||
{
|
{
|
||||||
m_plotWin->SetMargins( 35, 140, 35, 70 );
|
m_plotWin->SetMargins( 30, 140, 45, 70 );
|
||||||
|
|
||||||
m_axis_y3 = new LIN_SCALE<mpScaleY>( wxEmptyString, wxT( "W" ), mpALIGN_FAR_RIGHT );
|
m_axis_y3 = new LIN_SCALE<mpScaleY>( wxEmptyString, wxT( "W" ), mpALIGN_FAR_RIGHT );
|
||||||
m_axis_y3->SetNameAlign( mpALIGN_FAR_RIGHT );
|
m_axis_y3->SetNameAlign( mpALIGN_FAR_RIGHT );
|
||||||
|
@ -763,7 +763,7 @@ void SIM_PLOT_TAB::prepareDCAxes( int aNewTraceType )
|
||||||
|
|
||||||
if( ( aNewTraceType & SPT_POWER ) && !m_axis_y3 )
|
if( ( aNewTraceType & SPT_POWER ) && !m_axis_y3 )
|
||||||
{
|
{
|
||||||
m_plotWin->SetMargins( 35, 140, 35, 70 );
|
m_plotWin->SetMargins( 30, 140, 45, 70 );
|
||||||
|
|
||||||
m_axis_y3 = new LIN_SCALE<mpScaleY>( wxEmptyString, wxT( "W" ), mpALIGN_FAR_RIGHT );
|
m_axis_y3 = new LIN_SCALE<mpScaleY>( wxEmptyString, wxT( "W" ), mpALIGN_FAR_RIGHT );
|
||||||
m_axis_y3->SetNameAlign( mpALIGN_FAR_RIGHT );
|
m_axis_y3->SetNameAlign( mpALIGN_FAR_RIGHT );
|
||||||
|
|
Loading…
Reference in New Issue