checkpoint - move vpMeasurementBase to MeasureGui

hlorus · Sep 12, 2023 · ab5f7c4 · ab5f7c4
1 parent 8872f6a
commit ab5f7c4
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 27 deletions.
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -112,7 +112,6 @@
 #include "ViewProviderLinkPy.h"
 #include "ViewProviderMaterialObject.h"
 #include "ViewProviderMeasureDistance.h"
-#include "ViewProviderMeasurementBase.h"
 #include "ViewProviderOrigin.h"
 #include "ViewProviderOriginFeature.h"
 #include "ViewProviderOriginGroup.h"
@@ -1912,7 +1911,6 @@ void Application::initTypes()
     Gui::ViewProviderLink                       ::init();
     Gui::ViewProviderLinkPython                 ::init();
     Gui::AxisOrigin                             ::init();
-    Gui::ViewProviderMeasurementBase            ::init();
 
     // Workbench
     Gui::Workbench                              ::init();

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -900,7 +900,6 @@ SET(Viewprovider_CPP_SRCS
     ViewProviderGeometryObject.cpp
     ViewProviderImagePlane.cpp
     ViewProviderInventorObject.cpp
-    ViewProviderMeasurementBase.cpp
     ViewProviderMeasureDistance.cpp
     ViewProviderPyImp.cpp
     ViewProviderPythonFeature.cpp
@@ -938,7 +937,6 @@ SET(Viewprovider_SRCS
     ViewProviderGeometryObject.h
     ViewProviderImagePlane.h
     ViewProviderInventorObject.h
-    ViewProviderMeasurementBase.h
     ViewProviderMeasureDistance.h
     ViewProviderPythonFeature.h
     ViewProviderVRMLObject.h

diff --git a/src/Mod/Measure/Gui/AppMeasureGui.cpp b/src/Mod/Measure/Gui/AppMeasureGui.cpp
@@ -35,7 +35,7 @@
 #include "ViewProviderMeasureAngle.h"
 #include "ViewProviderMeasureDistancePoints.h"
 #include "ViewProviderMeasureDistance.h"
-
+#include "ViewProviderMeasurementBase.h"
 
 
 // use a different name to CreateCommand()
@@ -89,6 +89,7 @@ PyMOD_INIT_FUNC(MeasureGui)
     // instantiating the commands
     CreateMeasureCommands();
 
+    MeasureGui::ViewProviderMeasurementBase            ::init();
     MeasureGui::ViewProviderMeasureDistancePoints      ::init();
     MeasureGui::ViewProviderMeasureAngle               ::init();
     MeasureGui::ViewProviderMeasureDistance            ::init();

diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt
@@ -31,6 +31,8 @@ SET(MeasureGui_SRCS
     Resources/Measure.qrc
     PreCompiled.cpp
     PreCompiled.h
+    ViewProviderMeasurementBase.cpp
+    ViewProviderMeasurementBase.h
     ViewProviderMeasureDistancePoints.cpp
     ViewProviderMeasureDistancePoints.h
     ViewProviderMeasureAngle.cpp

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp
@@ -250,7 +250,7 @@ SbMatrix ViewProviderMeasureAngle::getMatrix() {
 
 
 
-PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureAngle, Gui::ViewProviderMeasurementBase)
+PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureAngle, MeasureGui::ViewProviderMeasurementBase)
 
 
 ViewProviderMeasureAngle::ViewProviderMeasureAngle()

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.h
@@ -24,14 +24,16 @@
 #ifndef GUI_VIEWPROVIDERMEASUREANGLE_H
 #define GUI_VIEWPROVIDERMEASUREANGLE_H
 
-#include <Gui/ViewProviderMeasurementBase.h>
 #include <Mod/Measure/MeasureGlobal.h>
+
 #include <QObject>
 
 #include <Inventor/fields/SoSFFloat.h>
 #include <Inventor/fields/SoSFMatrix.h>
 #include <Inventor/fields/SoSFVec3f.h>
 
+#include "ViewProviderMeasurementBase.h"
+
 
 class SoText2;
 class SoTranslation;
@@ -43,7 +45,7 @@ class SoTransform;
 namespace MeasureGui
 {
 
-class MeasureGuiExport ViewProviderMeasureAngle : public Gui::ViewProviderMeasurementBase
+class MeasureGuiExport ViewProviderMeasureAngle : public MeasureGui::ViewProviderMeasurementBase
 {
     PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasureAngle);
 

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.cpp
@@ -57,7 +57,7 @@ using namespace Gui;
 using namespace MeasureGui;
 using namespace Measure;
 
-PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureDistance, Gui::ViewProviderMeasurementBase)
+PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureDistance, MeasureGui::ViewProviderMeasurementBase)
 
 
 ViewProviderMeasureDistance::ViewProviderMeasureDistance()
@@ -108,7 +108,7 @@ void ViewProviderMeasureDistance::onChanged(const App::Property* prop)
         updateData(prop);
     }
     else {
-        Gui::ViewProviderMeasurementBase::onChanged(prop);
+        ViewProviderMeasurementBase::onChanged(prop);
     }
 }
 

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h b/src/Mod/Measure/Gui/ViewProviderMeasureDistance.h
@@ -24,11 +24,11 @@
 #ifndef MEASUREGUI_VIEWPROVIDERMEASUREDISTANCE_H
 #define MEASUREGUI_VIEWPROVIDERMEASUREDISTANCE_H
 
-#include <Gui/ViewProviderMeasurementBase.h>
 #include <Mod/Measure/MeasureGlobal.h>
 
 #include <QObject>
 
+#include "ViewProviderMeasurementBase.h"
 
 class SoCoordinate3;
 class SoIndexedLineSet;
@@ -37,7 +37,7 @@ namespace MeasureGui
 {
 
 
-class MeasureGuiExport ViewProviderMeasureDistance : public Gui::ViewProviderMeasurementBase
+class MeasureGuiExport ViewProviderMeasureDistance : public MeasureGui::ViewProviderMeasurementBase
 {
     PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasureDistance);
 

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistancePoints.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureDistancePoints.cpp
@@ -57,7 +57,7 @@ using namespace Gui;
 using namespace Measure;
 using namespace MeasureGui;
 
-PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureDistancePoints, Gui::ViewProviderMeasurementBase)
+PROPERTY_SOURCE(MeasureGui::ViewProviderMeasureDistancePoints, MeasureGui::ViewProviderMeasurementBase)
 
 
 ViewProviderMeasureDistancePoints::ViewProviderMeasureDistancePoints()

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureDistancePoints.h b/src/Mod/Measure/Gui/ViewProviderMeasureDistancePoints.h
@@ -24,21 +24,23 @@
 #ifndef GUI_VIEWPROVIDERMEASUREDISTANCEPOINTS_H
 #define GUI_VIEWPROVIDERMEASUREDISTANCEPOINTS_H
 
-
-#include <Gui/ViewProviderMeasureDistance.h>
-#include <Gui/ViewProviderMeasurementBase.h>
 #include <Mod/Measure/MeasureGlobal.h>
 
 #include <QObject>
 
+// isn't this the old measuredistance vp??
+#include <Gui/ViewProviderMeasureDistance.h>
+
+#include "ViewProviderMeasurementBase.h"
+
 class SoCoordinate3;
 class SoIndexedLineSet;
 
 namespace MeasureGui
 {
 
 
-class MeasureGuiExport ViewProviderMeasureDistancePoints : public Gui::ViewProviderMeasurementBase
+class MeasureGuiExport ViewProviderMeasureDistancePoints : public MeasureGui::ViewProviderMeasurementBase
 {
     PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasureDistancePoints);
 

diff --git a/src/Gui/ViewProviderMeasurementBase.cpp → ...asure/Gui/ViewProviderMeasurementBase.cpp b/src/Gui/ViewProviderMeasurementBase.cpp → ...asure/Gui/ViewProviderMeasurementBase.cpp
@@ -38,20 +38,17 @@
 # include <Inventor/nodes/SoTranslation.h>
 #endif
 
-
-
-
 #include <App/DocumentObject.h>
-#include "ViewProviderMeasurementBase.h"
+#include <Base/Console.h>
 
-#include "Base/Console.h"
+#include "ViewProviderMeasurementBase.h"
 
 
-using namespace Gui;
+using namespace MeasureGui;
 namespace bp = boost::placeholders;
 
 
-PROPERTY_SOURCE(Gui::ViewProviderMeasurementBase, Gui::ViewProviderDocumentObject)
+PROPERTY_SOURCE(MeasureGui::ViewProviderMeasurementBase, Gui::ViewProviderDocumentObject)
 
 ViewProviderMeasurementBase::ViewProviderMeasurementBase()
 {

diff --git a/src/Gui/ViewProviderMeasurementBase.h → ...Measure/Gui/ViewProviderMeasurementBase.h b/src/Gui/ViewProviderMeasurementBase.h → ...Measure/Gui/ViewProviderMeasurementBase.h
@@ -23,10 +23,12 @@
 #ifndef GUI_VIEWPROVIDER_MEASUREMENTBASE_H
 #define GUI_VIEWPROVIDER_MEASUREMENTBASE_H
 
+#include <Mod/Measure/MeasureGlobal.h>
+
 #include <App/Material.h>
 #include <App/Measure.h>
 #include <Base/Parameter.h>
-#include "ViewProviderDocumentObject.h"
+#include <Gui/ViewProviderDocumentObject.h>
 #include "App/PropertyContainer.h"
 
 
@@ -38,10 +40,12 @@ class SoTranslation;
 class SoPickStyle;
 
 namespace Gui {
-
 class View3DInventorViewer;
+}
+
+namespace MeasureGui {
 
-class GuiExport ViewProviderMeasurementBase:public ViewProviderDocumentObject
+class MeasureGuiExport ViewProviderMeasurementBase :public Gui::ViewProviderDocumentObject
 {
     PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderMeasurementBase);