Fem: add feature of mechancial simulation result import from vtk file

berndhahnebach · Feb 1, 2017 · 0b41074 · 0b41074
1 parent 6c3b78e
commit 0b41074
Show file tree

Hide file tree

Showing 3 changed files with 247 additions and 187 deletions.
diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp
@@ -95,8 +95,8 @@ class Module : public Py::ExtensionModule<Module>
             "Read a mesh from a file and returns a Mesh object."
         );
 #ifdef FC_USE_VTK
-        add_varargs_method("readCfdResult",&Module::readCfdResult,
-            "Read a CFD result from a file (file format detected from file suffix)"
+        add_varargs_method("readResult",&Module::readResult,
+            "Read a CFD or Mechanical result (auto detect) from a file (file format detected from file suffix)"
         );
         add_varargs_method("writeResult",&Module::writeResult,
             "write a CFD or FEM result (auto detect) to a file (file format detected from file suffix)"
@@ -247,7 +247,7 @@ class Module : public Py::ExtensionModule<Module>
     }
 
 #ifdef FC_USE_VTK
-    Py::Object readCfdResult(const Py::Tuple& args)
+    Py::Object readResult(const Py::Tuple& args)
     {
         char* fileName = NULL; 
         char* objName = NULL;
@@ -263,10 +263,10 @@ class Module : public Py::ExtensionModule<Module>
         {
             App::Document* pcDoc = App::GetApplication().getActiveDocument();
             App::DocumentObject* obj = pcDoc->getObject(resName.c_str());
-            FemVTKTools::readFluidicResult(EncodedName.c_str(), obj);
+            FemVTKTools::readResult(EncodedName.c_str(), obj);
         }
         else
-            FemVTKTools::readFluidicResult(EncodedName.c_str());  //assuming activeObject can hold Result
+            FemVTKTools::readResult(EncodedName.c_str());  //assuming activeObject can hold Result
 
         return Py::None();
     }