diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index 6b76231da7..53400ea2a3 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 Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,75 +12,75 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxVERTICAL ); - + m_simPages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_simPages->SetMinSize( wxSize( 650,-1 ) ); - + m_pgAC = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); - - + + bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxString m_acScaleChoices[] = { _("Decade"), _("Octave"), _("Linear") }; int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString ); m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, _("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS ); m_acScale->SetSelection( 0 ); m_acScale->Hide(); - + bSizer3->Add( m_acScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - + + bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxFlexGridSizer* fgSizer1; 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->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 ); - - + + 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_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 ); - - + + bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_pgAC->SetSizer( bSizer3 ); m_pgAC->Layout(); bSizer3->Fit( m_pgAC ); @@ -88,329 +88,329 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID 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 ); - + m_dcEnable1 = new wxCheckBox( sbSizer21->GetStaticBox(), wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 ); - m_dcEnable1->SetValue(true); + m_dcEnable1->SetValue(true); sbSizer21->Add( m_dcEnable1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - + wxFlexGridSizer* fgSizer21; 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->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 ); + + m_dcSource1 = new wxComboBox( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer21->Add( m_dcSource1, 0, wxALL, 5 ); - - + + 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_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_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 ); - - + + bSizer4->Add( sbSizer21, 0, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer2; 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, 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->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 ); + + m_dcSource2 = new wxComboBox( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer2->Add( m_dcSource2, 0, wxALL, 5 ); - - + + 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_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_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 ); - - + + bSizer4->Add( sbSizer2, 0, wxEXPAND, 5 ); - - + + m_pgDC->SetSizer( bSizer4 ); m_pgDC->Layout(); bSizer4->Fit( m_pgDC ); m_simPages->AddPage( m_pgDC, _("DC Transfer"), true ); m_pgDistortion = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgDistortion->Hide(); - + m_simPages->AddPage( m_pgDistortion, _("Distortion"), false ); m_pgNoise = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgNoise->Hide(); - + wxBoxSizer* bSizer15; bSizer15 = new wxBoxSizer( wxVERTICAL ); - - + + bSizer15->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxFlexGridSizer* fgSizer7; fgSizer7 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer7->SetFlexibleDirection( wxBOTH ); fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText14 = new wxStaticText( m_pgNoise, wxID_ANY, _("Measured node"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText14->Wrap( -1 ); fgSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_noiseMeas = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_noiseMeas = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer7->Add( m_noiseMeas, 0, wxALL, 5 ); - - + + fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticText15 = new wxStaticText( m_pgNoise, wxID_ANY, _("Reference node"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15->Wrap( -1 ); fgSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_noiseRef = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_noiseRef = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer7->Add( m_noiseRef, 0, wxALL, 5 ); - + m_staticText23 = new wxStaticText( m_pgNoise, wxID_ANY, _("(optional; default GND)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); fgSizer7->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText16 = new wxStaticText( m_pgNoise, wxID_ANY, _("Noise source"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); fgSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_noiseSrc = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_noiseSrc = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer7->Add( m_noiseSrc, 0, wxALL, 5 ); - - + + fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizer15->Add( fgSizer7, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizer15->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxString m_noiseScaleChoices[] = { _("Decade"), _("Octave"), _("Linear") }; int m_noiseScaleNChoices = sizeof( m_noiseScaleChoices ) / sizeof( wxString ); m_noiseScale = new wxRadioBox( m_pgNoise, wxID_ANY, _("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_noiseScaleNChoices, m_noiseScaleChoices, 1, wxRA_SPECIFY_COLS ); m_noiseScale->SetSelection( 0 ); bSizer15->Add( m_noiseScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - + + bSizer15->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxFlexGridSizer* fgSizer11; fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer11->SetFlexibleDirection( wxBOTH ); fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText11 = new wxStaticText( m_pgNoise, wxID_ANY, _("Number of points"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); fgSizer11->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_noisePointsNumber = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer11->Add( m_noisePointsNumber, 0, wxALL, 5 ); - + m_staticText21 = new wxStaticText( m_pgNoise, wxID_ANY, _("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_noiseFreqStart = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer11->Add( m_noiseFreqStart, 0, wxALL, 5 ); - + m_staticText31 = new wxStaticText( m_pgNoise, wxID_ANY, _("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); fgSizer11->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_noiseFreqStop = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer11->Add( m_noiseFreqStop, 0, wxALL, 5 ); - - + + bSizer15->Add( fgSizer11, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizer15->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_pgNoise->SetSizer( bSizer15 ); m_pgNoise->Layout(); bSizer15->Fit( m_pgNoise ); m_simPages->AddPage( m_pgNoise, _("Noise"), false ); m_pgOP = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgOP->Hide(); - + wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxVERTICAL ); - - + + bSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticText13 = new wxStaticText( m_pgOP, wxID_ANY, _("This tab has no settings"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); bSizer8->Add( m_staticText13, 0, wxALIGN_CENTER, 5 ); - - + + bSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_pgOP->SetSizer( bSizer8 ); m_pgOP->Layout(); bSizer8->Fit( m_pgOP ); m_simPages->AddPage( m_pgOP, _("Operating Point"), false ); m_pgPoleZero = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgPoleZero->Hide(); - + m_simPages->AddPage( m_pgPoleZero, _("Pole-Zero"), false ); m_pgSensitivity = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgSensitivity->Hide(); - + m_simPages->AddPage( m_pgSensitivity, _("Sensitivity"), false ); m_pgTransferFunction = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_pgTransferFunction->Hide(); - + m_simPages->AddPage( m_pgTransferFunction, _("Transfer Function"), false ); m_pgTransient = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer81; bSizer81 = new wxBoxSizer( wxVERTICAL ); - - + + bSizer81->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxFlexGridSizer* fgSizer6; 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:"), 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:"), 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:"), 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 ); - - + + bSizer81->Add( fgSizer6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - + + bSizer81->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_pgTransient->SetSizer( bSizer81 ); m_pgTransient->Layout(); bSizer81->Fit( m_pgTransient ); @@ -418,50 +418,50 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID m_pgCustom = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); - + m_staticText18 = new wxStaticText( m_pgCustom, wxID_ANY, _("Spice directives:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); bSizer2->Add( m_staticText18, 0, wxALL, 5 ); - + m_customTxt = new wxTextCtrl( m_pgCustom, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 ); - + m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, _("Load directives from schematic"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer2->Add( m_loadDirectives, 0, wxALL|wxEXPAND, 5 ); - - + + m_pgCustom->SetSizer( bSizer2 ); m_pgCustom->Layout(); bSizer2->Fit( m_pgCustom ); m_simPages->AddPage( m_pgCustom, _("Custom"), false ); - + bSizer1->Add( m_simPages, 1, wxEXPAND | wxALL, 5 ); - + m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, _("Adjust passive symbol values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( m_fixPassiveVals, 0, wxALL, 5 ); - + m_fixIncludePaths = new wxCheckBox( this, wxID_ANY, _("Add full path for .include library directives"), wxDefaultPosition, wxDefaultSize, 0 ); - m_fixIncludePaths->SetValue(true); + m_fixIncludePaths->SetValue(true); bSizer1->Add( m_fixIncludePaths, 0, wxALL, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - - bSizer1->Add( m_sdbSizer, 0, wxALL|wxEXPAND|wxALIGN_RIGHT, 5 ); - - + + bSizer1->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); + + this->SetSizer( bSizer1 ); this->Layout(); bSizer1->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_SIM_SETTINGS_BASE::onInitDlg ) ); m_loadDirectives->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SIM_SETTINGS_BASE::onLoadDirectives ), NULL, this ); @@ -472,5 +472,5 @@ DIALOG_SIM_SETTINGS_BASE::~DIALOG_SIM_SETTINGS_BASE() // Disconnect Events this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_SIM_SETTINGS_BASE::onInitDlg ) ); m_loadDirectives->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SIM_SETTINGS_BASE::onLoadDirectives ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 1090bcc05a..9fed4b67c5 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -53,42 +53,7 @@ - - - - - - - - - - - - - - - onInitDlg - - - - - - - - - - - - - - - - - - - - bSizer1 @@ -151,31 +116,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - AC @@ -231,29 +171,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer3 @@ -333,30 +250,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -418,6 +311,7 @@ 0 wxID_ANY Number of points: + 0 0 @@ -443,29 +337,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -530,33 +401,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -602,6 +446,7 @@ 0 wxID_ANY Start frequency: + 0 0 @@ -627,29 +472,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -714,33 +536,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -776,6 +571,7 @@ 0 wxID_ANY Hertz + 0 0 @@ -801,29 +597,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -859,6 +632,7 @@ 0 wxID_ANY Stop frequency: + 0 0 @@ -884,29 +658,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -971,33 +722,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1033,6 +757,7 @@ 0 wxID_ANY Hertz + 0 0 @@ -1058,29 +783,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1153,29 +855,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer4 @@ -1193,7 +872,6 @@ wxVERTICAL 1 none - 5 wxALIGN_CENTER_HORIZONTAL|wxALL @@ -1256,30 +934,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1331,6 +985,7 @@ 0 wxID_ANY DC source: + 0 0 @@ -1356,29 +1011,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1444,34 +1076,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1517,6 +1121,7 @@ 0 wxID_ANY Starting voltage: + 0 0 @@ -1542,29 +1147,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1629,33 +1211,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1691,6 +1246,7 @@ 0 wxID_ANY Volts + 0 0 @@ -1716,29 +1272,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1774,6 +1307,7 @@ 0 wxID_ANY Final voltage: + 0 0 @@ -1799,29 +1333,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1886,33 +1397,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1948,6 +1432,7 @@ 0 wxID_ANY Volts + 0 0 @@ -1973,29 +1458,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2031,6 +1493,7 @@ 0 wxID_ANY Increment step: + 0 0 @@ -2056,29 +1519,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2143,33 +1583,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2205,6 +1618,7 @@ 0 wxID_ANY Volts + 0 0 @@ -2230,29 +1644,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2271,7 +1662,6 @@ wxVERTICAL 1 none - 5 wxALIGN_CENTER_HORIZONTAL|wxALL @@ -2334,30 +1724,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2409,6 +1775,7 @@ 0 wxID_ANY DC source: + 0 0 @@ -2434,29 +1801,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2522,34 +1866,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2595,6 +1911,7 @@ 0 wxID_ANY Starting voltage: + 0 0 @@ -2620,29 +1937,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2707,33 +2001,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2769,6 +2036,7 @@ 0 wxID_ANY Volts + 0 0 @@ -2794,29 +2062,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2852,6 +2097,7 @@ 0 wxID_ANY Final voltage: + 0 0 @@ -2877,29 +2123,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2964,33 +2187,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3026,6 +2222,7 @@ 0 wxID_ANY Volts + 0 0 @@ -3051,29 +2248,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3109,6 +2283,7 @@ 0 wxID_ANY Increment step: + 0 0 @@ -3134,29 +2309,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3221,33 +2373,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3283,6 +2408,7 @@ 0 wxID_ANY Volts + 0 0 @@ -3308,29 +2434,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3395,29 +2498,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -3475,29 +2555,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer15 @@ -3562,6 +2619,7 @@ 0 wxID_ANY Measured node + 0 0 @@ -3587,29 +2645,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3675,34 +2710,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3748,6 +2755,7 @@ 0 wxID_ANY Reference node + 0 0 @@ -3773,29 +2781,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3861,34 +2846,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3924,6 +2881,7 @@ 0 wxID_ANY (optional; default GND) + 0 0 @@ -3949,29 +2907,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4007,6 +2942,7 @@ 0 wxID_ANY Noise source + 0 0 @@ -4032,29 +2968,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4120,34 +3033,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4236,30 +3121,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -4321,6 +3182,7 @@ 0 wxID_ANY Number of points + 0 0 @@ -4346,29 +3208,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4433,33 +3272,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4495,6 +3307,7 @@ 0 wxID_ANY Start frequency [Hz] + 0 0 @@ -4520,29 +3333,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4607,33 +3397,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4669,6 +3432,7 @@ 0 wxID_ANY Stop frequency [Hz] + 0 0 @@ -4694,29 +3458,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4781,33 +3522,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4880,29 +3594,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer8 @@ -4951,6 +3642,7 @@ 0 wxID_ANY This tab has no settings + 0 0 @@ -4976,29 +3668,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5069,29 +3738,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -5149,29 +3795,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -5229,29 +3852,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -5309,29 +3909,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer81 @@ -5396,6 +3973,7 @@ 0 wxID_ANY Time step: + 0 0 @@ -5421,29 +3999,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5508,33 +4063,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5570,6 +4098,7 @@ 0 wxID_ANY seconds + 0 0 @@ -5595,29 +4124,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5663,6 +4169,7 @@ 0 wxID_ANY Final time: + 0 0 @@ -5688,29 +4195,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5775,33 +4259,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5837,6 +4294,7 @@ 0 wxID_ANY seconds + 0 0 @@ -5862,29 +4320,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5930,6 +4365,7 @@ 0 wxID_ANY Initial time: + 0 0 @@ -5955,29 +4391,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6042,33 +4455,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6104,6 +4490,7 @@ 0 wxID_ANY seconds + 0 0 @@ -6129,29 +4516,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6187,6 +4551,7 @@ 0 wxID_ANY (optional; default 0) + 0 0 @@ -6212,29 +4577,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6307,29 +4649,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer2 @@ -6368,6 +4687,7 @@ 0 wxID_ANY Spice directives: + 0 0 @@ -6393,29 +4713,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6480,33 +4777,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6524,25 +4794,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Load directives from schematic + + 0 0 @@ -6557,6 +4833,8 @@ protected 1 + + Resizable 1 @@ -6572,29 +4850,6 @@ onLoadDirectives - - - - - - - - - - - - - - - - - - - - - - - @@ -6664,30 +4919,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -6752,35 +4983,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND|wxALIGN_RIGHT + wxALIGN_RIGHT|wxALL 0 0 @@ -6794,14 +5001,6 @@ m_sdbSizer protected - - - - - - - - diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h index 5fe04e5942..5c4e47b0e8 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.h +++ b/eeschema/dialogs/dialog_sim_settings_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_SIM_SETTINGS_BASE_H__ -#define __DIALOG_SIM_SETTINGS_BASE_H__ +#pragma once #include #include @@ -42,7 +41,7 @@ class DIALOG_SIM_SETTINGS_BASE : public DIALOG_SHIM { private: - + protected: wxNotebook* m_simPages; wxPanel* m_pgAC; @@ -121,17 +120,16 @@ class DIALOG_SIM_SETTINGS_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - + // Virtual event handlers, overide them in your derived class virtual void onInitDlg( wxInitDialogEvent& event ) { event.Skip(); } virtual void onLoadDirectives( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SIM_SETTINGS_BASE(); - + }; -#endif //__DIALOG_SIM_SETTINGS_BASE_H__ diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp index 453e4b498e..6a63ea4da7 100644 --- a/eeschema/sim/sim_plot_frame_base.cpp +++ b/eeschema/sim/sim_plot_frame_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "sim_plot_frame_base.h" @@ -12,280 +12,280 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : KIWAY_PLAYER( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxSize( 200,200 ), wxDefaultSize ); - + m_mainMenu = new wxMenuBar( 0 ); m_fileMenu = new wxMenu(); wxMenuItem* m_newPlot; m_newPlot = new wxMenuItem( m_fileMenu, wxID_NEW, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_newPlot ); - + m_fileMenu->AppendSeparator(); - + wxMenuItem* m_openWorkbook; m_openWorkbook = new wxMenuItem( m_fileMenu, wxID_OPEN, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_openWorkbook ); - + wxMenuItem* m_saveWorkbook; m_saveWorkbook = new wxMenuItem( m_fileMenu, wxID_SAVE, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_saveWorkbook ); - + m_fileMenu->AppendSeparator(); - + wxMenuItem* m_saveImage; m_saveImage = new wxMenuItem( m_fileMenu, wxID_ANY, wxString( _("Save as image") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_saveImage ); - + wxMenuItem* m_saveCsv; m_saveCsv = new wxMenuItem( m_fileMenu, wxID_ANY, wxString( _("Save as .csv file") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_saveCsv ); - + m_fileMenu->AppendSeparator(); - + wxMenuItem* m_exitSim; m_exitSim = new wxMenuItem( m_fileMenu, wxID_CLOSE, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL ); m_fileMenu->Append( m_exitSim ); - - m_mainMenu->Append( m_fileMenu, _("File") ); - + + m_mainMenu->Append( m_fileMenu, _("File") ); + m_simulationMenu = new wxMenu(); m_runSimulation = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Run Simulation") ) , wxEmptyString, wxITEM_NORMAL ); m_simulationMenu->Append( m_runSimulation ); - + m_simulationMenu->AppendSeparator(); - + m_addSignals = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Add signals...") ) , wxEmptyString, wxITEM_NORMAL ); m_simulationMenu->Append( m_addSignals ); - + m_probeSignals = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Probe from schematics") ) , wxEmptyString, wxITEM_NORMAL ); m_simulationMenu->Append( m_probeSignals ); - + m_tuneValue = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Tune component value") ) , wxEmptyString, wxITEM_NORMAL ); m_simulationMenu->Append( m_tuneValue ); - + m_showNetlist = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Show SPICE Netlist...") ) , _("Shows current simulation's netlist. Useful for debugging SPICE errors."), wxITEM_NORMAL ); m_simulationMenu->Append( m_showNetlist ); - + m_simulationMenu->AppendSeparator(); - + m_settings = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Settings...") ) , wxEmptyString, wxITEM_NORMAL ); m_simulationMenu->Append( m_settings ); - - m_mainMenu->Append( m_simulationMenu, _("Simulation") ); - + + m_mainMenu->Append( m_simulationMenu, _("Simulation") ); + m_viewMenu = new wxMenu(); wxMenuItem* m_zoomIn; m_zoomIn = new wxMenuItem( m_viewMenu, wxID_ZOOM_IN, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL ); m_viewMenu->Append( m_zoomIn ); - + wxMenuItem* m_zoomOut; m_zoomOut = new wxMenuItem( m_viewMenu, wxID_ZOOM_OUT, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL ); m_viewMenu->Append( m_zoomOut ); - + wxMenuItem* m_zoomFit; m_zoomFit = new wxMenuItem( m_viewMenu, wxID_ZOOM_FIT, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL ); m_viewMenu->Append( m_zoomFit ); - + m_viewMenu->AppendSeparator(); - + wxMenuItem* m_showGrid; m_showGrid = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &grid") ) , wxEmptyString, wxITEM_CHECK ); m_viewMenu->Append( m_showGrid ); - + wxMenuItem* m_showLegend; m_showLegend = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &legend") ) , wxEmptyString, wxITEM_CHECK ); m_viewMenu->Append( m_showLegend ); - - m_mainMenu->Append( m_viewMenu, _("View") ); - + + m_mainMenu->Append( m_viewMenu, _("View") ); + this->SetMenuBar( m_mainMenu ); - + m_sizerMain = new wxBoxSizer( wxVERTICAL ); - - m_toolBar = new wxToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT ); - m_toolBar->Realize(); - + + m_toolBar = new wxToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT ); + m_toolBar->Realize(); + m_sizerMain->Add( m_toolBar, 0, wxEXPAND, 5 ); - + m_splitterLeftRight = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); m_splitterLeftRight->SetSashGravity( 0.7 ); m_splitterLeftRight->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterLeftRightOnIdle ), NULL, this ); m_splitterLeftRight->SetMinimumPaneSize( 50 ); - + m_panelLeft = new wxPanel( m_splitterLeftRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelLeft->SetMinSize( wxSize( 300,-1 ) ); - + m_sizer11 = new wxBoxSizer( wxVERTICAL ); - + m_splitterPlotAndConsole = new wxSplitterWindow( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); m_splitterPlotAndConsole->SetSashGravity( 0.8 ); m_splitterPlotAndConsole->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotAndConsoleOnIdle ), NULL, this ); m_splitterPlotAndConsole->SetMinimumPaneSize( 50 ); - + m_plotPanel = new wxPanel( m_splitterPlotAndConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_plotPanel->SetMinSize( wxSize( -1,200 ) ); - + m_sizerPlot = new wxBoxSizer( wxHORIZONTAL ); - + m_plotNotebook = new wxAuiNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_CLOSE_ON_ALL_TABS|wxAUI_NB_MIDDLE_CLICK_CLOSE|wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TOP ); m_welcomePanel = new wxPanel( m_plotNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_sizer8 = new wxBoxSizer( wxVERTICAL ); - - + + m_sizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer81; bSizer81 = new wxBoxSizer( wxHORIZONTAL ); - - + + bSizer81->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticText2 = new wxStaticText( m_welcomePanel, wxID_ANY, _("Start the simulation by clicking the Run Simulation button"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_staticText2->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); - - bSizer81->Add( m_staticText2, 0, wxALIGN_RIGHT|wxALL|wxEXPAND, 5 ); - - + + bSizer81->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 ); + + bSizer81->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_sizer8->Add( bSizer81, 0, wxEXPAND, 5 ); - - + + m_sizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + m_welcomePanel->SetSizer( m_sizer8 ); m_welcomePanel->Layout(); m_sizer8->Fit( m_welcomePanel ); m_plotNotebook->AddPage( m_welcomePanel, _("a page"), false, wxNullBitmap ); - + m_sizerPlot->Add( m_plotNotebook, 1, wxEXPAND | wxALL, 5 ); - - + + m_plotPanel->SetSizer( m_sizerPlot ); m_plotPanel->Layout(); m_sizerPlot->Fit( m_plotPanel ); m_panelConsole = new wxPanel( m_splitterPlotAndConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelConsole->SetMinSize( wxSize( -1,100 ) ); - + m_sizerConsole = new wxBoxSizer( wxVERTICAL ); - + m_simConsole = new wxTextCtrl( m_panelConsole, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY ); m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + m_sizerConsole->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 ); - - + + m_panelConsole->SetSizer( m_sizerConsole ); m_panelConsole->Layout(); m_sizerConsole->Fit( m_panelConsole ); m_splitterPlotAndConsole->SplitHorizontally( m_plotPanel, m_panelConsole, 500 ); m_sizer11->Add( m_splitterPlotAndConsole, 1, wxEXPAND, 5 ); - - + + m_panelLeft->SetSizer( m_sizer11 ); m_panelLeft->Layout(); m_sizer11->Fit( m_panelLeft ); m_sidePanel = new wxPanel( m_splitterLeftRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_sidePanel->SetMinSize( wxSize( 200,-1 ) ); - + m_sideSizer = new wxBoxSizer( wxVERTICAL ); - + m_splitterSignals = new wxSplitterWindow( m_sidePanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); m_splitterSignals->SetSashGravity( 0.3 ); m_splitterSignals->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterSignalsOnIdle ), NULL, this ); m_splitterSignals->SetMinimumPaneSize( 20 ); - + m_panelSignals = new wxPanel( m_splitterSignals, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelSignals->SetMinSize( wxSize( -1,100 ) ); - + wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelSignals, wxID_ANY, _("Signals") ), wxVERTICAL ); - + m_signals = new wxListView( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL ); sbSizer1->Add( m_signals, 1, wxALL|wxEXPAND, 5 ); - - + + m_panelSignals->SetSizer( sbSizer1 ); m_panelSignals->Layout(); sbSizer1->Fit( m_panelSignals ); m_panelCursorsAndTune = new wxPanel( m_splitterSignals, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelCursorsAndTune->SetMinSize( wxSize( -1,300 ) ); - + wxBoxSizer* bSizer9; bSizer9 = new wxBoxSizer( wxVERTICAL ); - + m_splitterTuneValues = new wxSplitterWindow( m_panelCursorsAndTune, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); m_splitterTuneValues->SetSashGravity( 0.5 ); m_splitterTuneValues->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterTuneValuesOnIdle ), NULL, this ); m_splitterTuneValues->SetMinimumPaneSize( 20 ); - + m_panelCursors = new wxPanel( m_splitterTuneValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelCursors->SetMinSize( wxSize( -1,100 ) ); - + wxStaticBoxSizer* sbSizer3; sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelCursors, wxID_ANY, _("Cursors") ), wxVERTICAL ); - + m_cursors = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL ); sbSizer3->Add( m_cursors, 1, wxALL|wxEXPAND, 5 ); - - + + m_panelCursors->SetSizer( sbSizer3 ); m_panelCursors->Layout(); sbSizer3->Fit( m_panelCursors ); m_tunePanel = new wxPanel( m_splitterTuneValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_tunePanel->SetMinSize( wxSize( -1,200 ) ); - + m_tuneSizerStb = new wxStaticBoxSizer( new wxStaticBox( m_tunePanel, wxID_ANY, _("Tune") ), wxHORIZONTAL ); - + m_tuneSizer = new wxBoxSizer( wxHORIZONTAL ); - - + + m_tuneSizerStb->Add( m_tuneSizer, 1, wxEXPAND, 5 ); - - + + m_tunePanel->SetSizer( m_tuneSizerStb ); m_tunePanel->Layout(); m_tuneSizerStb->Fit( m_tunePanel ); m_splitterTuneValues->SplitHorizontally( m_panelCursors, m_tunePanel, 0 ); bSizer9->Add( m_splitterTuneValues, 1, wxEXPAND, 5 ); - - + + m_panelCursorsAndTune->SetSizer( bSizer9 ); m_panelCursorsAndTune->Layout(); bSizer9->Fit( m_panelCursorsAndTune ); m_splitterSignals->SplitHorizontally( m_panelSignals, m_panelCursorsAndTune, 0 ); m_sideSizer->Add( m_splitterSignals, 1, wxEXPAND, 5 ); - - + + m_sidePanel->SetSizer( m_sideSizer ); m_sidePanel->Layout(); m_sideSizer->Fit( m_sidePanel ); m_splitterLeftRight->SplitVertically( m_panelLeft, m_sidePanel, 700 ); m_sizerMain->Add( m_splitterLeftRight, 1, wxEXPAND, 5 ); - - + + this->SetSizer( m_sizerMain ); this->Layout(); m_sizerMain->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events - this->Connect( m_newPlot->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) ); - this->Connect( m_openWorkbook->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) ); - this->Connect( m_saveWorkbook->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) ); - this->Connect( m_saveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) ); - this->Connect( m_saveCsv->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) ); - this->Connect( m_exitSim->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) ); - this->Connect( m_zoomIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) ); - this->Connect( m_zoomOut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) ); - this->Connect( m_zoomFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) ); - this->Connect( m_showGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) ); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ), this, m_newPlot->GetId()); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ), this, m_openWorkbook->GetId()); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ), this, m_saveWorkbook->GetId()); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ), this, m_saveImage->GetId()); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ), this, m_saveCsv->GetId()); + m_fileMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ), this, m_exitSim->GetId()); + m_viewMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ), this, m_zoomIn->GetId()); + m_viewMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ), this, m_zoomOut->GetId()); + m_viewMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ), this, m_zoomFit->GetId()); + m_viewMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ), this, m_showGrid->GetId()); this->Connect( m_showGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) ); - this->Connect( m_showLegend->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) ); + m_viewMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ), this, m_showLegend->GetId()); this->Connect( m_showLegend->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) ); m_plotNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this ); m_plotNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotClose ), NULL, this ); @@ -296,22 +296,11 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE() { // Disconnect Events - this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) ); - this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) ); - this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) ); - this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) ); - this->Disconnect( wxID_ZOOM_IN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) ); - this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) ); - this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) ); this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) ); this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) ); m_plotNotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this ); m_plotNotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotClose ), NULL, this ); m_signals->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this ); m_signals->Disconnect( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this ); - + } diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp index d0c5a788c2..33687fa0e6 100644 --- a/eeschema/sim/sim_plot_frame_base.fbp +++ b/eeschema/sim/sim_plot_frame_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ sim_plot_frame_base 1000 none + 1 SpiceWindow @@ -53,41 +54,6 @@ SIM_PLOT_FRAME wxTAB_TRAVERSAL 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -110,29 +76,6 @@ - - - - - - - - - - - - - - - - - - - - - - - File m_fileMenu @@ -150,7 +93,6 @@ menuNewPlot - m_separator3 @@ -169,7 +111,6 @@ menuOpenWorkbook - @@ -184,7 +125,6 @@ menuSaveWorkbook - m_separator1 @@ -203,7 +143,6 @@ menuSaveImage - @@ -218,7 +157,6 @@ menuSaveCsv - m_separator4 @@ -237,10 +175,9 @@ menuExit - - + Simulation m_simulationMenu protected @@ -256,8 +193,6 @@ protected - - m_separator31 @@ -275,8 +210,6 @@ protected - - @@ -290,8 +223,6 @@ protected - - @@ -305,10 +236,8 @@ protected - - - + 0 1 @@ -320,8 +249,6 @@ protected - - m_separator41 @@ -339,8 +266,6 @@ protected - - @@ -360,7 +285,6 @@ menuZoomIn - @@ -375,7 +299,6 @@ menuZoomOut - @@ -390,7 +313,6 @@ menuZoomFit - m_separator2 @@ -493,29 +415,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -579,33 +478,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -658,29 +530,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - m_sizer11 @@ -747,33 +596,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -826,39 +648,16 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - m_sizerPlot wxHORIZONTAL protected - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -912,43 +711,13 @@ - - - - - onPlotChanged - onPlotClose - - - - - - - - - - - - - - - - - - - - - - - - - + a page 0 - + 1 1 1 @@ -999,30 +768,7 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - + m_sizer8 wxVERTICAL @@ -1037,11 +783,11 @@ 0 - + 5 wxEXPAND 0 - + bSizer81 wxHORIZONTAL @@ -1058,7 +804,7 @@ 5 - wxALIGN_RIGHT|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1089,6 +835,7 @@ 0 wxID_ANY Start the simulation by clicking the Run Simulation button + 0 0 @@ -1114,29 +861,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1221,29 +945,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - m_sizerConsole @@ -1311,33 +1012,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1349,7 +1023,7 @@ - + 1 1 1 @@ -1400,39 +1074,16 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - + m_sideSizer wxVERTICAL protected - + 5 wxEXPAND 1 - + 1 1 1 @@ -1489,35 +1140,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 1 1 @@ -1568,29 +1192,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY Signals @@ -1599,7 +1200,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -1660,56 +1260,15 @@ - - - - - - - onSignalDblClick - - - - - - - - - - - - - - - - - - - onSignalRClick - - - - - - - - - - - - - - - - - + + 1 1 1 @@ -1760,39 +1319,16 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - + bSizer9 wxVERTICAL none - + 5 wxEXPAND 1 - + 1 1 1 @@ -1849,35 +1385,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 1 1 @@ -1928,29 +1437,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY Cursors @@ -1959,7 +1445,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -2020,56 +1505,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 1 1 @@ -2120,30 +1562,7 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - + wxID_ANY Tune @@ -2151,12 +1570,11 @@ wxHORIZONTAL 1 protected - - + 5 wxEXPAND 1 - + m_tuneSizer wxHORIZONTAL diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h index c23134735f..465faed030 100644 --- a/eeschema/sim/sim_plot_frame_base.h +++ b/eeschema/sim/sim_plot_frame_base.h @@ -1,19 +1,15 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __SIM_PLOT_FRAME_BASE_H__ -#define __SIM_PLOT_FRAME_BASE_H__ +#pragma once #include #include #include -class KIWAY_PLAYER; -class wxListView; - #include "kiway_player.h" #include #include @@ -44,7 +40,7 @@ class wxListView; class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER { private: - + protected: wxMenuBar* m_mainMenu; wxMenu* m_fileMenu; @@ -83,7 +79,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER wxPanel* m_tunePanel; wxStaticBoxSizer* m_tuneSizerStb; wxBoxSizer* m_tuneSizer; - + // Virtual event handlers, overide them in your derived class virtual void menuNewPlot( wxCommandEvent& event ) { event.Skip(); } virtual void menuOpenWorkbook( wxCommandEvent& event ) { event.Skip(); } @@ -102,38 +98,37 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER virtual void onPlotClose( wxAuiNotebookEvent& event ) { event.Skip(); } virtual void onSignalDblClick( wxMouseEvent& event ) { event.Skip(); } virtual void onSignalRClick( wxListEvent& event ) { event.Skip(); } - - + + public: - + SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Spice Simulator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") ); - + ~SIM_PLOT_FRAME_BASE(); - + void m_splitterLeftRightOnIdle( wxIdleEvent& ) { m_splitterLeftRight->SetSashPosition( 700 ); m_splitterLeftRight->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterLeftRightOnIdle ), NULL, this ); } - + void m_splitterPlotAndConsoleOnIdle( wxIdleEvent& ) { m_splitterPlotAndConsole->SetSashPosition( 500 ); m_splitterPlotAndConsole->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotAndConsoleOnIdle ), NULL, this ); } - + void m_splitterSignalsOnIdle( wxIdleEvent& ) { m_splitterSignals->SetSashPosition( 0 ); m_splitterSignals->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterSignalsOnIdle ), NULL, this ); } - + void m_splitterTuneValuesOnIdle( wxIdleEvent& ) { m_splitterTuneValues->SetSashPosition( 0 ); m_splitterTuneValues->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterTuneValuesOnIdle ), NULL, this ); } - + }; -#endif //__SIM_PLOT_FRAME_BASE_H__