From 3f315c1ed55dbf09bcf82f35b4fe6fab29e29e02 Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Fri, 6 Jun 2025 15:32:05 +0200 Subject: [PATCH] Renaming Gui::SiemensNXStyle to Gui::SiemensNXNavigationStyle for consistency --- src/Gui/CMakeLists.txt | 4 ++-- ...XStyle.cpp => SiemensNXNavigationStyle.cpp} | 18 +++++++++--------- ...ensNXStyle.h => SiemensNXNavigationStyle.h} | 12 ++++++------ src/Gui/SoFCDB.cpp | 4 ++-- src/Mod/Tux/NavigationIndicatorGui.py | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) rename src/Gui/Navigation/{SiemensNXStyle.cpp => SiemensNXNavigationStyle.cpp} (96%) rename src/Gui/Navigation/{SiemensNXStyle.h => SiemensNXNavigationStyle.h} (89%) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 49391e1c2b..ab93d16cac 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -939,7 +939,7 @@ SET(Navigation_CPP_SRCS Navigation/CADNavigationStyle.cpp Navigation/RevitNavigationStyle.cpp Navigation/BlenderNavigationStyle.cpp - Navigation/SiemensNXStyle.cpp + Navigation/SiemensNXNavigationStyle.cpp Navigation/SolidWorksNavigationStyle.cpp Navigation/MayaGestureNavigationStyle.cpp Navigation/OpenCascadeNavigationStyle.cpp @@ -958,7 +958,7 @@ SET(Navigation_SRCS Navigation/GestureNavigationStyle.h Navigation/NavigationAnimator.h Navigation/NavigationAnimation.h - Navigation/SiemensNXStyle.h + Navigation/SiemensNXNavigationStyle.h ) SOURCE_GROUP("Navigation" FILES ${Navigation_SRCS}) diff --git a/src/Gui/Navigation/SiemensNXStyle.cpp b/src/Gui/Navigation/SiemensNXNavigationStyle.cpp similarity index 96% rename from src/Gui/Navigation/SiemensNXStyle.cpp rename to src/Gui/Navigation/SiemensNXNavigationStyle.cpp index 044e5f545c..45090aa2bf 100644 --- a/src/Gui/Navigation/SiemensNXStyle.cpp +++ b/src/Gui/Navigation/SiemensNXNavigationStyle.cpp @@ -32,7 +32,7 @@ #include #include "Camera.h" -#include "SiemensNXStyle.h" +#include "SiemensNXNavigationStyle.h" #include "View3DInventorViewer.h" // NOLINTBEGIN(cppcoreguidelines-pro-type-static-cast-downcast, @@ -41,7 +41,7 @@ using namespace Gui; namespace sc = boost::statechart; using SC = NavigationStateChart; -using NS = SiemensNXStyle; +using NS = SiemensNXNavigationStyle; struct NS::NaviMachine: public sc::state_machine { @@ -396,20 +396,20 @@ struct NS::SelectionState: public sc::state // ---------------------------------------------------------------------------------- -/* TRANSLATOR Gui::SiemensNXStyle */ +/* TRANSLATOR Gui::SiemensNXNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::SiemensNXStyle, Gui::UserNavigationStyle) +TYPESYSTEM_SOURCE(Gui::SiemensNXNavigationStyle, Gui::UserNavigationStyle) -SiemensNXStyle::SiemensNXStyle() +SiemensNXNavigationStyle::SiemensNXNavigationStyle() { naviMachine.reset(new NaviStateMachineT(new NaviMachine(*this))); } -SiemensNXStyle::~SiemensNXStyle() +SiemensNXNavigationStyle::~SiemensNXNavigationStyle() { } -const char* SiemensNXStyle::mouseButtons(ViewerMode mode) +const char* SiemensNXNavigationStyle::mouseButtons(ViewerMode mode) { switch (mode) { case NavigationStyle::SELECTION: @@ -425,12 +425,12 @@ const char* SiemensNXStyle::mouseButtons(ViewerMode mode) } } -std::string SiemensNXStyle::userFriendlyName() const +std::string SiemensNXNavigationStyle::userFriendlyName() const { return {"Siemens NX"}; } -SbBool SiemensNXStyle::processKeyboardEvent(const SoKeyboardEvent * const event) +SbBool SiemensNXNavigationStyle::processKeyboardEvent(const SoKeyboardEvent* const event) { // See https://forum.freecad.org/viewtopic.php?t=96459 // Isometric view: Home key button diff --git a/src/Gui/Navigation/SiemensNXStyle.h b/src/Gui/Navigation/SiemensNXNavigationStyle.h similarity index 89% rename from src/Gui/Navigation/SiemensNXStyle.h rename to src/Gui/Navigation/SiemensNXNavigationStyle.h index efd36afadc..a888551df0 100644 --- a/src/Gui/Navigation/SiemensNXStyle.h +++ b/src/Gui/Navigation/SiemensNXNavigationStyle.h @@ -22,8 +22,8 @@ **************************************************************************/ -#ifndef GUI_SIEMENSNXSTYLE_H -#define GUI_SIEMENSNXSTYLE_H +#ifndef GUI_SIEMENSNXNAVIGATIONSTYLE_H +#define GUI_SIEMENSNXNAVIGATIONSTYLE_H #include @@ -31,14 +31,14 @@ namespace Gui { -class GuiExport SiemensNXStyle : public NavigationStateChart { +class GuiExport SiemensNXNavigationStyle : public NavigationStateChart { using inherited = NavigationStateChart; TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - SiemensNXStyle(); - ~SiemensNXStyle() override; + SiemensNXNavigationStyle(); + ~SiemensNXNavigationStyle() override; const char* mouseButtons(ViewerMode mode) override; std::string userFriendlyName() const override; @@ -60,4 +60,4 @@ private: } // namespace Gui // NOLINTEND(cppcoreguidelines-avoid*, readability-avoid-const-params-in-decls) -#endif // GUI_SIEMENSNXSTYLE_H +#endif // GUI_SIEMENSNXNAVIGATIONSTYLE_H diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index 7a0dc4718c..19b32fda94 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -53,7 +53,7 @@ #include "Inventor/Draggers/SoTransformDragger.h" #include "Navigation/GestureNavigationStyle.h" #include "Navigation/NavigationStyle.h" -#include "Navigation/SiemensNXStyle.h" +#include "Navigation/SiemensNXNavigationStyle.h" #include "SelectionObject.h" #include "SoDevicePixelRatioElement.h" #include "SoFCColorBar.h" @@ -198,7 +198,7 @@ void Gui::SoFCDB::init() InventorNavigationStyle ::init(); OpenSCADNavigationStyle ::init(); RevitNavigationStyle ::init(); - SiemensNXStyle ::init(); + SiemensNXNavigationStyle ::init(); SolidWorksNavigationStyle ::init(); TinkerCADNavigationStyle ::init(); TouchpadNavigationStyle ::init(); diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py index 3e68c64a90..194ead53ab 100644 --- a/src/Mod/Tux/NavigationIndicatorGui.py +++ b/src/Mod/Tux/NavigationIndicatorGui.py @@ -760,7 +760,7 @@ a8.setObjectName("Indicator_NavigationRevit") a9 = QtGui.QAction(gStyle) a9.setText("Siemens NX ") -a9.setData("Gui::SiemensNXStyle") +a9.setData("Gui::SiemensNXNavigationStyle") a9.setObjectName("Indicator_NavigationSiemensNX") a10 = QtGui.QAction(gStyle)