From 324d27711a1a991688d766363c622a009d9b004f Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 11 Aug 2016 14:41:52 +0200 Subject: [PATCH] Hide OP & noise analysis, scale settings for AC in settings dialog --- eeschema/dialogs/dialog_sim_settings_base.cpp | 8 +++++++- eeschema/dialogs/dialog_sim_settings_base.fbp | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index e0854e15cd..c33376441e 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.cpp +++ b/eeschema/dialogs/dialog_sim_settings_base.cpp @@ -27,7 +27,9 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID wxString m_acScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") }; int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString ); m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS ); - m_acScale->SetSelection( 0 ); + m_acScale->SetSelection( 2 ); + m_acScale->Hide(); + bSizer3->Add( m_acScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); @@ -174,6 +176,8 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_simPages->AddPage( m_pgDistortion, wxT("Distortion"), false ); m_pgNoise = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_pgNoise->Hide(); + wxBoxSizer* bSizer15; bSizer15 = new wxBoxSizer( wxVERTICAL ); @@ -269,6 +273,8 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer15->Fit( m_pgNoise ); m_simPages->AddPage( m_pgNoise, wxT("Noise"), false ); m_pgOP = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_pgOP->Hide(); + wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxVERTICAL ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 7318cc4666..00194907df 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -97,7 +97,7 @@ 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -299,7 +299,7 @@ 1 0 - 0 + 1 wxID_ANY Frequency scale 1 @@ -318,7 +318,7 @@ 1 Resizable - 0 + 2 1 wxRA_SPECIFY_COLS @@ -2751,7 +2751,7 @@ 1 0 - 0 + 1 wxID_ANY 0 @@ -4150,7 +4150,7 @@ 1 0 - 0 + 1 wxID_ANY 0