FEM Post: Move post processing to fem objects

FreeCAD · May 18, 2016 · 4d09c09 · 4d09c09
1 parent 8805cab
commit 4d09c09
Show file tree

Hide file tree

Showing 26 changed files with 2,727 additions and 452 deletions.
diff --git a/CMakeLists.txt b/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)" ON)
 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)
@@ -196,7 +197,6 @@ OPTION(BUILD_START "Build the FreeCAD start module" ON)
 OPTION(BUILD_TEST "Build the FreeCAD test module" ON)
 OPTION(BUILD_WEB "Build the FreeCAD web module" ON)
 OPTION(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF)
-OPTION(BUILD_VTK "Build the FreeCAD VTK support (need VTK 6 or higher)" OFF)
 
 if(MSVC)
     OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
@@ -754,12 +754,9 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 #---------------------------------------------------
 
 # -------------------------------- VTK --------------------------------
-    if(BUILD_VTK)
-        find_package(VTK REQUIRED)
-        add_definitions(-DFC_USE_VTK)
-
-        include(${VTK_USE_FILE})
-    endif(BUILD_VTK)
+    if(BUILD_FEM_VTK)
+        find_package(VTK REQUIRED)       
+    endif(BUILD_FEM_VTK)
 
     if(BUILD_GUI)
 # -------------------------------- OpenGL --------------------------------

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -115,13 +115,6 @@ if(PYSIDE_INCLUDE_DIR)
     )
 endif(PYSIDE_INCLUDE_DIR)
 
-if(BUILD_VTK)
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
-        ${VTK_LIBRARIES}
-    )
-endif(BUILD_VTK)
-
 generate_from_xml(DocumentPy)
 generate_from_xml(PythonWorkbenchPy)
 generate_from_xml(ViewProviderPy)

diff --git a/src/Gui/CMakeLists.txt.orig b/src/Gui/CMakeLists.txt.orig
@@ -115,13 +115,6 @@ if(PYSIDE_INCLUDE_DIR)
     )
 endif(PYSIDE_INCLUDE_DIR)
 
-if(BUILD_VTK)
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
-        ${VTK_LIBRARIES}
-    )
-endif(BUILD_VTK)
-
 generate_from_xml(DocumentPy)
 generate_from_xml(PythonWorkbenchPy)
 generate_from_xml(ViewProviderPy)
@@ -900,11 +893,10 @@ SET(Inventor_CPP_SRCS
     SoAxisCrossKit.cpp
     SoTextLabel.cpp
     SoTouchEvents.cpp
-<<<<<<< d7d347b2d62ec685840e7db1c35863e659148981
+<<<<<<< 09326bbbdaf756fe381d51d340e0db27fd8c452a
     SoFCCSysDragger.cpp
 =======
-    SoVTKActor.cpp
->>>>>>> proof of concept
+>>>>>>> Move post processing to fem objects
 )
 SET(Inventor_SRCS
     ${Inventor_CPP_SRCS}
@@ -928,11 +920,10 @@ SET(Inventor_SRCS
     SoAxisCrossKit.h
     SoTextLabel.h
     SoTouchEvents.h
-<<<<<<< d7d347b2d62ec685840e7db1c35863e659148981
+<<<<<<< 09326bbbdaf756fe381d51d340e0db27fd8c452a
     SoFCCSysDragger.h
 =======
-    SoVTKActor.h
->>>>>>> proof of concept
+>>>>>>> Move post processing to fem objects
 )
 SOURCE_GROUP("View3D\\Inventor" FILES ${Inventor_SRCS})
 

diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
@@ -35,7 +35,6 @@
 #include <zipios++/gzipoutputstream.h>
 
 #include "SoFCDB.h"
-#include "SoVTKActor.h"
 #include "SoFCColorBar.h"
 #include "SoFCColorLegend.h"
 #include "SoFCColorGradient.h"

diff --git a/src/Gui/SoFCDB.cpp.orig b/src/Gui/SoFCDB.cpp.orig
@@ -35,7 +35,6 @@
 #include <zipios++/gzipoutputstream.h>
 
 #include "SoFCDB.h"
-#include "SoVTKActor.h"
 #include "SoFCColorBar.h"
 #include "SoFCColorLegend.h"
 #include "SoFCColorGradient.h"