diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index 1a2c244943..804cde7f14 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -71,10 +71,6 @@ #include "ViewProviderFemPostObject.h" #include "ViewProviderFemPostBranchFilter.h" -#include -#include -#include - using namespace FemGui; using namespace Gui; diff --git a/src/Mod/Fem/Gui/TaskPostExtraction.cpp b/src/Mod/Fem/Gui/TaskPostExtraction.cpp index 45ace5bb15..4765b14c0e 100644 --- a/src/Mod/Fem/Gui/TaskPostExtraction.cpp +++ b/src/Mod/Fem/Gui/TaskPostExtraction.cpp @@ -37,11 +37,6 @@ #include #include -#include -#include -#include -#include - #include "ViewProviderFemPostObject.h" #include "TaskPostExtraction.h" diff --git a/src/Mod/Fem/femguiutils/data_extraction.py b/src/Mod/Fem/femguiutils/data_extraction.py index 23a1bb784b..5b80f64d36 100644 --- a/src/Mod/Fem/femguiutils/data_extraction.py +++ b/src/Mod/Fem/femguiutils/data_extraction.py @@ -33,10 +33,17 @@ from . import vtk_table_view from PySide import QtCore, QtGui +from vtkmodules.vtkCommonCore import vtkVersion from vtkmodules.vtkCommonDataModel import vtkTable -from vtkmodules.vtkFiltersCore import vtkAttributeDataToTableFilter from vtkmodules.vtkFiltersGeneral import vtkSplitColumnComponents +if vtkVersion.GetVTKMajorVersion() > 9 and \ + vtkVersion.GetVTKMinorVersion() > 3: + from vtkmodules.vtkFiltersCore import vtkAttributeDataToTableFilter +else: + from vtkmodules.vtkInfovisCore import vtkDataObjectToTable + + import FreeCAD import FreeCADGui @@ -117,7 +124,13 @@ class DataExtraction(_BasePostTaskPanel): if not algo: self.data_model.setTable(vtkTable()) - filter = vtkAttributeDataToTableFilter() + if vtkVersion.GetVTKMajorVersion() > 9 and \ + vtkVersion.GetVTKMinorVersion() > 3: + filter = vtkAttributeDataToTableFilter() + else: + filter = vtkDataObjectToTable() + filter.SetFieldType(vtkDataObjectToTable.POINT_DATA) + filter.SetInputConnection(0, algo.GetOutputPort(0)) filter.Update() table = filter.GetOutputDataObject(0)