From 4687cd1ddb516610360c0bdf4929817178064c08 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sun, 8 Jan 2023 11:59:32 -0500 Subject: [PATCH] 3D viewer properties dialog layout improvements. --- .../dialogs/panel_3D_raytracing_options_base.cpp | 4 ++-- .../dialogs/panel_3D_raytracing_options_base.fbp | 7 +++++-- 3d-viewer/dialogs/panel_3D_raytracing_options_base.h | 3 ++- 3d-viewer/dialogs/panel_preview_3d_model_base.cpp | 6 +++--- 3d-viewer/dialogs/panel_preview_3d_model_base.fbp | 12 ++++++------ 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp index 2edce7ed59..a1ec54de64 100644 --- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp +++ b/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -164,7 +164,7 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa sbSizerRaytracingLightConfiguration->Add( bSizer11, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); wxFlexGridSizer* fgSizer11; - fgSizer11 = new wxFlexGridSizer( 0, 9, 0, 0 ); + fgSizer11 = new wxFlexGridSizer( 0, 9, 3, 0 ); fgSizer11->AddGrowableCol( 4 ); fgSizer11->SetFlexibleDirection( wxHORIZONTAL ); fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp index 48aaa61e5d..57e216bf06 100644 --- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp +++ b/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ panel_3D_raytracing_options_base 1000 none + 1 panel_3D_raytracing_options_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + 0 wxTAB_TRAVERSAL @@ -1699,7 +1702,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 diff --git a/3d-viewer/dialogs/panel_3D_raytracing_options_base.h b/3d-viewer/dialogs/panel_3D_raytracing_options_base.h index 6f863da936..1d11c9f4e9 100644 --- a/3d-viewer/dialogs/panel_3D_raytracing_options_base.h +++ b/3d-viewer/dialogs/panel_3D_raytracing_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -100,6 +100,7 @@ class PANEL_3D_RAYTRACING_OPTIONS_BASE : public RESETTABLE_PANEL public: PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~PANEL_3D_RAYTRACING_OPTIONS_BASE(); }; diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp index d1d28fca77..75469400ab 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp @@ -21,7 +21,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizerScale = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scale") ), wxVERTICAL ); wxFlexGridSizer* fgSizerScale; - fgSizerScale = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizerScale = new wxFlexGridSizer( 0, 3, 3, 3 ); fgSizerScale->AddGrowableCol( 1 ); fgSizerScale->SetFlexibleDirection( wxBOTH ); fgSizerScale->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -66,7 +66,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizerRotation = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Rotation") ), wxVERTICAL ); wxFlexGridSizer* fgSizerRotate; - fgSizerRotate = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizerRotate = new wxFlexGridSizer( 0, 3, 3, 3 ); fgSizerRotate->AddGrowableCol( 1 ); fgSizerRotate->SetFlexibleDirection( wxBOTH ); fgSizerRotate->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -111,7 +111,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizerOffset = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Offset") ), wxVERTICAL ); wxFlexGridSizer* fgSizerOffset; - fgSizerOffset = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizerOffset = new wxFlexGridSizer( 0, 3, 3, 3 ); fgSizerOffset->AddGrowableCol( 1 ); fgSizerOffset->SetFlexibleDirection( wxBOTH ); fgSizerOffset->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp index ead85a92df..9420b798fa 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp @@ -87,13 +87,13 @@ wxBOTH 1 - 0 + 3 fgSizerScale wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 wxALIGN_CENTER_VERTICAL|wxLEFT @@ -680,13 +680,13 @@ wxBOTH 1 - 0 + 3 fgSizerRotate wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 wxALIGN_CENTER_VERTICAL|wxLEFT @@ -1273,13 +1273,13 @@ wxBOTH 1 - 0 + 3 fgSizerOffset wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 wxALIGN_CENTER_VERTICAL|wxLEFT