From bee732581108febce1a135f575a23fba4a596f3a Mon Sep 17 00:00:00 2001
From: acrovato <170-acrovato@users.noreply.gitlab.uliege.be>
Date: Mon, 3 Feb 2020 14:13:29 +0100
Subject: [PATCH] Impvd fix for vtk
---
mrstlnos/viewer.py | 6 ++++--
waves/viewer.py | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/mrstlnos/viewer.py b/mrstlnos/viewer.py
index e6d0a171..7ac724cb 100644
--- a/mrstlnos/viewer.py
+++ b/mrstlnos/viewer.py
@@ -569,7 +569,8 @@ class Mesh(object):
self.mapper.SetInput(ugrid)
else:
self.mapper.SetInputData(ugrid)
- self.mapper.ImmediateModeRenderingOff()
+ if vtk.VTK_MAJOR_VERSION <= 7:
+ self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
@@ -671,7 +672,8 @@ class Grid(object):
#self.producer.SetOutput(ugrid) # le double producer (dans Mesh/Grid) ne marche pas sous Qt 4 => faire un objet dataset
self.mapper = vtk.vtkDataSetMapper()
- self.mapper.ImmediateModeRenderingOff()
+ if vtk.VTK_MAJOR_VERSION <= 7:
+ self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
#self.mapper.SetInputConnection(self.producer.GetOutputPort())
diff --git a/waves/viewer.py b/waves/viewer.py
index 38f1cd9b..9f0acd40 100644
--- a/waves/viewer.py
+++ b/waves/viewer.py
@@ -332,7 +332,8 @@ class Mesh(object):
self.mapper = vtk.vtkDataSetMapper()
#self.mapper.SetInputConnection(self.producer.GetOutputPort())
self.mapper.SetInputData(ugrid)
- #self.mapper.ImmediateModeRenderingOff()
+ if vtk.VTK_MAJOR_VERSION <= 7:
+ self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
@@ -432,7 +433,8 @@ class ScalarBar(object):
class Grid(object):
def __init__(self, ugrid):
self.mapper = vtk.vtkDataSetMapper()
- #self.mapper.ImmediateModeRenderingOff()
+ if vtk.VTK_MAJOR_VERSION <= 7:
+ self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
self.mapper.SetInputData(ugrid)
--
GitLab