From 8dddd9cc2c953ea464585c4ee21139e6baa692fa Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 23 Feb 2024 16:06:23 +0000 Subject: [PATCH] Separate "use board stackup colors" into separate checkbox. Fixes https://gitlab.com/kicad/code/kicad/-/issues/17085 --- 3d-viewer/3d_canvas/board_adapter.cpp | 71 +- 3d-viewer/3d_canvas/board_adapter.h | 1 + 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp | 11 +- .../3d_viewer/eda_3d_viewer_settings.cpp | 2 + 3d-viewer/3d_viewer/eda_3d_viewer_settings.h | 1 + 3d-viewer/dialogs/appearance_controls_3D.cpp | 55 + 3d-viewer/dialogs/appearance_controls_3D.h | 24 +- .../dialogs/appearance_controls_3D_base.cpp | 9 +- .../dialogs/appearance_controls_3D_base.fbp | 998 +++--- .../dialogs/appearance_controls_3D_base.h | 4 +- common/settings/color_settings.cpp | 7 +- include/settings/color_settings.h | 6 +- pcbnew/widgets/appearance_controls_base.cpp | 8 +- pcbnew/widgets/appearance_controls_base.fbp | 2793 +++++++++-------- pcbnew/widgets/appearance_controls_base.h | 2 +- 15 files changed, 2077 insertions(+), 1915 deletions(-) diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp index 628099e529..207699e727 100644 --- a/3d-viewer/3d_canvas/board_adapter.cpp +++ b/3d-viewer/3d_canvas/board_adapter.cpp @@ -589,13 +589,18 @@ std::map BOARD_ADAPTER::GetLayerColors() const { std::map colors; - if( m_Cfg->m_CurrentPreset == FOLLOW_PCB || m_Cfg->m_CurrentPreset == FOLLOW_PLOT_SETTINGS ) + if( LAYER_PRESET_3D* preset = m_Cfg->FindPreset( m_Cfg->m_CurrentPreset ) ) { - colors = GetDefaultColors(); - - if( !m_board ) - return colors; + colors = preset->colors; + } + else + { + for( const auto& [ layer, color ] : GetDefaultColors() ) + colors[ layer ] = color; + } + if( m_Cfg->m_UseStackupColors && m_board ) + { const BOARD_STACKUP& stackup = m_board->GetDesignSettings().GetStackupDescriptor(); KIGFX::COLOR4D bodyColor( 0, 0, 0, 0 ); @@ -683,26 +688,6 @@ std::map BOARD_ADAPTER::GetLayerColors() const { colors[ LAYER_3D_COPPER_TOP ] = findColor( wxT( "Silver" ), g_FinishColors ); } - - SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager(); - PCBNEW_SETTINGS* pcbnewSettings = mgr.GetAppSettings(); - COLOR_SETTINGS* pcbnewColors = mgr.GetColorSettings( pcbnewSettings->m_ColorTheme ); - - colors[ LAYER_3D_USER_DRAWINGS ] = pcbnewColors->GetColor( Dwgs_User ); - colors[ LAYER_3D_USER_COMMENTS ] = pcbnewColors->GetColor( Cmts_User ); - colors[ LAYER_3D_USER_ECO1 ] = pcbnewColors->GetColor( Eco1_User ); - colors[ LAYER_3D_USER_ECO2 ] = pcbnewColors->GetColor( Eco2_User ); - } - else if( LAYER_PRESET_3D* preset = m_Cfg->FindPreset( m_Cfg->m_CurrentPreset ) ) - { - return preset->colors; - } - else - { - COLOR_SETTINGS* settings = Pgm().GetSettingsManager().GetColorSettings(); - - for( const auto& [ layer, color ] : GetDefaultColors() ) - colors[ layer ] = settings->GetColor( layer ); } colors[ LAYER_3D_COPPER_BOTTOM ] = colors[ LAYER_3D_COPPER_TOP ]; @@ -860,6 +845,42 @@ std::bitset BOARD_ADAPTER::GetVisibleLayers() const } +std::bitset BOARD_ADAPTER::GetDefaultVisibleLayers() const +{ + std::bitset ret; + + ret.set( LAYER_3D_BOARD, true ); + ret.set( LAYER_3D_COPPER_TOP, true ); + ret.set( LAYER_3D_COPPER_BOTTOM, true ); + ret.set( LAYER_3D_SILKSCREEN_TOP, true ); + ret.set( LAYER_3D_SILKSCREEN_BOTTOM, true ); + ret.set( LAYER_3D_SOLDERMASK_TOP, true ); + ret.set( LAYER_3D_SOLDERMASK_BOTTOM, true ); + ret.set( LAYER_3D_SOLDERPASTE, true ); + ret.set( LAYER_3D_ADHESIVE, true ); + ret.set( LAYER_3D_USER_COMMENTS, false ); + ret.set( LAYER_3D_USER_DRAWINGS, false ); + ret.set( LAYER_3D_USER_ECO1, false ); + ret.set( LAYER_3D_USER_ECO2, false ); + + ret.set( LAYER_FP_REFERENCES, true ); + ret.set( LAYER_FP_VALUES, true ); + ret.set( LAYER_FP_TEXT, true ); + + ret.set( LAYER_3D_TH_MODELS, true ); + ret.set( LAYER_3D_SMD_MODELS, true ); + ret.set( LAYER_3D_VIRTUAL_MODELS, true ); + ret.set( LAYER_3D_MODELS_NOT_IN_POS, false ); + ret.set( LAYER_3D_MODELS_MARKED_DNP, false ); + + ret.set( LAYER_3D_BOUNDING_BOXES, false ); + ret.set( LAYER_3D_OFF_BOARD_SILK, false ); + ret.set( LAYER_3D_AXES, true ); + + return ret; +} + + bool BOARD_ADAPTER::createBoardPolygon( wxString* aErrorMsg ) { m_board_poly.RemoveAllContours(); diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h index 13827539e8..ceb9350c81 100644 --- a/3d-viewer/3d_canvas/board_adapter.h +++ b/3d-viewer/3d_canvas/board_adapter.h @@ -112,6 +112,7 @@ public: void SetLayerColors( const std::map& aColors ); std::bitset GetVisibleLayers() const; + std::bitset GetDefaultVisibleLayers() const; void SetVisibleLayers( const std::bitset& aLayers ); /** diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp index 1e25f07a1d..9bb9b7c92a 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp @@ -587,17 +587,16 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg ) { wxString legacyColorsPresetName = _( "legacy colors" ); + cfg->m_UseStackupColors = false; + if( !cfg->FindPreset( legacyColorsPresetName ) ) { cfg->m_LayerPresets.emplace_back( legacyColorsPresetName, - GetAdapter().GetVisibleLayers(), - GetAdapter().GetLayerColors() ); + GetAdapter().GetDefaultVisibleLayers(), + GetAdapter().GetDefaultColors() ); } - if( Pgm().GetSettingsManager().GetColorSettings()->GetUseBoardStackupColors() ) - cfg->m_CurrentPreset = FOLLOW_PCB; - else - cfg->m_CurrentPreset = legacyColorsPresetName; + cfg->m_CurrentPreset = wxEmptyString; } m_boardAdapter.InitSettings( nullptr, nullptr ); diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp index 2e23aa8e61..5eef4700c0 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp @@ -377,6 +377,8 @@ EDA_3D_VIEWER_SETTINGS::EDA_3D_VIEWER_SETTINGS() : m_params.emplace_back( new PARAM( "camera.projection_mode", &m_Camera.projection_mode, 1 ) ); + m_params.emplace_back( new PARAM( "use_stackup_colors", + &m_UseStackupColors, true ) ); m_params.emplace_back( new PARAM_LAYER_PRESET_3D( "layer_presets", &m_LayerPresets ) ); m_params.emplace_back( new PARAM( "current_layer_preset", diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_settings.h b/3d-viewer/3d_viewer/eda_3d_viewer_settings.h index 12ccca72e7..c21dd2f5bb 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer_settings.h +++ b/3d-viewer/3d_viewer/eda_3d_viewer_settings.h @@ -169,6 +169,7 @@ public: RENDER_SETTINGS m_Render; CAMERA_SETTINGS m_Camera; + bool m_UseStackupColors; std::vector m_LayerPresets; wxString m_CurrentPreset; diff --git a/3d-viewer/dialogs/appearance_controls_3D.cpp b/3d-viewer/dialogs/appearance_controls_3D.cpp index 53c280a81b..ae543868e9 100644 --- a/3d-viewer/dialogs/appearance_controls_3D.cpp +++ b/3d-viewer/dialogs/appearance_controls_3D.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include <../3d_rendering/opengl/render_3d_opengl.h> @@ -112,6 +113,24 @@ APPEARANCE_CONTROLS_3D::APPEARANCE_CONTROLS_3D( EDA_3D_VIEWER_FRAME* aParent, m_presetsLabel->SetFont( infoFont ); m_viewportsLabel->SetFont( infoFont ); + // Create display options + m_cbUseBoardStackupColors = new wxCheckBox( m_panelLayers, wxID_ANY, + _( "Use board stackup colors" ) ); + m_cbUseBoardStackupColors->SetFont( infoFont ); + + m_cbUseBoardStackupColors->Bind( wxEVT_CHECKBOX, + [this]( wxCommandEvent& aEvent ) + { + EDA_3D_VIEWER_SETTINGS* cfg = m_frame->GetAdapter().m_Cfg; + cfg->m_UseStackupColors = aEvent.IsChecked(); + + UpdateLayerCtls(); + syncLayerPresetSelection(); + m_frame->NewDisplay( true ); + } ); + + m_panelLayersSizer->Add( m_cbUseBoardStackupColors, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 7 ); + m_cbLayerPresets->SetToolTip( wxString::Format( _( "Save and restore color and visibility " "combinations.\n" "Use %s+Tab to activate selector.\n" @@ -176,7 +195,9 @@ void APPEARANCE_CONTROLS_3D::OnSize( wxSizeEvent& aEvent ) void APPEARANCE_CONTROLS_3D::OnLanguageChanged() { Freeze(); + rebuildLayers(); + m_cbUseBoardStackupColors->SetLabel( _( "Use board stackup colors" ) ); rebuildLayerPresetsWidget(); rebuildViewportsWidget(); @@ -209,6 +230,9 @@ void APPEARANCE_CONTROLS_3D::OnDarkModeToggle() void APPEARANCE_CONTROLS_3D::CommonSettingsChanged() { OnLanguageChanged(); + + UpdateLayerCtls(); + syncLayerPresetSelection(); } @@ -437,6 +461,19 @@ void APPEARANCE_CONTROLS_3D::rebuildLayers() SWATCH_SMALL ); swatch->SetToolTip( _( "Left double click or middle click to change color" ) ); + swatch->SetReadOnlyCallback( + [this]() + { + WX_INFOBAR* infobar = m_frame->GetInfoBar(); + + infobar->RemoveAllButtons(); + infobar->AddCloseButton(); + + infobar->ShowMessageFor( _( "Uncheck 'Use board stackup colors' to " + "allow color editing." ), + 10000, wxICON_INFORMATION ); + } ); + sizer->Add( swatch, 0, wxALIGN_CENTER_VERTICAL, 0 ); aSetting->m_Ctl_color = swatch; @@ -515,6 +552,7 @@ void APPEARANCE_CONTROLS_3D::rebuildLayers() void APPEARANCE_CONTROLS_3D::UpdateLayerCtls() { + EDA_3D_VIEWER_SETTINGS* cfg = m_frame->GetAdapter().m_Cfg; std::bitset visibleLayers = m_frame->GetAdapter().GetVisibleLayers(); std::map colors = m_frame->GetAdapter().GetLayerColors(); @@ -527,8 +565,16 @@ void APPEARANCE_CONTROLS_3D::UpdateLayerCtls() setting->m_Ctl_visibility->SetValue( visibleLayers.test( setting->m_Id ) ); if( setting->m_Ctl_color ) + { setting->m_Ctl_color->SetSwatchColor( colors[ setting->m_Id ], false ); + + if( cfg ) + setting->m_Ctl_color->SetReadOnly( cfg->m_UseStackupColors ); + } } + + if( cfg ) + m_cbUseBoardStackupColors->SetValue( cfg->m_UseStackupColors ); } @@ -567,6 +613,12 @@ void APPEARANCE_CONTROLS_3D::syncLayerPresetSelection() presets.begin(), presets.end(), [&]( const LAYER_PRESET_3D& aPreset ) { + if( aPreset.name.Lower() == _( "legacy colors" ) + && m_cbUseBoardStackupColors->GetValue() ) + { + return false; + } + for( int layer = LAYER_3D_BOARD; layer < LAYER_3D_END; ++layer ) { if( aPreset.layers.test( layer ) != visibleLayers.test( layer ) ) @@ -749,6 +801,9 @@ void APPEARANCE_CONTROLS_3D::doApplyLayerPreset( const LAYER_PRESET_3D& aPreset adapter.SetVisibleLayers( aPreset.layers ); adapter.SetLayerColors( aPreset.colors ); + if( aPreset.name.Lower() == _( "legacy colors" ) ) + adapter.m_Cfg->m_UseStackupColors = false; + UpdateLayerCtls(); m_frame->NewDisplay( true ); } diff --git a/3d-viewer/dialogs/appearance_controls_3D.h b/3d-viewer/dialogs/appearance_controls_3D.h index 67cfd2f105..17a9346d36 100644 --- a/3d-viewer/dialogs/appearance_controls_3D.h +++ b/3d-viewer/dialogs/appearance_controls_3D.h @@ -166,26 +166,26 @@ private: void passOnFocus(); private: - EDA_3D_VIEWER_FRAME* m_frame; - wxWindow* m_focusOwner; - static const APPEARANCE_SETTING_3D s_layerSettings[]; - GRID_BITMAP_TOGGLE_RENDERER* m_toggleGridRenderer; + EDA_3D_VIEWER_FRAME* m_frame; + wxWindow* m_focusOwner; std::vector> m_layerSettings; std::map m_layerSettingsMap; - wxArrayString m_presetMRU; + wxArrayString m_presetMRU; - std::map m_viewports; - VIEWPORT3D* m_lastSelectedViewport; - wxArrayString m_viewportMRU; + std::map m_viewports; + VIEWPORT3D* m_lastSelectedViewport; + wxArrayString m_viewportMRU; - wxBoxSizer* m_layersOuterSizer; - wxBoxSizer* m_envOuterSizer; - int m_pointSize; - wxColour m_layerPanelColour; + wxBoxSizer* m_layersOuterSizer; + wxBoxSizer* m_envOuterSizer; + int m_pointSize; + wxColour m_layerPanelColour; + GRID_BITMAP_TOGGLE_RENDERER* m_toggleGridRenderer; + wxCheckBox* m_cbUseBoardStackupColors; }; #endif diff --git a/3d-viewer/dialogs/appearance_controls_3D_base.cpp b/3d-viewer/dialogs/appearance_controls_3D_base.cpp index 682cf7af77..103b2df5f3 100644 --- a/3d-viewer/dialogs/appearance_controls_3D_base.cpp +++ b/3d-viewer/dialogs/appearance_controls_3D_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -25,11 +25,14 @@ APPEARANCE_CONTROLS_3D_BASE::APPEARANCE_CONTROLS_3D_BASE( wxWindow* parent, wxWi m_panelLayers->SetSizer( m_panelLayersSizer ); m_panelLayers->Layout(); m_panelLayersSizer->Fit( m_panelLayers ); - m_sizerOuter->Add( m_panelLayers, 1, wxEXPAND|wxBOTTOM, 5 ); + m_sizerOuter->Add( m_panelLayers, 1, wxEXPAND, 5 ); wxBoxSizer* bBottomMargin; bBottomMargin = new wxBoxSizer( wxVERTICAL ); + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bBottomMargin->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 3 ); + wxBoxSizer* bPresets; bPresets = new wxBoxSizer( wxVERTICAL ); @@ -44,7 +47,7 @@ APPEARANCE_CONTROLS_3D_BASE::APPEARANCE_CONTROLS_3D_BASE( wxWindow* parent, wxWi bPresets->Add( m_cbLayerPresets, 0, wxALL|wxEXPAND, 2 ); - bBottomMargin->Add( bPresets, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bBottomMargin->Add( bPresets, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bBottomMargin->Add( 0, 2, 0, wxEXPAND, 5 ); diff --git a/3d-viewer/dialogs/appearance_controls_3D_base.fbp b/3d-viewer/dialogs/appearance_controls_3D_base.fbp index cd0e6d7c08..3da05d3444 100644 --- a/3d-viewer/dialogs/appearance_controls_3D_base.fbp +++ b/3d-viewer/dialogs/appearance_controls_3D_base.fbp @@ -1,487 +1,553 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - appearance_controls_3D_base - 1000 - none - - - 1 - Appearance Panel 3D - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + ; + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + appearance_controls_3D_base + 1000 + none + + + 1 + Appearance Panel 3D + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + 200,360 + APPEARANCE_CONTROLS_3D_BASE + + -1,-1 + WX_PANEL; widgets/wx_panel.h; forward_declare + + 0 + + + wxTAB_TRAVERSAL + OnSetFocus + OnSize + + + m_sizerOuter + wxVERTICAL + protected + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 - 200,360 - APPEARANCE_CONTROLS_3D_BASE + + 0 + + 1 + m_panelLayers + 1 + + + protected + 1 - -1,-1 - WX_PANEL; widgets/wx_panel.h; forward_declare + Resizable + 1 + + ; ; forward_declare + 0 - 0 wxTAB_TRAVERSAL OnSetFocus - OnSize - - - m_sizerOuter - wxVERTICAL - protected - - 5 - wxEXPAND|wxBOTTOM - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelLayers - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - m_panelLayersSizer - wxVERTICAL - protected - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - wxScrolledCanvas - 1 - - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <wx/scrolwin.h> #include <wx/grid.h> // needed for MSVC to see wxScrolledCanvas indirectly exported - - 0 - - - 0 - - 1 - m_windowLayers - 1 - - - protected - 1 - - Resizable - - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - - 2 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - - bBottomMargin - wxVERTICAL - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - bPresets - wxVERTICAL - none - - 2 - wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Presets (Ctrl+Tab): - 0 - - 0 - - - 0 - - 1 - m_presetsLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Follow PCB Editor" "Follow PCB Plot Settings" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbLayerPresets - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onLayerPresetChanged - - - - - - 5 - wxEXPAND - 0 - - 2 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - - bViewports - wxVERTICAL - none - - 2 - wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Viewports (Alt+Tab): - 0 - - 0 - - - 0 - - 1 - m_viewportsLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 2 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "(unsaved)" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbViewports - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onViewportChanged - onUpdateViewportsCb - - - - - + + + m_panelLayersSizer + wxVERTICAL + protected + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxScrolledCanvas + 1 + + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <wx/scrolwin.h> #include <wx/grid.h> // needed for MSVC to see wxScrolledCanvas indirectly exported + + 0 + + + 0 + + 1 + m_windowLayers + 1 + + + protected + 1 + + Resizable + + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + + + 2 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + + bBottomMargin + wxVERTICAL + none + + 3 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + bPresets + wxVERTICAL + none + + 2 + wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Presets (Ctrl+Tab): + 0 + + 0 + + + 0 + + 1 + m_presetsLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Follow PCB Editor" "Follow PCB Plot Settings" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbLayerPresets + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onLayerPresetChanged + + + + + + 5 + wxEXPAND + 0 + + 2 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + bViewports + wxVERTICAL + none + + 2 + wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Viewports (Alt+Tab): + 0 + + 0 + + + 0 + + 1 + m_viewportsLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 2 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "(unsaved)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbViewports + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onViewportChanged + onUpdateViewportsCb + + + + + + + + diff --git a/3d-viewer/dialogs/appearance_controls_3D_base.h b/3d-viewer/dialogs/appearance_controls_3D_base.h index 63622a2970..fb32746555 100644 --- a/3d-viewer/dialogs/appearance_controls_3D_base.h +++ b/3d-viewer/dialogs/appearance_controls_3D_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -38,6 +39,7 @@ class APPEARANCE_CONTROLS_3D_BASE : public WX_PANEL wxPanel* m_panelLayers; wxBoxSizer* m_panelLayersSizer; wxScrolledCanvas* m_windowLayers; + wxStaticLine* m_staticline1; wxStaticText* m_presetsLabel; wxChoice* m_cbLayerPresets; wxStaticText* m_viewportsLabel; diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp index f73eab77b7..3990af624c 100644 --- a/common/settings/color_settings.cpp +++ b/common/settings/color_settings.cpp @@ -37,8 +37,7 @@ const wxString COLOR_SETTINGS::COLOR_BUILTIN_CLASSIC = "_builtin_classic"; COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath ) : JSON_SETTINGS( std::move( aFilename ), SETTINGS_LOC::COLORS, colorsSchemaVersion ), - m_overrideSchItemColors( false ), - m_useBoardStackupColors( true ) + m_overrideSchItemColors( false ) { if( aAbsolutePath ) SetLocation( SETTINGS_LOC::NONE ); @@ -49,9 +48,6 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath ) m_params.emplace_back( new PARAM( "schematic.override_item_colors", &m_overrideSchItemColors, false ) ); - m_params.emplace_back( new PARAM( "3d_viewer.use_board_stackup_colors", - &m_useBoardStackupColors, true ) ); - #define CLR( x, y ) \ wxASSERT( s_defaultTheme.count( y ) ); \ m_params.emplace_back( new COLOR_MAP_PARAM( x, y, s_defaultTheme.at( y ), &m_colors ) ); @@ -282,7 +278,6 @@ void COLOR_SETTINGS::initFromOther( const COLOR_SETTINGS& aOther ) { m_displayName = aOther.m_displayName; m_overrideSchItemColors = aOther.m_overrideSchItemColors; - m_useBoardStackupColors = aOther.m_useBoardStackupColors; m_colors = aOther.m_colors; m_defaultColors = aOther.m_defaultColors; m_writeFile = aOther.m_writeFile; diff --git a/include/settings/color_settings.h b/include/settings/color_settings.h index 9dc37cc247..ab8338bc0c 100644 --- a/include/settings/color_settings.h +++ b/include/settings/color_settings.h @@ -78,9 +78,6 @@ public: bool GetOverrideSchItemColors() const { return m_overrideSchItemColors; } void SetOverrideSchItemColors( bool aFlag ) { m_overrideSchItemColors = aFlag; } - bool GetUseBoardStackupColors() const { return m_useBoardStackupColors; } - void SetUseBoardStackupColors( bool aFlag ) { m_useBoardStackupColors = aFlag; } - /** * Constructs and returns a list of color settings objects based on the built-in color themes. * These color settings are not backed by a file and cannot be modified by the user. @@ -99,10 +96,9 @@ private: void initFromOther( const COLOR_SETTINGS& aOther ); +private: wxString m_displayName; - bool m_overrideSchItemColors; - bool m_useBoardStackupColors; /** * Map of all layer colors. diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp index cec3451677..aa60b10a58 100644 --- a/pcbnew/widgets/appearance_controls_base.cpp +++ b/pcbnew/widgets/appearance_controls_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -160,7 +160,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_presetsLabel = new wxStaticText( this, wxID_ANY, _("Presets (Ctrl+Tab):"), wxDefaultPosition, wxDefaultSize, 0 ); m_presetsLabel->Wrap( -1 ); - bPresets->Add( m_presetsLabel, 1, wxRIGHT|wxLEFT, 2 ); + bPresets->Add( m_presetsLabel, 1, wxTOP|wxRIGHT|wxLEFT, 2 ); wxString m_cbLayerPresetsChoices[] = { _("All Layers"), _("(unsaved)") }; int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString ); @@ -188,10 +188,10 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID bViewports->Add( m_cbViewports, 0, wxALL|wxEXPAND, 2 ); - bBottomMargin->Add( bViewports, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bBottomMargin->Add( bViewports, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_sizerOuter->Add( bBottomMargin, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); + m_sizerOuter->Add( bBottomMargin, 0, wxEXPAND|wxTOP|wxBOTTOM, 4 ); this->SetSizer( m_sizerOuter ); diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp index 711dd8d5e2..286c527162 100644 --- a/pcbnew/widgets/appearance_controls_base.fbp +++ b/pcbnew/widgets/appearance_controls_base.fbp @@ -1,1411 +1,1432 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - appearance_controls_base - 1000 - none - - - 1 - Appearance Panel - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + ; + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + appearance_controls_base + 1000 + none + + + 1 + Appearance Panel + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + 200,360 + APPEARANCE_CONTROLS_BASE + + -1,-1 + WX_PANEL; widgets/wx_panel.h; forward_declare + + 0 + + + wxTAB_TRAVERSAL + OnSetFocus + OnSize + + + m_sizerOuter + wxVERTICAL + protected + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 - 200,360 - APPEARANCE_CONTROLS_BASE + + 0 + + 1 + m_notebook + 1 + + + protected + 1 - -1,-1 - WX_PANEL; widgets/wx_panel.h; forward_declare + Resizable + 1 + + + ; ; forward_declare + 0 - 0 - wxTAB_TRAVERSAL + + OnNotebookPageChanged OnSetFocus - OnSize - + + + Layers + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - m_sizerOuter - wxVERTICAL + 1 + m_panelLayers + 1 + + protected - + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + OnSetFocus + + + m_panelLayersSizer + wxVERTICAL + protected + 5 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_notebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - OnNotebookPageChanged - OnSetFocus - - - Layers - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelLayers - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - m_panelLayersSizer - wxVERTICAL - protected - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - wxScrolledCanvas - 1 - - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <wx/scrolwin.h> - - 0 - - - 0 - - 1 - m_windowLayers - 1 - - - protected - 1 - - Resizable - - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - - - Objects - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_WINDOW - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelObjects - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - m_objectsPanelSizer - wxVERTICAL - protected - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - wxScrolledCanvas - 1 - - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <wx/scrolwin.h> - - 0 - - - 0 - - 1 - m_windowObjects - 1 - - - protected - 1 - - Resizable - - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - - - Nets - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelNetsAndClasses - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - m_netsTabOuterSizer - wxVERTICAL - protected - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 80 - - 0 - - 1 - m_netsTabSplitter - 1 - - - protected - 1 - - Resizable - 0.8 - 300 - -1 - 1 - - wxSPLIT_HORIZONTAL - wxSP_3D|wxSP_LIVE_UPDATE - ; ; forward_declare - 0 - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelNets - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - bSizer192 - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bSizer17 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Nets - 0 - - 0 - - - 0 - - 1 - m_staticTextNets - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 1 - wxID_ANY - - 0 - - - - 0 - - 1 - m_txtNetFilter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - BITMAP_BUTTON - 1 - - - 0 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_btnNetInspector - 1 - - - protected - 1 - - Resizable - - 1 - - BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare - 0 - Show the Net Inspector - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 3 - 40,40,400 - - 1 - 0 - Dock - 0 - Left - 0 - 0 - 0 - 0 - 0 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_netsGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 5 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnNetGridClick - OnNetGridDoubleClick - OnNetGridRightClick - OnSetFocus - - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelNetclasses - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - OnSetFocus - - - bSizerNetClasses - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bSizer20 - wxHORIZONTAL - none - - 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Net Classes - 0 - - 0 - - - 0 - - 1 - m_staticTextNetClasses - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - BITMAP_BUTTON - 1 - - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_btnConfigureNetClasses - 1 - - - protected - 1 - - Resizable - - 1 - - BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare - 0 - Configure net classes - - - - - - - - - 5 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_netclassScrolledWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - m_netclassOuterSizer - wxVERTICAL - protected - - - - - - - - - - - - - - - 2 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - - bBottomMargin - wxVERTICAL - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - bPresets - wxVERTICAL - none - - 2 - wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Presets (Ctrl+Tab): - 0 - - 0 - - - 0 - - 1 - m_presetsLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "All Layers" "(unsaved)" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbLayerPresets - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onLayerPresetChanged - - - - - - 5 - wxEXPAND - 0 - - 2 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - - bViewports - wxVERTICAL - none - - 2 - wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Viewports (Alt+Tab): - 0 - - 0 - - - 0 - - 1 - m_viewportsLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "(unsaved)" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbViewports - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onViewportChanged - - - - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxScrolledCanvas + 1 + + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <wx/scrolwin.h> + + 0 + + + 0 + + 1 + m_windowLayers + 1 + + + protected + 1 + + Resizable + + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + + + + Objects + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_WINDOW + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelObjects + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + OnSetFocus + + + m_objectsPanelSizer + wxVERTICAL + protected + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxScrolledCanvas + 1 + + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <wx/scrolwin.h> + + 0 + + + 0 + + 1 + m_windowObjects + 1 + + + protected + 1 + + Resizable + + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + + + + + + + Nets + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelNetsAndClasses + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + OnSetFocus + + + m_netsTabOuterSizer + wxVERTICAL + protected + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 80 + + 0 + + 1 + m_netsTabSplitter + 1 + + + protected + 1 + + Resizable + 0.8 + 300 + -1 + 1 + + wxSPLIT_HORIZONTAL + wxSP_3D|wxSP_LIVE_UPDATE + ; ; forward_declare + 0 + + + + + + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelNets + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + OnSetFocus + + + bSizer192 + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bSizer17 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Nets + 0 + + 0 + + + 0 + + 1 + m_staticTextNets + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 1 + wxID_ANY + + 0 + + + + 0 + + 1 + m_txtNetFilter + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + BITMAP_BUTTON + 1 + + + 0 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_btnNetInspector + 1 + + + protected + 1 + + Resizable + + 1 + + BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare + 0 + Show the Net Inspector + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 3 + 40,40,400 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_netsGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 5 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnNetGridClick + OnNetGridDoubleClick + OnNetGridRightClick + OnSetFocus + + + + + + + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelNetclasses + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + OnSetFocus + + + bSizerNetClasses + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bSizer20 + wxHORIZONTAL + none + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Net Classes + 0 + + 0 + + + 0 + + 1 + m_staticTextNetClasses + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + BITMAP_BUTTON + 1 + + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_btnConfigureNetClasses + 1 + + + protected + 1 + + Resizable + + 1 + + BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare + 0 + Configure net classes + + + + + + + + + 5 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_netclassScrolledWindow + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + + m_netclassOuterSizer + wxVERTICAL + protected + + + + + + + + + + + + + + 4 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + + bBottomMargin + wxVERTICAL + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + bPresets + wxVERTICAL + none + + 2 + wxTOP|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Presets (Ctrl+Tab): + 0 + + 0 + + + 0 + + 1 + m_presetsLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "All Layers" "(unsaved)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbLayerPresets + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onLayerPresetChanged + + + + + + 5 + wxEXPAND + 0 + + 2 + protected + 0 + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + + bViewports + wxVERTICAL + none + + 2 + wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Viewports (Alt+Tab): + 0 + + 0 + + + 0 + + 1 + m_viewportsLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "(unsaved)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbViewports + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onViewportChanged + + + + + + + + diff --git a/pcbnew/widgets/appearance_controls_base.h b/pcbnew/widgets/appearance_controls_base.h index 843e6939ed..5352f4b068 100644 --- a/pcbnew/widgets/appearance_controls_base.h +++ b/pcbnew/widgets/appearance_controls_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!