VTK postprocessing in FEM workbench

CMakeLists.txt

@@ -165,6 +165,7 @@ if(APPLE)
 endif(APPLE)
 
 OPTION(BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
+OPTION(BUILD_FEM_VTK "Build the FreeCAD VTK Postprocessing support (need VTK 6 or higher)" OFF)
 OPTION(BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
 OPTION(BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
 OPTION(BUILD_ARCH "Build the FreeCAD Architecture module" ON)
@@ -752,6 +753,11 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 #---------------------------------------------------
 
+# -------------------------------- VTK --------------------------------
+    if(BUILD_FEM_VTK)
+        find_package(VTK REQUIRED)       
+    endif(BUILD_FEM_VTK)
+
     if(BUILD_GUI)
 # -------------------------------- OpenGL --------------------------------
 

src/App/Application.cpp

@@ -129,6 +129,7 @@ using namespace boost::program_options;
 // scriptings (scripts are build in but can be overridden by command line option)
 #include "InitScript.h"
 #include "TestScript.h"
+#include "CMakeScript.h"
 
 #ifdef _MSC_VER // New handler for Microsoft Visual C++ compiler
 # include <new.h>
@@ -1292,6 +1293,7 @@ void Application::initApplication(void)
 {
     // interpreter and Init script ==========================================================
     // register scripts
+    new ScriptProducer( "CMakeVariables", CMakeVariables );
     new ScriptProducer( "FreeCADInit",    FreeCADInit    );
     new ScriptProducer( "FreeCADTest",    FreeCADTest    );
 
@@ -1310,6 +1312,7 @@ void Application::initApplication(void)
 
     // starting the init script
     Console().Log("Run App init script\n");
+    Interpreter().runString(Base::ScriptFactory().ProduceScript("CMakeVariables"));
     Interpreter().runString(Base::ScriptFactory().ProduceScript("FreeCADInit"));
 }
 

src/App/CMakeLists.txt

@@ -14,6 +14,25 @@ ENDIF(DOCDIR)
 
 add_definitions(-DBOOST_${Boost_VERSION})
 
+#write relevant cmake variables to a file for later access with python. Exportet are all variables 
+#starting with BUILD. As the variable only exists if the user set it to ON a dict is useless, we 
+#use a python list for export. 
+set(_vars "const char CMakeVariables[] =\"cmake = [")
+set(_delim "")
+get_cmake_property(_variableNames VARIABLES)
+foreach (_variableName ${_variableNames})
+    if (${_variableName})
+        STRING(REGEX MATCH "^[_]?[^_]*" _prefix "${_variableName}_") 
+        if(${_prefix} STREQUAL "BUILD")
+            STRING(REPLACE "\\" "\\\\" _name ${_variableName})
+            set(_vars "${_vars}${_delim}\\n\"\n\"\\\"${_name}\\\"")
+            set(_delim ",")
+        endif()
+    endif ()
+endforeach()
+set(_vars "${_vars}]\\n\" \n;")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeScript.h "${_vars}" )
+
 include_directories(
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_SOURCE_DIR}/src

src/App/FreeCADInit.py

@@ -150,6 +150,9 @@ def InitApplications():
 Wrn = FreeCAD.Console.PrintWarning
 test_ascii = lambda s: all(ord(c) < 128 for c in s)
 
+#store the cmake variales
+App.__cmake__ = cmake;
+
 Log ('Init: starting App::FreeCADInit.py\n')
 
 # init every application by importing Init.py

src/Mod/Fem/App/AppFem.cpp

@@ -55,6 +55,13 @@
 #include "FemResultObject.h"
 #include "FemSolverObject.h"
 
+#ifdef FC_USE_VTK
+#include "FemPostPipeline.h"
+#include "FemPostFilter.h"
+#include "FemPostFunction.h"
+#include "PropertyPostDataObject.h"
+#endif
+
 namespace Fem {
 extern PyObject* initModule();
 }
@@ -142,7 +149,21 @@ PyMODINIT_FUNC initFem()
     Fem::ConstraintDisplacement     ::init();
 
     Fem::FemResultObject            ::init();
-    Fem::FemResultObjectPython      ::init();
     Fem::FemSolverObject            ::init();
     Fem::FemSolverObjectPython      ::init();
+
+#ifdef FC_USE_VTK
+    Fem::FemPostObject              ::init();
+    Fem::FemPostPipeline            ::init();
+    Fem::FemPostFilter              ::init();
+    Fem::FemPostClipFilter          ::init();
+    Fem::FemPostScalarClipFilter    ::init();
+    Fem::FemPostWarpVectorFilter    ::init();
+    Fem::FemPostCutFilter           ::init();
+    Fem::FemPostFunction            ::init();
+    Fem::FemPostFunctionProvider    ::init();
+    Fem::FemPostPlaneFunction       ::init();
+    Fem::FemPostSphereFunction      ::init();
+    Fem::PropertyPostDataObject     ::init();
+#endif
 }

src/Mod/Fem/App/AppFemPy.cpp

@@ -65,6 +65,9 @@
 #include "FemMesh.h"
 #include "FemMeshObject.h"
 #include "FemMeshPy.h"
+#ifdef FC_USE_VTK
+#include "FemPostPipeline.h"
+#endif
 
 #include <cstdlib>
 
@@ -163,16 +166,37 @@ class Module : public Py::ExtensionModule<Module>
             pcDoc = App::GetApplication().newDocument(DocName);
         }
 
-        std::auto_ptr<FemMesh> mesh(new FemMesh);
-        mesh->read(EncodedName.c_str());
         Base::FileInfo file(EncodedName.c_str());
-
-        FemMeshObject *pcFeature = static_cast<FemMeshObject *>
-            (pcDoc->addObject("Fem::FemMeshObject", file.fileNamePure().c_str()));
-        pcFeature->Label.setValue(file.fileNamePure().c_str());
-        pcFeature->FemMesh.setValuePtr(mesh.get());
-        (void)mesh.release();
-        pcFeature->purgeTouched();
+
+        try {
+            std::auto_ptr<FemMesh> mesh(new FemMesh);
+            mesh->read(EncodedName.c_str());
+
+            FemMeshObject *pcFeature = static_cast<FemMeshObject *>
+                (pcDoc->addObject("Fem::FemMeshObject", file.fileNamePure().c_str()));
+            pcFeature->Label.setValue(file.fileNamePure().c_str());
+            pcFeature->FemMesh.setValuePtr(mesh.get());
+            (void)mesh.release();
+            pcFeature->purgeTouched();
+        }
+        catch(Base::Exception& e) {
+#ifdef FC_USE_VTK
+            if( FemPostPipeline::canRead(file) ) {
+
+                FemPostPipeline *pcFeature = static_cast<FemPostPipeline *>
+                    (pcDoc->addObject("Fem::FemPostPipeline", file.fileNamePure().c_str()));
+
+                pcFeature->Label.setValue(file.fileNamePure().c_str());
+                pcFeature->read(file);
+                pcFeature->touch();
+                pcDoc->recomputeFeature(pcFeature);
+            }
+            else 
+                throw e;
+#else
+            throw e;
+#endif            
+        }
 
         return Py::None();
     }

src/Mod/Fem/App/CMakeLists.txt

@@ -26,28 +26,29 @@ include_directories(
 
 link_directories(${OCC_LIBRARY_DIR})
 
-
-if(BUILD_FEM_NETGEN)
-    set(Fem_LIBS
+set(Fem_LIBS
         Part
         FreeCADApp
         StdMeshers
-        NETGENPlugin
         SMESH
         SMDS
         SMESHDS
     )
-else(BUILD_FEM_NETGEN)
+
+if(BUILD_FEM_NETGEN)
     set(Fem_LIBS
-        Part
-        FreeCADApp
-        StdMeshers
-        SMESH
-        SMDS
-        SMESHDS
+        ${Fem_LIBS}
+        NETGENPlugin
     )
 endif(BUILD_FEM_NETGEN)
 
+if(BUILD_FEM_VTK)
+    set(Fem_LIBS
+        ${Fem_LIBS}
+        ${VTK_LIBRARIES}
+    )
+endif(BUILD_FEM_VTK)
+
 generate_from_xml(FemMeshPy)
 
 
@@ -121,7 +122,6 @@ SET(FemScripts_SRCS
     FemSelectionObserver.py
     TestFem.py
     z88DispReader.py
-
     TaskPanelFemBeamSection.ui
     TaskPanelFemShellThickness.ui
     TaskPanelFemSolverCalculix.ui
@@ -199,15 +199,29 @@ SET(FemConstraints_SRCS
     )
 SOURCE_GROUP("Constraints" FILES ${FemConstraints_SRCS})
 
-SET(FemResult_SRCS
+if(BUILD_FEM_VTK) 
+    SET(FemPost_SRCS
+        PropertyPostDataObject.h
+        PropertyPostDataObject.cpp
+        FemPostObject.h
+        FemPostObject.cpp
+        FemPostPipeline.h
+        FemPostPipeline.cpp
+        FemPostFilter.h
+        FemPostFilter.cpp
+        FemPostFunction.h
+        FemPostFunction.cpp
     )
-SOURCE_GROUP("ResultObjects" FILES ${FemResult_SRCS})
+    SOURCE_GROUP("PostObjects" FILES ${FemPost_SRCS})
+endif(BUILD_FEM_VTK)
+
 
 SET(Fem_SRCS
     ${FemBase_SRCS}
     ${FemSet_SRCS}
     ${FemConstraints_SRCS}
     ${FemResult_SRCS}
+    ${FemPost_SRCS}
     ${Mod_SRCS}
     ${Python_SRCS}
 )