Commit d1df762f authored by Jean-Loup Haberbusch's avatar Jean-Loup Haberbusch

UPDATED library-camitkcore

removing obsolete ImmediateModeRenderingOn() function wich is present in vtk8.0.1 and not in 8.1.0.
parent 2eaece56
......@@ -28,8 +28,6 @@
#include "DefaultGUIText.h"
#include <Log.h>
// Qt files
#include <QFileDialog>
......
......@@ -125,7 +125,7 @@ Geometry::Geometry(QString label, vtkSmartPointer<vtkPointSet> pointSetPtr, cons
//-- init mapper
mapper = vtkSmartPointer<vtkDataSetMapper>::New();
mapper->SetInputConnection(customPipelineOutput);
mapper->ImmediateModeRenderingOn();
//mapper->ImmediateModeRenderingOn();
mapper->SetResolveCoincidentTopologyToPolygonOffset();
// set the rainbow lookup table from blue to red
......
......@@ -366,7 +366,7 @@ QMap <RendererWidget::ScreenshotFormat, RendererWidget::ScreenshotFormatInfo*> s
#if VTK_MAJOR_VERSION == 6
RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget2(parent) {
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget(parent) {
#else
......@@ -447,7 +447,7 @@ RendererWidget::RendererWidget(QWidget* parent, ControlMode mode) : QVTKWidget(p
newFormat.setStencilBufferSize(context()->format().stencilBufferSize());
context()->setFormat(newFormat);
}
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
auto window = windowHandle();
if (window != nullptr) {
......@@ -1394,7 +1394,7 @@ void RendererWidget::mousePressEvent(QMouseEvent* event) {
#if VTK_MAJOR_VERSION == 6
QVTKWidget2::mousePressEvent(event);
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
QVTKWidget::mousePressEvent(event);
#else
......@@ -1408,7 +1408,7 @@ void RendererWidget::mouseReleaseEvent(QMouseEvent* event) {
#if VTK_MAJOR_VERSION == 6
QVTKWidget2::mouseReleaseEvent(event);
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
QVTKWidget::mouseReleaseEvent(event);
#else
......@@ -1457,7 +1457,7 @@ void RendererWidget::mouseMoveEvent(QMouseEvent* event) {
#if VTK_MAJOR_VERSION == 6
QVTKWidget2::mouseMoveEvent(event);
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
QVTKWidget::mouseMoveEvent(event);
#else
......
......@@ -41,7 +41,7 @@
// additional needed headers for QVTKWidget2
#include <vtkGenericOpenGLRenderWindow.h>
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
#include <QVTKWidget.h>
// additional needed headers for QVTKWidget
#include <QWindow>
......@@ -139,7 +139,7 @@ namespace camitk {
#if VTK_MAJOR_VERSION == 6
class CAMITK_API RendererWidget : public QVTKWidget2 {
#elif VTK_MAJOR_VERSION == 7
#elif VTK_MAJOR_VERSION == 7 || VTK_MAJOR_VERSION == 8
class CAMITK_API RendererWidget : public QVTKWidget {
#else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment