Updated noether_gui for compatibility with vtk9

ros-industrial · Jan 4, 2024 · e4e526b · e4e526b
1 parent cd959a2
commit e4e526b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/noether_gui/include/noether_gui/widgets/tpp_widget.h b/noether_gui/include/noether_gui/widgets/tpp_widget.h
@@ -4,7 +4,14 @@
 #include <QWidget>
 #include <vtkSmartPointer.h>
 
+#if VTK_MAJOR_VERSION > 7
+class QVTKOpenGLNativeWidget;
+using RenderWidget = QVTKOpenGLNativeWidget;
+#else
 class QVTKWidget;
+using RenderWidget = QVTKWidget;
+#endif
+
 class vtkActor;
 class vtkPolyDataMapper;
 class vtkProp;
@@ -63,7 +70,7 @@ class TPPWidget : public QWidget
   TPPPipelineWidget* pipeline_widget_;
 
   // Viewer rendering
-  QVTKWidget* render_widget_;
+  RenderWidget* render_widget_;
   vtkSmartPointer<vtkRenderer> renderer_;
   vtkSmartPointer<vtkPolyDataMapper> mesh_mapper_;
   vtkSmartPointer<vtkActor> mesh_actor_;

diff --git a/noether_gui/src/widgets/tpp_widget.cpp b/noether_gui/src/widgets/tpp_widget.cpp
@@ -13,7 +13,11 @@
 #include <yaml-cpp/yaml.h>
 
 // Rendering includes
+#if VTK_MAJOR_VERSION > 7
+#include <QVTKOpenGLNativeWidget.h>
+#else
 #include <QVTKWidget.h>
+#endif
 #include <vtkAxesActor.h>
 #include <vtkAssembly.h>
 #include <vtkOpenGLPolyDataMapper.h>
@@ -35,7 +39,7 @@ TPPWidget::TPPWidget(boost_plugin_loader::PluginLoader loader, QWidget* parent)
   : QWidget(parent)
   , ui_(new Ui::TPP())
   , pipeline_widget_(new TPPPipelineWidget(std::move(loader), this))
-  , render_widget_(new QVTKWidget(this))
+  , render_widget_(new RenderWidget(this))
   , renderer_(vtkSmartPointer<vtkOpenGLRenderer>::New())
   , mesh_mapper_(vtkSmartPointer<vtkOpenGLPolyDataMapper>::New())
   , mesh_actor_(vtkSmartPointer<vtkOpenGLActor>::New())