From 2baca1d65070430b696778fec7ec8c2419c6eb54 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Mon, 23 Apr 2018 12:01:15 -0700 Subject: [PATCH] Standardize colons and units in spice sim settings dialog --- eeschema/dialogs/dialog_sim_settings_base.cpp | 100 +- eeschema/dialogs/dialog_sim_settings_base.fbp | 1054 ++++++++++++++++- eeschema/dialogs/dialog_sim_settings_base.h | 13 +- 3 files changed, 1088 insertions(+), 79 deletions(-) diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index fdf45ab7d0..6b76231da7 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.cpp +++ b/eeschema/dialogs/dialog_sim_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,31 +38,42 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText1 = new wxStaticText( m_pgAC, wxID_ANY, _("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1 = new wxStaticText( m_pgAC, wxID_ANY, _("Number of points:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_acPointsNumber = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_acPointsNumber, 0, wxALL|wxEXPAND, 5 ); - m_staticText2 = new wxStaticText( m_pgAC, wxID_ANY, _("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_staticText2 = new wxStaticText( m_pgAC, wxID_ANY, _("Start frequency:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_acFreqStart = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_acFreqStart, 0, wxALL|wxEXPAND, 5 ); - m_staticText3 = new wxStaticText( m_pgAC, wxID_ANY, _("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText19 = new wxStaticText( m_pgAC, wxID_ANY, _("Hertz"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText19->Wrap( -1 ); + fgSizer1->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText3 = new wxStaticText( m_pgAC, wxID_ANY, _("Stop frequency:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_acFreqStop = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_acFreqStop, 0, wxALL|wxEXPAND, 5 ); + m_staticText110 = new wxStaticText( m_pgAC, wxID_ANY, _("Hertz"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText110->Wrap( -1 ); + fgSizer1->Add( m_staticText110, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -73,50 +84,66 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgAC->SetSizer( bSizer3 ); m_pgAC->Layout(); bSizer3->Fit( m_pgAC ); - m_simPages->AddPage( m_pgAC, _("AC"), true ); + m_simPages->AddPage( m_pgAC, _("AC"), false ); m_pgDC = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer21; - sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 1") ), wxVERTICAL ); + sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 1:") ), wxVERTICAL ); m_dcEnable1 = new wxCheckBox( sbSizer21->GetStaticBox(), wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dcEnable1->SetValue(true); sbSizer21->Add( m_dcEnable1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); wxFlexGridSizer* fgSizer21; - fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer21 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer21->SetFlexibleDirection( wxBOTH ); fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText41 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText41 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("DC source:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText41->Wrap( -1 ); fgSizer21->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcSource1 = new wxComboBox( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer21->Add( m_dcSource1, 0, wxALL, 5 ); - m_staticText51 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgSizer21->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_staticText51 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Starting voltage:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText51->Wrap( -1 ); fgSizer21->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStart1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer21->Add( m_dcStart1, 0, wxALL, 5 ); - m_staticText61 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText511 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText511->Wrap( -1 ); + fgSizer21->Add( m_staticText511, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText61 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Final voltage:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText61->Wrap( -1 ); fgSizer21->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStop1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer21->Add( m_dcStop1, 0, wxALL, 5 ); - m_staticText71 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText512 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText512->Wrap( -1 ); + fgSizer21->Add( m_staticText512, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText71 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Increment step:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText71->Wrap( -1 ); fgSizer21->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcIncr1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer21->Add( m_dcIncr1, 0, wxALL, 5 ); + m_staticText513 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText513->Wrap( -1 ); + fgSizer21->Add( m_staticText513, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + sbSizer21->Add( fgSizer21, 1, wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -124,44 +151,59 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer4->Add( sbSizer21, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 2") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, _("DC sweep source 2:") ), wxVERTICAL ); m_dcEnable2 = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer2->Add( m_dcEnable2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer2 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText4 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("DC source"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("DC source:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer2->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcSource2 = new wxComboBox( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer2->Add( m_dcSource2, 0, wxALL, 5 ); - m_staticText5 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_staticText5 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Starting voltage:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); fgSizer2->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStart2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_dcStart2, 0, wxALL, 5 ); - m_staticText6 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText52 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText52->Wrap( -1 ); + fgSizer2->Add( m_staticText52, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText6 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Final voltage:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); fgSizer2->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcStop2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_dcStop2, 0, wxALL, 5 ); - m_staticText7 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText53 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText53->Wrap( -1 ); + fgSizer2->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText7 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Increment step:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); fgSizer2->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_dcIncr2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_dcIncr2, 0, wxALL, 5 ); + m_staticText54 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Volts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText54->Wrap( -1 ); + fgSizer2->Add( m_staticText54, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + sbSizer2->Add( fgSizer2, 1, wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -172,7 +214,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgDC->SetSizer( bSizer4 ); m_pgDC->Layout(); bSizer4->Fit( m_pgDC ); - m_simPages->AddPage( m_pgDC, _("DC Transfer"), false ); + m_simPages->AddPage( m_pgDC, _("DC Transfer"), true ); m_pgDistortion = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgDistortion->Hide(); @@ -315,37 +357,49 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer81->Add( 0, 0, 1, wxEXPAND, 5 ); wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer6 = new wxFlexGridSizer( 0, 4, 0, 0 ); fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText151 = new wxStaticText( m_pgTransient, wxID_ANY, _("Time step [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText151 = new wxStaticText( m_pgTransient, wxID_ANY, _("Time step:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText151->Wrap( -1 ); fgSizer6->Add( m_staticText151, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_transStep = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_transStep, 0, wxALL, 5 ); + m_staticText1511 = new wxStaticText( m_pgTransient, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1511->Wrap( -1 ); + fgSizer6->Add( m_staticText1511, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + fgSizer6->Add( 0, 0, 0, wxEXPAND, 5 ); - m_staticText161 = new wxStaticText( m_pgTransient, wxID_ANY, _("Final time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText161 = new wxStaticText( m_pgTransient, wxID_ANY, _("Final time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText161->Wrap( -1 ); fgSizer6->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_transFinal = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_transFinal, 0, wxALL, 5 ); + m_staticText1512 = new wxStaticText( m_pgTransient, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1512->Wrap( -1 ); + fgSizer6->Add( m_staticText1512, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + fgSizer6->Add( 0, 0, 0, wxEXPAND, 5 ); - m_staticText17 = new wxStaticText( m_pgTransient, wxID_ANY, _("Initial time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText17 = new wxStaticText( m_pgTransient, wxID_ANY, _("Initial time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); fgSizer6->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_transInitial = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_transInitial, 0, wxALL, 5 ); + m_staticText1513 = new wxStaticText( m_pgTransient, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1513->Wrap( -1 ); + fgSizer6->Add( m_staticText1513, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 ); + m_staticText24 = new wxStaticText( m_pgTransient, wxID_ANY, _("(optional; default 0)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); fgSizer6->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 18d12db179..1090bcc05a 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -14,6 +14,7 @@ dialog_sim_settings_base 1000 none + 1 DIALOG_SIM_SETTINGS_BASE @@ -97,7 +98,7 @@ 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -175,11 +176,11 @@ - + AC - 1 - + 0 + 1 1 1 @@ -253,16 +254,16 @@ - + bSizer3 wxVERTICAL none - + 5 wxEXPAND 1 - + 0 protected 0 @@ -358,22 +359,22 @@ - + 5 wxEXPAND 1 - + 0 protected 0 - + 5 wxALIGN_CENTER_HORIZONTAL 0 - - 2 + + 3 wxBOTH @@ -416,7 +417,7 @@ 0 0 wxID_ANY - Number of points + Number of points: 0 @@ -558,6 +559,16 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -590,7 +601,7 @@ 0 0 wxID_ANY - Start frequency [Hz] + Start frequency: 0 @@ -732,6 +743,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Hertz + + 0 + + + 0 + + 1 + m_staticText19 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -764,7 +858,7 @@ 0 0 wxID_ANY - Stop frequency [Hz] + Stop frequency: 0 @@ -906,13 +1000,96 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Hertz + + 0 + + + 0 + + 1 + m_staticText110 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxEXPAND 1 - + 0 protected 0 @@ -921,11 +1098,11 @@ - + DC Transfer - 0 - + 1 + 1 1 1 @@ -999,18 +1176,18 @@ - + bSizer4 wxVERTICAL none - + 5 wxEXPAND 0 - + wxID_ANY - DC sweep source 1 + DC sweep source 1: sbSizer21 wxVERTICAL @@ -1035,7 +1212,7 @@ 1 0 - 0 + 1 1 1 @@ -1110,7 +1287,7 @@ wxALIGN_CENTER_HORIZONTAL 1 - 2 + 3 wxBOTH @@ -1153,7 +1330,7 @@ 0 0 wxID_ANY - DC source + DC source: 0 @@ -1297,6 +1474,16 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1329,7 +1516,7 @@ 0 0 wxID_ANY - Starting voltage [V] + Starting voltage: 0 @@ -1471,6 +1658,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText511 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1503,7 +1773,7 @@ 0 0 wxID_ANY - Final voltage [V] + Final voltage: 0 @@ -1645,6 +1915,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText512 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1677,7 +2030,7 @@ 0 0 wxID_ANY - Increment step [V] + Increment step: 0 @@ -1819,17 +2172,100 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText513 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxEXPAND 0 - + wxID_ANY - DC sweep source 2 + DC sweep source 2: sbSizer2 wxVERTICAL @@ -1929,7 +2365,7 @@ wxALIGN_CENTER_HORIZONTAL 1 - 2 + 3 wxBOTH @@ -1972,7 +2408,7 @@ 0 0 wxID_ANY - DC source + DC source: 0 @@ -2116,6 +2552,16 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -2148,7 +2594,7 @@ 0 0 wxID_ANY - Starting voltage [V] + Starting voltage: 0 @@ -2290,6 +2736,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText52 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -2322,7 +2851,7 @@ 0 0 wxID_ANY - Final voltage [V] + Final voltage: 0 @@ -2464,6 +2993,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText53 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -2496,7 +3108,7 @@ 0 0 wxID_ANY - Increment step [V] + Increment step: 0 @@ -2638,6 +3250,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Volts + + 0 + + + 0 + + 1 + m_staticText54 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2725,11 +3420,11 @@ - + Noise 0 - + 1 1 1 @@ -2803,7 +3498,7 @@ - + bSizer15 wxVERTICAL @@ -2818,11 +3513,11 @@ 0 - + 5 wxALIGN_CENTER_HORIZONTAL 0 - + 3 wxBOTH @@ -4559,11 +5254,11 @@ - + Transient 0 - + 1 1 1 @@ -4637,7 +5332,7 @@ - + bSizer81 wxVERTICAL @@ -4652,12 +5347,12 @@ 0 - + 5 wxALL|wxALIGN_CENTER_HORIZONTAL 0 - - 3 + + 4 wxBOTH @@ -4700,7 +5395,7 @@ 0 0 wxID_ANY - Time step [s] + Time step: 0 @@ -4842,6 +5537,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + seconds + + 0 + + + 0 + + 1 + m_staticText1511 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND @@ -4884,7 +5662,7 @@ 0 0 wxID_ANY - Final time [s] + Final time: 0 @@ -5026,6 +5804,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + seconds + + 0 + + + 0 + + 1 + m_staticText1512 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND @@ -5068,7 +5929,7 @@ 0 0 wxID_ANY - Initial time [s] + Initial time: 0 @@ -5210,6 +6071,89 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + seconds + + 0 + + + 0 + + 1 + m_staticText1513 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5308,11 +6252,11 @@ - + Custom 0 - + 1 1 1 @@ -5386,7 +6330,7 @@ - + bSizer2 wxVERTICAL diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h index 9da247dfdd..5fe04e5942 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.h +++ b/eeschema/dialogs/dialog_sim_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,27 +51,35 @@ class DIALOG_SIM_SETTINGS_BASE : public DIALOG_SHIM wxTextCtrl* m_acPointsNumber; wxStaticText* m_staticText2; wxTextCtrl* m_acFreqStart; + wxStaticText* m_staticText19; wxStaticText* m_staticText3; wxTextCtrl* m_acFreqStop; + wxStaticText* m_staticText110; wxPanel* m_pgDC; wxCheckBox* m_dcEnable1; wxStaticText* m_staticText41; wxComboBox* m_dcSource1; wxStaticText* m_staticText51; wxTextCtrl* m_dcStart1; + wxStaticText* m_staticText511; wxStaticText* m_staticText61; wxTextCtrl* m_dcStop1; + wxStaticText* m_staticText512; wxStaticText* m_staticText71; wxTextCtrl* m_dcIncr1; + wxStaticText* m_staticText513; wxCheckBox* m_dcEnable2; wxStaticText* m_staticText4; wxComboBox* m_dcSource2; wxStaticText* m_staticText5; wxTextCtrl* m_dcStart2; + wxStaticText* m_staticText52; wxStaticText* m_staticText6; wxTextCtrl* m_dcStop2; + wxStaticText* m_staticText53; wxStaticText* m_staticText7; wxTextCtrl* m_dcIncr2; + wxStaticText* m_staticText54; wxPanel* m_pgDistortion; wxPanel* m_pgNoise; wxStaticText* m_staticText14; @@ -96,10 +104,13 @@ class DIALOG_SIM_SETTINGS_BASE : public DIALOG_SHIM wxPanel* m_pgTransient; wxStaticText* m_staticText151; wxTextCtrl* m_transStep; + wxStaticText* m_staticText1511; wxStaticText* m_staticText161; wxTextCtrl* m_transFinal; + wxStaticText* m_staticText1512; wxStaticText* m_staticText17; wxTextCtrl* m_transInitial; + wxStaticText* m_staticText1513; wxStaticText* m_staticText24; wxPanel* m_pgCustom; wxStaticText* m_staticText18;