+ FEM: Improve drag and drop for FEM analysis object

src/Mod/Fem/Gui/ViewProviderAnalysis.cpp

@@ -25,7 +25,6 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
-
 #endif
 
 #include "ViewProviderAnalysis.h"
@@ -35,6 +34,9 @@
 
 #include <Mod/Fem/App/FemAnalysis.h>
 #include <Mod/Fem/App/FemMeshObject.h>
+#include <Mod/Fem/App/FemSetObject.h>
+#include <Mod/Fem/App/FemConstraint.h>
+#include <App/MaterialObject.h>
 
 #include "TaskDlgAnalysis.h"
 
@@ -52,7 +54,6 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemAnalysis, Gui::ViewProviderDocumentObject
 ViewProviderFemAnalysis::ViewProviderFemAnalysis()
 {
     sPixmap = "Fem_Analysis";
-
 }
 
 ViewProviderFemAnalysis::~ViewProviderFemAnalysis()
@@ -165,6 +166,22 @@ bool ViewProviderFemAnalysis::canDragObjects() const
     return true;
 }
 
+bool ViewProviderFemAnalysis::canDragObject(App::DocumentObject* obj) const
+{
+    if (!obj)
+        return false;
+    if (obj->getTypeId().isDerivedFrom(Fem::FemMeshObject::getClassTypeId()))
+        return true;
+    else if (obj->getTypeId().isDerivedFrom(Fem::Constraint::getClassTypeId()))
+        return true;
+    else if (obj->getTypeId().isDerivedFrom(Fem::FemSetObject::getClassTypeId()))
+        return true;
+    else if (obj->getTypeId().isDerivedFrom(App::MaterialObject::getClassTypeId()))
+        return true;
+    else
+        return false;
+}
+
 void ViewProviderFemAnalysis::dragObject(App::DocumentObject* obj)
 {
     Fem::FemAnalysis* analyze = static_cast<Fem::FemAnalysis*>(getObject());
@@ -183,10 +200,13 @@ bool ViewProviderFemAnalysis::canDropObjects() const
     return true;
 }
 
+bool ViewProviderFemAnalysis::canDropObject(App::DocumentObject* obj) const
+{
+    return canDragObject(obj);
+}
+
 void ViewProviderFemAnalysis::dropObject(App::DocumentObject* obj)
 {
-    if (!obj || !obj->getTypeId().isDerivedFrom(Fem::FemMeshObject::getClassTypeId()))
-        return;
     Fem::FemAnalysis* analyze = static_cast<Fem::FemAnalysis*>(getObject());
     std::vector<App::DocumentObject*> fem = analyze->Member.getValues();
     fem.push_back(obj);

src/Mod/Fem/Gui/ViewProviderAnalysis.h

@@ -67,10 +67,14 @@ public:
     //@{
     /// Returns true if the view provider generally supports dragging objects
     bool canDragObjects() const;
+    /// Check whether the object can be removed from the view provider by drag and drop
+    bool canDragObject(App::DocumentObject*) const;
     /// Starts to drag the object
     void dragObject(App::DocumentObject*);
     /// Returns true if the view provider generally accepts dropping of objects
     bool canDropObjects() const;
+    /// Check whether the object can be dropped to the view provider by drag and drop
+    bool canDropObject(App::DocumentObject*) const;
     /// If the dropped object type is accepted the object will be added as child
     void dropObject(App::DocumentObject*);
     //@}