From 751fdbf278dbedf18f31dff3b7237f1d25671308 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 9 Jan 2021 20:29:25 +0000 Subject: [PATCH] Simplify layout & terminology in 3D settings dialog. Fixes https://gitlab.com/kicad/code/kicad/issues/6659 --- .../dialogs/dialog_3D_view_option.cpp | 25 - .../dialogs/dialog_3D_view_option_base.cpp | 592 +- .../dialogs/dialog_3D_view_option_base.fbp | 6745 +++++++---------- .../dialogs/dialog_3D_view_option_base.h | 54 +- 4 files changed, 2806 insertions(+), 4610 deletions(-) diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp index 50aac127c4..1aebdba608 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp @@ -39,8 +39,6 @@ public: return static_cast( DIALOG_SHIM::GetParent() ); } - void initDialog(); - void OnCheckEnableAnimation( wxCommandEvent& WXUNUSED( event ) ) override; void OnLightsResetToDefaults( wxCommandEvent& event ) override; @@ -74,8 +72,6 @@ DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_VIEWER* aParent ) : m_settings( aParent->GetAdapter() ), m_canvas( aParent->GetCanvas() ) { - initDialog(); - m_sdbSizerOK->SetDefault(); // Now all widgets have the size fixed, call FinishDialogSettings @@ -83,27 +79,6 @@ DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_VIEWER* aParent ) : } -void DIALOG_3D_VIEW_OPTIONS::initDialog() -{ - m_bitmapRealisticMode->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) ); - m_bitmapBoardBody->SetBitmap( KiBitmap( ortho_xpm ) ); - m_bitmapCuThickness->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) ); - m_bitmap3DshapesTH->SetBitmap( KiBitmap( shape_3d_xpm ) ); - m_bitmap3DshapesSMD->SetBitmap( KiBitmap( shape_3d_xpm ) ); - m_bitmap3DshapesVirtual->SetBitmap( KiBitmap( shape_3d_xpm ) ); - m_bitmapBoundingBoxes->SetBitmap( KiBitmap( axis3d_xpm ) ); - m_bitmapAreas->SetBitmap( KiBitmap( add_zone_xpm ) ); - m_bitmapSilkscreen->SetBitmap( KiBitmap( text_xpm ) ); - m_bitmapSolderMask->SetBitmap( KiBitmap( pads_mask_layers_xpm ) ); - m_bitmapSolderPaste->SetBitmap( KiBitmap( pads_mask_layers_xpm ) ); - m_bitmapAdhesive->SetBitmap( KiBitmap( tools_xpm ) ); - m_bitmapComments->SetBitmap( KiBitmap( editor_xpm ) ); - m_bitmapECO->SetBitmap( KiBitmap( editor_xpm ) ); - m_bitmapSubtractMaskFromSilk->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) ); - m_bitmapClipSilkOnViaAnnulus->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) ); -} - - void DIALOG_3D_VIEW_OPTIONS::OnCheckEnableAnimation( wxCommandEvent& event ) { m_staticAnimationSpeed->Enable( m_checkBoxEnableAnimation->GetValue() ); diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp index eecf2829a9..c99fec38a0 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,207 +24,82 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi wxBoxSizer* bSizeLeft; bSizeLeft = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Render Options") ), wxVERTICAL ); + wxStaticBoxSizer* sbModelVisibility; + sbModelVisibility = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("3D Model Visibility") ), wxVERTICAL ); - wxFlexGridSizer* fgSizerRenderOptions; - fgSizerRenderOptions = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizerRenderOptions->SetFlexibleDirection( wxBOTH ); - fgSizerRenderOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_checkBox3DshapesTH = new wxCheckBox( sbModelVisibility->GetStaticBox(), wxID_ANY, _("Show 3D through hole models"), wxDefaultPosition, wxDefaultSize, 0 ); + sbModelVisibility->Add( m_checkBox3DshapesTH, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBox3DshapesSMD = new wxCheckBox( sbModelVisibility->GetStaticBox(), wxID_ANY, _("Show 3D SMD models"), wxDefaultPosition, wxDefaultSize, 0 ); + sbModelVisibility->Add( m_checkBox3DshapesSMD, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBox3DshapesVirtual = new wxCheckBox( sbModelVisibility->GetStaticBox(), wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 ); + sbModelVisibility->Add( m_checkBox3DshapesVirtual, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - fgSizerRenderOptions->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); - - m_bitmapRealisticMode = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_bitmapRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBoxRealisticMode = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_checkBoxRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapBoardBody = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_bitmapBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBoxBoardBody = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Show board body"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_checkBoxBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapAreas = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_bitmapAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBoxAreas = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_checkBoxAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapSubtractMaskFromSilk = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_bitmapSubtractMaskFromSilk, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBoxSubtractMaskFromSilk = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_checkBoxSubtractMaskFromSilk, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 0, wxALIGN_LEFT|wxALIGN_RIGHT, 10 ); - - m_bitmapClipSilkOnViaAnnulus = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_bitmapClipSilkOnViaAnnulus, 0, wxALL, 5 ); - - m_checkBoxClipSilkOnViaAnnulus = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Clip silkscreen at via annulus"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRenderOptions->Add( m_checkBoxClipSilkOnViaAnnulus, 0, wxALL, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 1, wxEXPAND, 5 ); - - - fgSizerRenderOptions->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_checkBoxRenderPlatedPadsAsPlated = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Non plated pads copper as bare copper"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkBoxRenderPlatedPadsAsPlated->SetToolTip( _("Display plated pads as plated but other copper as raw copper material. (Slow)") ); - - fgSizerRenderOptions->Add( m_checkBoxRenderPlatedPadsAsPlated, 0, wxALL, 5 ); - - - sbSizer1->Add( fgSizerRenderOptions, 0, wxEXPAND|wxBOTTOM, 5 ); - - - bSizeLeft->Add( sbSizer1, 0, wxALL|wxEXPAND, 5 ); - - wxStaticBoxSizer* sbSizer3DVis; - sbSizer3DVis = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("3D Model Visibility") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizer3DVisibility; - fgSizer3DVisibility = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer3DVisibility->SetFlexibleDirection( wxBOTH ); - fgSizer3DVisibility->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - fgSizer3DVisibility->Add( 0, 0, 1, wxLEFT|wxRIGHT, 10 ); - - m_bitmap3DshapesTH = new wxStaticBitmap( sbSizer3DVis->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_bitmap3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBox3DshapesTH = new wxCheckBox( sbSizer3DVis->GetStaticBox(), wxID_ANY, _("Show 3D through hole models"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_checkBox3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmap3DshapesSMD = new wxStaticBitmap( sbSizer3DVis->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_bitmap3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBox3DshapesSMD = new wxCheckBox( sbSizer3DVis->GetStaticBox(), wxID_ANY, _("Show 3D SMD models"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_checkBox3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmap3DshapesVirtual = new wxStaticBitmap( sbSizer3DVis->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_bitmap3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_checkBox3DshapesVirtual = new wxCheckBox( sbSizer3DVis->GetStaticBox(), wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3DVisibility->Add( m_checkBox3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - sbSizer3DVis->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 ); - - - bSizeLeft->Add( sbSizer3DVis, 0, wxALL|wxEXPAND, 5 ); - - - bSizerDisplayOptions->Add( bSizeLeft, 1, wxALL|wxEXPAND, 5 ); - - m_staticlineVertical = new wxStaticLine( m_panelDspOpt, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - bSizerDisplayOptions->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 ); - - wxBoxSizer* bSizerRight; - bSizerRight = new wxBoxSizer( wxVERTICAL ); + bSizeLeft->Add( sbModelVisibility, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbBoardLayers; sbBoardLayers = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Board Layers") ), wxVERTICAL ); - wxFlexGridSizer* fgSizerShowBrdLayersOpts; - fgSizerShowBrdLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizerShowBrdLayersOpts->SetFlexibleDirection( wxBOTH ); - fgSizerShowBrdLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapSilkscreen = new wxStaticBitmap( sbBoardLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_bitmapSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_checkBoxSilkscreen = new wxCheckBox( sbBoardLayers->GetStaticBox(), wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_checkBoxSilkscreen, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - - fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapSolderMask = new wxStaticBitmap( sbBoardLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_bitmapSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbBoardLayers->Add( m_checkBoxSilkscreen, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxSolderMask = new wxCheckBox( sbBoardLayers->GetStaticBox(), wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapSolderPaste = new wxStaticBitmap( sbBoardLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_bitmapSolderPaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbBoardLayers->Add( m_checkBoxSolderMask, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxSolderpaste = new wxCheckBox( sbBoardLayers->GetStaticBox(), wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderpaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapAdhesive = new wxStaticBitmap( sbBoardLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_bitmapAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbBoardLayers->Add( m_checkBoxSolderpaste, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxAdhesive = new wxCheckBox( sbBoardLayers->GetStaticBox(), wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowBrdLayersOpts->Add( m_checkBoxAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbBoardLayers->Add( m_checkBoxAdhesive, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - sbBoardLayers->Add( fgSizerShowBrdLayersOpts, 0, wxEXPAND, 5 ); - - - bSizerRight->Add( sbBoardLayers, 0, wxALL|wxEXPAND, 5 ); + bSizeLeft->Add( sbBoardLayers, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbUserLayers; sbUserLayers = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("User Layers (not shown in realistic mode)") ), wxVERTICAL ); - wxFlexGridSizer* fgSizerShowUserLayersOpts; - fgSizerShowUserLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizerShowUserLayersOpts->SetFlexibleDirection( wxBOTH ); - fgSizerShowUserLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapComments = new wxStaticBitmap( sbUserLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowUserLayersOpts->Add( m_bitmapComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_checkBoxComments = new wxCheckBox( sbUserLayers->GetStaticBox(), wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowUserLayersOpts->Add( m_checkBoxComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); - - m_bitmapECO = new wxStaticBitmap( sbUserLayers->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowUserLayersOpts->Add( m_bitmapECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbUserLayers->Add( m_checkBoxComments, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxECO = new wxCheckBox( sbUserLayers->GetStaticBox(), wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShowUserLayersOpts->Add( m_checkBoxECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + sbUserLayers->Add( m_checkBoxECO, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - sbUserLayers->Add( fgSizerShowUserLayersOpts, 0, wxEXPAND, 5 ); + bSizeLeft->Add( sbUserLayers, 1, wxALL|wxEXPAND, 5 ); - bSizerRight->Add( sbUserLayers, 0, wxALL|wxEXPAND, 5 ); + bSizerDisplayOptions->Add( bSizeLeft, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizerRight; + bSizerRight = new wxBoxSizer( wxVERTICAL ); + + wxStaticBoxSizer* sbRenderOptions; + sbRenderOptions = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Render Options") ), wxVERTICAL ); + + m_checkBoxRealisticMode = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRenderOptions->Add( m_checkBoxRealisticMode, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBoxBoardBody = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Show board body"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRenderOptions->Add( m_checkBoxBoardBody, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBoxAreas = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRenderOptions->Add( m_checkBoxAreas, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBoxSubtractMaskFromSilk = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRenderOptions->Add( m_checkBoxSubtractMaskFromSilk, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBoxClipSilkOnViaAnnulus = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Clip silkscreen at via annulus"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRenderOptions->Add( m_checkBoxClipSilkOnViaAnnulus, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_checkBoxRenderPlatedPadsAsPlated = new wxCheckBox( sbRenderOptions->GetStaticBox(), wxID_ANY, _("Use bare copper color for unplated copper"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxRenderPlatedPadsAsPlated->SetToolTip( _("Use different colors for plated and unplated copper. (Slow)") ); + + sbRenderOptions->Add( m_checkBoxRenderPlatedPadsAsPlated, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + bSizerRight->Add( sbRenderOptions, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbCameraOptions; sbCameraOptions = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Camera Options") ), wxVERTICAL ); @@ -234,46 +109,46 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi m_staticTextRotAngle = new wxStaticText( sbCameraOptions->GetStaticBox(), wxID_ANY, _("Rotation Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRotAngle->Wrap( -1 ); - bSizerRotAngle->Add( m_staticTextRotAngle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerRotAngle->Add( m_staticTextRotAngle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spinCtrlRotationAngle = new wxSpinCtrlDouble( sbCameraOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 359, 10, 1 ); m_spinCtrlRotationAngle->SetDigits( 0 ); - bSizerRotAngle->Add( m_spinCtrlRotationAngle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerRotAngle->Add( m_spinCtrlRotationAngle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_staticTextRotAngleUnits = new wxStaticText( sbCameraOptions->GetStaticBox(), wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRotAngleUnits->Wrap( -1 ); - bSizerRotAngle->Add( m_staticTextRotAngleUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerRotAngle->Add( m_staticTextRotAngleUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - sbCameraOptions->Add( bSizerRotAngle, 1, wxEXPAND, 5 ); + sbCameraOptions->Add( bSizerRotAngle, 0, wxEXPAND|wxBOTTOM, 5 ); m_staticline3 = new wxStaticLine( sbCameraOptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - sbCameraOptions->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 ); + sbCameraOptions->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_checkBoxEnableAnimation = new wxCheckBox( sbCameraOptions->GetStaticBox(), wxID_ANY, _("Enable animation"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxEnableAnimation->SetValue(true); - sbCameraOptions->Add( m_checkBoxEnableAnimation, 0, wxALL, 5 ); + sbCameraOptions->Add( m_checkBoxEnableAnimation, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizerSlider; bSizerSlider = new wxBoxSizer( wxHORIZONTAL ); m_staticAnimationSpeed = new wxStaticText( sbCameraOptions->GetStaticBox(), wxID_ANY, _("Animation speed:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticAnimationSpeed->Wrap( -1 ); - bSizerSlider->Add( m_staticAnimationSpeed, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerSlider->Add( m_staticAnimationSpeed, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_sliderAnimationSpeed = new wxSlider( sbCameraOptions->GetStaticBox(), wxID_ANY, 3, 1, 5, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); m_sliderAnimationSpeed->SetMinSize( wxSize( 100,-1 ) ); - bSizerSlider->Add( m_sliderAnimationSpeed, 1, wxALL|wxEXPAND, 5 ); + bSizerSlider->Add( m_sliderAnimationSpeed, 1, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - sbCameraOptions->Add( bSizerSlider, 1, wxEXPAND, 5 ); + sbCameraOptions->Add( bSizerSlider, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - bSizerRight->Add( sbCameraOptions, 0, wxALL|wxEXPAND, 5 ); + bSizerRight->Add( sbCameraOptions, 1, wxALL|wxEXPAND, 5 ); - bSizerDisplayOptions->Add( bSizerRight, 0, wxALL|wxEXPAND, 5 ); + bSizerDisplayOptions->Add( bSizerRight, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_panelDspOpt->SetSizer( bSizerDisplayOptions ); @@ -290,49 +165,26 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi wxStaticBoxSizer* sbSizerOpenGLRenderoptions; sbSizerOpenGLRenderoptions = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("OpenGL Render Options") ), wxVERTICAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 2, 3, 0, 0 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - fgSizer6->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - m_bitmapBoundingBoxes = new wxStaticBitmap( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_bitmapBoundingBoxes, 0, wxALL, 5 ); - m_checkBoxBoundingBoxes = new wxCheckBox( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, _("Show model bounding boxes"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_checkBoxBoundingBoxes, 0, wxALL, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - m_bitmapCuThickness = new wxStaticBitmap( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_bitmapCuThickness, 0, wxALL, 5 ); + sbSizerOpenGLRenderoptions->Add( m_checkBoxBoundingBoxes, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxCuThickness = new wxCheckBox( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_checkBoxCuThickness, 0, wxALL, 5 ); + sbSizerOpenGLRenderoptions->Add( m_checkBoxCuThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - sbSizerOpenGLRenderoptions->Add( fgSizer6, 1, wxALL|wxEXPAND, 5 ); - - - bSizer7->Add( sbSizerOpenGLRenderoptions, 1, wxALL|wxEXPAND, 5 ); + bSizer7->Add( sbSizerOpenGLRenderoptions, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerOtherOptions; sbSizerOtherOptions = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("Other Options") ), wxVERTICAL ); wxFlexGridSizer* fgSizer7; - fgSizer7 = new wxFlexGridSizer( 2, 3, 0, 0 ); + fgSizer7 = new wxFlexGridSizer( 2, 2, 2, 0 ); fgSizer7->SetFlexibleDirection( wxBOTH ); fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - fgSizer7->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - m_staticText221 = new wxStaticText( sbSizerOtherOptions->GetStaticBox(), wxID_ANY, _("Anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText221 = new wxStaticText( sbSizerOtherOptions->GetStaticBox(), wxID_ANY, _("Anti-aliasing:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText221->Wrap( -1 ); - fgSizer7->Add( m_staticText221, 0, wxALL, 5 ); + fgSizer7->Add( m_staticText221, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); wxString m_choiceAntiAliasingChoices[] = { _("Disabled"), _("2x"), _("4x"), _("8x"), wxEmptyString }; int m_choiceAntiAliasingNChoices = sizeof( m_choiceAntiAliasingChoices ) / sizeof( wxString ); @@ -342,62 +194,39 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer7->Add( m_choiceAntiAliasing, 0, wxALL|wxEXPAND, 5 ); - - fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_staticText231 = new wxStaticText( sbSizerOtherOptions->GetStaticBox(), wxID_ANY, _("Selection color"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText231 = new wxStaticText( sbSizerOtherOptions->GetStaticBox(), wxID_ANY, _("Selection color:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText231->Wrap( -1 ); - fgSizer7->Add( m_staticText231, 0, wxALL, 5 ); + fgSizer7->Add( m_staticText231, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_colourPickerSelection = new wxColourPickerCtrl( sbSizerOtherOptions->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE ); - fgSizer7->Add( m_colourPickerSelection, 0, wxALL|wxEXPAND, 5 ); + fgSizer7->Add( m_colourPickerSelection, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - sbSizerOtherOptions->Add( fgSizer7, 1, wxALL|wxEXPAND, 5 ); + sbSizerOtherOptions->Add( fgSizer7, 1, wxEXPAND|wxRIGHT, 5 ); - bSizer7->Add( sbSizerOtherOptions, 1, wxALL|wxEXPAND, 5 ); + bSizer7->Add( sbSizerOtherOptions, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerWhileMoving; sbSizerWhileMoving = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("While Moving") ), wxVERTICAL ); - wxFlexGridSizer* fgSizer8; - fgSizer8 = new wxFlexGridSizer( 2, 4, 0, 0 ); - fgSizer8->SetFlexibleDirection( wxBOTH ); - fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - fgSizer8->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - m_checkBoxDisableAAMove = new wxCheckBox( sbSizerWhileMoving->GetStaticBox(), wxID_ANY, _("Disable anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_checkBoxDisableAAMove, 0, wxALL, 5 ); - - - fgSizer8->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + sbSizerWhileMoving->Add( m_checkBoxDisableAAMove, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxDisableMoveThickness = new wxCheckBox( sbSizerWhileMoving->GetStaticBox(), wxID_ANY, _("Disable thickness"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_checkBoxDisableMoveThickness, 0, wxALL, 5 ); - - - fgSizer8->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + sbSizerWhileMoving->Add( m_checkBoxDisableMoveThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxDisableMoveVias = new wxCheckBox( sbSizerWhileMoving->GetStaticBox(), wxID_ANY, _("Disable vias"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_checkBoxDisableMoveVias, 0, wxALL, 5 ); - - - fgSizer8->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + sbSizerWhileMoving->Add( m_checkBoxDisableMoveVias, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxDisableMoveHoles = new wxCheckBox( sbSizerWhileMoving->GetStaticBox(), wxID_ANY, _("Disable holes"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_checkBoxDisableMoveHoles, 0, wxALL, 5 ); - - - sbSizerWhileMoving->Add( fgSizer8, 1, wxALL|wxEXPAND, 5 ); + sbSizerWhileMoving->Add( m_checkBoxDisableMoveHoles, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizer7->Add( sbSizerWhileMoving, 1, wxALL|wxEXPAND, 5 ); - bSizerOpenGL->Add( bSizer7, 1, wxALL|wxEXPAND, 5 ); + bSizerOpenGL->Add( bSizer7, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_panelOpenGL->SetSizer( bSizerOpenGL ); @@ -413,165 +242,130 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi wxBoxSizer* bSizerRaytracing; bSizerRaytracing = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer12; - bSizer12 = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbSizerRaytracingRenderOptions; sbSizerRaytracingRenderOptions = new wxStaticBoxSizer( new wxStaticBox( m_panel4, wxID_ANY, _("Raytracing Render Options") ), wxVERTICAL ); sbSizerRaytracingRenderOptions->SetMinSize( wxSize( -1,32 ) ); - wxFlexGridSizer* fgSizer9; - fgSizer9 = new wxFlexGridSizer( 2, 4, 0, 0 ); - fgSizer9->SetFlexibleDirection( wxBOTH ); - fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE ); - - - fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + wxBoxSizer* bSizer16; + bSizer16 = new wxBoxSizer( wxVERTICAL ); m_checkBoxRaytracing_proceduralTextures = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Procedural textures"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_proceduralTextures->SetValue(true); - fgSizer9->Add( m_checkBoxRaytracing_proceduralTextures, 0, wxALL, 5 ); - - - fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + bSizer16->Add( m_checkBoxRaytracing_proceduralTextures, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxRaytracing_addFloor = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Add floor"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_addFloor->SetValue(true); - fgSizer9->Add( m_checkBoxRaytracing_addFloor, 0, wxALL, 5 ); - - - fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + bSizer16->Add( m_checkBoxRaytracing_addFloor, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxRaytracing_antiAliasing = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_antiAliasing->SetValue(true); - fgSizer9->Add( m_checkBoxRaytracing_antiAliasing, 0, wxALL, 5 ); - - - fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); + bSizer16->Add( m_checkBoxRaytracing_antiAliasing, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkBoxRaytracing_postProcessing = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Post-processing"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_postProcessing->SetValue(true); - fgSizer9->Add( m_checkBoxRaytracing_postProcessing, 0, wxALL, 5 ); + bSizer16->Add( m_checkBoxRaytracing_postProcessing, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - sbSizerRaytracingRenderOptions->Add( fgSizer9, 0, wxALL, 5 ); - - m_staticline4 = new wxStaticLine( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - sbSizerRaytracingRenderOptions->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 ); + sbSizerRaytracingRenderOptions->Add( bSizer16, 0, wxEXPAND|wxBOTTOM, 5 ); wxFlexGridSizer* fgSizer111; - fgSizer111 = new wxFlexGridSizer( 0, 5, 0, 0 ); + fgSizer111 = new wxFlexGridSizer( 0, 4, 6, 8 ); fgSizer111->SetFlexibleDirection( wxBOTH ); fgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - fgSizer111->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - fgSizer111->Add( 0, 0, 1, wxEXPAND, 5 ); m_staticText19 = new wxStaticText( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Number of Samples"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText19->Wrap( -1 ); - fgSizer111->Add( m_staticText19, 0, wxALL, 5 ); + fgSizer111->Add( m_staticText19, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_staticText201 = new wxStaticText( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Spread Factor %"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText201->Wrap( -1 ); - fgSizer111->Add( m_staticText201, 0, wxALL, 5 ); + fgSizer111->Add( m_staticText201, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText211 = new wxStaticText( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Recursive Level"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211 = new wxStaticText( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Recursion Level"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText211->Wrap( -1 ); - fgSizer111->Add( m_staticText211, 0, wxALL, 5 ); + fgSizer111->Add( m_staticText211, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - fgSizer111->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_checkBoxRaytracing_renderShadows = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Shadows"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxRaytracing_renderShadows = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Shadows:"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_renderShadows->SetValue(true); - fgSizer111->Add( m_checkBoxRaytracing_renderShadows, 0, wxALL, 5 ); + fgSizer111->Add( m_checkBoxRaytracing_renderShadows, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_spinCtrl_NrSamples_Shadows = new wxSpinCtrl( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 1, 64, 0 ); m_spinCtrl_NrSamples_Shadows->SetToolTip( _("Number of rays that will be cast, into light direction, to evaluate a shadow point") ); - fgSizer111->Add( m_spinCtrl_NrSamples_Shadows, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrl_NrSamples_Shadows, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spinCtrlDouble_SpreadFactor_Shadows = new wxSpinCtrlDouble( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 0.1, 25, 0, 1 ); m_spinCtrlDouble_SpreadFactor_Shadows->SetDigits( 1 ); m_spinCtrlDouble_SpreadFactor_Shadows->SetToolTip( _("Random direction factor of the cast rays") ); - fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Shadows, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Shadows, 0, wxRIGHT|wxLEFT, 5 ); fgSizer111->Add( 0, 0, 1, wxEXPAND, 5 ); - - fgSizer111->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - m_checkBoxRaytracing_showReflections = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Reflections"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxRaytracing_showReflections = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Reflections:"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_showReflections->SetValue(true); - fgSizer111->Add( m_checkBoxRaytracing_showReflections, 0, wxALL, 5 ); + fgSizer111->Add( m_checkBoxRaytracing_showReflections, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_spinCtrl_NrSamples_Reflections = new wxSpinCtrl( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 1, 32, 0 ); m_spinCtrl_NrSamples_Reflections->SetToolTip( _("Number of rays that will be cast to evaluate a reflection point") ); - fgSizer111->Add( m_spinCtrl_NrSamples_Reflections, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrl_NrSamples_Reflections, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlDouble_SpreadFactor_Reflections = new wxSpinCtrlDouble( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 0.1, 25, 0, 1 ); m_spinCtrlDouble_SpreadFactor_Reflections->SetDigits( 1 ); m_spinCtrlDouble_SpreadFactor_Reflections->SetToolTip( _("Random direction factor of the cast rays") ); - fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Reflections, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Reflections, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spinCtrlRecursiveLevel_Reflections = new wxSpinCtrl( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 1, 5, 0 ); m_spinCtrlRecursiveLevel_Reflections->SetToolTip( _("Interactions number that a ray can travel through objects. (higher number of levels improve results, specially on very transparent boards)") ); - fgSizer111->Add( m_spinCtrlRecursiveLevel_Reflections, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrlRecursiveLevel_Reflections, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - fgSizer111->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 ); - - m_checkBoxRaytracing_showRefractions = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Refractions"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxRaytracing_showRefractions = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Refractions:"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxRaytracing_showRefractions->SetValue(true); - fgSizer111->Add( m_checkBoxRaytracing_showRefractions, 0, wxALL, 5 ); + fgSizer111->Add( m_checkBoxRaytracing_showRefractions, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_spinCtrl_NrSamples_Refractions = new wxSpinCtrl( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 1, 5, 0 ); m_spinCtrl_NrSamples_Refractions->SetToolTip( _("Number of rays that will be cast to evaluate a refraction point") ); - fgSizer111->Add( m_spinCtrl_NrSamples_Refractions, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrl_NrSamples_Refractions, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spinCtrlDouble_SpreadFactor_Refractions = new wxSpinCtrlDouble( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 0.1, 25, 0, 1 ); m_spinCtrlDouble_SpreadFactor_Refractions->SetDigits( 1 ); m_spinCtrlDouble_SpreadFactor_Refractions->SetToolTip( _("Random direction factor of the cast rays") ); - fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Refractions, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrlDouble_SpreadFactor_Refractions, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_spinCtrlRecursiveLevel_Refractions = new wxSpinCtrl( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, 1, 7, 0 ); m_spinCtrlRecursiveLevel_Refractions->SetToolTip( _("Number of bounces that a ray can hit reflective objects") ); - fgSizer111->Add( m_spinCtrlRecursiveLevel_Refractions, 0, wxALL, 5 ); + fgSizer111->Add( m_spinCtrlRecursiveLevel_Refractions, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - sbSizerRaytracingRenderOptions->Add( fgSizer111, 1, wxALL, 5 ); + sbSizerRaytracingRenderOptions->Add( fgSizer111, 1, wxTOP|wxBOTTOM|wxRIGHT, 5 ); sbSizerRaytracingRenderOptions->Add( 0, 0, 1, wxEXPAND, 5 ); - bSizer12->Add( sbSizerRaytracingRenderOptions, 0, wxALL|wxEXPAND, 5 ); - - - bSizerRaytracing->Add( bSizer12, 1, wxALL|wxEXPAND, 5 ); + bSizerRaytracing->Add( sbSizerRaytracingRenderOptions, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_panel4->SetSizer( bSizerRaytracing ); m_panel4->Layout(); bSizerRaytracing->Fit( m_panel4 ); m_notebook2->AddPage( m_panel4, _("Render Options"), true ); - m_panel5 = new wxPanel( m_notebook2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_lightsConfig = new wxPanel( m_notebook2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer17; bSizer17 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizerRaytracingLightConfiguration; - sbSizerRaytracingLightConfiguration = new wxStaticBoxSizer( new wxStaticBox( m_panel5, wxID_ANY, _("Lights configuration") ), wxVERTICAL ); + sbSizerRaytracingLightConfiguration = new wxStaticBoxSizer( new wxStaticBox( m_lightsConfig, wxID_ANY, _("Lights Configuration") ), wxVERTICAL ); wxBoxSizer* bSizer11; bSizer11 = new wxBoxSizer( wxHORIZONTAL ); @@ -579,18 +373,18 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi bSizer11->Add( 0, 0, 1, 0, 5 ); - m_staticText17 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Ambient Camera Light"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText17 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Ambient camera light:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); - bSizer11->Add( m_staticText17, 0, wxALL, 5 ); + bSizer11->Add( m_staticText17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_colourPickerCameraLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 51, 51, 51 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE ); - bSizer11->Add( m_colourPickerCameraLight, 0, 0, 5 ); + m_colourPickerCameraLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 51, 51, 51 ), wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + bSizer11->Add( m_colourPickerCameraLight, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizer11->Add( 0, 0, 1, 0, 5 ); - sbSizerRaytracingLightConfiguration->Add( bSizer11, 1, wxEXPAND, 5 ); + sbSizerRaytracingLightConfiguration->Add( bSizer11, 0, wxEXPAND|wxBOTTOM, 5 ); wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxHORIZONTAL ); @@ -598,186 +392,187 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi bSizer13->Add( 0, 0, 1, 0, 5 ); - m_staticText5 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Top Light"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Top light:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); - bSizer13->Add( m_staticText5, 0, wxALL, 5 ); + bSizer13->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_colourPickerTopLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 63, 63, 63 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE ); - bSizer13->Add( m_colourPickerTopLight, 0, 0, 5 ); + m_colourPickerTopLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 63, 63, 63 ), wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + bSizer13->Add( m_colourPickerTopLight, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizer13->Add( 0, 0, 1, 0, 5 ); - m_staticText6 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Bottom Light"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Bottom light:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); - bSizer13->Add( m_staticText6, 0, wxALL, 5 ); + bSizer13->Add( m_staticText6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_colourPickerBottomLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 63, 63, 63 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE ); - bSizer13->Add( m_colourPickerBottomLight, 0, 0, 5 ); + m_colourPickerBottomLight = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxColour( 63, 63, 63 ), wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + bSizer13->Add( m_colourPickerBottomLight, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizer13->Add( 0, 0, 1, 0, 5 ); - sbSizerRaytracingLightConfiguration->Add( bSizer13, 1, wxEXPAND, 5 ); + sbSizerRaytracingLightConfiguration->Add( bSizer13, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); wxFlexGridSizer* fgSizer11; fgSizer11 = new wxFlexGridSizer( 0, 9, 0, 0 ); - fgSizer11->SetFlexibleDirection( wxBOTH ); + fgSizer11->AddGrowableCol( 4 ); + fgSizer11->SetFlexibleDirection( wxHORIZONTAL ); fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - fgSizer11->Add( 0, 0, 1, 0, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - fgSizer11->Add( 0, 0, 1, 0, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); m_staticText20 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText20->Wrap( -1 ); - fgSizer11->Add( m_staticText20, 0, wxALL, 5 ); + fgSizer11->Add( m_staticText20, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_staticText18 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); - fgSizer11->Add( m_staticText18, 0, wxALL, 5 ); + fgSizer11->Add( m_staticText18, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - fgSizer11->Add( 0, 0, 1, 0, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - fgSizer11->Add( 0, 0, 1, 0, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - fgSizer11->Add( 0, 0, 1, 0, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); m_staticText27 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText27->Wrap( -1 ); - fgSizer11->Add( m_staticText27, 0, wxALL, 5 ); + fgSizer11->Add( m_staticText27, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 ); m_staticText28 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText28->Wrap( -1 ); - fgSizer11->Add( m_staticText28, 0, wxALL, 5 ); + fgSizer11->Add( m_staticText28, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 ); - m_staticText21 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText21 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("1:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); - fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL, 5 ); - m_colourPickerLight1 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight1, 0, wxALL, 5 ); + m_colourPickerLight1 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight1, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation1 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation1, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth1 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth1, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - fgSizer11->Add( 0, 0, 1, wxALL, 5 ); + fgSizer11->Add( 10, 0, 0, 0, 5 ); - m_staticText22 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("5"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText22 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("5:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText22->Wrap( -1 ); - fgSizer11->Add( m_staticText22, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText22, 0, wxALIGN_CENTER|wxLEFT, 5 ); - m_colourPickerLight5 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight5, 0, wxALL, 5 ); + m_colourPickerLight5 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight5, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation5 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation5, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth5 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth5, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - m_staticText23 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("2"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText23 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); - fgSizer11->Add( m_staticText23, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText23, 0, wxALIGN_CENTER, 5 ); - m_colourPickerLight2 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight2, 0, wxALL, 5 ); + m_colourPickerLight2 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight2, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation2 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation2, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth2 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth2, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - fgSizer11->Add( 0, 0, 1, wxALL, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - m_staticText24 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("6"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText24 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("6:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); - fgSizer11->Add( m_staticText24, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText24, 0, wxALIGN_CENTER|wxLEFT, 5 ); - m_colourPickerLight6 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight6, 0, wxALL, 5 ); + m_colourPickerLight6 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight6, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation6 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation6, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth6 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth6, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - m_staticText25 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("3"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText25 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("3:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText25->Wrap( -1 ); - fgSizer11->Add( m_staticText25, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText25, 0, wxALIGN_CENTER, 5 ); - m_colourPickerLight3 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight3, 0, wxALL, 5 ); + m_colourPickerLight3 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight3, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation3 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation3, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth3 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth3, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - fgSizer11->Add( 0, 0, 1, wxALL, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - m_staticText26 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("7"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText26 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("7:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText26->Wrap( -1 ); - fgSizer11->Add( m_staticText26, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText26, 0, wxALIGN_CENTER|wxLEFT, 5 ); - m_colourPickerLight7 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight7, 0, wxALL, 5 ); + m_colourPickerLight7 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight7, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation7 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation7, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth7 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth7, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - m_staticText171 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("4"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText171 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("4:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText171->Wrap( -1 ); - fgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER, 5 ); - m_colourPickerLight4 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight4, 0, wxALL, 5 ); + m_colourPickerLight4 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight4, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation4 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation4, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth4 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth4, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - fgSizer11->Add( 0, 0, 1, wxALL|wxEXPAND, 5 ); + fgSizer11->Add( 0, 0, 0, 0, 5 ); - m_staticText181 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("8"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText181 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("8:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText181->Wrap( -1 ); - fgSizer11->Add( m_staticText181, 0, wxALIGN_CENTER|wxALL, 5 ); + fgSizer11->Add( m_staticText181, 0, wxALIGN_CENTER|wxLEFT, 5 ); - m_colourPickerLight8 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( -1,-1 ), wxCLRP_DEFAULT_STYLE ); - fgSizer11->Add( m_colourPickerLight8, 0, wxALL, 5 ); + m_colourPickerLight8 = new wxColourPickerCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxSize( 72,-1 ), wxCLRP_DEFAULT_STYLE ); + fgSizer11->Add( m_colourPickerLight8, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spinCtrlLightElevation8 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); - fgSizer11->Add( m_spinCtrlLightElevation8, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightElevation8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); m_spinCtrlLightAzimuth8 = new wxSpinCtrl( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 124,-1 ), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 ); - fgSizer11->Add( m_spinCtrlLightAzimuth8, 0, wxALL, 1 ); + fgSizer11->Add( m_spinCtrlLightAzimuth8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 1 ); - sbSizerRaytracingLightConfiguration->Add( fgSizer11, 0, wxALL|wxEXPAND, 5 ); + sbSizerRaytracingLightConfiguration->Add( fgSizer11, 0, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizer19; - bSizer19 = new wxBoxSizer( wxHORIZONTAL ); + bSizer19 = new wxBoxSizer( wxVERTICAL ); bSizer19->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -786,16 +581,16 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi bSizer19->Add( m_buttonLightsResetToDefaults, 0, wxALL, 5 ); - sbSizerRaytracingLightConfiguration->Add( bSizer19, 1, wxEXPAND, 5 ); + sbSizerRaytracingLightConfiguration->Add( bSizer19, 1, wxEXPAND|wxALL, 5 ); - bSizer17->Add( sbSizerRaytracingLightConfiguration, 0, wxALL|wxEXPAND, 5 ); + bSizer17->Add( sbSizerRaytracingLightConfiguration, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_panel5->SetSizer( bSizer17 ); - m_panel5->Layout(); - bSizer17->Fit( m_panel5 ); - m_notebook2->AddPage( m_panel5, _("Lights configuration"), false ); + m_lightsConfig->SetSizer( bSizer17 ); + m_lightsConfig->Layout(); + bSizer17->Fit( m_lightsConfig ); + m_notebook2->AddPage( m_lightsConfig, _("Lights Configuration"), false ); bSizer14->Add( m_notebook2, 1, wxEXPAND | wxALL, 5 ); @@ -807,9 +602,6 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi bSizerMain->Add( m_notebook, 1, wxALL|wxEXPAND, 5 ); - m_staticlineH = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticlineH, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp index e133677f59..218dbc4061 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp @@ -14,7 +14,6 @@ dialog_3D_view_option_base 1000 none - 1 dialog_3D_view_option_base @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -179,7 +177,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 @@ -187,783 +185,6 @@ wxVERTICAL none - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Render Options - - sbSizer1 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM - 0 - - 3 - wxBOTH - - - 0 - - fgSizerRenderOptions - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapRealisticMode - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Realistic mode - - 0 - - - 0 - - 1 - m_checkBoxRealisticMode - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnCheckRealisticMode - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From File; ; [-1; -1] - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_bitmapBoardBody - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show board body - - 0 - - - 0 - - 1 - m_checkBoxBoardBody - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapAreas - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show filled areas in zones - - 0 - - - 0 - - 1 - m_checkBoxAreas - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapSubtractMaskFromSilk - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Subtract soldermask from silkscreen - - 0 - - - 0 - - 1 - m_checkBoxSubtractMaskFromSilk - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxALIGN_LEFT|wxALIGN_RIGHT - 0 - - 0 - protected - 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 - m_bitmapClipSilkOnViaAnnulus - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Clip silkscreen at via annulus - - 0 - - - 0 - - 1 - m_checkBoxClipSilkOnViaAnnulus - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Non plated pads copper as bare copper - - 0 - - - 0 - - 1 - m_checkBoxRenderPlatedPadsAsPlated - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Display plated pads as plated but other copper as raw copper material. (Slow) - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - 5 wxALL|wxEXPAND 0 @@ -971,496 +192,205 @@ wxID_ANY 3D Model Visibility - sbSizer3DVis + sbModelVisibility wxVERTICAL 1 none 5 - wxEXPAND + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - - 3 - wxBOTH - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show 3D through hole models + + 0 + + + 0 - fgSizer3DVisibility - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 10 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmap3DshapesTH - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show 3D through hole models - - 0 - - - 0 - - 1 - m_checkBox3DshapesTH - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmap3DshapesSMD - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show 3D SMD models - - 0 - - - 0 - - 1 - m_checkBox3DshapesSMD - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmap3DshapesVirtual - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show 3D virtual models - - 0 - - - 0 - - 1 - m_checkBox3DshapesVirtual - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBox3DshapesTH + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show 3D SMD models + + 0 + + + 0 + + 1 + m_checkBox3DshapesSMD + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show 3D virtual models + + 0 + + + 0 + + 1 + m_checkBox3DshapesVirtual + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + - - - - 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticlineVertical - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_VERTICAL - - 0 - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - bSizerRight - wxVERTICAL - none - + 5 wxALL|wxEXPAND 0 @@ -1474,556 +404,266 @@ none 5 - wxEXPAND + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - - 3 - wxBOTH - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show silkscreen layers + + 0 + + + 0 - fgSizerShowBrdLayersOpts - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapSilkscreen - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show silkscreen layers - - 0 - - - 0 - - 1 - m_checkBoxSilkscreen - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapSolderMask - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show solder mask layers - - 0 - - - 0 - - 1 - m_checkBoxSolderMask - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapSolderPaste - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show solder paste layers - - 0 - - - 0 - - 1 - m_checkBoxSolderpaste - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapAdhesive - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show adhesive layers - - 0 - - - 0 - - 1 - m_checkBoxAdhesive - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxSilkscreen + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show solder mask layers + + 0 + + + 0 + + 1 + m_checkBoxSolderMask + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show solder paste layers + + 0 + + + 0 + + 1 + m_checkBoxSolderpaste + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show adhesive layers + + 0 + + + 0 + + 1 + m_checkBoxAdhesive + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + - + 5 wxALL|wxEXPAND - 0 + 1 wxID_ANY User Layers (not shown in realistic mode) @@ -2034,292 +674,548 @@ none 5 - wxEXPAND + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - - 3 - wxBOTH - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show comments and drawings layers + + 0 + + + 0 - fgSizerShowUserLayersOpts - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapComments - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show comments and drawings layers - - 0 - - - 0 - - 1 - m_checkBoxComments - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 0 - protected - 0 - - - - 5 - wxALL|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_bitmapECO - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show ECO layers - - 0 - - - 0 - - 1 - m_checkBoxECO - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxComments + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show ECO layers + + 0 + + + 0 + + 1 + m_checkBoxECO + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + - + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + bSizerRight + wxVERTICAL + none + 5 wxALL|wxEXPAND 0 + + wxID_ANY + Render Options + + sbRenderOptions + wxVERTICAL + 1 + none + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Realistic mode + + 0 + + + 0 + + 1 + m_checkBoxRealisticMode + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckRealisticMode + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show board body + + 0 + + + 0 + + 1 + m_checkBoxBoardBody + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show filled areas in zones + + 0 + + + 0 + + 1 + m_checkBoxAreas + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Subtract soldermask from silkscreen + + 0 + + + 0 + + 1 + m_checkBoxSubtractMaskFromSilk + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Clip silkscreen at via annulus + + 0 + + + 0 + + 1 + m_checkBoxClipSilkOnViaAnnulus + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use bare copper color for unplated copper + + 0 + + + 0 + + 1 + m_checkBoxRenderPlatedPadsAsPlated + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Use different colors for plated and unplated copper. (Slow) + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 wxID_ANY Camera Options @@ -2330,8 +1226,8 @@ none 5 - wxEXPAND - 1 + wxEXPAND|wxBOTTOM + 0 bSizerRotAngle @@ -2339,7 +1235,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2400,7 +1296,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2464,7 +1360,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2527,7 +1423,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxTOP|wxBOTTOM 0 1 @@ -2585,7 +1481,7 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -2650,8 +1546,8 @@ 5 - wxEXPAND - 1 + wxEXPAND|wxTOP|wxBOTTOM + 0 bSizerSlider @@ -2659,7 +1555,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2720,7 +1616,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 1 1 @@ -2854,18 +1750,18 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 bSizer7 wxVERTICAL none - + 5 wxALL|wxEXPAND - 1 - + 0 + wxID_ANY OpenGL Render Options @@ -2875,284 +1771,130 @@ none 5 - wxALL|wxEXPAND - 1 - - 3 - wxBOTH - - - 0 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show model bounding boxes + + 0 + + + 0 - fgSizer6 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 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 - m_bitmapBoundingBoxes - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show model bounding boxes - - 0 - - - 0 - - 1 - m_checkBoxBoundingBoxes - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From File; ; [-1; -1] - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_bitmapCuThickness - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show copper thickness - - 0 - - - 0 - - 1 - m_checkBoxCuThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxBoundingBoxes + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show copper thickness + + 0 + + + 0 + + 1 + m_checkBoxCuThickness + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + @@ -3160,7 +1902,7 @@ 5 wxALL|wxEXPAND - 1 + 0 wxID_ANY Other Options @@ -3171,10 +1913,10 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxRIGHT 1 - 3 + 2 wxBOTH @@ -3184,20 +1926,10 @@ wxFLEX_GROWMODE_SPECIFIED none 2 - 0 - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - + 2 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3227,7 +1959,7 @@ 0 0 wxID_ANY - Anti-aliasing + Anti-aliasing: 0 0 @@ -3322,17 +2054,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3362,7 +2084,7 @@ 0 0 wxID_ANY - Selection color + Selection color: 0 0 @@ -3393,7 +2115,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3458,11 +2180,11 @@ - + 5 wxALL|wxEXPAND 1 - + wxID_ANY While Moving @@ -3472,316 +2194,258 @@ none 5 - wxALL|wxEXPAND - 1 - - 4 - wxBOTH - - - 0 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable anti-aliasing + + 0 + + + 0 - fgSizer8 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable anti-aliasing - - 0 - - - 0 - - 1 - m_checkBoxDisableAAMove - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable thickness - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable vias - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable holes - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveHoles - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxDisableAAMove + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable thickness + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveThickness + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable vias + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveVias + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable holes + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveHoles + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + @@ -3970,344 +2634,314 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - - - bSizer12 + + wxID_ANY + Raytracing Render Options + -1,32 + sbSizerRaytracingRenderOptions wxVERTICAL + 1 none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM 0 - - wxID_ANY - Raytracing Render Options - -1,32 - sbSizerRaytracingRenderOptions + + + bSizer16 wxVERTICAL - 1 none - + 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 - - 4 - wxBOTH - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Procedural textures + + 0 + + + 0 - fgSizer9 - wxFLEX_GROWMODE_NONE - none - 2 - 0 - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Procedural textures - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_proceduralTextures - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Add floor - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_addFloor - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Anti-aliasing - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_antiAliasing - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Post-processing - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_postProcessing - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_checkBoxRaytracing_proceduralTextures + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + - + 5 - wxEXPAND | wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Add floor + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_addFloor + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Anti-aliasing + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_antiAliasing + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Post-processing + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_postProcessing + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 1 + + 4 + wxBOTH + + + 8 + + fgSizer111 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 6 + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + 1 1 1 @@ -4335,6 +2969,8 @@ 0 0 wxID_ANY + Number of Samples + 0 0 @@ -4342,7 +2978,7 @@ 0 1 - m_staticline4 + m_staticText19 1 @@ -4352,968 +2988,326 @@ Resizable 1 - wxLI_HORIZONTAL + ; ; forward_declare 0 + -1 + + + + 5 + wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Spread Factor % + 0 + + 0 + + + 0 + + 1 + m_staticText201 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 5 - wxALL - 1 - - 5 - wxBOTH - - - 0 + wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Recursion Level + 0 + + 0 + + + 0 - fgSizer111 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Number of Samples - 0 - - 0 - - - 0 - - 1 - m_staticText19 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Spread Factor % - 0 - - 0 - - - 0 - - 1 - m_staticText201 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Recursive Level - 0 - - 0 - - - 0 - - 1 - m_staticText211 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Shadows - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_renderShadows - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 64 - - 0 - - 1 - - 0 - - 1 - m_spinCtrl_NrSamples_Shadows - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Number of rays that will be cast, into light direction, to evaluate a shadow point - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 1 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 0 - 25 - - 0 - - 0.1 - - 0 - - 1 - m_spinCtrlDouble_SpreadFactor_Shadows - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Random direction factor of the cast rays - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Reflections - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_showReflections - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 32 - - 0 - - 1 - - 0 - - 1 - m_spinCtrl_NrSamples_Reflections - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Number of rays that will be cast to evaluate a reflection point - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 1 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 0 - 25 - - 0 - - 0.1 - - 0 - - 1 - m_spinCtrlDouble_SpreadFactor_Reflections - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Random direction factor of the cast rays - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 5 - - 0 - - 1 - - 0 - - 1 - m_spinCtrlRecursiveLevel_Reflections - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Interactions number that a ray can travel through objects. (higher number of levels improve results, specially on very transparent boards) - - - - - - - - 5 - wxLEFT|wxRIGHT - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Refractions - - 0 - - - 0 - - 1 - m_checkBoxRaytracing_showRefractions - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 5 - - 0 - - 1 - - 0 - - 1 - m_spinCtrl_NrSamples_Refractions - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Number of rays that will be cast to evaluate a refraction point - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 1 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 1 - 0 - 25 - - 0 - - 0.1 - - 0 - - 1 - m_spinCtrlDouble_SpreadFactor_Refractions - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Random direction factor of the cast rays - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - 7 - - 0 - - 1 - - 0 - - 1 - m_spinCtrlRecursiveLevel_Refractions - 1 - - - protected - 1 - - Resizable - 1 - 124,-1 - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - Number of bounces that a ray can hit reflective objects - - - - - - + 1 + m_staticText211 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Shadows: + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_renderShadows + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 64 + + 0 + + 1 + + 0 + + 1 + m_spinCtrl_NrSamples_Shadows + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Number of rays that will be cast, into light direction, to evaluate a shadow point + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 1 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 0 + 25 + + 0 + + 0.1 + + 0 + + 1 + m_spinCtrlDouble_SpreadFactor_Shadows + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Random direction factor of the cast rays + + + + @@ -5326,6 +3320,520 @@ 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Reflections: + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_showReflections + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 32 + + 0 + + 1 + + 0 + + 1 + m_spinCtrl_NrSamples_Reflections + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Number of rays that will be cast to evaluate a reflection point + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 1 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 0 + 25 + + 0 + + 0.1 + + 0 + + 1 + m_spinCtrlDouble_SpreadFactor_Reflections + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Random direction factor of the cast rays + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 5 + + 0 + + 1 + + 0 + + 1 + m_spinCtrlRecursiveLevel_Reflections + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Interactions number that a ray can travel through objects. (higher number of levels improve results, specially on very transparent boards) + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Refractions: + + 0 + + + 0 + + 1 + m_checkBoxRaytracing_showRefractions + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 5 + + 0 + + 1 + + 0 + + 1 + m_spinCtrl_NrSamples_Refractions + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Number of rays that will be cast to evaluate a refraction point + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 1 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 1 + 0 + 25 + + 0 + + 0.1 + + 0 + + 1 + m_spinCtrlDouble_SpreadFactor_Refractions + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Random direction factor of the cast rays + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 7 + + 0 + + 1 + + 0 + + 1 + m_spinCtrlRecursiveLevel_Refractions + 1 + + + protected + 1 + + Resizable + 1 + 124,-1 + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + Number of bounces that a ray can hit reflective objects + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 @@ -5335,9 +3843,9 @@ - Lights configuration + Lights Configuration 0 - + 1 1 1 @@ -5372,7 +3880,7 @@ 0 1 - m_panel5 + m_lightsConfig 1 @@ -5388,28 +3896,28 @@ wxTAB_TRAVERSAL - + bSizer17 wxVERTICAL none - + 5 - wxALL|wxEXPAND - 0 - + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + wxID_ANY - Lights configuration + Lights Configuration -1,-1 sbSizerRaytracingLightConfiguration wxVERTICAL 1 none - + 5 - wxEXPAND - 1 - + wxEXPAND|wxBOTTOM + 0 + -1,-1 bSizer11 wxHORIZONTAL @@ -5426,7 +3934,7 @@ 5 - wxALL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -5456,7 +3964,7 @@ 0 0 wxID_ANY - Ambient Camera Light + Ambient camera light: 0 0 @@ -5487,7 +3995,7 @@ 5 - + wxALIGN_CENTER_VERTICAL 0 1 @@ -5534,7 +4042,7 @@ Resizable 1 - + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -5560,11 +4068,11 @@ - + 5 - wxEXPAND - 1 - + wxEXPAND|wxTOP|wxBOTTOM + 0 + -1,-1 bSizer13 wxHORIZONTAL @@ -5581,7 +4089,7 @@ 5 - wxALL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -5611,7 +4119,7 @@ 0 0 wxID_ANY - Top Light + Top light: 0 0 @@ -5642,7 +4150,7 @@ 5 - + wxALIGN_CENTER_VERTICAL 0 1 @@ -5689,7 +4197,7 @@ Resizable 1 - + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -5715,7 +4223,7 @@ 5 - wxALL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -5745,7 +4253,7 @@ 0 0 wxID_ANY - Bottom Light + Bottom light: 0 0 @@ -5776,7 +4284,7 @@ 5 - + wxALIGN_CENTER_VERTICAL 0 1 @@ -5823,7 +4331,7 @@ Resizable 1 - + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -5849,14 +4357,14 @@ - + 5 - wxALL|wxEXPAND + wxEXPAND|wxALL 0 - + 9 - wxBOTH - + wxHORIZONTAL + 4 0 @@ -5868,7 +4376,7 @@ 5 - 1 + 0 0 protected @@ -5878,7 +4386,7 @@ 5 - 1 + 0 0 protected @@ -5887,7 +4395,7 @@ 5 - wxALL + wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -5948,7 +4456,7 @@ 5 - wxALL + wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -6010,7 +4518,7 @@ 5 - 1 + 0 0 protected @@ -6020,7 +4528,7 @@ 5 - 1 + 0 0 protected @@ -6030,7 +4538,7 @@ 5 - 1 + 0 0 protected @@ -6039,7 +4547,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 1 @@ -6100,7 +4608,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 1 @@ -6161,7 +4669,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER|wxALIGN_CENTER_VERTICAL 0 1 @@ -6191,7 +4699,7 @@ 0 0 wxID_ANY - 1 + 1: 0 0 @@ -6222,7 +4730,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -6269,7 +4777,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -6285,7 +4793,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6347,7 +4855,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6409,17 +4917,17 @@ 5 - wxALL - 1 + + 0 0 protected - 0 + 10 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER|wxLEFT 0 1 @@ -6449,7 +4957,7 @@ 0 0 wxID_ANY - 5 + 5: 0 0 @@ -6480,7 +4988,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -6527,7 +5035,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -6543,7 +5051,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6605,7 +5113,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6667,7 +5175,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER 0 1 @@ -6697,7 +5205,7 @@ 0 0 wxID_ANY - 2 + 2: 0 0 @@ -6728,7 +5236,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -6775,7 +5283,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -6791,7 +5299,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6853,7 +5361,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -6915,8 +5423,8 @@ 5 - wxALL - 1 + + 0 0 protected @@ -6925,7 +5433,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER|wxLEFT 0 1 @@ -6955,7 +5463,7 @@ 0 0 wxID_ANY - 6 + 6: 0 0 @@ -6986,7 +5494,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -7033,7 +5541,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -7049,7 +5557,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7111,7 +5619,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7173,7 +5681,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER 0 1 @@ -7203,7 +5711,7 @@ 0 0 wxID_ANY - 3 + 3: 0 0 @@ -7234,7 +5742,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -7281,7 +5789,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -7297,7 +5805,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7359,7 +5867,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7421,8 +5929,8 @@ 5 - wxALL - 1 + + 0 0 protected @@ -7431,7 +5939,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER|wxLEFT 0 1 @@ -7461,7 +5969,7 @@ 0 0 wxID_ANY - 7 + 7: 0 0 @@ -7492,7 +6000,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -7539,7 +6047,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -7555,7 +6063,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7617,7 +6125,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7679,7 +6187,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER 0 1 @@ -7709,7 +6217,7 @@ 0 0 wxID_ANY - 4 + 4: 0 0 @@ -7740,7 +6248,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -7787,7 +6295,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -7803,7 +6311,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7865,7 +6373,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -7927,8 +6435,8 @@ 5 - wxALL|wxEXPAND - 1 + + 0 0 protected @@ -7937,7 +6445,7 @@ 5 - wxALIGN_CENTER|wxALL + wxALIGN_CENTER|wxLEFT 0 1 @@ -7967,7 +6475,7 @@ 0 0 wxID_ANY - 8 + 8: 0 0 @@ -7998,7 +6506,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL 0 1 @@ -8045,7 +6553,7 @@ Resizable 1 - -1,-1 + 72,-1 wxCLRP_DEFAULT_STYLE ; ; forward_declare 0 @@ -8061,7 +6569,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -8123,7 +6631,7 @@ 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -8185,14 +6693,14 @@ - + 5 - wxEXPAND + wxEXPAND|wxALL 1 - + bSizer19 - wxHORIZONTAL + wxVERTICAL none 5 @@ -8217,7 +6725,6 @@ - 0 @@ -8292,64 +6799,6 @@ - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticlineH - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - 5 wxALIGN_RIGHT|wxALL diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h index f76d27107a..f3ed2f910a 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,23 +11,22 @@ #include #include #include "dialog_shim.h" -#include -#include -#include -#include +#include +#include #include #include #include #include -#include -#include #include #include -#include #include #include +#include #include #include +#include +#include +#include #include #include #include @@ -47,36 +46,21 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM protected: wxNotebook* m_notebook; wxPanel* m_panelDspOpt; - wxStaticBitmap* m_bitmapRealisticMode; + wxCheckBox* m_checkBox3DshapesTH; + wxCheckBox* m_checkBox3DshapesSMD; + wxCheckBox* m_checkBox3DshapesVirtual; + wxCheckBox* m_checkBoxSilkscreen; + wxCheckBox* m_checkBoxSolderMask; + wxCheckBox* m_checkBoxSolderpaste; + wxCheckBox* m_checkBoxAdhesive; + wxCheckBox* m_checkBoxComments; + wxCheckBox* m_checkBoxECO; wxCheckBox* m_checkBoxRealisticMode; - wxStaticBitmap* m_bitmapBoardBody; wxCheckBox* m_checkBoxBoardBody; - wxStaticBitmap* m_bitmapAreas; wxCheckBox* m_checkBoxAreas; - wxStaticBitmap* m_bitmapSubtractMaskFromSilk; wxCheckBox* m_checkBoxSubtractMaskFromSilk; - wxStaticBitmap* m_bitmapClipSilkOnViaAnnulus; wxCheckBox* m_checkBoxClipSilkOnViaAnnulus; wxCheckBox* m_checkBoxRenderPlatedPadsAsPlated; - wxStaticBitmap* m_bitmap3DshapesTH; - wxCheckBox* m_checkBox3DshapesTH; - wxStaticBitmap* m_bitmap3DshapesSMD; - wxCheckBox* m_checkBox3DshapesSMD; - wxStaticBitmap* m_bitmap3DshapesVirtual; - wxCheckBox* m_checkBox3DshapesVirtual; - wxStaticLine* m_staticlineVertical; - wxStaticBitmap* m_bitmapSilkscreen; - wxCheckBox* m_checkBoxSilkscreen; - wxStaticBitmap* m_bitmapSolderMask; - wxCheckBox* m_checkBoxSolderMask; - wxStaticBitmap* m_bitmapSolderPaste; - wxCheckBox* m_checkBoxSolderpaste; - wxStaticBitmap* m_bitmapAdhesive; - wxCheckBox* m_checkBoxAdhesive; - wxStaticBitmap* m_bitmapComments; - wxCheckBox* m_checkBoxComments; - wxStaticBitmap* m_bitmapECO; - wxCheckBox* m_checkBoxECO; wxStaticText* m_staticTextRotAngle; wxSpinCtrlDouble* m_spinCtrlRotationAngle; wxStaticText* m_staticTextRotAngleUnits; @@ -85,9 +69,7 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM wxStaticText* m_staticAnimationSpeed; wxSlider* m_sliderAnimationSpeed; wxPanel* m_panelOpenGL; - wxStaticBitmap* m_bitmapBoundingBoxes; wxCheckBox* m_checkBoxBoundingBoxes; - wxStaticBitmap* m_bitmapCuThickness; wxCheckBox* m_checkBoxCuThickness; wxStaticText* m_staticText221; wxChoice* m_choiceAntiAliasing; @@ -104,7 +86,6 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM wxCheckBox* m_checkBoxRaytracing_addFloor; wxCheckBox* m_checkBoxRaytracing_antiAliasing; wxCheckBox* m_checkBoxRaytracing_postProcessing; - wxStaticLine* m_staticline4; wxStaticText* m_staticText19; wxStaticText* m_staticText201; wxStaticText* m_staticText211; @@ -119,7 +100,7 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM wxSpinCtrl* m_spinCtrl_NrSamples_Refractions; wxSpinCtrlDouble* m_spinCtrlDouble_SpreadFactor_Refractions; wxSpinCtrl* m_spinCtrlRecursiveLevel_Refractions; - wxPanel* m_panel5; + wxPanel* m_lightsConfig; wxStaticText* m_staticText17; wxColourPickerCtrl* m_colourPickerCameraLight; wxStaticText* m_staticText5; @@ -163,7 +144,6 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM wxSpinCtrl* m_spinCtrlLightElevation8; wxSpinCtrl* m_spinCtrlLightAzimuth8; wxButton* m_buttonLightsResetToDefaults; - wxStaticLine* m_staticlineH; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel;