Measure: Rename ViewProviderMeasurePropertyBase -> ViewProviderMeasure

hlorus · Jan 7, 2024 · b216b78 · b216b78
1 parent d2af51c
commit b216b78
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/src/Mod/Measure/App/MeasureArea.h b/src/Mod/Measure/App/MeasureArea.h
@@ -71,7 +71,7 @@ class MeasureExport MeasureArea : public Measure::MeasureBaseExtendable<MeasureA
     void recalculateArea();
 
     const char* getViewProviderName() const override {
-        return "MeasureGui::ViewProviderMeasurePropertyBase";
+        return "MeasureGui::ViewProviderMeasure";
     }
 
     static bool isValidSelection(const App::MeasureSelection& selection);

diff --git a/src/Mod/Measure/App/MeasureBase.cpp b/src/Mod/Measure/App/MeasureBase.cpp
@@ -185,7 +185,7 @@ namespace App {
 /// @cond DOXERR
 PROPERTY_SOURCE_TEMPLATE(Measure::MeasurePython, Measure::MeasureBase)
 template<> const char* Measure::MeasurePython::getViewProviderName(void) const {
-    return "MeasureGui::ViewProviderMeasurePropertyBase";
+    return "MeasureGui::ViewProviderMeasure";
 }
 template<> PyObject* Measure::MeasurePython::getPyObject() {
     if (PythonObject.is(Py::_None())) {

diff --git a/src/Mod/Measure/App/MeasureLength.h b/src/Mod/Measure/App/MeasureLength.h
@@ -71,7 +71,7 @@ class MeasureExport MeasureLength : public Measure::MeasureBaseExtendable<Measur
     void recalculateLength();
 
     const char* getViewProviderName() const override {
-        return "MeasureGui::ViewProviderMeasurePropertyBase";
+        return "MeasureGui::ViewProviderMeasure";
     }
 
     static bool isValidSelection(const App::MeasureSelection& selection);

diff --git a/src/Mod/Measure/App/MeasurePosition.h b/src/Mod/Measure/App/MeasurePosition.h
@@ -57,7 +57,7 @@ class MeasureExport MeasurePosition : public Measure::MeasureBaseExtendable<Base
     void recalculatePosition();
 
     const char* getViewProviderName() const override {
-        return "MeasureGui::ViewProviderMeasurePropertyBase";
+        return "MeasureGui::ViewProviderMeasure";
     }
 
     static bool isValidSelection(const App::MeasureSelection& selection);

diff --git a/src/Mod/Measure/App/MeasureRadius.h b/src/Mod/Measure/App/MeasureRadius.h
@@ -59,7 +59,7 @@ class MeasureExport MeasureRadius : public Measure::MeasureBaseExtendable<Measur
 
     App::DocumentObjectExecReturn *execute() override;
     const char* getViewProviderName() const override {
-        return "MeasureGui::ViewProviderMeasurePropertyBase";
+        return "MeasureGui::ViewProviderMeasure";
     }
 
     void recalculateRadius();

diff --git a/src/Mod/Measure/Gui/AppMeasureGui.cpp b/src/Mod/Measure/Gui/AppMeasureGui.cpp
@@ -88,7 +88,7 @@ PyMOD_INIT_FUNC(MeasureGui)
     CreateMeasureCommands();
 
     MeasureGui::ViewProviderMeasureBase                ::init();
-    MeasureGui::ViewProviderMeasurePropertyBase        ::init();
+    MeasureGui::ViewProviderMeasure        ::init();
     MeasureGui::ViewProviderMeasureAngle               ::init();
     MeasureGui::ViewProviderMeasureDistance            ::init();
 

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureBase.cpp
@@ -447,11 +447,11 @@ void ViewProviderMeasureBase::onSubjectVisibilityChanged(const App::DocumentObje
 
 
 //NOLINTBEGIN
-PROPERTY_SOURCE(MeasureGui::ViewProviderMeasurePropertyBase, MeasureGui::ViewProviderMeasureBase)
+PROPERTY_SOURCE(MeasureGui::ViewProviderMeasure, MeasureGui::ViewProviderMeasureBase)
 //NOLINTEND
 
 
-ViewProviderMeasurePropertyBase::ViewProviderMeasurePropertyBase()
+ViewProviderMeasure::ViewProviderMeasure()
 {
     const size_t lineCount(3);
 
@@ -500,14 +500,14 @@ ViewProviderMeasurePropertyBase::ViewProviderMeasurePropertyBase()
     sPixmap = "umf-measurement";
 }
 
-ViewProviderMeasurePropertyBase::~ViewProviderMeasurePropertyBase()
+ViewProviderMeasure::~ViewProviderMeasure()
 {
     pCoords->unref();
     pLines->unref();
 }
 
 
-void ViewProviderMeasurePropertyBase::onGuiInit(const Measure::MeasureBase* measureObject) {
+void ViewProviderMeasure::onGuiInit(const Measure::MeasureBase* measureObject) {
     (void)measureObject;
 
     // Initialize the text position
@@ -526,7 +526,7 @@ void ViewProviderMeasurePropertyBase::onGuiInit(const Measure::MeasureBase* meas
     setLabelTranslation(destVec);
 }
 
-void ViewProviderMeasurePropertyBase::onChanged(const App::Property* prop)
+void ViewProviderMeasure::onChanged(const App::Property* prop)
 {
     if (pcObject == nullptr) {
         return;
@@ -537,15 +537,15 @@ void ViewProviderMeasurePropertyBase::onChanged(const App::Property* prop)
 
 
 
-void ViewProviderMeasurePropertyBase::attach(App::DocumentObject* pcObject)
+void ViewProviderMeasure::attach(App::DocumentObject* pcObject)
 {
     ViewProviderMeasureBase::attach(pcObject);
 
 }
 
 
 //! repaint the annotation
-void ViewProviderMeasurePropertyBase::redrawAnnotation()
+void ViewProviderMeasure::redrawAnnotation()
 {
     // point on element
     Base::Vector3d basePos = getBasePosition();
@@ -558,14 +558,14 @@ void ViewProviderMeasurePropertyBase::redrawAnnotation()
 }
 
 
-Base::Vector3d ViewProviderMeasurePropertyBase::getBasePosition(){
+Base::Vector3d ViewProviderMeasure::getBasePosition(){
     auto measureObject = getMeasureObject();
     Base::Placement placement = measureObject->getPlacement();
     return placement.getPosition();
 }
 
 
-Base::Vector3d ViewProviderMeasurePropertyBase::getTextPosition(){
+Base::Vector3d ViewProviderMeasure::getTextPosition(){
     auto basePoint = getBasePosition();
     Base::Vector3d textDirection(1.0, 1.0, 1.0);
     textDirection.Normalize();

diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureBase.h b/src/Mod/Measure/Gui/ViewProviderMeasureBase.h
@@ -131,15 +131,15 @@ class MeasureGuiExport ViewProviderMeasureBase :public Gui::ViewProviderDocument
 };
 
 //NOLINTBEGIN
-class MeasureGuiExport ViewProviderMeasurePropertyBase : public MeasureGui::ViewProviderMeasureBase
+class MeasureGuiExport ViewProviderMeasure : public MeasureGui::ViewProviderMeasureBase
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasurePropertyBase);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasure);
 //NOLINTEND
 
 public:
     /// Constructor
-    ViewProviderMeasurePropertyBase();
-    ~ViewProviderMeasurePropertyBase() override;
+    ViewProviderMeasure();
+    ~ViewProviderMeasure() override;
 
     void attach(App::DocumentObject * feature) override;
     void redrawAnnotation() override;