diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp index afce15a607..747d343211 100644 --- a/eeschema/sim/sim_plot_frame_base.cpp +++ b/eeschema/sim/sim_plot_frame_base.cpp @@ -213,12 +213,14 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const m_splitterSignals->SetMinimumPaneSize( 20 ); m_panelSignals = new wxPanel( m_splitterSignals, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelSignals->SetMinSize( wxSize( -1,100 ) ); + wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxVERTICAL ); - m_staticText2 = new wxStaticText( m_panelSignals, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - bSizer10->Add( m_staticText2, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_staticTextSignals = new wxStaticText( m_panelSignals, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSignals->Wrap( -1 ); + bSizer10->Add( m_staticTextSignals, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_signals = new wxListView( m_panelSignals, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL ); bSizer10->Add( m_signals, 1, wxEXPAND, 5 ); @@ -239,12 +241,14 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const m_splitterTuneValues->SetMinimumPaneSize( 20 ); m_panelCursors = new wxPanel( m_splitterTuneValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelCursors->SetMinSize( wxSize( -1,100 ) ); + wxBoxSizer* bSizer12; bSizer12 = new wxBoxSizer( wxVERTICAL ); - m_staticText3 = new wxStaticText( m_panelCursors, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - bSizer12->Add( m_staticText3, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_staticTextCursors = new wxStaticText( m_panelCursors, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextCursors->Wrap( -1 ); + bSizer12->Add( m_staticTextCursors, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_cursors = new wxListCtrl( m_panelCursors, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL ); bSizer12->Add( m_cursors, 1, wxEXPAND, 5 ); @@ -254,12 +258,14 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const m_panelCursors->Layout(); bSizer12->Fit( m_panelCursors ); m_tunePanel = new wxPanel( m_splitterTuneValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_tunePanel->SetMinSize( wxSize( -1,100 ) ); + wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxVERTICAL ); - m_staticText4 = new wxStaticText( m_tunePanel, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText4->Wrap( -1 ); - bSizer13->Add( m_staticText4, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_staticTextTune = new wxStaticText( m_tunePanel, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextTune->Wrap( -1 ); + bSizer13->Add( m_staticTextTune, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_tuneSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -290,7 +296,6 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const this->SetSizer( m_sizerMain ); this->Layout(); - m_sizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp index a5642395de..72eb2fa789 100644 --- a/eeschema/sim/sim_plot_frame_base.fbp +++ b/eeschema/sim/sim_plot_frame_base.fbp @@ -47,7 +47,7 @@ -1,-1 SIM_PLOT_FRAME_BASE - -1,-1 + 564,531 wxDEFAULT_FRAME_STYLE KIWAY_PLAYER; kiway_player.h Spice Simulator @@ -179,7 +179,7 @@ menuExit - + Simulation m_simulationMenu protected @@ -274,7 +274,7 @@ - + View m_viewMenu protected @@ -354,11 +354,11 @@ menuShowLegend menuShowLegendUpdate - + m_separator21 none - + 0 1 @@ -373,7 +373,7 @@ menuShowDotted menuShowDottedUpdate - + 0 1 @@ -518,8 +518,8 @@ wxBORDER_NONE - - + + 1 1 1 @@ -570,16 +570,16 @@ wxTAB_TRAVERSAL - + -1,-1 m_sizer11 wxVERTICAL protected - + 5 wxEXPAND 1 - + 1 1 1 @@ -636,8 +636,8 @@ - - + + 1 1 1 @@ -688,16 +688,16 @@ wxTAB_TRAVERSAL - + m_sizerPlot wxHORIZONTAL protected - + 5 wxEXPAND 1 - + 1 1 1 @@ -753,11 +753,11 @@ onPlotChanged onPlotClose - + a page 0 - + 1 1 1 @@ -808,7 +808,7 @@ wxTAB_TRAVERSAL - + m_sizer8 wxVERTICAL @@ -823,11 +823,11 @@ 0 - + 5 wxEXPAND 0 - + bSizer81 wxHORIZONTAL @@ -933,8 +933,8 @@ - - + + 1 1 1 @@ -985,7 +985,7 @@ wxTAB_TRAVERSAL - + m_sizerConsole wxVERTICAL @@ -1062,8 +1062,8 @@ - - + + 1 1 1 @@ -1114,16 +1114,16 @@ wxTAB_TRAVERSAL - + m_sideSizer wxVERTICAL protected - + 5 wxEXPAND 1 - + 1 1 1 @@ -1180,8 +1180,8 @@ - - + + 1 1 1 @@ -1214,7 +1214,7 @@ 0 - -1,-1 + -1,100 1 m_panelSignals 1 @@ -1232,16 +1232,16 @@ wxTAB_TRAVERSAL - + bSizer10 wxVERTICAL none - + 5 wxTOP|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -1278,7 +1278,7 @@ 0 1 - m_staticText2 + m_staticTextSignals 1 @@ -1335,7 +1335,7 @@ 0 - + -1,-1 1 m_signals 1 @@ -1365,8 +1365,8 @@ - - + + 1 1 1 @@ -1417,16 +1417,16 @@ wxTAB_TRAVERSAL - + bSizer9 wxVERTICAL none - + 5 wxEXPAND 1 - + 1 1 1 @@ -1483,8 +1483,8 @@ wxBORDER_NONE - - + + 1 1 1 @@ -1517,7 +1517,7 @@ 0 - -1,-1 + -1,100 1 m_panelCursors 1 @@ -1535,16 +1535,16 @@ wxTAB_TRAVERSAL - + bSizer12 wxVERTICAL none - + 5 wxTOP|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -1581,7 +1581,7 @@ 0 1 - m_staticText3 + m_staticTextCursors 1 @@ -1638,7 +1638,7 @@ 0 - + -1,-1 1 m_cursors 1 @@ -1666,8 +1666,8 @@ - - + + 1 1 1 @@ -1700,7 +1700,7 @@ 0 - -1,-1 + -1,100 1 m_tunePanel 1 @@ -1718,16 +1718,16 @@ wxTAB_TRAVERSAL - + bSizer13 wxVERTICAL none - + 5 wxTOP|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -1764,7 +1764,7 @@ 0 1 - m_staticText4 + m_staticTextTune 1 @@ -1784,11 +1784,11 @@ -1 - + 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 4a2a74ab2a..238a111ab6 100644 --- a/eeschema/sim/sim_plot_frame_base.h +++ b/eeschema/sim/sim_plot_frame_base.h @@ -84,15 +84,15 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER wxBoxSizer* m_sideSizer; wxSplitterWindow* m_splitterSignals; wxPanel* m_panelSignals; - wxStaticText* m_staticText2; + wxStaticText* m_staticTextSignals; wxListView* m_signals; wxPanel* m_panelCursorsAndTune; wxSplitterWindow* m_splitterTuneValues; wxPanel* m_panelCursors; - wxStaticText* m_staticText3; + wxStaticText* m_staticTextCursors; wxListCtrl* m_cursors; wxPanel* m_tunePanel; - wxStaticText* m_staticText4; + wxStaticText* m_staticTextTune; wxBoxSizer* m_tuneSizer; // Virtual event handlers, overide them in your derived class @@ -121,7 +121,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER 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( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Spice Simulator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 564,531 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") ); ~SIM_PLOT_FRAME_BASE();