FEM: Adopt data extraction for VTK <9.3: different table filter

Additionally remove unneeded includes in c++ code remaining from earlier experiments
This commit is contained in:
Stefan Tröger
2025-05-09 11:19:49 +02:00
parent d50a98b9cf
commit 8cec9ad7f9
3 changed files with 15 additions and 11 deletions

View File

@@ -71,10 +71,6 @@
#include "ViewProviderFemPostObject.h"
#include "ViewProviderFemPostBranchFilter.h"
#include <vtkQtTableView.h>
#include <vtkQtTableModelAdapter.h>
#include <vtkAttributeDataToTableFilter.h>
using namespace FemGui;
using namespace Gui;

View File

@@ -37,11 +37,6 @@
#include <QDialog>
#include <QVBoxLayout>
#include <vtkTable.h>
#include <vtkAttributeDataToTableFilter.h>
#include <vtkSplitColumnComponents.h>
#include <vtkAbstractArray.h>
#include "ViewProviderFemPostObject.h"
#include "TaskPostExtraction.h"

View File

@@ -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)