From 3e652f2d40513de6a4b0a65f3aa1acd142868efd Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Mon, 23 Apr 2018 12:23:07 -0700 Subject: [PATCH] Standardize colons and units in spice model dialog --- eeschema/dialogs/dialog_spice_model_base.cpp | 177 +- eeschema/dialogs/dialog_spice_model_base.fbp | 2042 +++++++++++++++++- eeschema/dialogs/dialog_spice_model_base.h | 25 +- 3 files changed, 2141 insertions(+), 103 deletions(-) diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp index 00ae7c3a64..3cab1baf1f 100644 --- a/eeschema/dialogs/dialog_spice_model_base.cpp +++ b/eeschema/dialogs/dialog_spice_model_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! @@ -27,7 +27,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText2 = new wxStaticText( m_passive, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2 = new wxStaticText( m_passive, wxID_ANY, _("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -42,7 +42,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_staticText62->Wrap( -1 ); fgSizer1->Add( m_staticText62, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_staticText3 = new wxStaticText( m_passive, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( m_passive, wxID_ANY, _("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -196,7 +196,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_passive->SetSizer( bSizer41 ); m_passive->Layout(); bSizer41->Fit( m_passive ); - m_notebook->AddPage( m_passive, _("Passive"), false ); + m_notebook->AddPage( m_passive, _("Passive"), true ); m_model = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); @@ -207,7 +207,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText7 = new wxStaticText( m_model, wxID_ANY, _("Library"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7 = new wxStaticText( m_model, wxID_ANY, _("Library:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); fgSizer3->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -223,14 +223,14 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer3->Add( bSizer7, 1, wxEXPAND, 5 ); - m_staticText5 = new wxStaticText( m_model, wxID_ANY, _("Model"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5 = new wxStaticText( m_model, wxID_ANY, _("Model:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); fgSizer3->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_modelName = new wxComboBox( m_model, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_SORT ); fgSizer3->Add( m_modelName, 0, wxALL|wxEXPAND, 5 ); - m_staticText4 = new wxStaticText( m_model, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4 = new wxStaticText( m_model, wxID_ANY, _("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer3->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -261,16 +261,16 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i bSizer4 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("DC/AC analysis") ), wxVERTICAL ); + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("DC/AC analysis:") ), wxVERTICAL ); wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 4, 0, 0 ); + fgSizer6 = new wxFlexGridSizer( 0, 6, 0, 0 ); fgSizer6->AddGrowableCol( 1 ); fgSizer6->AddGrowableCol( 3 ); fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText10 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("DC [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText10 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("DC:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText10->Wrap( -1 ); fgSizer6->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -279,13 +279,20 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer6->Add( m_genDc, 0, wxALL|wxEXPAND, 5 ); + m_staticText113 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText113->Wrap( -1 ); + fgSizer6->Add( m_staticText113, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + + fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText11 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC magnitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText11 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC magnitude:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); fgSizer6->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -294,15 +301,23 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer6->Add( m_genAcMag, 0, wxALL|wxEXPAND, 5 ); - m_staticText12 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC phase [rad]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText111 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText111->Wrap( -1 ); + fgSizer6->Add( m_staticText111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText12 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC phase:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); - fgSizer6->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizer6->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_genAcPhase = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_genAcPhase->SetMinSize( wxSize( 60,-1 ) ); fgSizer6->Add( m_genAcPhase, 0, wxALL|wxEXPAND, 5 ); + m_staticText112 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("radians"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText112->Wrap( -1 ); + fgSizer6->Add( m_staticText112, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + sbSizer1->Add( fgSizer6, 1, wxEXPAND, 5 ); @@ -310,17 +325,17 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i bSizer4->Add( sbSizer1, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer3; - sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("Transient analysis") ), wxVERTICAL ); + sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("Transient analysis:") ), wxVERTICAL ); m_powerNotebook = new wxNotebook( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_pwrPulse = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer7; - fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer7 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer7->AddGrowableCol( 1 ); fgSizer7->SetFlexibleDirection( wxBOTH ); fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText13 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Initial value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText13 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Initial value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); fgSizer7->Add( m_staticText13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -329,48 +344,76 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer7->Add( m_pulseInit, 0, wxALL|wxEXPAND, 5 ); - m_staticText14 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulsed value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText131 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText131->Wrap( -1 ); + fgSizer7->Add( m_staticText131, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText14 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulsed value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText14->Wrap( -1 ); fgSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulseNominal = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulseNominal, 0, wxALL|wxEXPAND, 5 ); - m_staticText15 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText132 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText132->Wrap( -1 ); + fgSizer7->Add( m_staticText132, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText15 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Delay time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15->Wrap( -1 ); fgSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulseDelay = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulseDelay, 0, wxALL|wxEXPAND, 5 ); - m_staticText16 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Rise time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText133 = new wxStaticText( m_pwrPulse, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText133->Wrap( -1 ); + fgSizer7->Add( m_staticText133, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText16 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Rise time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); fgSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulseRise = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulseRise, 0, wxALL|wxEXPAND, 5 ); - m_staticText17 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Fall time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText134 = new wxStaticText( m_pwrPulse, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText134->Wrap( -1 ); + fgSizer7->Add( m_staticText134, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText17 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Fall time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); fgSizer7->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulseFall = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulseFall, 0, wxALL|wxEXPAND, 5 ); - m_staticText18 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulse width [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText135 = new wxStaticText( m_pwrPulse, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText135->Wrap( -1 ); + fgSizer7->Add( m_staticText135, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText18 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulse width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); fgSizer7->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulseWidth = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulseWidth, 0, wxALL|wxEXPAND, 5 ); - m_staticText20 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Period [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText136 = new wxStaticText( m_pwrPulse, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText136->Wrap( -1 ); + fgSizer7->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText20 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Period:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText20->Wrap( -1 ); fgSizer7->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pulsePeriod = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( m_pulsePeriod, 0, wxALL|wxEXPAND, 5 ); + m_staticText137 = new wxStaticText( m_pwrPulse, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText137->Wrap( -1 ); + fgSizer7->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + m_pwrPulse->SetSizer( fgSizer7 ); m_pwrPulse->Layout(); @@ -378,12 +421,12 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), true ); m_pwrSin = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer8; - fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer8 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer8->AddGrowableCol( 1 ); fgSizer8->SetFlexibleDirection( wxBOTH ); fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText21 = new wxStaticText( m_pwrSin, wxID_ANY, _("DC offset [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText21 = new wxStaticText( m_pwrSin, wxID_ANY, _("DC offset:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); fgSizer8->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -392,34 +435,54 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer8->Add( m_sinOffset, 0, wxALL|wxEXPAND, 5 ); - m_staticText22 = new wxStaticText( m_pwrSin, wxID_ANY, _("Amplitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211 = new wxStaticText( m_pwrSin, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211->Wrap( -1 ); + fgSizer8->Add( m_staticText211, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText22 = new wxStaticText( m_pwrSin, wxID_ANY, _("Amplitude:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText22->Wrap( -1 ); fgSizer8->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_sinAmplitude = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_sinAmplitude, 0, wxALL|wxEXPAND, 5 ); - m_staticText23 = new wxStaticText( m_pwrSin, wxID_ANY, _("Frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText212 = new wxStaticText( m_pwrSin, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText212->Wrap( -1 ); + fgSizer8->Add( m_staticText212, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText23 = new wxStaticText( m_pwrSin, wxID_ANY, _("Frequency:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); fgSizer8->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_sinFreq = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_sinFreq, 0, wxALL|wxEXPAND, 5 ); - m_staticText24 = new wxStaticText( m_pwrSin, wxID_ANY, _("Delay [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText213 = new wxStaticText( m_pwrSin, wxID_ANY, _("Hz"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText213->Wrap( -1 ); + fgSizer8->Add( m_staticText213, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText24 = new wxStaticText( m_pwrSin, wxID_ANY, _("Delay:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); fgSizer8->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_sinDelay = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_sinDelay, 0, wxALL|wxEXPAND, 5 ); - m_staticText25 = new wxStaticText( m_pwrSin, wxID_ANY, _("Damping factor [1/s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText214 = new wxStaticText( m_pwrSin, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText214->Wrap( -1 ); + fgSizer8->Add( m_staticText214, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText25 = new wxStaticText( m_pwrSin, wxID_ANY, _("Damping factor:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText25->Wrap( -1 ); fgSizer8->Add( m_staticText25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_sinDampFactor = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_sinDampFactor, 0, wxALL|wxEXPAND, 5 ); + m_staticText215 = new wxStaticText( m_pwrSin, wxID_ANY, _("1/seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText215->Wrap( -1 ); + fgSizer8->Add( m_staticText215, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + m_pwrSin->SetSizer( fgSizer8 ); m_pwrSin->Layout(); @@ -427,12 +490,12 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_powerNotebook->AddPage( m_pwrSin, _("Sinusoidal"), false ); m_pwrExp = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer9; - fgSizer9 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer9 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer9->AddGrowableCol( 1 ); fgSizer9->SetFlexibleDirection( wxBOTH ); fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText26 = new wxStaticText( m_pwrExp, wxID_ANY, _("Initial value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText26 = new wxStaticText( m_pwrExp, wxID_ANY, _("Initial value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText26->Wrap( -1 ); fgSizer9->Add( m_staticText26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -441,41 +504,65 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer9->Add( m_expInit, 0, wxALL|wxEXPAND, 5 ); - m_staticText27 = new wxStaticText( m_pwrExp, wxID_ANY, _("Pulsed value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText261 = new wxStaticText( m_pwrExp, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText261->Wrap( -1 ); + fgSizer9->Add( m_staticText261, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText27 = new wxStaticText( m_pwrExp, wxID_ANY, _("Pulsed value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText27->Wrap( -1 ); fgSizer9->Add( m_staticText27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_expPulsed = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer9->Add( m_expPulsed, 0, wxALL|wxEXPAND, 5 ); - m_staticText28 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText262 = new wxStaticText( m_pwrExp, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText262->Wrap( -1 ); + fgSizer9->Add( m_staticText262, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText28 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise delay time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText28->Wrap( -1 ); fgSizer9->Add( m_staticText28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_expRiseDelay = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer9->Add( m_expRiseDelay, 0, wxALL|wxEXPAND, 5 ); - m_staticText29 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise time constant [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText263 = new wxStaticText( m_pwrExp, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText263->Wrap( -1 ); + fgSizer9->Add( m_staticText263, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText29 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise time constant:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText29->Wrap( -1 ); fgSizer9->Add( m_staticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_expRiseConst = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer9->Add( m_expRiseConst, 0, wxALL|wxEXPAND, 5 ); - m_staticText30 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText264 = new wxStaticText( m_pwrExp, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText264->Wrap( -1 ); + fgSizer9->Add( m_staticText264, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText30 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall delay time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText30->Wrap( -1 ); fgSizer9->Add( m_staticText30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_expFallDelay = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer9->Add( m_expFallDelay, 0, wxALL|wxEXPAND, 5 ); - m_staticText31 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall time constant [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText265 = new wxStaticText( m_pwrExp, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText265->Wrap( -1 ); + fgSizer9->Add( m_staticText265, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText31 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall time constant:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); fgSizer9->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_expFallConst = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer9->Add( m_expFallConst, 0, wxALL|wxEXPAND, 5 ); + m_staticText266 = new wxStaticText( m_pwrExp, wxID_ANY, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText266->Wrap( -1 ); + fgSizer9->Add( m_staticText266, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + m_pwrExp->SetSizer( fgSizer9 ); m_pwrExp->Layout(); @@ -492,12 +579,12 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); wxFlexGridSizer* fgSizer10; - fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer10 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer10->AddGrowableCol( 1 ); fgSizer10->SetFlexibleDirection( wxBOTH ); fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText34 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Time [s]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText34 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText34->Wrap( -1 ); fgSizer10->Add( m_staticText34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -506,13 +593,21 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i fgSizer10->Add( m_pwlTime, 0, wxALL|wxEXPAND, 5 ); - m_staticText35 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText342 = new wxStaticText( m_pwrPwl, wxID_ANY, _("second"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText342->Wrap( -1 ); + fgSizer10->Add( m_staticText342, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticText35 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText35->Wrap( -1 ); fgSizer10->Add( m_staticText35, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_pwlValue = new wxTextCtrl( m_pwrPwl, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer10->Add( m_pwlValue, 0, wxALL|wxEXPAND, 5 ); + m_staticText343 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Volts/Amps"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText343->Wrap( -1 ); + fgSizer10->Add( m_staticText343, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + fgSizer15->Add( fgSizer10, 1, wxEXPAND, 5 ); @@ -560,15 +655,15 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i wxString m_pwrTypeChoices[] = { _("Voltage"), _("Current") }; int m_pwrTypeNChoices = sizeof( m_pwrTypeChoices ) / sizeof( wxString ); - m_pwrType = new wxRadioBox( m_power, wxID_ANY, _("Source type"), wxDefaultPosition, wxDefaultSize, m_pwrTypeNChoices, m_pwrTypeChoices, 1, wxRA_SPECIFY_ROWS ); - m_pwrType->SetSelection( 0 ); + m_pwrType = new wxRadioBox( m_power, wxID_ANY, _("Source type:"), wxDefaultPosition, wxDefaultSize, m_pwrTypeNChoices, m_pwrTypeChoices, 1, wxRA_SPECIFY_ROWS ); + m_pwrType->SetSelection( 1 ); bSizer4->Add( m_pwrType, 0, wxALL|wxEXPAND, 5 ); m_power->SetSizer( bSizer4 ); m_power->Layout(); bSizer4->Fit( m_power ); - m_notebook->AddPage( m_power, _("Source"), true ); + m_notebook->AddPage( m_power, _("Source"), false ); bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp index 57f2ac92c5..c332c088b0 100644 --- a/eeschema/dialogs/dialog_spice_model_base.fbp +++ b/eeschema/dialogs/dialog_spice_model_base.fbp @@ -14,6 +14,7 @@ dialog_spice_model_base 1000 none + 1 DIALOG_SPICE_MODEL_BASE @@ -178,7 +179,7 @@ Passive - 0 + 1 1 1 @@ -253,16 +254,16 @@ - + bSizer41 wxVERTICAL none - + 5 wxEXPAND|wxALL 0 - + 3 wxBOTH 1 @@ -306,7 +307,7 @@ 0 0 wxID_ANY - Type + Type: 0 @@ -565,7 +566,7 @@ 0 0 wxID_ANY - Value + Value: 0 @@ -792,11 +793,11 @@ - + 5 wxEXPAND | wxALL 0 - + 1 1 1 @@ -873,11 +874,11 @@ - + 5 wxALIGN_CENTER_HORIZONTAL 0 - + bSizer5 wxVERTICAL @@ -1048,11 +1049,11 @@ - + 5 wxEXPAND 1 - + 3 wxBOTH 1 @@ -3443,7 +3444,7 @@ 0 0 wxID_ANY - Library + Library: 0 @@ -3716,7 +3717,7 @@ 0 0 wxID_ANY - Model + Model: 0 @@ -3892,7 +3893,7 @@ 0 0 wxID_ANY - Type + Type: 0 @@ -4135,8 +4136,8 @@ Source - 1 - + 0 + 1 1 1 @@ -4210,7 +4211,7 @@ - + bSizer4 wxVERTICAL @@ -4221,7 +4222,7 @@ 0 wxID_ANY - DC/AC analysis + DC/AC analysis: sbSizer1 wxVERTICAL @@ -4233,7 +4234,7 @@ wxEXPAND 1 - 4 + 6 wxBOTH 1,3 @@ -4276,7 +4277,7 @@ 0 0 wxID_ANY - DC [V/A] + DC: 0 @@ -4418,11 +4419,104 @@ - + + 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/Amps + + 0 + + + 0 + + 1 + m_staticText113 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND 1 - + + 0 + protected + 0 + + + + 5 + wxEXPAND + 1 + 0 protected 0 @@ -4470,7 +4564,7 @@ 0 0 wxID_ANY - AC magnitude [V/A] + AC magnitude: 0 @@ -4612,9 +4706,92 @@ + + 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/Amps + + 0 + + + 0 + + 1 + m_staticText111 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -4644,7 +4821,7 @@ 0 0 wxID_ANY - AC phase [rad] + AC phase: 0 @@ -4786,28 +4963,111 @@ + + 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 + radians + + 0 + + + 0 + + 1 + m_staticText112 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxALL|wxEXPAND 0 - + wxID_ANY - Transient analysis + Transient analysis: sbSizer3 wxVERTICAL 1 none - + 5 wxEXPAND | wxALL 0 - + 1 1 1 @@ -4885,7 +5145,7 @@ - + Pulse 1 @@ -4964,7 +5224,7 @@ - 2 + 3 wxBOTH 1 @@ -5007,7 +5267,7 @@ 0 0 wxID_ANY - Initial value [V/A] + Initial value: 0 @@ -5149,6 +5409,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/Amps + + 0 + + + 0 + + 1 + m_staticText131 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5181,7 +5524,7 @@ 0 0 wxID_ANY - Pulsed value [V/A] + Pulsed value: 0 @@ -5323,6 +5666,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/Amps + + 0 + + + 0 + + 1 + m_staticText132 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5355,7 +5781,7 @@ 0 0 wxID_ANY - Delay time [s] + Delay time: 0 @@ -5497,6 +5923,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_staticText133 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5529,7 +6038,7 @@ 0 0 wxID_ANY - Rise time [s] + Rise time: 0 @@ -5671,6 +6180,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_staticText134 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5703,7 +6295,7 @@ 0 0 wxID_ANY - Fall time [s] + Fall time: 0 @@ -5845,6 +6437,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_staticText135 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -5877,7 +6552,7 @@ 0 0 wxID_ANY - Pulse width [s] + Pulse width: 0 @@ -6019,6 +6694,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_staticText136 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -6051,7 +6809,7 @@ 0 0 wxID_ANY - Period [s] + Period: 0 @@ -6193,6 +6951,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_staticText137 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6275,7 +7116,7 @@ - 2 + 3 wxBOTH 1 @@ -6318,7 +7159,7 @@ 0 0 wxID_ANY - DC offset [V/A] + DC offset: 0 @@ -6460,6 +7301,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/Amps + + 0 + + + 0 + + 1 + m_staticText211 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -6492,7 +7416,7 @@ 0 0 wxID_ANY - Amplitude [V/A] + Amplitude: 0 @@ -6634,6 +7558,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/Amps + + 0 + + + 0 + + 1 + m_staticText212 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -6666,7 +7673,7 @@ 0 0 wxID_ANY - Frequency [Hz] + Frequency: 0 @@ -6808,6 +7815,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 + Hz + + 0 + + + 0 + + 1 + m_staticText213 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -6840,7 +7930,7 @@ 0 0 wxID_ANY - Delay [s] + Delay: 0 @@ -6982,6 +8072,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_staticText214 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -7014,7 +8187,7 @@ 0 0 wxID_ANY - Damping factor [1/s] + Damping factor: 0 @@ -7156,14 +8329,97 @@ + + 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 + 1/seconds + + 0 + + + 0 + + 1 + m_staticText215 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + - + Exponential 0 - + 1 1 1 @@ -7238,7 +8494,7 @@ - 2 + 3 wxBOTH 1 @@ -7281,7 +8537,7 @@ 0 0 wxID_ANY - Initial value [V/A] + Initial value: 0 @@ -7423,6 +8679,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/Amps + + 0 + + + 0 + + 1 + m_staticText261 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -7455,7 +8794,7 @@ 0 0 wxID_ANY - Pulsed value [V/A] + Pulsed value: 0 @@ -7597,6 +8936,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/Amps + + 0 + + + 0 + + 1 + m_staticText262 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -7629,7 +9051,7 @@ 0 0 wxID_ANY - Rise delay time [s] + Rise delay time: 0 @@ -7771,6 +9193,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_staticText263 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -7803,7 +9308,7 @@ 0 0 wxID_ANY - Rise time constant [s] + Rise time constant: 0 @@ -7945,6 +9450,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_staticText264 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -7977,7 +9565,7 @@ 0 0 wxID_ANY - Fall delay time [s] + Fall delay time: 0 @@ -8119,6 +9707,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_staticText265 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -8151,7 +9822,7 @@ 0 0 wxID_ANY - Fall time constant [s] + Fall time constant: 0 @@ -8293,10 +9964,93 @@ + + 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_staticText266 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + - + Piece-wise Linear 0 @@ -8391,7 +10145,7 @@ wxEXPAND 1 - 2 + 3 wxBOTH 1 @@ -8434,7 +10188,7 @@ 0 0 wxID_ANY - Time [s] + Time: 0 @@ -8576,6 +10330,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 + second + + 0 + + + 0 + + 1 + m_staticText342 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -8608,7 +10445,7 @@ 0 0 wxID_ANY - Value [V/A] + Value: 0 @@ -8750,6 +10587,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/Amps + + 0 + + + 0 + + 1 + m_staticText343 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9473,7 +11393,7 @@ 0 0 wxID_ANY - Source type + Source type: 1 0 @@ -9490,7 +11410,7 @@ 1 Resizable - 0 + 1 1 wxRA_SPECIFY_ROWS diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h index c585264f99..c1a36d88f8 100644 --- a/eeschema/dialogs/dialog_spice_model_base.h +++ b/eeschema/dialogs/dialog_spice_model_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! @@ -95,55 +95,78 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM wxPanel* m_power; wxStaticText* m_staticText10; wxTextCtrl* m_genDc; + wxStaticText* m_staticText113; wxStaticText* m_staticText11; wxTextCtrl* m_genAcMag; + wxStaticText* m_staticText111; wxStaticText* m_staticText12; wxTextCtrl* m_genAcPhase; + wxStaticText* m_staticText112; wxNotebook* m_powerNotebook; wxPanel* m_pwrPulse; wxStaticText* m_staticText13; wxTextCtrl* m_pulseInit; + wxStaticText* m_staticText131; wxStaticText* m_staticText14; wxTextCtrl* m_pulseNominal; + wxStaticText* m_staticText132; wxStaticText* m_staticText15; wxTextCtrl* m_pulseDelay; + wxStaticText* m_staticText133; wxStaticText* m_staticText16; wxTextCtrl* m_pulseRise; + wxStaticText* m_staticText134; wxStaticText* m_staticText17; wxTextCtrl* m_pulseFall; + wxStaticText* m_staticText135; wxStaticText* m_staticText18; wxTextCtrl* m_pulseWidth; + wxStaticText* m_staticText136; wxStaticText* m_staticText20; wxTextCtrl* m_pulsePeriod; + wxStaticText* m_staticText137; wxPanel* m_pwrSin; wxStaticText* m_staticText21; wxTextCtrl* m_sinOffset; + wxStaticText* m_staticText211; wxStaticText* m_staticText22; wxTextCtrl* m_sinAmplitude; + wxStaticText* m_staticText212; wxStaticText* m_staticText23; wxTextCtrl* m_sinFreq; + wxStaticText* m_staticText213; wxStaticText* m_staticText24; wxTextCtrl* m_sinDelay; + wxStaticText* m_staticText214; wxStaticText* m_staticText25; wxTextCtrl* m_sinDampFactor; + wxStaticText* m_staticText215; wxPanel* m_pwrExp; wxStaticText* m_staticText26; wxTextCtrl* m_expInit; + wxStaticText* m_staticText261; wxStaticText* m_staticText27; wxTextCtrl* m_expPulsed; + wxStaticText* m_staticText262; wxStaticText* m_staticText28; wxTextCtrl* m_expRiseDelay; + wxStaticText* m_staticText263; wxStaticText* m_staticText29; wxTextCtrl* m_expRiseConst; + wxStaticText* m_staticText264; wxStaticText* m_staticText30; wxTextCtrl* m_expFallDelay; + wxStaticText* m_staticText265; wxStaticText* m_staticText31; wxTextCtrl* m_expFallConst; + wxStaticText* m_staticText266; wxPanel* m_pwrPwl; wxStaticText* m_staticText34; wxTextCtrl* m_pwlTime; + wxStaticText* m_staticText342; wxStaticText* m_staticText35; wxTextCtrl* m_pwlValue; + wxStaticText* m_staticText343; wxButton* m_pwlAddButton; wxListCtrl* m_pwlValList; wxButton* m_pwlRemoveBtn;