Merge remote-tracking branch 'origin/adrien' into ci-py3

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

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

tboxVtk/qt5vtk6/QVTKRenderWindowInteractor.py

+# -*- coding: utf-8 -*-
+
 # Copyright 2020 University of Liège
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");

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)