Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Naming conventions.

6.0.7
Jeff Young 4 years ago
parent
5bf0b99813
commit
77680eba30
29 changed files with 53 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      3d-viewer/3d_canvas/eda_3d_canvas.cpp
  2. 12
      3d-viewer/3d_viewer/3d_menubar.cpp
  3. 2
      3d-viewer/3d_viewer/3d_toolbar.cpp
  4. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp
  5. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_colors.h
  6. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp
  7. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h
  8. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp
  9. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h
  10. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp
  11. 2
      3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h
  12. 27
      3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
  13. 0
      3d-viewer/3d_viewer/eda_3d_viewer_frame.h
  14. 8
      3d-viewer/3d_viewer/tools/eda_3d_actions.cpp
  15. 8
      3d-viewer/3d_viewer/tools/eda_3d_actions.h
  16. 10
      3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
  17. 2
      3d-viewer/CMakeLists.txt
  18. 2
      pcbnew/dialogs/dialog_footprint_properties.cpp
  19. 2
      pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
  20. 2
      pcbnew/dialogs/panel_fp_lib_table.cpp
  21. 2
      pcbnew/dialogs/panel_fp_properties_3d_model.cpp
  22. 2
      pcbnew/files.cpp
  23. 2
      pcbnew/footprint_edit_frame.cpp
  24. 2
      pcbnew/footprint_viewer_frame.cpp
  25. 2
      pcbnew/footprint_wizard_frame.cpp
  26. 2
      pcbnew/pcb_base_frame.cpp
  27. 2
      pcbnew/pcb_edit_frame.cpp
  28. 2
      pcbnew/tools/pcb_control.cpp
  29. 2
      pcbnew/tools/pcb_viewer_tools.cpp

2
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -28,7 +28,7 @@
#include "../common_ogl/ogl_utils.h"
#include "eda_3d_canvas.h"
#include <eda_3d_viewer.h>
#include <eda_3d_viewer_frame.h>
#include <3d_rendering/3d_render_raytracing/render_3d_raytrace.h>
#include <3d_rendering/legacy/render_3d_legacy.h>
#include <3d_viewer_id.h>

12
3d-viewer/3d_viewer/3d_menubar.cpp
View File

@ -26,7 +26,7 @@
#include <bitmaps.h>
#include <tool/conditional_menu.h>
#include <eda_3d_viewer.h>
#include <eda_3d_viewer_frame.h>
#include <menus_helpers.h>
#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 );

2
3d-viewer/3d_viewer/3d_toolbar.cpp
View File

@ -27,7 +27,7 @@
#include <wx/wupdlock.h>
#include <bitmaps.h>
#include <eda_3d_viewer.h>
#include <eda_3d_viewer_frame.h>
#include <menus_helpers.h>
#include <tool/action_toolbar.h>
#include <tools/eda_3d_actions.h>

2
3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp
View File

@ -24,7 +24,7 @@
#include "panel_3D_colors.h"
#include <widgets/color_swatch.h>
#include <3d_canvas/board_adapter.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <eda_3d_viewer_settings.h>
#include <settings/settings_manager.h>
#include <board_stackup_manager/stackup_predefined_prms.h>

2
3d-viewer/3d_viewer/dialogs/panel_3D_colors.h
View File

@ -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
{

2
3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp
View File

@ -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 <tool/tool_manager.h>

2
3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h
View File

@ -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

2
3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp
View File

@ -25,7 +25,7 @@
#include "panel_3D_opengl_options.h"
#include <widgets/color_swatch.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>
PANEL_3D_OPENGL_OPTIONS::PANEL_3D_OPENGL_OPTIONS( EDA_3D_VIEWER_FRAME* aFrame, wxWindow* aParent ) :

2
3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h
View File

@ -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
{

2
3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp
View File

@ -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 <bitmaps.h>
#include <tool/tool_manager.h>

2
3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h
View File

@ -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
{

27
3d-viewer/3d_viewer/eda_3d_viewer.cpp → 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
View File

@ -29,7 +29,7 @@
#include <wx/clipbrd.h>
#include <wx/filedlg.h>
#include <wx/treebook.h>
#include "eda_3d_viewer.h"
#include "eda_3d_viewer_frame.h"
#include <eda_3d_viewer_settings.h>
#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();
}
}

0
3d-viewer/3d_viewer/eda_3d_viewer.h → 3d-viewer/3d_viewer/eda_3d_viewer_frame.h
View File

8
3d-viewer/3d_viewer/tools/eda_3d_actions.cpp
View File

@ -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 );

8
3d-viewer/3d_viewer/tools/eda_3d_actions.h
View File

@ -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;

10
3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
View File

@ -24,7 +24,7 @@
#include <tool/actions.h>
#include <tool/tool_manager.h>
#include <eda_3d_canvas.h>
#include <eda_3d_viewer.h>
#include <eda_3d_viewer_frame.h>
#include <id.h>
#include <kiface_i.h>
#include <tools/eda_3d_controller.h>
@ -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() );

2
3d-viewer/CMakeLists.txt
View File

@ -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

2
pcbnew/dialogs/dialog_footprint_properties.cpp
View File

@ -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 <bitmaps.h>
#include <board_commit.h>
#include <board_design_settings.h>

2
pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
View File

@ -26,7 +26,7 @@
#include <confirm.h>
#include <dialogs/dialog_text_entry.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <validators.h>
#include <board_design_settings.h>
#include <board_commit.h>

2
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -39,7 +39,7 @@
#include <wx/filedlg.h>
#include <project.h>
#include <3d_viewer/eda_3d_viewer.h> // for KICAD6_3DMODEL_DIR
#include <3d_viewer/eda_3d_viewer_frame.h> // for KICAD6_3DMODEL_DIR
#include <panel_fp_lib_table.h>
#include <lib_id.h>
#include <fp_lib_table.h>

2
pcbnew/dialogs/panel_fp_properties_3d_model.cpp
View File

@ -27,7 +27,7 @@
#include <panel_fp_properties_3d_model.h>
#include <confirm.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <board_design_settings.h>
#include <bitmaps.h>
#include <widgets/grid_icon_text_helpers.h>

2
pcbnew/files.cpp
View File

@ -28,7 +28,7 @@
#include <gestfich.h>
#include <pcb_edit_frame.h>
#include <board_design_settings.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <widgets/msgpanel.h>
#include <fp_lib_table.h>
#include <kiface_i.h>

2
pcbnew/footprint_edit_frame.cpp
View File

@ -32,7 +32,7 @@
#include "tools/pcb_point_editor.h"
#include "tools/pcb_selection_tool.h"
#include <python/scripting/pcb_scripting_tool.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <bitmaps.h>
#include <board.h>
#include <footprint.h>

2
pcbnew/footprint_viewer_frame.cpp
View File

@ -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 <bitmaps.h>
#include <board_commit.h>
#include <board.h>

2
pcbnew/footprint_wizard_frame.cpp
View File

@ -27,7 +27,7 @@
#include <kiface_i.h>
#include <pcb_draw_panel_gal.h>
#include <pcb_edit_frame.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <widgets/msgpanel.h>
#include <bitmaps.h>
#include <grid_tricks.h>

2
pcbnew/pcb_base_frame.cpp
View File

@ -38,7 +38,7 @@
#include <base_units.h>
#include <widgets/msgpanel.h>
#include <pgm_base.h>
#include <3d_viewer/eda_3d_viewer.h> // To include VIEWER3D_FRAMENAME
#include <3d_viewer/eda_3d_viewer_frame.h> // To include VIEWER3D_FRAMENAME
#include <footprint_editor_settings.h>
#include <fp_lib_table.h>
#include <pcbnew_id.h>

2
pcbnew/pcb_edit_frame.cpp
View File

@ -25,7 +25,7 @@
#include <kiway.h>
#include <pgm_base.h>
#include <pcb_edit_frame.h>
#include <3d_viewer/eda_3d_viewer.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <fp_lib_table.h>
#include <bitmaps.h>
#include <confirm.h>

2
pcbnew/tools/pcb_control.cpp
View File

@ -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 <bitmaps.h>
#include <board_commit.h>
#include <board.h>

2
pcbnew/tools/pcb_viewer_tools.cpp
View File

@ -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 <kiplatform/ui.h>
#include <pcb_base_frame.h>
#include <pcbnew_settings.h>

Write Preview
Loading…
Cancel
Save