MeasureGui: Revert temporary measure object creation

Reverts the temporary creation of measurement objects that was added in FreeCAD#15122

Author: hlorus

src/Mod/Measure/Gui/TaskMeasure.cpp

@@ -38,7 +38,7 @@
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Control.h>
-#include <Gui/ViewProviderDocumentObject.h>
+#include <Gui/ViewProvider.h>
 
 #include <QFormLayout>
 #include <QPushButton>
@@ -174,85 +174,36 @@ void TaskMeasure::enableAnnotateButton(bool state)
     btn->setEnabled(state);
 }
 
-void TaskMeasure::setMeasureObject(Measure::MeasureBase* obj)
-{
-    _mMeasureObject = obj;
-}
-
 
-App::DocumentObject* TaskMeasure::createObject(const App::MeasureType* measureType)
+Measure::MeasureBase* TaskMeasure::createObject(const App::MeasureType* measureType)
 {
-    auto measureClass =
-        measureType->isPython ? "Measure::MeasurePython" : measureType->measureObject;
-    auto type = Base::Type::getTypeIfDerivedFrom(measureClass.c_str(),
-                                                 App::DocumentObject::getClassTypeId(),
-                                                 true);
-
-    if (type.isBad()) {
+    App::Document* doc = App::GetApplication().getActiveDocument();
+    if (!doc) {
         return nullptr;
     }
 
-    _mMeasureObject = static_cast<Measure::MeasureBase*>(type.createInstance());
-
-    // Create an instance of the python measure class, the classe's
-    // initializer sets the object as proxy
     if (measureType->isPython) {
         Base::PyGILStateLocker lock;
-        Py::Tuple args(1);
-        args.setItem(0, Py::asObject(_mMeasureObject->getPyObject()));
-        PyObject* result = PyObject_CallObject(measureType->pythonClass, args.ptr());
-        Py_XDECREF(result);
-    }
-
-    return static_cast<App::DocumentObject*>(_mMeasureObject);
-}
+        auto pyMeasureClass = measureType->pythonClass;
 
+        // Create a MeasurePython instance
+        auto featurePython = doc->addObject("Measure::MeasurePython", measureType->label.c_str());
+        _mMeasureObject = (Measure::MeasureBase*)featurePython;
 
-Gui::ViewProviderDocumentObject* TaskMeasure::createViewObject(App::DocumentObject* measureObj)
-{
-    // Add view object
-    auto vpName = measureObj->getViewProviderName();
-    if ((vpName == nullptr) || (vpName[0] == '\0')) {
-        return nullptr;
-    }
-
-    auto vpType =
-        Base::Type::getTypeIfDerivedFrom(vpName,
-                                         Gui::ViewProviderDocumentObject::getClassTypeId(),
-                                         true);
-    if (vpType.isBad()) {
-        return nullptr;
+        // Create an instance of the pyMeasureClass, the classe's initializer sets the object as
+        // proxy
+        Py::Tuple args(1);
+        args.setItem(0, Py::asObject(featurePython->getPyObject()));
+        PyObject* result = PyObject_CallObject(pyMeasureClass, args.ptr());
+        Py_XDECREF(result);
     }
-
-    auto vp = static_cast<Gui::ViewProviderDocumentObject*>(vpType.createInstance());
-
-    _mGuiDocument = Gui::Application::Instance->activeDocument();
-    _mGuiDocument->setAnnotationViewProvider(vp->getTypeId().getName(), vp);
-    vp->attach(measureObj);
-
-    // Init the position of the annotation
-    static_cast<MeasureGui::ViewProviderMeasureBase*>(vp)->positionAnno(_mMeasureObject);
-
-    vp->updateView();
-    vp->setActiveMode();
-
-    _mViewObject = vp;
-    return vp;
-}
-
-
-void TaskMeasure::saveObject()
-{
-    if (_mViewObject && _mGuiDocument) {
-        _mGuiDocument->addViewProvider(_mViewObject);
-        _mGuiDocument->takeAnnotationViewProvider(_mViewObject->getTypeId().getName());
-        _mViewObject = nullptr;
+    else {
+        // Create measure object
+        _mMeasureObject = (Measure::MeasureBase*)doc->addObject(measureType->measureObject.c_str(),
+                                                    measureType->label.c_str());
     }
 
-    _mDocument = App::GetApplication().getActiveDocument();
-    _mDocument->addObject(_mMeasureObject,
-                          modeSwitch->currentIndex() != 0 ? modeSwitch->currentText().toLatin1()
-                                                          : QString().toLatin1());
+    return _mMeasureObject;
 }
 
 
@@ -327,6 +278,9 @@ void TaskMeasure::update()
         createObject(measureType);
     }
 
+    // From here on we need a valid measure object
+    assert(_mMeasureObject);
+
     // we have a valid measure object so we can enable the annotate button
     enableAnnotateButton(true);
 
@@ -336,15 +290,19 @@ void TaskMeasure::update()
     // Get result
     valueResult->setText(_mMeasureObject->getResultString());
 
-    createViewObject(_mMeasureObject);
 
-    // Must be after createViewObject!
-    assert(_mViewObject);
-    auto* prop = dynamic_cast<App::PropertyBool*>(_mViewObject->getPropertyByName("ShowDelta"));
+    // Init the position of the annotation
+    Gui::Document* guiDoc = Gui::Application::Instance->activeDocument();
+    Gui::ViewProvider* viewObject = guiDoc->getViewProvider(_mMeasureObject);
+    assert(viewObject);
+    dynamic_cast<MeasureGui::ViewProviderMeasureBase*>(viewObject)->positionAnno(_mMeasureObject);
+
+    // Set the ShowDelta Property if it exists on the measurements view object
+    auto* prop = dynamic_cast<App::PropertyBool*>(viewObject->getPropertyByName("ShowDelta"));
     setDeltaPossible(prop != nullptr);
     if (prop) {
         prop->setValue(showDelta->isChecked());
-        _mViewObject->update(prop);
+        viewObject->update(prop);
     }
 }
 
@@ -385,7 +343,6 @@ void TaskMeasure::invoke()
 
 bool TaskMeasure::apply()
 {
-    saveObject();
     ensureGroup(_mMeasureObject);
     _mMeasureObject = nullptr;
     reset();
@@ -428,13 +385,8 @@ void TaskMeasure::removeObject()
         return;
     }
 
-    if (_mViewObject && _mGuiDocument) {
-        _mGuiDocument->removeAnnotationViewProvider(_mViewObject->getTypeId().getName());
-        _mViewObject = nullptr;
-    }
-
-    delete _mMeasureObject;
-    setMeasureObject(nullptr);
+    _mMeasureObject->getDocument()->removeObject(_mMeasureObject->getNameInDocument());
+    _mMeasureObject = nullptr;
 }
 
 bool TaskMeasure::hasSelection()

src/Mod/Measure/Gui/TaskMeasure.h

@@ -65,15 +65,13 @@ class TaskMeasure: public TaskView::TaskDialog, public Gui::SelectionObserver
     bool hasSelection();
     void clearSelection();
     bool eventFilter(QObject* obj, QEvent* event) override;
-    void setMeasureObject(Measure::MeasureBase* obj);
 
 private:
     void onSelectionChanged(const Gui::SelectionChanges& msg) override;
 
     App::Document* _mDocument = nullptr;
     Gui::Document* _mGuiDocument = nullptr;
     Measure::MeasureBase* _mMeasureObject = nullptr;
-    Gui::ViewProviderDocumentObject* _mViewObject = nullptr;
 
     QLineEdit* valueResult {nullptr};
     QComboBox* modeSwitch {nullptr};
@@ -86,9 +84,7 @@ class TaskMeasure: public TaskView::TaskDialog, public Gui::SelectionObserver
     void setModeSilent(App::MeasureType* mode);
     App::MeasureType* getMeasureType();
     void enableAnnotateButton(bool state);
-    App::DocumentObject* createObject(const App::MeasureType* measureType);
-    Gui::ViewProviderDocumentObject* createViewObject(App::DocumentObject* measureObj);
-    void saveObject();
+    Measure::MeasureBase* createObject(const App::MeasureType* measureType);
     void ensureGroup(Measure::MeasureBase* measurement);
     void setDeltaPossible(bool possible);