3D-Viewer: use wxStaticBoxSizer for options, fix coding style
This commit is contained in:
Mario Luzeiro
parent
67fe304f1f
commit
b0bf9f7b57
|
|
@ -567,7 +567,7 @@ bool C3D_RENDER_OGL_LEGACY::Redraw(
|
|||
|
||||
if( m_boardAdapter.GetFlag( FL_RENDER_OPENGL_AA_DISABLE_ON_MOVE ) )
|
||||
{
|
||||
if( aIsMoving == false )
|
||||
if( !aIsMoving )
|
||||
{
|
||||
glEnable( GL_MULTISAMPLE );
|
||||
}
|
||||
|
|
@ -636,12 +636,15 @@ bool C3D_RENDER_OGL_LEGACY::Redraw(
|
|||
glLightfv( GL_LIGHT0, GL_POSITION, headlight_pos );
|
||||
}
|
||||
|
||||
bool drawMiddleSegments = !( (aIsMoving == true) &&
|
||||
m_boardAdapter.GetFlag( FL_RENDER_OPENGL_THICKNESS_DISABLE_ON_MOVE ) );
|
||||
const bool drawMiddleSegments = !( aIsMoving &&
|
||||
m_boardAdapter.GetFlag( FL_RENDER_OPENGL_THICKNESS_DISABLE_ON_MOVE ) );
|
||||
|
||||
const bool skipRenderHoles = (aIsMoving == true ) &&
|
||||
const bool skipRenderHoles = aIsMoving &&
|
||||
m_boardAdapter.GetFlag( FL_RENDER_OPENGL_HOLES_DISABLE_ON_MOVE );
|
||||
|
||||
const bool skipRenderVias = aIsMoving &&
|
||||
m_boardAdapter.GetFlag( FL_RENDER_OPENGL_VIAS_DISABLE_ON_MOVE );
|
||||
|
||||
// Display board body
|
||||
// /////////////////////////////////////////////////////////////////////////
|
||||
if( m_boardAdapter.GetFlag( FL_SHOW_BOARD_BODY ) )
|
||||
|
|
@ -683,26 +686,14 @@ bool C3D_RENDER_OGL_LEGACY::Redraw(
|
|||
OGL_SetMaterial( m_materials.m_GrayMaterial );
|
||||
}
|
||||
|
||||
if( ( (aIsMoving == true) &&
|
||||
m_boardAdapter.GetFlag( FL_RENDER_OPENGL_VIAS_DISABLE_ON_MOVE ) ) ||
|
||||
skipRenderHoles )
|
||||
if( (!( skipRenderVias || skipRenderHoles ) ) && m_ogl_disp_list_via )
|
||||
{
|
||||
// Do not render vias while moving or if skipRenderHoles
|
||||
}
|
||||
else
|
||||
{
|
||||
if( m_ogl_disp_list_via )
|
||||
{
|
||||
m_ogl_disp_list_via->DrawAll();
|
||||
}
|
||||
m_ogl_disp_list_via->DrawAll();
|
||||
}
|
||||
|
||||
if( !skipRenderHoles )
|
||||
if( ( !skipRenderHoles ) && m_ogl_disp_list_pads_holes )
|
||||
{
|
||||
if( m_ogl_disp_list_pads_holes )
|
||||
{
|
||||
m_ogl_disp_list_pads_holes->DrawAll();
|
||||
}
|
||||
m_ogl_disp_list_pads_holes->DrawAll();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -824,7 +815,6 @@ bool C3D_RENDER_OGL_LEGACY::Redraw(
|
|||
|
||||
// Render 3D Models (Non-transparent)
|
||||
// /////////////////////////////////////////////////////////////////////////
|
||||
|
||||
render_3D_models( false, false );
|
||||
render_3D_models( true, false );
|
||||
|
||||
|
|
|
|||
|
|
@ -121,18 +121,13 @@ void EDA_3D_VIEWER::CreateMenuBar()
|
|||
return m_boardAdapter.MaterialModeGet() == MATERIAL_MODE::CAD_MODE;
|
||||
};
|
||||
|
||||
auto copperThicknessCondition = [this]( const SELECTION& aSel )
|
||||
{
|
||||
return m_boardAdapter.GetFlag( FL_RENDER_OPENGL_COPPER_THICKNESS );
|
||||
};
|
||||
|
||||
auto boundingBoxesCondition = [this]( const SELECTION& aSel )
|
||||
{
|
||||
return m_boardAdapter.GetFlag( FL_RENDER_OPENGL_SHOW_MODEL_BBOX );
|
||||
};
|
||||
|
||||
auto renderShadowsCondition = [this]( const SELECTION& aSel )
|
||||
{
|
||||
{
|
||||
return m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS );
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,17 +18,14 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_panelDspOpt = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
wxBoxSizer* bSizerUpper;
|
||||
bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
|
||||
wxBoxSizer* bSizerDisplayOptions;
|
||||
bSizerDisplayOptions = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
wxBoxSizer* bSizeLeft;
|
||||
bSizeLeft = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticText3DRenderOpts = new wxStaticText( m_panelDspOpt, wxID_ANY, _("Render options:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText3DRenderOpts->Wrap( -1 );
|
||||
m_staticText3DRenderOpts->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizeLeft->Add( m_staticText3DRenderOpts, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizer1;
|
||||
sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Render options") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizerRenderOptions;
|
||||
fgSizerRenderOptions = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
|
|
@ -38,37 +35,37 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
fgSizerRenderOptions->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_bitmapRealisticMode = new wxStaticBitmap( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelDspOpt, wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelDspOpt, wxID_ANY, _("Show board body"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelDspOpt, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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, wxALIGN_LEFT|wxALIGN_RIGHT, 10 );
|
||||
|
||||
m_bitmapSubtractMaskFromSilk = new wxStaticBitmap( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapSubtractMaskFromSilk = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerRenderOptions->Add( m_bitmapSubtractMaskFromSilk, 0, wxALL, 5 );
|
||||
|
||||
m_checkBoxSubtractMaskFromSilk = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxSubtractMaskFromSilk = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerRenderOptions->Add( m_checkBoxSubtractMaskFromSilk, 0, wxALL, 5 );
|
||||
|
||||
wxFlexGridSizer* fgSizer3;
|
||||
|
|
@ -80,16 +77,13 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
fgSizerRenderOptions->Add( fgSizer3, 1, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizeLeft->Add( fgSizerRenderOptions, 0, wxEXPAND|wxBOTTOM, 5 );
|
||||
sbSizer1->Add( fgSizerRenderOptions, 0, wxEXPAND|wxBOTTOM, 5 );
|
||||
|
||||
|
||||
bSizeLeft->Add( 0, 10, 0, 0, 5 );
|
||||
bSizeLeft->Add( sbSizer1, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticText3DmodelVisibility = new wxStaticText( m_panelDspOpt, wxID_ANY, _("3D model visibility:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText3DmodelVisibility->Wrap( -1 );
|
||||
m_staticText3DmodelVisibility->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizeLeft->Add( m_staticText3DmodelVisibility, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizer2;
|
||||
sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("3D model visibility") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer3DVisibility;
|
||||
fgSizer3DVisibility = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
|
|
@ -99,50 +93,47 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
fgSizer3DVisibility->Add( 0, 0, 1, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_bitmap3DshapesTH = new wxStaticBitmap( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmap3DshapesTH = new wxStaticBitmap( sbSizer2->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer3DVisibility->Add( m_bitmap3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBox3DshapesTH = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show 3D through hole models"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBox3DshapesTH = new wxCheckBox( sbSizer2->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmap3DshapesSMD = new wxStaticBitmap( sbSizer2->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer3DVisibility->Add( m_bitmap3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBox3DshapesSMD = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show 3D SMD models"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBox3DshapesSMD = new wxCheckBox( sbSizer2->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmap3DshapesVirtual = new wxStaticBitmap( sbSizer2->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer3DVisibility->Add( m_bitmap3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBox3DshapesVirtual = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBox3DshapesVirtual = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer3DVisibility->Add( m_checkBox3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
|
||||
bSizeLeft->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 );
|
||||
sbSizer2->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerUpper->Add( bSizeLeft, 1, wxEXPAND, 5 );
|
||||
bSizeLeft->Add( sbSizer2, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerDisplayOptions->Add( bSizeLeft, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticlineVertical = new wxStaticLine( m_panelDspOpt, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
|
||||
bSizerUpper->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 );
|
||||
bSizerDisplayOptions->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 );
|
||||
|
||||
wxBoxSizer* bSizerRight;
|
||||
bSizerRight = new wxBoxSizer( wxHORIZONTAL );
|
||||
bSizerRight = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
wxBoxSizer* bSizeLayer;
|
||||
bSizeLayer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticTextBoardLayers = new wxStaticText( m_panelDspOpt, wxID_ANY, _("Board layers:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextBoardLayers->Wrap( -1 );
|
||||
m_staticTextBoardLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizeLayer->Add( m_staticTextBoardLayers, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizer3;
|
||||
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelDspOpt, wxID_ANY, _("Board layers") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizerShowBrdLayersOpts;
|
||||
fgSizerShowBrdLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
|
|
@ -152,50 +143,47 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_bitmapSilkscreen = new wxStaticBitmap( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapSilkscreen = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowBrdLayersOpts->Add( m_bitmapSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxSilkscreen = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxSilkscreen = new wxCheckBox( sbSizer3->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapSolderMask = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowBrdLayersOpts->Add( m_bitmapSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxSolderMask = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxSolderMask = new wxCheckBox( sbSizer3->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapSolderPaste = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowBrdLayersOpts->Add( m_bitmapSolderPaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxSolderpaste = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxSolderpaste = new wxCheckBox( sbSizer3->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapAdhesive = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowBrdLayersOpts->Add( m_bitmapAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxAdhesive = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxAdhesive = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowBrdLayersOpts->Add( m_checkBoxAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
|
||||
bSizeLayer->Add( fgSizerShowBrdLayersOpts, 0, wxEXPAND, 5 );
|
||||
sbSizer3->Add( fgSizerShowBrdLayersOpts, 0, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizeLayer->Add( 0, 10, 0, 0, 5 );
|
||||
bSizerRight->Add( sbSizer3, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticTextUserLayers = new wxStaticText( m_panelDspOpt, wxID_ANY, _("User layers (not shown in realistic mode):"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextUserLayers->Wrap( -1 );
|
||||
m_staticTextUserLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizeLayer->Add( m_staticTextUserLayers, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizer4;
|
||||
sbSizer4 = 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 );
|
||||
|
|
@ -205,76 +193,76 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
|
||||
|
||||
m_bitmapComments = new wxStaticBitmap( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapComments = new wxStaticBitmap( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowUserLayersOpts->Add( m_bitmapComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxComments = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxComments = new wxCheckBox( sbSizer4->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( m_panelDspOpt, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapECO = new wxStaticBitmap( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowUserLayersOpts->Add( m_bitmapECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
m_checkBoxECO = new wxCheckBox( m_panelDspOpt, wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxECO = new wxCheckBox( sbSizer4->GetStaticBox(), wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizerShowUserLayersOpts->Add( m_checkBoxECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
|
||||
bSizeLayer->Add( fgSizerShowUserLayersOpts, 0, wxEXPAND, 5 );
|
||||
sbSizer4->Add( fgSizerShowUserLayersOpts, 0, wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerRight->Add( bSizeLayer, 1, wxEXPAND, 5 );
|
||||
bSizerRight->Add( sbSizer4, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerUpper->Add( bSizerRight, 1, wxEXPAND, 5 );
|
||||
bSizerDisplayOptions->Add( bSizerRight, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelDspOpt->SetSizer( bSizerUpper );
|
||||
m_panelDspOpt->SetSizer( bSizerDisplayOptions );
|
||||
m_panelDspOpt->Layout();
|
||||
bSizerUpper->Fit( m_panelDspOpt );
|
||||
bSizerDisplayOptions->Fit( m_panelDspOpt );
|
||||
m_notebook->AddPage( m_panelDspOpt, _("Display Options"), true );
|
||||
m_panelOpenGL = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
wxBoxSizer* bSizerOpenGL;
|
||||
bSizerOpenGL = new wxBoxSizer( wxVERTICAL );
|
||||
bSizerOpenGL = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_staticTextOpenGLRenderOpts = new wxStaticText( m_panelOpenGL, wxID_ANY, _("OpenGL Render options:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextOpenGLRenderOpts->Wrap( -1 );
|
||||
m_staticTextOpenGLRenderOpts->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
wxBoxSizer* bSizer7;
|
||||
bSizer7 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
bSizerOpenGL->Add( m_staticTextOpenGLRenderOpts, 0, wxALL|wxEXPAND, 5 );
|
||||
wxStaticBoxSizer* sbSizerOpenGLRenderoptions;
|
||||
sbSizerOpenGLRenderoptions = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("OpenGL Render options") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer6;
|
||||
fgSizer6 = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||
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( m_panelOpenGL, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapBoundingBoxes = new wxStaticBitmap( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer6->Add( m_bitmapBoundingBoxes, 0, wxALL, 5 );
|
||||
|
||||
m_checkBoxBoundingBoxes = new wxCheckBox( m_panelOpenGL, wxID_ANY, _("Show model bounding boxes"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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( m_panelOpenGL, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_bitmapCuThickness = new wxStaticBitmap( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer6->Add( m_bitmapCuThickness, 0, wxALL, 5 );
|
||||
|
||||
m_checkBoxCuThickness = new wxCheckBox( m_panelOpenGL, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxCuThickness = new wxCheckBox( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer6->Add( m_checkBoxCuThickness, 0, wxALL, 5 );
|
||||
|
||||
|
||||
bSizerOpenGL->Add( fgSizer6, 1, wxEXPAND, 5 );
|
||||
sbSizerOpenGLRenderoptions->Add( fgSizer6, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticTextOpenGLRenderOptsAA = new wxStaticText( m_panelOpenGL, wxID_ANY, _("Anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextOpenGLRenderOptsAA->Wrap( -1 );
|
||||
m_staticTextOpenGLRenderOptsAA->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizerOpenGL->Add( m_staticTextOpenGLRenderOptsAA, 0, wxALL, 5 );
|
||||
bSizer7->Add( sbSizerOpenGLRenderoptions, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
wxStaticBoxSizer* sbSizerAntialiasing;
|
||||
sbSizerAntialiasing = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("Anti-aliasing") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer7;
|
||||
fgSizer7 = new wxFlexGridSizer( 1, 2, 0, 0 );
|
||||
|
|
@ -286,57 +274,58 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
|
||||
wxString m_choiceAntiAliasingChoices[] = { _("Disabled"), _("2x"), _("4x"), _("8x"), wxEmptyString };
|
||||
int m_choiceAntiAliasingNChoices = sizeof( m_choiceAntiAliasingChoices ) / sizeof( wxString );
|
||||
m_choiceAntiAliasing = new wxChoice( m_panelOpenGL, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceAntiAliasingNChoices, m_choiceAntiAliasingChoices, 0 );
|
||||
m_choiceAntiAliasing = new wxChoice( sbSizerAntialiasing->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceAntiAliasingNChoices, m_choiceAntiAliasingChoices, 0 );
|
||||
m_choiceAntiAliasing->SetSelection( 0 );
|
||||
m_choiceAntiAliasing->SetToolTip( _("3D-Viewer must be closed and re-opened to apply this setting") );
|
||||
|
||||
fgSizer7->Add( m_choiceAntiAliasing, 0, 0, 5 );
|
||||
|
||||
|
||||
fgSizer7->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_staticText14 = new wxStaticText( m_panelOpenGL, wxID_ANY, _("(3D-Viewer must be closed and re-opened to apply this setting)"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText14->Wrap( -1 );
|
||||
fgSizer7->Add( m_staticText14, 0, wxLEFT, 5 );
|
||||
sbSizerAntialiasing->Add( fgSizer7, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerOpenGL->Add( fgSizer7, 1, wxEXPAND, 5 );
|
||||
bSizer7->Add( sbSizerAntialiasing, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_staticTextOpenGLWhileMoving = new wxStaticText( m_panelOpenGL, wxID_ANY, _("While Moving"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextOpenGLWhileMoving->Wrap( -1 );
|
||||
m_staticTextOpenGLWhileMoving->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
|
||||
bSizerOpenGL->Add( m_staticTextOpenGLWhileMoving, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizerWhileMoving;
|
||||
sbSizerWhileMoving = new wxStaticBoxSizer( new wxStaticBox( m_panelOpenGL, wxID_ANY, _("While Moving") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer8;
|
||||
fgSizer8 = new wxFlexGridSizer( 0, 4, 0, 0 );
|
||||
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( m_panelOpenGL, wxID_ANY, _("Disable anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxDisableMoveThickness = new wxCheckBox( m_panelOpenGL, wxID_ANY, _("Disable thickness"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxDisableMoveVias = new wxCheckBox( m_panelOpenGL, wxID_ANY, _("Disable vias"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxDisableMoveHoles = new wxCheckBox( m_panelOpenGL, wxID_ANY, _("Disable holes"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxDisableMoveHoles = new wxCheckBox( sbSizerWhileMoving->GetStaticBox(), wxID_ANY, _("Disable holes"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer8->Add( m_checkBoxDisableMoveHoles, 0, wxALL, 5 );
|
||||
|
||||
|
||||
bSizerOpenGL->Add( fgSizer8, 1, wxEXPAND, 5 );
|
||||
sbSizerWhileMoving->Add( fgSizer8, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizer7->Add( sbSizerWhileMoving, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerOpenGL->Add( bSizer7, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelOpenGL->SetSizer( bSizerOpenGL );
|
||||
|
|
@ -344,76 +333,82 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
bSizerOpenGL->Fit( m_panelOpenGL );
|
||||
m_notebook->AddPage( m_panelOpenGL, _("OpenGL"), false );
|
||||
m_panelRaytracing = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
wxBoxSizer* bSizer14;
|
||||
bSizer14 = new wxBoxSizer( wxVERTICAL );
|
||||
wxBoxSizer* bSizerRaytracing;
|
||||
bSizerRaytracing = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticTextRaytracingRenderOpts = new wxStaticText( m_panelRaytracing, wxID_ANY, _("Raytracing Render options:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextRaytracingRenderOpts->Wrap( -1 );
|
||||
m_staticTextRaytracingRenderOpts->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
|
||||
wxBoxSizer* bSizer8;
|
||||
bSizer8 = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
bSizer14->Add( m_staticTextRaytracingRenderOpts, 0, wxALL, 5 );
|
||||
wxStaticBoxSizer* sbSizerRaytracingRenderOptions;
|
||||
sbSizerRaytracingRenderOptions = new wxStaticBoxSizer( new wxStaticBox( m_panelRaytracing, wxID_ANY, _("Raytracing Render options") ), wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer9;
|
||||
fgSizer9 = new wxFlexGridSizer( 0, 4, 0, 0 );
|
||||
fgSizer9 = new wxFlexGridSizer( 4, 4, 0, 0 );
|
||||
fgSizer9->SetFlexibleDirection( wxBOTH );
|
||||
fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
|
||||
fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_checkBoxRaytracing_renderShadows = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Render Shadows"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_renderShadows = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Render Shadows"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_renderShadows->SetValue(true);
|
||||
fgSizer9->Add( m_checkBoxRaytracing_renderShadows, 0, wxALL, 5 );
|
||||
|
||||
|
||||
fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_checkBoxRaytracing_proceduralTextures = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Procedural Textures"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxRaytracing_addFloor = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Add Floor"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxRaytracing_showRefractions = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Refractions"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_showRefractions = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Refractions"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_showRefractions->SetValue(true);
|
||||
fgSizer9->Add( m_checkBoxRaytracing_showRefractions, 0, wxALL, 5 );
|
||||
|
||||
|
||||
fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_checkBoxRaytracing_showReflections = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Reflections"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_showReflections = new wxCheckBox( sbSizerRaytracingRenderOptions->GetStaticBox(), wxID_ANY, _("Reflections"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_checkBoxRaytracing_showReflections->SetValue(true);
|
||||
fgSizer9->Add( m_checkBoxRaytracing_showReflections, 0, wxALL, 5 );
|
||||
|
||||
|
||||
fgSizer9->Add( 0, 0, 1, wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
m_checkBoxRaytracing_antiAliasing = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Anti-aliasing"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
m_checkBoxRaytracing_postProcessing = new wxCheckBox( m_panelRaytracing, wxID_ANY, _("Post-processing"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
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 );
|
||||
|
||||
|
||||
bSizer14->Add( fgSizer9, 1, wxEXPAND, 5 );
|
||||
sbSizerRaytracingRenderOptions->Add( fgSizer9, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelRaytracing->SetSizer( bSizer14 );
|
||||
bSizer8->Add( sbSizerRaytracingRenderOptions, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
bSizerRaytracing->Add( bSizer8, 1, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelRaytracing->SetSizer( bSizerRaytracing );
|
||||
m_panelRaytracing->Layout();
|
||||
bSizer14->Fit( m_panelRaytracing );
|
||||
bSizerRaytracing->Fit( m_panelRaytracing );
|
||||
m_notebook->AddPage( m_panelRaytracing, _("Raytracing"), false );
|
||||
|
||||
bSizerMain->Add( m_notebook, 1, wxALL|wxEXPAND, 5 );
|
||||
|
|
@ -428,7 +423,7 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
|
|||
m_sdbSizer->AddButton( m_sdbSizerCancel );
|
||||
m_sdbSizer->Realize();
|
||||
|
||||
bSizerMain->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 );
|
||||
bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 );
|
||||
|
||||
|
||||
this->SetSizer( bSizerMain );
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -11,18 +11,18 @@
|
|||
#include <wx/xrc/xmlres.h>
|
||||
#include <wx/intl.h>
|
||||
#include "dialog_shim.h"
|
||||
#include <wx/string.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/colour.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/icon.h>
|
||||
#include <wx/statbmp.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/colour.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/checkbox.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/statbox.h>
|
||||
#include <wx/statline.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/choice.h>
|
||||
|
|
@ -43,7 +43,6 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
|
|||
protected:
|
||||
wxNotebook* m_notebook;
|
||||
wxPanel* m_panelDspOpt;
|
||||
wxStaticText* m_staticText3DRenderOpts;
|
||||
wxStaticBitmap* m_bitmapRealisticMode;
|
||||
wxCheckBox* m_checkBoxRealisticMode;
|
||||
wxStaticBitmap* m_bitmapBoardBody;
|
||||
|
|
@ -52,7 +51,6 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
|
|||
wxCheckBox* m_checkBoxAreas;
|
||||
wxStaticBitmap* m_bitmapSubtractMaskFromSilk;
|
||||
wxCheckBox* m_checkBoxSubtractMaskFromSilk;
|
||||
wxStaticText* m_staticText3DmodelVisibility;
|
||||
wxStaticBitmap* m_bitmap3DshapesTH;
|
||||
wxCheckBox* m_checkBox3DshapesTH;
|
||||
wxStaticBitmap* m_bitmap3DshapesSMD;
|
||||
|
|
@ -60,7 +58,6 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
|
|||
wxStaticBitmap* m_bitmap3DshapesVirtual;
|
||||
wxCheckBox* m_checkBox3DshapesVirtual;
|
||||
wxStaticLine* m_staticlineVertical;
|
||||
wxStaticText* m_staticTextBoardLayers;
|
||||
wxStaticBitmap* m_bitmapSilkscreen;
|
||||
wxCheckBox* m_checkBoxSilkscreen;
|
||||
wxStaticBitmap* m_bitmapSolderMask;
|
||||
|
|
@ -69,27 +66,21 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
|
|||
wxCheckBox* m_checkBoxSolderpaste;
|
||||
wxStaticBitmap* m_bitmapAdhesive;
|
||||
wxCheckBox* m_checkBoxAdhesive;
|
||||
wxStaticText* m_staticTextUserLayers;
|
||||
wxStaticBitmap* m_bitmapComments;
|
||||
wxCheckBox* m_checkBoxComments;
|
||||
wxStaticBitmap* m_bitmapECO;
|
||||
wxCheckBox* m_checkBoxECO;
|
||||
wxPanel* m_panelOpenGL;
|
||||
wxStaticText* m_staticTextOpenGLRenderOpts;
|
||||
wxStaticBitmap* m_bitmapBoundingBoxes;
|
||||
wxCheckBox* m_checkBoxBoundingBoxes;
|
||||
wxStaticBitmap* m_bitmapCuThickness;
|
||||
wxCheckBox* m_checkBoxCuThickness;
|
||||
wxStaticText* m_staticTextOpenGLRenderOptsAA;
|
||||
wxChoice* m_choiceAntiAliasing;
|
||||
wxStaticText* m_staticText14;
|
||||
wxStaticText* m_staticTextOpenGLWhileMoving;
|
||||
wxCheckBox* m_checkBoxDisableAAMove;
|
||||
wxCheckBox* m_checkBoxDisableMoveThickness;
|
||||
wxCheckBox* m_checkBoxDisableMoveVias;
|
||||
wxCheckBox* m_checkBoxDisableMoveHoles;
|
||||
wxPanel* m_panelRaytracing;
|
||||
wxStaticText* m_staticTextRaytracingRenderOpts;
|
||||
wxCheckBox* m_checkBoxRaytracing_renderShadows;
|
||||
wxCheckBox* m_checkBoxRaytracing_proceduralTextures;
|
||||
wxCheckBox* m_checkBoxRaytracing_addFloor;
|
||||
|
|
|
|||
Loading…
Reference in New Issue