+ make FEM beam section and shell thickness ready for drag and drop

FreeCAD · Oct 19, 2015 · 861dc86 · 861dc86
1 parent eff2799
commit 861dc86
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/src/Mod/Fem/App/AppFem.cpp b/src/Mod/Fem/App/AppFem.cpp
@@ -118,6 +118,7 @@ void AppFemExport initFem()
 
     Fem::FemAnalysis                ::init();
     Fem::FemAnalysisPython          ::init();
+    Fem::FeaturePython              ::init();
     Fem::FemMesh                    ::init();
     Fem::FemMeshObject              ::init();
     Fem::FemMeshShapeObject         ::init();

diff --git a/src/Mod/Fem/App/FemAnalysis.cpp b/src/Mod/Fem/App/FemAnalysis.cpp
@@ -28,6 +28,7 @@
 
 #include "FemAnalysis.h"
 #include <App/DocumentObjectPy.h>
+#include <App/FeaturePythonPyImp.h>
 #include <Base/Placement.h>
 #include <Base/Uuid.h>
 
@@ -88,4 +89,24 @@ template<> const char* Fem::FemAnalysisPython::getViewProviderName(void) const {
 
 // explicit template instantiation
 template class AppFemExport FeaturePythonT<Fem::FemAnalysis>;
-}
+}
+
+// ---------------------------------------------------------
+
+namespace App {
+/// @cond DOXERR
+PROPERTY_SOURCE_TEMPLATE(Fem::FeaturePython, App::DocumentObject)
+template<> const char* Fem::FeaturePython::getViewProviderName(void) const {
+    return "Gui::ViewProviderPythonFeature";
+}
+template<> PyObject* Fem::FeaturePython::getPyObject(void) {
+    if (PythonObject.is(Py::_None())) {
+        // ref counter is set to 1
+        PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this),true);
+    }
+    return Py::new_reference_to(PythonObject);
+}
+// explicit template instantiation
+template class AppFemExport FeaturePythonT<App::DocumentObject>;
+/// @endcond
+}
diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h
@@ -65,6 +65,7 @@ class AppFemExport FemAnalysis : public App::DocumentObject
 };
 
 typedef App::FeaturePythonT<FemAnalysis> FemAnalysisPython;
+typedef App::FeaturePythonT<App::DocumentObject> FeaturePython;
 
 
 } //namespace Fem

diff --git a/src/Mod/Fem/FemBeamSection.py b/src/Mod/Fem/FemBeamSection.py
@@ -37,7 +37,7 @@
 
 def makeFemBeamSection(width=20.0, height=20.0, name="BeamSection"):
     '''makeFemBeamSection([width], [height], [name]): creates an beamsection object to define a cross section'''
-    obj = FemGui.getActiveAnalysis().Document.addObject("App::FeaturePython", name)
+    obj = FemGui.getActiveAnalysis().Document.addObject("Fem::FeaturePython", name)
     _FemBeamSection(obj)
     obj.Width = width
     obj.Height = height

diff --git a/src/Mod/Fem/FemShellThickness.py b/src/Mod/Fem/FemShellThickness.py
@@ -37,7 +37,7 @@
 
 def makeFemShellThickness(thickness=20.0, name="ShellThickness"):
     '''makeFemShellThickness([thickness], [name]): creates an shellthickness object to define a plate thickness'''
-    obj = FemGui.getActiveAnalysis().Document.addObject("App::FeaturePython", name)
+    obj = FemGui.getActiveAnalysis().Document.addObject("Fem::FeaturePython", name)
     _FemShellThickness(obj)
     obj.Thickness = thickness
     if FreeCAD.GuiUp:

diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
@@ -175,6 +175,8 @@ bool ViewProviderFemAnalysis::canDragObject(App::DocumentObject* obj) const
         return true;
     else if (obj->getTypeId().isDerivedFrom(Fem::FemSetObject::getClassTypeId()))
         return true;
+    else if (obj->getTypeId().isDerivedFrom(Base::Type::fromName("Fem::FeaturePython")))
+        return true;
     else if (obj->getTypeId().isDerivedFrom(App::MaterialObject::getClassTypeId()))
         return true;
     else