realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-15 10:43:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

PCB_calculator: use treebook

Browse Source
This commit is contained in:
Fabien Corona 2022-01-27 20:54:57 +00:00 committed by Seth Hillbrand
parent 8c907f1fdc
commit 8282130bbe
2 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <wx/menu.h> #include <wx/menu.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/notebook.h> #include <wx/treebook.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <typeinfo> #include <typeinfo>
@ -60,35 +60,48 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
SetSizeHints( wxDefaultSize, wxDefaultSize ); SetSizeHints( wxDefaultSize, wxDefaultSize );
m_menubar = new wxMenuBar( 0 );
SetMenuBar( m_menubar );
m_mainSizer = new wxBoxSizer( wxVERTICAL ); m_mainSizer = new wxBoxSizer( wxVERTICAL );
m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_mainSizer->Add( m_notebook, 1, wxEXPAND, 5 );
m_treebook = new wxTreebook( this, wxID_ANY );
m_treebook->SetFont( KIUI::GetControlFont( this ) );
m_mainSizer->Add( m_treebook, 1, wxEXPAND | wxLEFT | wxTOP, 0 );
SetSizer( m_mainSizer ); SetSizer( m_mainSizer );
Layout(); Layout();
Centre( wxBOTH ); Centre( wxBOTH );
AddCalculator( new PANEL_REGULATOR( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ), m_treebook->AddPage( nullptr, _( "General system design" ) );
AddCalculator( new PANEL_REGULATOR( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Regulators" ) ); _( "Regulators" ) );
AddCalculator( new PANEL_ATTENUATORS( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "RF Attenuators" ) ); m_treebook->AddPage( nullptr, _( "Power, current and isolation" ) );
AddCalculator( new PANEL_E_SERIE( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "E-Series" ) ); AddCalculator( new PANEL_ELECTRICAL_SPACING( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
AddCalculator( new PANEL_COLOR_CODE( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Color Code" ) );
AddCalculator( new PANEL_TRANSLINE( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "TransLine ") );
AddCalculator( new PANEL_VIA_SIZE( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Via Size" ) );
AddCalculator( new PANEL_TRACK_WIDTH( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Track Width" ) );
AddCalculator( new PANEL_ELECTRICAL_SPACING( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Electrical Spacing" ) ); _( "Electrical Spacing" ) );
AddCalculator( new PANEL_BOARD_CLASS( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ), AddCalculator( new PANEL_VIA_SIZE( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Via Size" ) );
AddCalculator( new PANEL_TRACK_WIDTH( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Track Width" ) );
m_treebook->AddPage( nullptr, _( "High speed" ) );
AddCalculator( new PANEL_ATTENUATORS( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "RF Attenuators" ) );
AddCalculator( new PANEL_TRANSLINE( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "TransLine ") );
m_treebook->AddPage( nullptr, _( "Memo" ) );
AddCalculator( new PANEL_E_SERIE( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "E-Series" ) );
AddCalculator( new PANEL_COLOR_CODE( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_( "Color Code" ) );
AddCalculator( new PANEL_BOARD_CLASS( m_treebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ),
_("Board Classes") ); _("Board Classes") );
LoadSettings( config() ); LoadSettings( config() );
@ -123,16 +136,33 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
Bind( wxEVT_SYS_COLOUR_CHANGED, Bind( wxEVT_SYS_COLOUR_CHANGED,
wxSysColourChangedEventHandler( PCB_CALCULATOR_FRAME::onThemeChanged ), this ); wxSysColourChangedEventHandler( PCB_CALCULATOR_FRAME::onThemeChanged ), this );
m_treebook->Connect( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxTreebookEventHandler(
PCB_CALCULATOR_FRAME::OnPageChanged ), NULL, this );
} }
PCB_CALCULATOR_FRAME::~PCB_CALCULATOR_FRAME() PCB_CALCULATOR_FRAME::~PCB_CALCULATOR_FRAME()
{ {
m_treebook->Disconnect( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxTreebookEventHandler(
PCB_CALCULATOR_FRAME::OnPageChanged ), NULL, this );
// This needed for OSX: avoids further OnDraw processing after this destructor and before // This needed for OSX: avoids further OnDraw processing after this destructor and before
// the native window is destroyed // the native window is destroyed
this->Freeze(); this->Freeze();
} }
void PCB_CALCULATOR_FRAME::OnPageChanged ( wxTreebookEvent& aEvent )
{
int page = aEvent.GetSelection();
// If the selected page is a top level page
if ( m_treebook->GetPageParent( page ) == wxNOT_FOUND )
{
m_treebook->ExpandNode( page );
// Select the first child
m_treebook->ChangeSelection( page + 1 );
}
}
void PCB_CALCULATOR_FRAME::AddCalculator( CALCULATOR_PANEL *aPanel, const wxString& panelUIName ) void PCB_CALCULATOR_FRAME::AddCalculator( CALCULATOR_PANEL *aPanel, const wxString& panelUIName )
{ {
@ -140,7 +170,7 @@ void PCB_CALCULATOR_FRAME::AddCalculator( CALCULATOR_PANEL *aPanel, const wxStri
m_panels.push_back( aPanel ); m_panels.push_back( aPanel );
m_panelTypes[ typeid( *aPanel ).hash_code() ] = aPanel; m_panelTypes[ typeid( *aPanel ).hash_code() ] = aPanel;
m_notebook->AddPage( aPanel, panelUIName, false ); m_treebook->AddSubPage( aPanel, panelUIName );
} }
@ -159,7 +189,7 @@ void PCB_CALCULATOR_FRAME::onThemeChanged( wxSysColourChangedEvent& aEvent )
void PCB_CALCULATOR_FRAME::OnUpdateUI( wxUpdateUIEvent& event ) void PCB_CALCULATOR_FRAME::OnUpdateUI( wxUpdateUIEvent& event )
{ {
if( m_notebook->GetSelection() != m_lastNotebookPage ) if( m_treebook->GetSelection() != m_lastNotebookPage )
{ {
// Kick all the things that wxWidgets can't seem to redraw on its own. // Kick all the things that wxWidgets can't seem to redraw on its own.
// This is getting seriously ridiculous.... // This is getting seriously ridiculous....
@ -202,8 +232,8 @@ void PCB_CALCULATOR_FRAME::OnUpdateUI( wxUpdateUIEvent& event )
// Until it's shown on screen the above won't work; but doing it anyway at least keeps // Until it's shown on screen the above won't work; but doing it anyway at least keeps
// putting new OnUpdateUI events into the queue until it *is* shown on screen. // putting new OnUpdateUI events into the queue until it *is* shown on screen.
if( m_notebook->IsShownOnScreen() ) if( m_treebook->IsShownOnScreen() )
m_lastNotebookPage = m_notebook->GetSelection(); m_lastNotebookPage = m_treebook->GetSelection();
} }
} }
@ -254,7 +284,7 @@ void PCB_CALCULATOR_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
PCB_CALCULATOR_SETTINGS* cfg = static_cast<PCB_CALCULATOR_SETTINGS*>( aCfg ); PCB_CALCULATOR_SETTINGS* cfg = static_cast<PCB_CALCULATOR_SETTINGS*>( aCfg );
m_notebook->ChangeSelection( cfg->m_LastPage ); m_treebook->ChangeSelection( cfg->m_LastPage );
for( auto& panel : m_panels ) for( auto& panel : m_panels )
panel->LoadSettings( cfg ); panel->LoadSettings( cfg );
@ -273,7 +303,7 @@ void PCB_CALCULATOR_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
if( cfg ) if( cfg )
{ {
cfg->m_LastPage = m_notebook->GetSelection(); cfg->m_LastPage = m_treebook->GetSelection();
for( auto& panel : m_panels ) for( auto& panel : m_panels )
panel->SaveSettings( cfg ); panel->SaveSettings( cfg );

9
pcb_calculator/pcb_calculator_frame.h
View File

@ -23,8 +23,8 @@
#include <calculator_panels/calculator_panel.h> #include <calculator_panels/calculator_panel.h>
#include <kiway_player.h> #include <kiway_player.h>
class wxMenuBar; class wxTreebook;
class wxNotebook; class wxTreebookEvent;
class wxBoxSizer; class wxBoxSizer;
class APP_SETTINGS_BASE; class APP_SETTINGS_BASE;
@ -76,16 +76,15 @@ private:
void SaveSettings( APP_SETTINGS_BASE* aCfg ) override; void SaveSettings( APP_SETTINGS_BASE* aCfg ) override;
private: private:
wxMenuBar* m_menubar;
wxNotebook* m_notebook;
wxBoxSizer* m_mainSizer; wxBoxSizer* m_mainSizer;
wxTreebook* m_treebook;
int m_lastNotebookPage; int m_lastNotebookPage;
std::vector<CALCULATOR_PANEL*> m_panels; std::vector<CALCULATOR_PANEL*> m_panels;
std::map<std::size_t, CALCULATOR_PANEL*> m_panelTypes; std::map<std::size_t, CALCULATOR_PANEL*> m_panelTypes;
void OnPageChanged ( wxTreebookEvent& aEvent );
}; };