From af868ed079414be0967dda6240125a7a33d15a09 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 18 Jan 2022 18:24:02 +0100 Subject: [PATCH] PD: move ReferenceHighlighter to Part module --- src/Mod/Part/Gui/CMakeLists.txt | 2 ++ .../Gui/ReferenceHighlighter.cpp | 2 +- .../Gui/ReferenceHighlighter.h | 15 ++++++++------- src/Mod/PartDesign/Gui/CMakeLists.txt | 2 -- src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp | 8 ++++---- src/Mod/PartDesign/Gui/ViewProviderLoft.cpp | 4 ++-- src/Mod/PartDesign/Gui/ViewProviderPipe.cpp | 4 ++-- 7 files changed, 19 insertions(+), 18 deletions(-) rename src/Mod/{PartDesign => Part}/Gui/ReferenceHighlighter.cpp (99%) rename src/Mod/{PartDesign => Part}/Gui/ReferenceHighlighter.h (93%) diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 51bd0ecd43..397773bce6 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -208,6 +208,8 @@ SET(PartGui_SRCS ViewProviderPrimitive.h Workbench.cpp Workbench.h + ReferenceHighlighter.cpp + ReferenceHighlighter.h ShapeFromMesh.cpp ShapeFromMesh.h TaskFaceColors.cpp diff --git a/src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp b/src/Mod/Part/Gui/ReferenceHighlighter.cpp similarity index 99% rename from src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp rename to src/Mod/Part/Gui/ReferenceHighlighter.cpp index a3893cb53b..de28037c15 100644 --- a/src/Mod/PartDesign/Gui/ReferenceHighlighter.cpp +++ b/src/Mod/Part/Gui/ReferenceHighlighter.cpp @@ -32,7 +32,7 @@ #include "ReferenceHighlighter.h" -using namespace PartDesignGui; +using namespace PartGui; ReferenceHighlighter::ReferenceHighlighter(const TopoDS_Shape& shape, const App::Color& color) : defaultColor(color) diff --git a/src/Mod/PartDesign/Gui/ReferenceHighlighter.h b/src/Mod/Part/Gui/ReferenceHighlighter.h similarity index 93% rename from src/Mod/PartDesign/Gui/ReferenceHighlighter.h rename to src/Mod/Part/Gui/ReferenceHighlighter.h index 4b1ebefca6..7a7afb789c 100644 --- a/src/Mod/PartDesign/Gui/ReferenceHighlighter.h +++ b/src/Mod/Part/Gui/ReferenceHighlighter.h @@ -21,21 +21,22 @@ ***************************************************************************/ -#ifndef PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H -#define PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H +#ifndef PARTGUI_REFERENCEHIGHLIGHTER_H +#define PARTGUI_REFERENCEHIGHLIGHTER_H -#include #include #include #include +#include +#include -namespace PartDesignGui { +namespace PartGui { /*! * \brief The ReferenceHighlighter class * \author Werner Mayer */ -class ReferenceHighlighter +class PartGuiExport ReferenceHighlighter { public: /*! @@ -86,7 +87,7 @@ private: }; -} // namespace PartDesignGui +} // namespace PartGui -#endif // PARTDESIGNGUI_REFERENCEHIGHLIGHTER_H +#endif // PARTGUI_REFERENCEHIGHLIGHTER_H diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index d04dc40fa2..2ef6ad7882 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -226,8 +226,6 @@ SET(PartDesignGuiModule_SRCS CommandBody.cpp EnumFlags.h Resources/PartDesign.qrc - ReferenceHighlighter.cpp - ReferenceHighlighter.h PreCompiled.cpp PreCompiled.h Utils.cpp diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index de87836a5d..1f4c658c37 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -32,11 +32,11 @@ # include #endif -#include #include +#include +#include #include "ViewProviderDressUp.h" -#include "ReferenceHighlighter.h" #include "TaskDressUpParameters.h" using namespace PartDesignGui; @@ -99,7 +99,7 @@ void ViewProviderDressUp::highlightReferences(const bool on) originalFaceColors = vp->DiffuseColor.getValues(); std::vector colors = originalFaceColors; - ReferenceHighlighter highlighter(base->Shape.getValue(), ShapeColor.getValue()); + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), ShapeColor.getValue()); highlighter.getFaceColors(faces, colors); vp->DiffuseColor.setValues(colors); } @@ -107,7 +107,7 @@ void ViewProviderDressUp::highlightReferences(const bool on) originalLineColors = vp->LineColorArray.getValues(); std::vector colors = originalLineColors; - ReferenceHighlighter highlighter(base->Shape.getValue(), LineColor.getValue()); + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), LineColor.getValue()); highlighter.getEdgeColors(edges, colors); vp->LineColorArray.setValues(colors); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp index 85bb8fd335..b4de80d1fd 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp @@ -31,10 +31,10 @@ #include "Utils.h" #include "ViewProviderLoft.h" #include "TaskLoftParameters.h" -#include "ReferenceHighlighter.h" #include #include #include +#include #include #include #include @@ -166,7 +166,7 @@ void ViewProviderLoft::highlightReferences(Part::Feature* base, const std::vecto edgeColors = svp->LineColorArray.getValues(); std::vector colors = edgeColors; - ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue()); + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue()); highlighter.getEdgeColors(elements, colors); svp->LineColorArray.setValues(colors); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp index b5844929dd..6409564ac1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp @@ -33,10 +33,10 @@ #include "Utils.h" #include "ViewProviderPipe.h" #include "TaskPipeParameters.h" -#include "ReferenceHighlighter.h" #include #include #include +#include #include #include #include @@ -167,7 +167,7 @@ void ViewProviderPipe::highlightReferences(Part::Feature* base, const std::vecto edgeColors = svp->LineColorArray.getValues(); std::vector colors = edgeColors; - ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue()); + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), svp->LineColor.getValue()); highlighter.getEdgeColors(edges, colors); svp->LineColorArray.setValues(colors); }