From b3ddd09c444b68844f27ded63f2ae7e0e38e200d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 2 Oct 2022 20:00:42 +0100 Subject: [PATCH] Unit-binderize board thickness. --- 3d-viewer/dialogs/panel_preview_3d_model.cpp | 98 +------ 3d-viewer/dialogs/panel_preview_3d_model.h | 37 +-- .../dialogs/panel_preview_3d_model_base.cpp | 34 +-- .../dialogs/panel_preview_3d_model_base.fbp | 261 ++++++++---------- .../dialogs/panel_preview_3d_model_base.h | 8 +- include/widgets/unit_binder.h | 4 +- 6 files changed, 152 insertions(+), 290 deletions(-) diff --git a/3d-viewer/dialogs/panel_preview_3d_model.cpp b/3d-viewer/dialogs/panel_preview_3d_model.cpp index 8501fd68b6..3770cfeaca 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model.cpp +++ b/3d-viewer/dialogs/panel_preview_3d_model.cpp @@ -50,7 +50,8 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM m_infobar( nullptr ), m_boardAdapter(), m_currentCamera( m_trackBallCamera ), - m_trackBallCamera( 2 * RANGE_SCALE_3D ) + m_trackBallCamera( 2 * RANGE_SCALE_3D ), + m_boardThickness( aFrame, aFrame->GetIuScale(), nullptr, m_boardThicknessCtrl, m_boardThicknessUnits ) { m_userUnits = aFrame->GetUserUnits(); @@ -61,8 +62,6 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM m_dummyBoard->SetBoardUse( BOARD_USE::FPHOLDER ); BOARD_DESIGN_SETTINGS parent_bds = aFrame->GetDesignSettings(); - m_boardThickness_mm = parent_bds.GetBoardThickness() / pcbIUScale.IU_PER_MM; - BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings(); dummy_bds.SetBoardThickness( parent_bds.GetBoardThickness() ); BOARD_STACKUP& dummy_board_stackup = m_dummyBoard->GetDesignSettings().GetStackupDescriptor(); @@ -90,8 +89,7 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM { m_spinXscale, m_spinYscale, m_spinZscale, m_spinXrot, m_spinYrot, m_spinZrot, - m_spinXoffset,m_spinYoffset, m_spinZoffset, - m_spinBoardThickness + m_spinXoffset,m_spinYoffset, m_spinZoffset }; for( wxSpinButton* button : spinButtonList ) @@ -279,17 +277,6 @@ wxString PANEL_PREVIEW_3D_MODEL::formatOffsetValue( double aValue ) EDA_UNIT_UTILS::GetText( m_userUnits ) ); } -wxString PANEL_PREVIEW_3D_MODEL::formatBoardThicknessValue( double aValue ) -{ - // Convert from internal units (mm) to user units - if( m_userUnits == EDA_UNITS::INCHES ) - aValue /= 25.4f; - else if( m_userUnits == EDA_UNITS::MILS ) - aValue /= 25.4 / 1e3; - - return wxString::Format( "%.2f %s", aValue, EDA_UNIT_UTILS::GetText( m_userUnits ) ); -} - void PANEL_PREVIEW_3D_MODEL::SetSelectedModel( int idx ) { @@ -312,8 +299,6 @@ void PANEL_PREVIEW_3D_MODEL::SetSelectedModel( int idx ) yoff->ChangeValue( formatOffsetValue( modelInfo.m_Offset.y ) ); zoff->ChangeValue( formatOffsetValue( modelInfo.m_Offset.z ) ); - boardthickness->ChangeValue( formatBoardThicknessValue( m_boardThickness_mm ) ); - m_opacity->SetValue( modelInfo.m_Opacity * 100.0 ); } else @@ -334,6 +319,9 @@ void PANEL_PREVIEW_3D_MODEL::SetSelectedModel( int idx ) m_opacity->SetValue( 100 ); } + + BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings(); + m_boardThickness.ChangeValue( dummy_bds.GetBoardThickness() ); } @@ -385,16 +373,11 @@ void PANEL_PREVIEW_3D_MODEL::onOpacitySlider( wxCommandEvent& event ) } } + void PANEL_PREVIEW_3D_MODEL::updateBoardThickness( wxCommandEvent& event ) { - double curr_value_mm = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits, - boardthickness->GetValue() ) - / pcbIUScale.IU_PER_MM; - curr_value_mm = std::min( MAX_BOARD_THICKNESS, curr_value_mm ); - curr_value_mm = std::max( curr_value_mm, MIN_BOARD_THICKNESS ); - BOARD_DESIGN_SETTINGS dummy_bds = m_dummyBoard->GetDesignSettings(); - dummy_bds.SetBoardThickness( static_cast( curr_value_mm * pcbIUScale.IU_PER_MM ) ); + dummy_bds.SetBoardThickness( m_boardThickness.GetValue() ); BOARD_STACKUP& dummy_board_stackup = m_dummyBoard->GetDesignSettings().GetStackupDescriptor(); dummy_board_stackup.RemoveAll(); @@ -415,7 +398,8 @@ void PANEL_PREVIEW_3D_MODEL::doIncrementScale( wxSpinEvent& event, double aSign else if( spinCtrl == m_spinZscale ) textCtrl = zscale; - double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, EDA_UNITS::UNSCALED, textCtrl->GetValue() ); + double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, EDA_UNITS::UNSCALED, + textCtrl->GetValue() ); curr_value += ( SCALE_INCREMENT * aSign ); curr_value = std::max( 1/MAX_SCALE, curr_value ); @@ -475,32 +459,6 @@ void PANEL_PREVIEW_3D_MODEL::doIncrementOffset( wxSpinEvent& event, double aSign } -void PANEL_PREVIEW_3D_MODEL::doIncrementBoardThickness( wxSpinEvent& aEvent, double aSign ) -{ - wxSpinButton* spinCtrl = (wxSpinButton*) aEvent.GetEventObject(); - wxTextCtrl* textCtrl = boardthickness; - - double step = BOARD_THICKNESS_INCREMENT_MM; - - if( m_userUnits == EDA_UNITS::INCHES ) - step = BOARD_THICKNESS_INCREMENT_MIL / 1000.0; - else if( m_userUnits == EDA_UNITS::MILS ) - step = BOARD_THICKNESS_INCREMENT_MIL; - - double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits, - textCtrl->GetValue() ) - / pcbIUScale.IU_PER_MM; - - // avoid keeping the lower limit as offset after hitting it (0.4 -> 0.2 -> 0.01 -> 0.2 -> 0.4) - if (curr_value <= MIN_BOARD_THICKNESS) - curr_value = 0; - curr_value += ( step * aSign ); - curr_value = std::max( MIN_BOARD_THICKNESS, curr_value ); - curr_value = std::min( curr_value, MAX_BOARD_THICKNESS ); - - textCtrl->SetValue( formatBoardThicknessValue( curr_value ) ); -} - void PANEL_PREVIEW_3D_MODEL::onMouseWheelScale( wxMouseEvent& event ) { wxTextCtrl* textCtrl = (wxTextCtrl*) event.GetEventObject(); @@ -578,42 +536,6 @@ void PANEL_PREVIEW_3D_MODEL::onMouseWheelOffset( wxMouseEvent& event ) textCtrl->SetValue( formatOffsetValue( curr_value_mm ) ); } -void PANEL_PREVIEW_3D_MODEL::onMouseWheelBoardThickness( wxMouseEvent& event ) -{ - wxTextCtrl* textCtrl = (wxTextCtrl*) event.GetEventObject(); - - double step = BOARD_THICKNESS_INCREMENT_MM; - - if( event.ShiftDown( )) - step = BOARD_THICKNESS_INCREMENT_MM_FINE; - - if(m_userUnits==EDA_UNITS::INCHES) - { - step = BOARD_THICKNESS_INCREMENT_MIL/1000.0; - - if( event.ShiftDown() ) - step = BOARD_THICKNESS_INCREMENT_MIL_FINE/1000.0; - } - else if( m_userUnits == EDA_UNITS::MILS ) - { - step = BOARD_THICKNESS_INCREMENT_MIL; - - if( event.ShiftDown() ) - step = BOARD_THICKNESS_INCREMENT_MIL_FINE; - } - - if (event.GetWheelRotation()>=0) - step = -step; - - double curr_value = EDA_UNIT_UTILS::UI::DoubleValueFromString( pcbIUScale, m_userUnits, - textCtrl->GetValue() ) - / pcbIUScale.IU_PER_MM; - - curr_value += step; - curr_value = std::max( 0.0, curr_value ); - curr_value = std::min( curr_value, MAX_BOARD_THICKNESS ); -} - void PANEL_PREVIEW_3D_MODEL::UpdateDummyFootprint( bool aReloadRequired ) { diff --git a/3d-viewer/dialogs/panel_preview_3d_model.h b/3d-viewer/dialogs/panel_preview_3d_model.h index 8a72ace203..d0898776a8 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model.h +++ b/3d-viewer/dialogs/panel_preview_3d_model.h @@ -3,7 +3,7 @@ * * Copyright (C) 2016 Mario Luzeiro * Copyright (C) 2015 Cirilo Bernardo - * Copyright (C) 2015-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2015-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,22 +23,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -/** - * @file panel_prev_model.h - * @brief Defines a panel which is to be added to a wxFileDialog via - * SetExtraControl(); - * The panel shows a preview of the footprint being edited and provides controls - * to set the offset/rotation/scale of each model 3d shape as per KiCad's - * current behavior. The panel may also be used in the 3D configuration dialog - * to tune the positioning of the models without invoking a file selector dialog. - */ - #ifndef PANEL_PREVIEW_3D_MODEL_H #define PANEL_PREVIEW_3D_MODEL_H #include "panel_preview_3d_model_base.h" #include +#include #include #include <3d_canvas/eda_3d_canvas.h> #include <3d_viewer_id.h> @@ -48,8 +39,6 @@ #define MAX_SCALE 10000.0 #define MAX_ROTATION 180.0 #define MAX_OFFSET 1000.0 -#define MIN_BOARD_THICKNESS 0.01 -#define MAX_BOARD_THICKNESS 100.0 #define SCALE_INCREMENT_FINE 0.02 #define SCALE_INCREMENT 0.1 @@ -64,12 +53,6 @@ #define OFFSET_INCREMENT_MIL 25.0 #define OFFSET_INCREMENT_MIL_FINE 5.0 -#define BOARD_THICKNESS_INCREMENT_MM 0.2 -#define BOARD_THICKNESS_INCREMENT_MM_FINE 0.05 - -#define BOARD_THICKNESS_INCREMENT_MIL 10.0 -#define BOARD_THICKNESS_INCREMENT_MIL_FINE 2.0 - // Declared classes to create pointers class WX_INFOBAR; @@ -124,7 +107,6 @@ private: void onMouseWheelScale( wxMouseEvent& event ) override; void onMouseWheelRot( wxMouseEvent& event ) override; void onMouseWheelOffset( wxMouseEvent& event ) override; - void onMouseWheelBoardThickness( wxMouseEvent& event ) override; void onIncrementRot( wxSpinEvent& event ) override { @@ -150,14 +132,6 @@ private: { doIncrementOffset( event, -1.0 ); } - void onIncrementBoardThickness( wxSpinEvent& event ) override - { - doIncrementBoardThickness( event, 1.0 ); - } - void onDecrementBoardThickness( wxSpinEvent& event ) override - { - doIncrementBoardThickness( event, -1.0 ); - } void onOpacitySlider( wxCommandEvent& event ) override; @@ -166,12 +140,10 @@ private: void doIncrementScale( wxSpinEvent& aEvent, double aSign ); void doIncrementRotation( wxSpinEvent& aEvent, double aSign ); void doIncrementOffset( wxSpinEvent& aEvent, double aSign ); - void doIncrementBoardThickness( wxSpinEvent& aEvent, double aSign ); wxString formatScaleValue( double aValue ); wxString formatRotationValue( double aValue ); wxString formatOffsetValue( double aValue ); - wxString formatBoardThicknessValue( double aValue ); void View3DISO( wxCommandEvent& event ) override { @@ -228,9 +200,8 @@ private: std::vector* m_parentModelList; int m_selected; /// Index into m_parentInfoList - EDA_UNITS m_userUnits; - - double m_boardThickness_mm; + UNIT_BINDER m_boardThickness; + EDA_UNITS m_userUnits; }; #endif // PANEL_PREVIEW_3D_MODEL_H diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp index 3e586b2ab4..0ad796b29e 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-0-g4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -162,22 +162,14 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi bSizerLeft->Add( sbSizer4, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxStaticBoxSizer* sbSizerBoardThickness; - sbSizerBoardThickness = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Board Thickness") ), wxVERTICAL ); + sbSizerBoardThickness = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Board Thickness") ), wxHORIZONTAL ); - wxFlexGridSizer* fgSizerBoardThickness; - fgSizerBoardThickness = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizerBoardThickness->AddGrowableCol( 0 ); - fgSizerBoardThickness->SetFlexibleDirection( wxBOTH ); - fgSizerBoardThickness->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_boardThicknessCtrl = new wxTextCtrl( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + sbSizerBoardThickness->Add( m_boardThicknessCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - boardthickness = new wxTextCtrl( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerBoardThickness->Add( boardthickness, 0, wxALL, 5 ); - - m_spinBoardThickness = new wxSpinButton( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL ); - fgSizerBoardThickness->Add( m_spinBoardThickness, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - sbSizerBoardThickness->Add( fgSizerBoardThickness, 1, wxBOTTOM|wxEXPAND|wxRIGHT, 5 ); + m_boardThicknessUnits = new wxStaticText( sbSizerBoardThickness->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_boardThicknessUnits->Wrap( -1 ); + sbSizerBoardThickness->Add( m_boardThicknessUnits, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); bSizerLeft->Add( sbSizerBoardThickness, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); @@ -289,10 +281,8 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi m_spinZoffset->Connect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementOffset ), NULL, this ); m_spinZoffset->Connect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementOffset ), NULL, this ); m_opacity->Connect( wxEVT_SLIDER, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onOpacitySlider ), NULL, this ); - boardthickness->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this ); - boardthickness->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this ); - m_spinBoardThickness->Connect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementBoardThickness ), NULL, this ); - m_spinBoardThickness->Connect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementBoardThickness ), NULL, this ); + m_boardThicknessCtrl->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this ); + m_boardThicknessCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this ); m_bpvISO->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DISO ), NULL, this ); m_bpvLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DLeft ), NULL, this ); m_bpvRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DRight ), NULL, this ); @@ -343,10 +333,8 @@ PANEL_PREVIEW_3D_MODEL_BASE::~PANEL_PREVIEW_3D_MODEL_BASE() m_spinZoffset->Disconnect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementOffset ), NULL, this ); m_spinZoffset->Disconnect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementOffset ), NULL, this ); m_opacity->Disconnect( wxEVT_SLIDER, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onOpacitySlider ), NULL, this ); - boardthickness->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this ); - boardthickness->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this ); - m_spinBoardThickness->Disconnect( wxEVT_SCROLL_LINEDOWN, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onDecrementBoardThickness ), NULL, this ); - m_spinBoardThickness->Disconnect( wxEVT_SCROLL_LINEUP, wxSpinEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onIncrementBoardThickness ), NULL, this ); + m_boardThicknessCtrl->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::onMouseWheelBoardThickness ), NULL, this ); + m_boardThicknessCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::updateBoardThickness ), NULL, this ); m_bpvISO->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DISO ), NULL, this ); m_bpvLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DLeft ), NULL, this ); m_bpvRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREVIEW_3D_MODEL_BASE::View3DRight ), NULL, this ); diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp index b7f4516efe..e5b2281288 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp @@ -1934,151 +1934,134 @@ Board Thickness sbSizerBoardThickness - wxVERTICAL + wxHORIZONTAL 1 none 5 - wxBOTTOM|wxEXPAND|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT 1 - - 2 - wxBOTH - 0 - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 - fgSizerBoardThickness - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - boardthickness - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - onMouseWheelBoardThickness - updateBoardThickness - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_spinBoardThickness - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS|wxSP_VERTICAL - ; ; forward_declare - 0 - - - - - onDecrementBoardThickness - onIncrementBoardThickness - - + 1 + m_boardThicknessCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + onMouseWheelBoardThickness + updateBoardThickness + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + 0 + + 0 + + + 0 + + 1 + m_boardThicknessUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.h b/3d-viewer/dialogs/panel_preview_3d_model_base.h index bc665c3e91..c584f12114 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.h +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-0-g4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -66,8 +66,8 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel wxTextCtrl* zoff; wxSpinButton* m_spinZoffset; wxSlider* m_opacity; - wxTextCtrl* boardthickness; - wxSpinButton* m_spinBoardThickness; + wxTextCtrl* m_boardThicknessCtrl; + wxStaticText* m_boardThicknessUnits; wxBoxSizer* m_SizerPanelView; wxBitmapButton* m_bpvISO; wxBitmapButton* m_bpvLeft; @@ -92,8 +92,6 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel virtual void onOpacitySlider( wxCommandEvent& event ) { event.Skip(); } virtual void onMouseWheelBoardThickness( wxMouseEvent& event ) { event.Skip(); } virtual void updateBoardThickness( wxCommandEvent& event ) { event.Skip(); } - virtual void onDecrementBoardThickness( wxSpinEvent& event ) { event.Skip(); } - virtual void onIncrementBoardThickness( wxSpinEvent& event ) { event.Skip(); } virtual void View3DISO( wxCommandEvent& event ) { event.Skip(); } virtual void View3DLeft( wxCommandEvent& event ) { event.Skip(); } virtual void View3DRight( wxCommandEvent& event ) { event.Skip(); } diff --git a/include/widgets/unit_binder.h b/include/widgets/unit_binder.h index 259bfbe362..f142553a63 100644 --- a/include/widgets/unit_binder.h +++ b/include/widgets/unit_binder.h @@ -56,8 +56,8 @@ public: wxStaticText* aLabel, wxWindow* aValueCtrl, wxStaticText* aUnitLabel, bool aAllowEval = true ); - UNIT_BINDER( EDA_BASE_FRAME* aParent, const EDA_IU_SCALE& aIUScale, wxStaticText* aLabel, wxWindow* aValueCtrl, - wxStaticText* aUnitLabel, bool aAllowEval = true ); + UNIT_BINDER( EDA_BASE_FRAME* aParent, const EDA_IU_SCALE& aIUScale, wxStaticText* aLabel, + wxWindow* aValueCtrl, wxStaticText* aUnitLabel, bool aAllowEval = true ); ~UNIT_BINDER() override;