From 173469c1a25dab64fc7fa73dee647163b12f22a4 Mon Sep 17 00:00:00 2001
From: acrovato <170-acrovato@users.noreply.gitlab.uliege.be>
Date: Sun, 2 Feb 2020 16:51:21 +0100
Subject: [PATCH] Compatibility with python3 and vtk8
---
tbox/utils.py | 5 +++--
tboxVtk/cutter.py | 2 +-
tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py | 2 ++
waves/viewer.py | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tbox/utils.py b/tbox/utils.py
index a15d3073..bcc21dbc 100644
--- a/tbox/utils.py
+++ b/tbox/utils.py
@@ -80,10 +80,11 @@ def read(filename):
"""Read from file and store in data array
Adrien Croavto
"""
+ import io
import numpy as np
# read file
- fl = file(filename)
- label = fl.next().split(',')
+ fl = io.open(filename, 'r')
+ label = fl.readline().split(',')
fl.close()
data = np.loadtxt(filename, delimiter=',', skiprows=1)
return data
diff --git a/tboxVtk/cutter.py b/tboxVtk/cutter.py
index a2ac356a..a9e30b33 100644
--- a/tboxVtk/cutter.py
+++ b/tboxVtk/cutter.py
@@ -48,7 +48,7 @@ class Cutter(object):
plane.SetOrigin(cutO[0], cutO[1], cutO[2])
plane.SetNormal(cutN[0], cutN[1], cutN[2])
# cut the threshold and get data
- cutter = vtk.vtkFiltersCorePython.vtkCutter()
+ cutter = vtk.vtkCutter()
cutter.SetCutFunction(plane)
cutter.SetInputConnection(thresh.GetOutputPort())
cutter.Update()
diff --git a/tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py b/tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py
index 8e70d460..652e3e14 100644
--- a/tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py
+++ b/tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/waves/viewer.py b/waves/viewer.py
index 919647b1..38f1cd9b 100644
--- a/waves/viewer.py
+++ b/waves/viewer.py
@@ -332,7 +332,7 @@ class Mesh(object):
self.mapper = vtk.vtkDataSetMapper()
#self.mapper.SetInputConnection(self.producer.GetOutputPort())
self.mapper.SetInputData(ugrid)
- self.mapper.ImmediateModeRenderingOff()
+ #self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
@@ -432,7 +432,7 @@ class ScalarBar(object):
class Grid(object):
def __init__(self, ugrid):
self.mapper = vtk.vtkDataSetMapper()
- self.mapper.ImmediateModeRenderingOff()
+ #self.mapper.ImmediateModeRenderingOff()
self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
self.mapper.ScalarVisibilityOff()
self.mapper.SetInputData(ugrid)
--
GitLab