diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp index e6e8f2193c..cfb4b4475d 100644 --- a/eeschema/sim/sim_plot_frame_base.cpp +++ b/eeschema/sim/sim_plot_frame_base.cpp @@ -94,14 +94,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 ); m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); - bSizer7->Add( m_signals, 0, wxALL|wxEXPAND, 5 ); - - m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, _("Parameters"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); - m_staticText21->Wrap( -1 ); - bSizer7->Add( m_staticText21, 0, wxALL|wxEXPAND, 5 ); - - m_signals1 = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); - bSizer7->Add( m_signals1, 0, wxALL|wxEXPAND, 5 ); + bSizer7->Add( m_signals, 1, wxALL|wxEXPAND, 5 ); wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 1, 0, 0, 0 ); diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp index 100d9c50ca..e837859bb3 100644 --- a/eeschema/sim/sim_plot_frame_base.fbp +++ b/eeschema/sim/sim_plot_frame_base.fbp @@ -133,7 +133,7 @@ - + File m_fileMenu protected @@ -206,7 +206,7 @@ - + View m_viewMenu protected @@ -281,11 +281,11 @@ bSizer1 wxVERTICAL none - + 5 wxEXPAND | wxALL 3 - + 1 1 1 @@ -359,16 +359,16 @@ - + bSizer5 wxHORIZONTAL none - + 5 wxEXPAND | wxALL 3 - + 1 1 1 @@ -542,11 +542,11 @@ - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -620,7 +620,7 @@ - + bSizer7 wxVERTICAL @@ -711,7 +711,7 @@ 5 wxALL|wxEXPAND - 0 + 1 1 1 @@ -800,178 +800,7 @@ 5 wxALL|wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Parameters - - 0 - - - 0 - - 1 - m_staticText21 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_CENTRE - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_signals1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_MULTIPLE|wxLB_SORT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - + 0 wxBOTH @@ -983,11 +812,11 @@ none 1 0 - + 5 wxALL 0 - + 1 1 1 @@ -1255,11 +1084,11 @@ - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -1333,7 +1162,7 @@ - + bSizer3 wxVERTICAL diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h index f6e5873060..9e76574943 100644 --- a/eeschema/sim/sim_plot_frame_base.h +++ b/eeschema/sim/sim_plot_frame_base.h @@ -52,8 +52,6 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER wxPanel* m_panel7; wxStaticText* m_staticText2; wxListBox* m_signals; - wxStaticText* m_staticText21; - wxListBox* m_signals1; wxButton* m_simulateBtn; wxButton* m_probeBtn; wxButton* m_tuneBtn;