From f037cc3c74faad3eb4cbe33c1c25cdfe25ade4de Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 16 May 2013 21:04:21 +0200 Subject: [PATCH] 3D viewer: Add more options, to show/hide technical layers. --- 3d-viewer/3d_draw.cpp | 26 +- 3d-viewer/3d_frame.cpp | 70 +- 3d-viewer/3d_toolbar.cpp | 85 +- 3d-viewer/3d_viewer.h | 1 + 3d-viewer/3d_viewer_id.h | 10 +- 3d-viewer/CMakeLists.txt | 2 + 3d-viewer/dialogs/dialog_3D_view_option.cpp | 125 ++ .../dialogs/dialog_3D_view_option_base.cpp | 132 ++ .../dialogs/dialog_3D_view_option_base.fbp | 1941 +++++++++++++++++ .../dialogs/dialog_3D_view_option_base.h | 82 + 3d-viewer/info3d_visu.h | 3 +- 11 files changed, 2401 insertions(+), 76 deletions(-) create mode 100644 3d-viewer/dialogs/dialog_3D_view_option.cpp create mode 100644 3d-viewer/dialogs/dialog_3D_view_option_base.cpp create mode 100644 3d-viewer/dialogs/dialog_3D_view_option_base.fbp create mode 100644 3d-viewer/dialogs/dialog_3D_view_option_base.h diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp index 1c65aa0218..380fec090c 100644 --- a/3d-viewer/3d_draw.cpp +++ b/3d-viewer/3d_draw.cpp @@ -768,20 +768,34 @@ bool Is3DLayerEnabled( LAYER_NUM aLayer ) // check the flags switch( aLayer ) { - case DRAW_N: - flg = g_Parm_3D_Visu.FL_DRAWINGS; + case ADHESIVE_N_BACK: + case ADHESIVE_N_FRONT: + flg = g_Parm_3D_Visu.FL_ADHESIVE; break; + case SOLDERPASTE_N_BACK: + case SOLDERPASTE_N_FRONT: + flg = g_Parm_3D_Visu.FL_SOLDERPASTE; + break; + + case SILKSCREEN_N_BACK: + case SILKSCREEN_N_FRONT: + flg = g_Parm_3D_Visu.FL_SILKSCREEN; + break; + + case SOLDERMASK_N_BACK: + case SOLDERMASK_N_FRONT: + flg = g_Parm_3D_Visu.FL_SOLDERMASK; + break; + + case DRAW_N: case COMMENT_N: flg = g_Parm_3D_Visu.FL_COMMENTS; break; case ECO1_N: - flg = g_Parm_3D_Visu.FL_ECO1; - break; - case ECO2_N: - flg = g_Parm_3D_Visu.FL_ECO2; + flg = g_Parm_3D_Visu.FL_ECO; break; default: diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 5251a7695a..eb67b42f0a 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -51,10 +51,12 @@ static const wxString keyShowAxis( wxT( "ShowAxis" ) ); static const wxString keyShowZones( wxT( "ShowZones" ) ); static const wxString keyShowFootprints( wxT( "ShowFootprints" ) ); static const wxString keyShowCopperThickness( wxT( "ShowCopperThickness" ) ); -static const wxString keyShowCommetsLayer( wxT( "ShowCommetsLayer" ) ); -static const wxString keyShowDrawingsLayer( wxT( "ShowDrawingsLayer" ) ); -static const wxString keyShowEco1Layer( wxT( "ShowEco1Layer" ) ); -static const wxString keyShowEco2Layer( wxT( "ShowEco2Layer" ) ); +static const wxString keyShowAdhesiveLayers( wxT( "ShowAdhesiveLayers" ) ); +static const wxString keyShowSilkScreenLayers( wxT( "ShowSilkScreenLayers" ) ); +static const wxString keyShowSolderMaskLayers( wxT( "ShowSolderMasLayers" ) ); +static const wxString keyShowSolderPasteLayers( wxT( "ShowSolderPasteLayers" ) ); +static const wxString keyShowCommentsLayer( wxT( "ShowCommentsLayers" ) ); +static const wxString keyShowEcoLayers( wxT( "ShowEcoLayers" ) ); BEGIN_EVENT_TABLE( EDA_3D_FRAME, wxFrame ) EVT_ACTIVATE( EDA_3D_FRAME::OnActivate ) @@ -62,6 +64,7 @@ EVT_ACTIVATE( EDA_3D_FRAME::OnActivate ) EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, EDA_3D_FRAME::Process_Zoom ) EVT_TOOL_RANGE( ID_START_COMMAND_3D, ID_END_COMMAND_3D, EDA_3D_FRAME::Process_Special_Functions ) +EVT_TOOL( ID_TOOL_SET_VISIBLE_ITEMS, EDA_3D_FRAME::Process_Special_Functions ) EVT_MENU( wxID_EXIT, EDA_3D_FRAME::Exit3DFrame ) EVT_MENU( ID_MENU_SCREENCOPY_PNG, EDA_3D_FRAME::Process_Special_Functions ) EVT_MENU( ID_MENU_SCREENCOPY_JPEG, EDA_3D_FRAME::Process_Special_Functions ) @@ -170,12 +173,13 @@ void EDA_3D_FRAME::GetSettings() &prms.m_DrawFlags[prms.FL_USE_COPPER_THICKNESS], false ); config->Read( keyShowZones, &prms.m_DrawFlags[prms.FL_ZONE], true ); - config->Read( keyShowCommetsLayer, &prms.m_DrawFlags[prms.FL_COMMENTS], true ); - config->Read( keyShowDrawingsLayer, &prms.m_DrawFlags[prms.FL_DRAWINGS], true ); - config->Read( keyShowEco1Layer, &prms.m_DrawFlags[prms.FL_ECO1], true ); - config->Read( keyShowEco2Layer, &prms.m_DrawFlags[prms.FL_ECO2], true ); + config->Read( keyShowAdhesiveLayers, &prms.m_DrawFlags[prms.FL_ADHESIVE], true ); + config->Read( keyShowSilkScreenLayers, &prms.m_DrawFlags[prms.FL_SILKSCREEN], true ); + config->Read( keyShowSolderMaskLayers, &prms.m_DrawFlags[prms.FL_SOLDERMASK], true ); + config->Read( keyShowSolderPasteLayers, &prms.m_DrawFlags[prms.FL_SOLDERPASTE], true ); + config->Read( keyShowCommentsLayer, &prms.m_DrawFlags[prms.FL_COMMENTS], true ); + config->Read( keyShowEcoLayers, &prms.m_DrawFlags[prms.FL_ECO], true ); } - } @@ -195,10 +199,12 @@ void EDA_3D_FRAME::SaveSettings() config->Write( keyShowFootprints, prms.m_DrawFlags[prms.FL_MODULE] ); config->Write( keyShowCopperThickness, prms.m_DrawFlags[prms.FL_USE_COPPER_THICKNESS] ); config->Write( keyShowZones, prms.m_DrawFlags[prms.FL_ZONE] ); - config->Write( keyShowCommetsLayer, prms.m_DrawFlags[prms.FL_COMMENTS] ); - config->Write( keyShowDrawingsLayer, prms.m_DrawFlags[prms.FL_DRAWINGS] ); - config->Write( keyShowEco1Layer, prms.m_DrawFlags[prms.FL_ECO1] ); - config->Write( keyShowEco2Layer, prms.m_DrawFlags[prms.FL_ECO2] ); + config->Write( keyShowAdhesiveLayers, prms.m_DrawFlags[prms.FL_ADHESIVE] ); + config->Write( keyShowSilkScreenLayers, prms.m_DrawFlags[prms.FL_SILKSCREEN] ); + config->Write( keyShowSolderMaskLayers, prms.m_DrawFlags[prms.FL_SOLDERMASK] ); + config->Write( keyShowSolderPasteLayers, prms.m_DrawFlags[prms.FL_SOLDERPASTE] ); + config->Write( keyShowCommentsLayer, prms.m_DrawFlags[prms.FL_COMMENTS] ); + config->Write( keyShowEcoLayers, prms.m_DrawFlags[prms.FL_ECO] ); if( IsIconized() ) return; @@ -286,6 +292,10 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event ) switch( id ) { + case ID_TOOL_SET_VISIBLE_ITEMS: + Install_3D_ViewOptionDialog( event ); + break; + case ID_RELOAD3D_BOARD: NewDisplay(); return; @@ -365,23 +375,33 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event ) NewDisplay(); return; + case ID_MENU3D_ADHESIVE_ONOFF: + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] = isChecked; + NewDisplay(); + return; + + case ID_MENU3D_SILKSCREEN_ONOFF: + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] = isChecked; + NewDisplay(); + return; + + case ID_MENU3D_SOLDER_MASK_ONOFF: + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] = isChecked; + NewDisplay(); + return; + + case ID_MENU3D_SOLDER_PASTE_ONOFF: + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] = isChecked; + NewDisplay(); + return; + case ID_MENU3D_COMMENTS_ONOFF: g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] = isChecked; NewDisplay(); return; - case ID_MENU3D_DRAWINGS_ONOFF: - g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_DRAWINGS] = isChecked; - NewDisplay(); - return; - - case ID_MENU3D_ECO1_ONOFF: - g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO1] = isChecked; - NewDisplay(); - return; - - case ID_MENU3D_ECO2_ONOFF: - g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO2] = isChecked; + case ID_MENU3D_ECO_ONOFF: + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] = isChecked; NewDisplay(); return; diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 7d3db91a0c..db0b4582b7 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -63,6 +63,12 @@ void EDA_3D_FRAME::ReCreateHToolbar() #endif m_HToolBar->AddSeparator(); + + m_HToolBar->AddTool( ID_TOOL_SET_VISIBLE_ITEMS, wxEmptyString, + KiBitmap( read_setup_xpm ), + _( "Set display options, and some layers visibility" ) ); + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), _( "Zoom in" ) ); @@ -132,13 +138,6 @@ void EDA_3D_FRAME::ReCreateVToolbar() void EDA_3D_FRAME::ReCreateMenuBar() { - bool full_options = true; - - // If called from the display frame of CvPcb, only some options are relevant - if( Parent()->GetName() == wxT( "CmpFrame" ) ) { - full_options = false; - } - wxMenuBar* menuBar = new wxMenuBar; wxMenu* fileMenu = new wxMenu; wxMenu* prefsMenu = new wxMenu; @@ -153,6 +152,7 @@ void EDA_3D_FRAME::ReCreateMenuBar() fileMenu->AppendSeparator(); fileMenu->Append( ID_TOOL_SCREENCOPY_TOCLIBBOARD, _( "Copy 3D Image to Clipboard" ) ); #endif + fileMenu->AppendSeparator(); fileMenu->Append( wxID_EXIT, _( "&Exit" ) ); @@ -166,50 +166,53 @@ void EDA_3D_FRAME::ReCreateMenuBar() _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK ); item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_AXIS]); + // Creates grid menu + wxMenu * gridlistMenu = new wxMenu; + item = AddMenuItem( prefsMenu, gridlistMenu, ID_MENU3D_GRID, + _( "3D Grid" ), KiBitmap( grid_xpm ) ); + gridlistMenu->Append( ID_MENU3D_GRID_NOGRID, _( "No 3D Grid" ), wxEmptyString, true ); + gridlistMenu->Check( ID_MENU3D_GRID_NOGRID, true ); - if( full_options ) - { - item = AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS, - _( "Show Copper Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS]); + gridlistMenu->Append( ID_MENU3D_GRID_10_MM, _( "3D Grid 10 mm" ), wxEmptyString, true ); + gridlistMenu->Append( ID_MENU3D_GRID_5_MM, _( "3D Grid 5 mm" ), wxEmptyString, true ); + gridlistMenu->Append( ID_MENU3D_GRID_2P5_MM, _( "3D Grid 2.5 mm" ), wxEmptyString, true ); + gridlistMenu->Append( ID_MENU3D_GRID_1_MM, _( "3D Grid 1 mm" ), wxEmptyString, true ); - item = AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF, - _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE]); + item = AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS, + _( "Show Copper Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS]); - item = AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF, - _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE]); + item = AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF, + _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE]); - // Creates grid menu - wxMenu * gridlistMenu = new wxMenu; - item = AddMenuItem( prefsMenu, gridlistMenu, ID_MENU3D_GRID, - _( "3D Grid" ), KiBitmap( grid_xpm ) ); - gridlistMenu->Append( ID_MENU3D_GRID_NOGRID, _( "No 3D Grid" ), wxEmptyString, true ); - gridlistMenu->Check( ID_MENU3D_GRID_NOGRID, true ); + item = AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF, + _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE]); - gridlistMenu->Append( ID_MENU3D_GRID_10_MM, _( "3D Grid 10 mm" ), wxEmptyString, true ); - gridlistMenu->Append( ID_MENU3D_GRID_5_MM, _( "3D Grid 5 mm" ), wxEmptyString, true ); - gridlistMenu->Append( ID_MENU3D_GRID_2P5_MM, _( "3D Grid 2.5 mm" ), wxEmptyString, true ); - gridlistMenu->Append( ID_MENU3D_GRID_1_MM, _( "3D Grid 1 mm" ), wxEmptyString, true ); + item = AddMenuItem( prefsMenu, ID_MENU3D_ADHESIVE_ONOFF, + _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE]); - item = AddMenuItem( prefsMenu, ID_MENU3D_COMMENTS_ONOFF, - _( "Show &Comments Layer" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS]); + item = AddMenuItem( prefsMenu, ID_MENU3D_SILKSCREEN_ONOFF, + _( "Show &Silkscreen Layer" ), KiBitmap( add_text_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN]); - item = AddMenuItem( prefsMenu, ID_MENU3D_DRAWINGS_ONOFF, - _( "Show &Drawings Layer" ), KiBitmap( add_polygon_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_DRAWINGS]); + item = AddMenuItem( prefsMenu, ID_MENU3D_SOLDER_MASK_ONOFF, + _( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK]); - item = AddMenuItem( prefsMenu, ID_MENU3D_ECO1_ONOFF, - _( "Show Eco&1 Layer" ), KiBitmap( tools_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO1]); + item = AddMenuItem( prefsMenu, ID_MENU3D_SOLDER_PASTE_ONOFF, + _( "Show Solder &Paste Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE]); - item = AddMenuItem( prefsMenu, ID_MENU3D_ECO2_ONOFF, - _( "Show Eco&2 Layer" ), KiBitmap( tools_xpm ), wxITEM_CHECK ); - item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO2]); + item = AddMenuItem( prefsMenu, ID_MENU3D_COMMENTS_ONOFF, + _( "Show &Comments and Drawings Layer" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS]); - } + item = AddMenuItem( prefsMenu, ID_MENU3D_ECO_ONOFF, + _( "Show &Eco Layers" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK ); + item->Check(g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO]); SetMenuBar( menuBar ); } diff --git a/3d-viewer/3d_viewer.h b/3d-viewer/3d_viewer.h index 8c18836f8e..ec3cf50677 100644 --- a/3d-viewer/3d_viewer.h +++ b/3d-viewer/3d_viewer.h @@ -115,6 +115,7 @@ private: void On3DGridSelection( wxCommandEvent& event ); void Process_Zoom( wxCommandEvent& event ); void OnActivate( wxActivateEvent& event ); + void Install_3D_ViewOptionDialog( wxCommandEvent& event ); // initialisation void ReCreateMenuBar(); diff --git a/3d-viewer/3d_viewer_id.h b/3d-viewer/3d_viewer_id.h index 447bad55b4..f58aa44bdf 100644 --- a/3d-viewer/3d_viewer_id.h +++ b/3d-viewer/3d_viewer_id.h @@ -33,12 +33,16 @@ enum id_3dview_frm ID_MENU3D_AXIS_ONOFF, ID_MENU3D_MODULE_ONOFF, ID_MENU3D_ZONE_ONOFF, - ID_MENU3D_DRAWINGS_ONOFF, + ID_MENU3D_ADHESIVE_ONOFF, + ID_MENU3D_SILKSCREEN_ONOFF, + ID_MENU3D_SOLDER_PASTE_ONOFF, + ID_MENU3D_SOLDER_MASK_ONOFF, ID_MENU3D_COMMENTS_ONOFF, - ID_MENU3D_ECO1_ONOFF, - ID_MENU3D_ECO2_ONOFF, + ID_MENU3D_ECO_ONOFF, ID_END_COMMAND_3D, + ID_TOOL_SET_VISIBLE_ITEMS, + ID_MENU3D_GRID, ID_MENU3D_GRID_NOGRID, ID_MENU3D_GRID_10_MM, diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt index 94cc9d396e..26e834be43 100644 --- a/3d-viewer/CMakeLists.txt +++ b/3d-viewer/CMakeLists.txt @@ -9,6 +9,8 @@ include_directories( ) set(3D-VIEWER_SRCS + dialogs/dialog_3D_view_option_base.cpp + dialogs/dialog_3D_view_option.cpp 3d_aux.cpp 3d_canvas.cpp 3d_class.cpp diff --git a/3d-viewer/dialogs/dialog_3D_view_option.cpp b/3d-viewer/dialogs/dialog_3D_view_option.cpp new file mode 100644 index 0000000000..a7104db35e --- /dev/null +++ b/3d-viewer/dialogs/dialog_3D_view_option.cpp @@ -0,0 +1,125 @@ + +#include "dialog_3D_view_option_base.h" +#include <3d_viewer.h> +#include + +class DIALOG_3D_VIEW_OPTIONS : public DIALOG_3D_VIEW_OPTIONS_BASE +{ +public: + DIALOG_3D_VIEW_OPTIONS( EDA_3D_FRAME* parent ); + +private: + EDA_3D_FRAME* m_parent; + + void initDialog(); + + // Event functions: + void OnShowAllClick( wxCommandEvent& event ); + void OnShowNoneClick( wxCommandEvent& event ); + void OnOKClick( wxCommandEvent& event ); +}; + +void EDA_3D_FRAME::Install_3D_ViewOptionDialog( wxCommandEvent& event ) +{ + DIALOG_3D_VIEW_OPTIONS dlg( this ); + dlg.ShowModal(); +} + + +DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_FRAME* parent ) + :DIALOG_3D_VIEW_OPTIONS_BASE( parent ) +{ + m_parent = parent; + + initDialog(); + + Layout(); + GetSizer()->SetSizeHints(this); + Centre(); +} + +void DIALOG_3D_VIEW_OPTIONS::initDialog() +{ + m_bitmapCuThickness->SetBitmap( KiBitmap( use_3D_copper_thickness_xpm ) ); + m_bitmap3Dshapes->SetBitmap( KiBitmap( shape_3d_xpm ) ); + m_bitmapAreas->SetBitmap( KiBitmap( add_zone_xpm ) ); + m_bitmapSilkscreen->SetBitmap( KiBitmap( add_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( edit_sheet_xpm ) ); + m_bitmapECO->SetBitmap( KiBitmap( edit_sheet_xpm ) ); + + // Check/uncheck checkboxes + m_checkBoxCuThickness->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS] ); + m_checkBox3Dshapes->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] ); + m_checkBoxAreas->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE] ); + m_checkBoxSilkscreen->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] ); + m_checkBoxSolderMask->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] ); + m_checkBoxSolderpaste->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] ); + m_checkBoxAdhesive->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] ); + m_checkBoxComments->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] ); + m_checkBoxECO->SetValue( + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] ); +} + +void DIALOG_3D_VIEW_OPTIONS::OnShowAllClick( wxCommandEvent& event ) +{ + bool state = true; + m_checkBoxCuThickness->SetValue( state ); + m_checkBox3Dshapes->SetValue( state ); + m_checkBoxAreas->SetValue( state ); + m_checkBoxSilkscreen->SetValue( state ); + m_checkBoxSolderMask->SetValue( state ); + m_checkBoxSolderpaste->SetValue( state ); + m_checkBoxAdhesive->SetValue( state ); + m_checkBoxComments->SetValue( state ); + m_checkBoxECO->SetValue( state ); +} + +void DIALOG_3D_VIEW_OPTIONS::OnShowNoneClick( wxCommandEvent& event ) +{ + bool state = false; + m_checkBoxCuThickness->SetValue( state ); + m_checkBox3Dshapes->SetValue( state ); + m_checkBoxAreas->SetValue( state ); + m_checkBoxSilkscreen->SetValue( state ); + m_checkBoxSolderMask->SetValue( state ); + m_checkBoxSolderpaste->SetValue( state ); + m_checkBoxAdhesive->SetValue( state ); + m_checkBoxComments->SetValue( state ); + m_checkBoxECO->SetValue( state ); +} + +void DIALOG_3D_VIEW_OPTIONS::OnOKClick( wxCommandEvent& event ) +{ + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_USE_COPPER_THICKNESS] = + m_checkBoxCuThickness->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] = + m_checkBox3Dshapes->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ZONE] = + m_checkBoxAreas->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SILKSCREEN] = + m_checkBoxSilkscreen->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERMASK] = + m_checkBoxSolderMask->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_SOLDERPASTE] = + m_checkBoxSolderpaste->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ADHESIVE] = + m_checkBoxAdhesive->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_COMMENTS] = + m_checkBoxComments->GetValue(); + g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_ECO] = + m_checkBoxECO->GetValue(); + + EndModal( wxID_OK ); + m_parent->NewDisplay(); +} diff --git a/3d-viewer/dialogs/dialog_3D_view_option_base.cpp b/3d-viewer/dialogs/dialog_3D_view_option_base.cpp new file mode 100644 index 0000000000..0c8065c631 --- /dev/null +++ b/3d-viewer/dialogs/dialog_3D_view_option_base.cpp @@ -0,0 +1,132 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_3D_view_option_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerLeft; + bSizerLeft = new wxBoxSizer( wxHORIZONTAL ); + + wxFlexGridSizer* fgSizeShowOpts; + fgSizeShowOpts = new wxFlexGridSizer( 9, 2, 0, 0 ); + fgSizeShowOpts->SetFlexibleDirection( wxBOTH ); + fgSizeShowOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_bitmapCuThickness = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapCuThickness, 0, wxALL, 5 ); + + m_checkBoxCuThickness = new wxCheckBox( this, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxCuThickness, 0, wxALL, 5 ); + + m_bitmap3Dshapes = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmap3Dshapes, 0, wxALL, 5 ); + + m_checkBox3Dshapes = new wxCheckBox( this, wxID_ANY, _("Show component 3D shapes"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBox3Dshapes, 0, wxALL, 5 ); + + m_bitmapAreas = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapAreas, 0, wxALL, 5 ); + + m_checkBoxAreas = new wxCheckBox( this, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxAreas, 0, wxALL, 5 ); + + m_bitmapSilkscreen = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapSilkscreen, 0, wxALL, 5 ); + + m_checkBoxSilkscreen = new wxCheckBox( this, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxSilkscreen, 0, wxALL, 5 ); + + m_bitmapSolderMask = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapSolderMask, 0, wxALL, 5 ); + + m_checkBoxSolderMask = new wxCheckBox( this, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxSolderMask, 0, wxALL, 5 ); + + m_bitmapSolderPaste = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapSolderPaste, 0, wxALL, 5 ); + + m_checkBoxSolderpaste = new wxCheckBox( this, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxSolderpaste, 0, wxALL, 5 ); + + m_bitmapAdhesive = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapAdhesive, 0, wxALL, 5 ); + + m_checkBoxAdhesive = new wxCheckBox( this, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxAdhesive, 0, wxALL, 5 ); + + m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapComments, 0, wxALL, 5 ); + + m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings Layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxComments, 0, wxALL, 5 ); + + m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_bitmapECO, 0, wxALL, 5 ); + + m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECOs layers"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizeShowOpts->Add( m_checkBoxECO, 0, wxALL, 5 ); + + + bSizerLeft->Add( fgSizeShowOpts, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizerRight; + bSizerRight = new wxBoxSizer( wxVERTICAL ); + + m_buttonShowAll = new wxButton( this, wxID_ANY, _("Show All"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRight->Add( m_buttonShowAll, 0, wxALL, 5 ); + + m_buttonShowNone = new wxButton( this, wxID_ANY, _("Show None"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRight->Add( m_buttonShowNone, 0, wxALL, 5 ); + + + bSizerLeft->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + + m_sdbSizer = new wxStdDialogButtonSizer(); + m_sdbSizerOK = new wxButton( this, wxID_OK ); + m_sdbSizer->AddButton( m_sdbSizerOK ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer->AddButton( m_sdbSizerCancel ); + m_sdbSizer->Realize(); + + bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + + this->Centre( wxBOTH ); + + // Connect Events + m_buttonShowAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowAllClick ), NULL, this ); + m_buttonShowNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowNoneClick ), NULL, this ); + m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnOKClick ), NULL, this ); +} + +DIALOG_3D_VIEW_OPTIONS_BASE::~DIALOG_3D_VIEW_OPTIONS_BASE() +{ + // Disconnect Events + m_buttonShowAll->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowAllClick ), NULL, this ); + m_buttonShowNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnShowNoneClick ), NULL, this ); + m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnOKClick ), NULL, this ); + +} diff --git a/3d-viewer/dialogs/dialog_3D_view_option_base.fbp b/3d-viewer/dialogs/dialog_3D_view_option_base.fbp new file mode 100644 index 0000000000..8a0fb1c5ee --- /dev/null +++ b/3d-viewer/dialogs/dialog_3D_view_option_base.fbp @@ -0,0 +1,1941 @@ + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_3D_view_option_base + 1000 + none + 1 + dialog_3D_view_option_base + + . + + 1 + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_3D_VIEW_OPTIONS_BASE + + 340,344 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + 3D Display Options + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizerMain + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizerLeft + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + 2 + wxBOTH + + + 0 + + fgSizeShowOpts + wxFLEX_GROWMODE_SPECIFIED + none + 9 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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_bitmap3Dshapes + 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 component 3D shapes + + 0 + + + 0 + + 1 + m_checkBox3Dshapes + 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 + + + 0 + + 1 + m_bitmapAreas + 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 filled areas in zones + + 0 + + + 0 + + 1 + m_checkBoxAreas + 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 + + + 0 + + 1 + m_bitmapSilkscreen + 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 silkscreen layers + + 0 + + + 0 + + 1 + m_checkBoxSilkscreen + 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 + + + 0 + + 1 + m_bitmapSolderMask + 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 solder mask layers + + 0 + + + 0 + + 1 + m_checkBoxSolderMask + 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 + + + 0 + + 1 + m_bitmapSolderPaste + 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 solder paste layers + + 0 + + + 0 + + 1 + m_checkBoxSolderpaste + 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 + + + 0 + + 1 + m_bitmapAdhesive + 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 adhesive layers + + 0 + + + 0 + + 1 + m_checkBoxAdhesive + 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 + + + 0 + + 1 + m_bitmapComments + 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 comments and drawings Layers + + 0 + + + 0 + + 1 + m_checkBoxComments + 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 + + + 0 + + 1 + m_bitmapECO + 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 ECOs layers + + 0 + + + 0 + + 1 + m_checkBoxECO + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bSizerRight + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show All + + 0 + + + 0 + + 1 + m_buttonShowAll + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnShowAllClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show None + + 0 + + + 0 + + 1 + m_buttonShowNone + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnShowNoneClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + + OnCancelClick + + + + OnOKClick + + + + + + + + diff --git a/3d-viewer/dialogs/dialog_3D_view_option_base.h b/3d-viewer/dialogs/dialog_3D_view_option_base.h new file mode 100644 index 0000000000..4b7f20dce8 --- /dev/null +++ b/3d-viewer/dialogs/dialog_3D_view_option_base.h @@ -0,0 +1,82 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_3D_VIEW_OPTION_BASE_H__ +#define __DIALOG_3D_VIEW_OPTION_BASE_H__ + +#include +#include +#include +class DIALOG_SHIM; + +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_3D_VIEW_OPTIONS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticBitmap* m_bitmapCuThickness; + wxCheckBox* m_checkBoxCuThickness; + wxStaticBitmap* m_bitmap3Dshapes; + wxCheckBox* m_checkBox3Dshapes; + wxStaticBitmap* m_bitmapAreas; + wxCheckBox* m_checkBoxAreas; + 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; + wxButton* m_buttonShowAll; + wxButton* m_buttonShowNone; + wxStaticLine* m_staticline1; + wxStdDialogButtonSizer* m_sdbSizer; + wxButton* m_sdbSizerOK; + wxButton* m_sdbSizerCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnShowAllClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnShowNoneClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,344 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_3D_VIEW_OPTIONS_BASE(); + +}; + +#endif //__DIALOG_3D_VIEW_OPTION_BASE_H__ diff --git a/3d-viewer/info3d_visu.h b/3d-viewer/info3d_visu.h index 573da70fd7..08b4a97e42 100644 --- a/3d-viewer/info3d_visu.h +++ b/3d-viewer/info3d_visu.h @@ -68,7 +68,8 @@ class INFO3D_VISU public: enum DISPLAY3D_FLG { FL_AXIS=0, FL_MODULE, FL_ZONE, - FL_COMMENTS, FL_DRAWINGS, FL_ECO1, FL_ECO2, + FL_ADHESIVE, FL_SILKSCREEN, FL_SOLDERMASK, FL_SOLDERPASTE, + FL_COMMENTS, FL_ECO, FL_GRID, FL_USE_COPPER_THICKNESS, FL_LAST