From 77680eba30552fcb3b340bbd694bbfbbb8ddcfe1 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 5 Aug 2021 13:03:59 +0100 Subject: [PATCH] Naming conventions. --- 3d-viewer/3d_canvas/eda_3d_canvas.cpp | 2 +- 3d-viewer/3d_viewer/3d_menubar.cpp | 12 ++++----- 3d-viewer/3d_viewer/3d_toolbar.cpp | 2 +- .../3d_viewer/dialogs/panel_3D_colors.cpp | 2 +- 3d-viewer/3d_viewer/dialogs/panel_3D_colors.h | 2 +- .../dialogs/panel_3D_display_options.cpp | 2 +- .../dialogs/panel_3D_display_options.h | 2 +- .../dialogs/panel_3D_opengl_options.cpp | 2 +- .../dialogs/panel_3D_opengl_options.h | 2 +- .../dialogs/panel_3D_raytracing_options.cpp | 2 +- .../dialogs/panel_3D_raytracing_options.h | 2 +- ..._3d_viewer.cpp => eda_3d_viewer_frame.cpp} | 27 ++++++++----------- ...{eda_3d_viewer.h => eda_3d_viewer_frame.h} | 0 3d-viewer/3d_viewer/tools/eda_3d_actions.cpp | 8 +++--- 3d-viewer/3d_viewer/tools/eda_3d_actions.h | 8 +++--- .../3d_viewer/tools/eda_3d_controller.cpp | 10 +++---- 3d-viewer/CMakeLists.txt | 2 +- .../dialogs/dialog_footprint_properties.cpp | 2 +- .../dialog_footprint_properties_fp_editor.cpp | 2 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 2 +- .../dialogs/panel_fp_properties_3d_model.cpp | 2 +- pcbnew/files.cpp | 2 +- pcbnew/footprint_edit_frame.cpp | 2 +- pcbnew/footprint_viewer_frame.cpp | 2 +- pcbnew/footprint_wizard_frame.cpp | 2 +- pcbnew/pcb_base_frame.cpp | 2 +- pcbnew/pcb_edit_frame.cpp | 2 +- pcbnew/tools/pcb_control.cpp | 2 +- pcbnew/tools/pcb_viewer_tools.cpp | 2 +- 29 files changed, 53 insertions(+), 58 deletions(-) rename 3d-viewer/3d_viewer/{eda_3d_viewer.cpp => eda_3d_viewer_frame.cpp} (97%) rename 3d-viewer/3d_viewer/{eda_3d_viewer.h => eda_3d_viewer_frame.h} (100%) diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index 0cb8676c0e..5b3e258b96 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -28,7 +28,7 @@ #include "../common_ogl/ogl_utils.h" #include "eda_3d_canvas.h" -#include +#include #include <3d_rendering/3d_render_raytracing/render_3d_raytrace.h> #include <3d_rendering/legacy/render_3d_legacy.h> #include <3d_viewer_id.h> diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp index 18d2371fbb..682726684a 100644 --- a/3d-viewer/3d_viewer/3d_menubar.cpp +++ b/3d-viewer/3d_viewer/3d_menubar.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include <3d_viewer_id.h> #include <3d_viewer/tools/eda_3d_actions.h> @@ -118,14 +118,14 @@ void EDA_3D_VIEWER_FRAME::CreateMenuBar() prefsMenu->AppendSeparator(); - prefsMenu->Add( EDA_3D_ACTIONS::attributesTHT, ACTION_MENU::CHECK ); - prefsMenu->Add( EDA_3D_ACTIONS::attributesSMD, ACTION_MENU::CHECK ); - prefsMenu->Add( EDA_3D_ACTIONS::attributesVirtual, ACTION_MENU::CHECK ); + prefsMenu->Add( EDA_3D_ACTIONS::showTHT, ACTION_MENU::CHECK ); + prefsMenu->Add( EDA_3D_ACTIONS::showSMD, ACTION_MENU::CHECK ); + prefsMenu->Add( EDA_3D_ACTIONS::showVirtual, ACTION_MENU::CHECK ); prefsMenu->AppendSeparator(); - prefsMenu->Add( EDA_3D_ACTIONS::showAxis, ACTION_MENU::CHECK ); - prefsMenu->Add( EDA_3D_ACTIONS::showBoundingBoxes, ACTION_MENU::CHECK ); + prefsMenu->Add( EDA_3D_ACTIONS::showAxis, ACTION_MENU::CHECK ); + prefsMenu->Add( EDA_3D_ACTIONS::showBBoxes, ACTION_MENU::CHECK ); // Grid submenu ACTION_MENU* gridSubmenu = new ACTION_MENU( false, tool ); diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp index 7ccd398193..d18c7f3b98 100644 --- a/3d-viewer/3d_viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_viewer/3d_toolbar.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp index 561a7c57ef..e97dc3b735 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp @@ -24,7 +24,7 @@ #include "panel_3D_colors.h" #include #include <3d_canvas/board_adapter.h> -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.h b/3d-viewer/3d_viewer/dialogs/panel_3D_colors.h index 6d376eff79..6b69359f03 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_colors.h @@ -25,7 +25,7 @@ #define PANEL_3D_COLORS_H #include "panel_3D_colors_base.h" -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> class PANEL_3D_COLORS : public PANEL_3D_COLORS_BASE { diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp index 441210153a..9edbd2dedd 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp @@ -24,7 +24,7 @@ #include "panel_3D_display_options.h" #include <3d_canvas/board_adapter.h> -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include <3d_viewer/tools/eda_3d_controller.h> #include diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h b/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h index b5ef9dc179..85f6027006 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h @@ -26,7 +26,7 @@ #define PANEL_3D_DISPLAY_OPTIONS_H #include "panel_3D_display_options_base.h" -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> class PANEL_3D_DISPLAY_OPTIONS : public PANEL_3D_DISPLAY_OPTIONS_BASE diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp index 74b55355d8..418af7d563 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp @@ -25,7 +25,7 @@ #include "panel_3D_opengl_options.h" #include #include <3d_canvas/board_adapter.h> -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include <3d_viewer/tools/eda_3d_controller.h> PANEL_3D_OPENGL_OPTIONS::PANEL_3D_OPENGL_OPTIONS( EDA_3D_VIEWER_FRAME* aFrame, wxWindow* aParent ) : diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h index 84436827f8..1a42469a27 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h @@ -26,7 +26,7 @@ #define PANEL_3D_OPENGL_OPTIONS_H #include "panel_3D_opengl_options_base.h" -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> class PANEL_3D_OPENGL_OPTIONS : public PANEL_3D_OPENGL_OPTIONS_BASE { diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp index 36a1f602d9..ad1a00c9ba 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp @@ -24,7 +24,7 @@ #include "panel_3D_raytracing_options.h" #include <3d_canvas/board_adapter.h> -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include <3d_viewer/tools/eda_3d_controller.h> #include #include diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h index 900d58fa13..d66f40a003 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h @@ -26,7 +26,7 @@ #define PANEL_3D_RAYTRACING_OPTIONS_H #include "panel_3D_raytracing_options_base.h" -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> class PANEL_3D_RAYTRACING_OPTIONS : public PANEL_3D_RAYTRACING_OPTIONS_BASE { diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp similarity index 97% rename from 3d-viewer/3d_viewer/eda_3d_viewer.cpp rename to 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp index 3541f9ab5a..d4b8c95244 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "eda_3d_viewer.h" +#include "eda_3d_viewer_frame.h" #include #include <3d_viewer_id.h> #include <3d_viewer/tools/eda_3d_actions.h> @@ -194,25 +194,21 @@ void EDA_3D_VIEWER_FRAME::setupUIConditions() #define FlagCheck( x ) ACTION_CONDITIONS().Check( cond.Flag( x ) ) #define GridSizeCheck( x ) ACTION_CONDITIONS().Check( cond.GridSize( x ) ) - auto raytracingCondition = [this]( const SELECTION& aSel ) - { - return m_boardAdapter.GetRenderEngine() != RENDER_ENGINE::OPENGL_LEGACY; - }; + auto raytracingCondition = + [this]( const SELECTION& aSel ) + { + return m_boardAdapter.GetRenderEngine() != RENDER_ENGINE::OPENGL_LEGACY; + }; RegisterUIUpdateHandler( ID_RENDER_CURRENT_VIEW, ACTION_CONDITIONS().Check( raytracingCondition ) ); - mgr->SetConditions( EDA_3D_ACTIONS::attributesTHT, - FlagCheck( FL_FP_ATTRIBUTES_NORMAL ) ); - mgr->SetConditions( EDA_3D_ACTIONS::attributesSMD, - FlagCheck( FL_FP_ATTRIBUTES_NORMAL_INSERT ) ); - mgr->SetConditions( EDA_3D_ACTIONS::attributesVirtual, - FlagCheck( FL_FP_ATTRIBUTES_VIRTUAL ) ); + mgr->SetConditions( EDA_3D_ACTIONS::showTHT, FlagCheck( FL_FP_ATTRIBUTES_NORMAL ) ); + mgr->SetConditions( EDA_3D_ACTIONS::showSMD, FlagCheck( FL_FP_ATTRIBUTES_NORMAL_INSERT ) ); + mgr->SetConditions( EDA_3D_ACTIONS::showVirtual, FlagCheck( FL_FP_ATTRIBUTES_VIRTUAL ) ); - mgr->SetConditions( EDA_3D_ACTIONS::showBoundingBoxes, - FlagCheck( FL_RENDER_OPENGL_SHOW_MODEL_BBOX ) ); - mgr->SetConditions( EDA_3D_ACTIONS::showAxis, - FlagCheck( FL_AXIS ) ); + mgr->SetConditions( EDA_3D_ACTIONS::showBBoxes, FlagCheck( FL_RENDER_OPENGL_SHOW_MODEL_BBOX ) ); + mgr->SetConditions( EDA_3D_ACTIONS::showAxis, FlagCheck( FL_AXIS ) ); mgr->SetConditions( EDA_3D_ACTIONS::noGrid, GridSizeCheck( GRID3D_TYPE::NONE ) ); mgr->SetConditions( EDA_3D_ACTIONS::show10mmGrid, GridSizeCheck( GRID3D_TYPE::GRID_10MM ) ); @@ -791,7 +787,6 @@ void EDA_3D_VIEWER_FRAME::takeScreenshot( wxCommandEvent& event ) screenshotImage.Destroy(); } - } diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.h b/3d-viewer/3d_viewer/eda_3d_viewer_frame.h similarity index 100% rename from 3d-viewer/3d_viewer/eda_3d_viewer.h rename to 3d-viewer/3d_viewer/eda_3d_viewer_frame.h diff --git a/3d-viewer/3d_viewer/tools/eda_3d_actions.cpp b/3d-viewer/3d_viewer/tools/eda_3d_actions.cpp index 4041fc07d7..191339b529 100644 --- a/3d-viewer/3d_viewer/tools/eda_3d_actions.cpp +++ b/3d-viewer/3d_viewer/tools/eda_3d_actions.cpp @@ -207,25 +207,25 @@ TOOL_ACTION EDA_3D_ACTIONS::rotate45axisZ( "3DViewer.Control.rotate45axisZ", WXK_TAB, "", "Rotate 45 degrees over Z axis" ); -TOOL_ACTION EDA_3D_ACTIONS::attributesTHT( "3DViewer.Control.attributesTHT", +TOOL_ACTION EDA_3D_ACTIONS::showTHT( "3DViewer.Control.attributesTHT", AS_ACTIVE, 'T', "", _( "Toggle Through Hole 3D models" ), _( "Toggle 3D models with 'Through hole' attribute" ), BITMAPS::INVALID_BITMAP, AF_NONE, (void*) FL_FP_ATTRIBUTES_NORMAL ); -TOOL_ACTION EDA_3D_ACTIONS::attributesSMD( "3DViewer.Control.attributesSMD", +TOOL_ACTION EDA_3D_ACTIONS::showSMD( "3DViewer.Control.attributesSMD", AS_ACTIVE, 'S', "", _( "Toggle SMD 3D models" ), _( "Toggle 3D models with 'Surface mount' attribute" ), BITMAPS::INVALID_BITMAP, AF_NONE, (void*) FL_FP_ATTRIBUTES_NORMAL_INSERT ); -TOOL_ACTION EDA_3D_ACTIONS::attributesVirtual( "3DViewer.Control.attributesVirtual", +TOOL_ACTION EDA_3D_ACTIONS::showVirtual( "3DViewer.Control.attributesVirtual", AS_ACTIVE, 'V', "", _( "Toggle Virtual 3D models" ), _( "Toggle 3D models with 'Virtual' attribute" ), BITMAPS::INVALID_BITMAP, AF_NONE, (void*) FL_FP_ATTRIBUTES_VIRTUAL ); -TOOL_ACTION EDA_3D_ACTIONS::showBoundingBoxes( "3DViewer.Control.showBoundingBoxes", +TOOL_ACTION EDA_3D_ACTIONS::showBBoxes( "3DViewer.Control.showBoundingBoxes", AS_GLOBAL, 0, "", _( "Show Model Bounding Boxes" ), _( "Show Model Bounding Boxes" ), BITMAPS::ortho, AF_NONE, (void*) FL_RENDER_OPENGL_SHOW_MODEL_BBOX ); diff --git a/3d-viewer/3d_viewer/tools/eda_3d_actions.h b/3d-viewer/3d_viewer/tools/eda_3d_actions.h index 94c517cc74..94310ffd3d 100644 --- a/3d-viewer/3d_viewer/tools/eda_3d_actions.h +++ b/3d-viewer/3d_viewer/tools/eda_3d_actions.h @@ -76,10 +76,10 @@ public: static TOOL_ACTION materialCAD; static TOOL_ACTION rotate45axisZ; - static TOOL_ACTION attributesTHT; - static TOOL_ACTION attributesSMD; - static TOOL_ACTION attributesVirtual; - static TOOL_ACTION showBoundingBoxes; + static TOOL_ACTION showTHT; + static TOOL_ACTION showSMD; + static TOOL_ACTION showVirtual; + static TOOL_ACTION showBBoxes; static TOOL_ACTION toggleRealisticMode; static TOOL_ACTION toggleBoardBody; static TOOL_ACTION showAxis; diff --git a/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp b/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp index 021a09630e..258e3aea10 100644 --- a/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp +++ b/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -353,10 +353,10 @@ void EDA_3D_CONTROLLER::setTransitions() // Visibility Go( &EDA_3D_CONTROLLER::ToggleOrtho, EDA_3D_ACTIONS::toggleOrtho.MakeEvent() ); - Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::attributesTHT.MakeEvent() ); - Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::attributesSMD.MakeEvent() ); - Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::attributesVirtual.MakeEvent() ); - Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showBoundingBoxes.MakeEvent() ); + Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showTHT.MakeEvent() ); + Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showSMD.MakeEvent() ); + Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showVirtual.MakeEvent() ); + Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showBBoxes.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::toggleRealisticMode.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::toggleBoardBody.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ToggleVisibility, EDA_3D_ACTIONS::showAxis.MakeEvent() ); diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt index e456d49f64..c5f307eae9 100644 --- a/3d-viewer/CMakeLists.txt +++ b/3d-viewer/CMakeLists.txt @@ -98,7 +98,7 @@ set(3D-VIEWER_SRCS 3d_viewer/tools/eda_3d_actions.cpp 3d_viewer/tools/eda_3d_conditions.cpp 3d_viewer/tools/eda_3d_controller.cpp - 3d_viewer/eda_3d_viewer.cpp + 3d_viewer/eda_3d_viewer_frame.cpp 3d_viewer/eda_3d_viewer_settings.cpp common_ogl/ogl_attr_list.cpp common_ogl/ogl_utils.cpp diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index 222e3f81eb..9fd2e0b941 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -24,7 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp index 52aa913514..9b5f791fb7 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp @@ -26,7 +26,7 @@ #include #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index 3c61fcd9a1..147dbe263c 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -39,7 +39,7 @@ #include #include -#include <3d_viewer/eda_3d_viewer.h> // for KICAD6_3DMODEL_DIR +#include <3d_viewer/eda_3d_viewer_frame.h> // for KICAD6_3DMODEL_DIR #include #include #include diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp index 7a5c5378f7..6a21f1354a 100644 --- a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp +++ b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp @@ -27,7 +27,7 @@ #include #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index fdf29fc853..20d701ebae 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -28,7 +28,7 @@ #include #include #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index 6b4d8ebc5e..e77d59daac 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -32,7 +32,7 @@ #include "tools/pcb_point_editor.h" #include "tools/pcb_selection_tool.h" #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp index c54db4e863..10a95c11fe 100644 --- a/pcbnew/footprint_viewer_frame.cpp +++ b/pcbnew/footprint_viewer_frame.cpp @@ -23,7 +23,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index 4d5ba310f9..e30e188149 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -27,7 +27,7 @@ #include #include #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp index fde917d38d..f7fd275727 100644 --- a/pcbnew/pcb_base_frame.cpp +++ b/pcbnew/pcb_base_frame.cpp @@ -38,7 +38,7 @@ #include #include #include -#include <3d_viewer/eda_3d_viewer.h> // To include VIEWER3D_FRAMENAME +#include <3d_viewer/eda_3d_viewer_frame.h> // To include VIEWER3D_FRAMENAME #include #include #include diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index 080d29c1d9..abfd8bafc0 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -25,7 +25,7 @@ #include #include #include -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp index 723614d22e..948e944ade 100644 --- a/pcbnew/tools/pcb_control.cpp +++ b/pcbnew/tools/pcb_control.cpp @@ -30,7 +30,7 @@ #include "pcb_picker_tool.h" #include "pcb_selection_tool.h" #include "board_reannotate_tool.h" -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include diff --git a/pcbnew/tools/pcb_viewer_tools.cpp b/pcbnew/tools/pcb_viewer_tools.cpp index d4e1b7bf98..15ea42d556 100644 --- a/pcbnew/tools/pcb_viewer_tools.cpp +++ b/pcbnew/tools/pcb_viewer_tools.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <3d_viewer/eda_3d_viewer.h> +#include <3d_viewer/eda_3d_viewer_frame.h> #include #include #include