Updating outdated vtk packages

AurelienBesnier · Jan 30, 2024 · d504e97 · d504e97
1 parent d102408
commit d504e97
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: openalea.phenomenal
-  version: "1.9.2"
+  version: "1.9.3"
 
 source:
   path: ..

diff --git a/src/openalea/phenomenal/mesh/algorithms.py b/src/openalea/phenomenal/mesh/algorithms.py
@@ -10,7 +10,7 @@
 from __future__ import division, print_function, absolute_import
 
 import vtk
-import vtk.util.numpy_support
+import vtkmodules.util.numpy_support
 import numpy
 import math
 import skimage.measure

diff --git a/src/openalea/phenomenal/mesh/formats.py b/src/openalea/phenomenal/mesh/formats.py
@@ -10,7 +10,8 @@
 from __future__ import division, print_function, absolute_import
 
 import vtk
-import vtk.util.numpy_support
+import vtkmodules.util.numpy_support
+import vtkmodules
 
 from .vtk_transformation import (from_vertices_faces_to_vtk_poly_data)
 # ==============================================================================
@@ -47,17 +48,17 @@ def read_ply_to_vertices_faces(filename):
 
     vtk_poly_data = ply_reader.GetOutput()
 
-    vertices = vtk.util.numpy_support.vtk_to_numpy(
+    vertices = vtkmodules.util.numpy_support.vtk_to_numpy(
         vtk_poly_data.GetPoints().GetData())
 
-    faces = vtk.util.numpy_support.vtk_to_numpy(
+    faces = vtkmodules.util.numpy_support.vtk_to_numpy(
         vtk_poly_data.GetPolys().GetData())
 
     faces = faces.reshape((len(faces) // 4, 4))
 
     colors = vtk_poly_data.GetPointData().GetScalars()
     if colors is not None:
-        colors = vtk.util.numpy_support.vtk_to_numpy(colors)
+        colors = vtkmodules.util.numpy_support.vtk_to_numpy(colors)
 
     return vertices, faces[:, 1:], colors
 

diff --git a/src/openalea/phenomenal/mesh/vtk_transformation.py b/src/openalea/phenomenal/mesh/vtk_transformation.py
@@ -10,7 +10,7 @@
 from __future__ import division, print_function, absolute_import
 
 import vtk
-import vtk.util.numpy_support
+import vtkmodules.util.numpy_support
 import operator
 
 # ==============================================================================
@@ -105,10 +105,10 @@ def make_vtk_id_list(it):
 
 def from_vtk_poly_data_to_vertices_faces(vtk_poly_data):
 
-    vertices = vtk.util.numpy_support.vtk_to_numpy(
+    vertices = vtkmodules.util.numpy_support.vtk_to_numpy(
         vtk_poly_data.GetPoints().GetData())
 
-    faces = vtk.util.numpy_support.vtk_to_numpy(
+    faces = vtkmodules.util.numpy_support.vtk_to_numpy(
         vtk_poly_data.GetPolys().GetData())
 
     faces = faces.reshape((len(faces) // 4, 4))
@@ -126,12 +126,12 @@ def from_numpy_matrix_to_vtk_image_data(data_matrix):
     image_data.SetSpacing(1.0, 1.0, 1.0)
 
     if vtk.VTK_MAJOR_VERSION < 6:
-        image_data.SetScalarType(vtk.util.numpy_support.get_vtk_array_type(
+        image_data.SetScalarType(vtkmodules.util.numpy_support.get_vtk_array_type(
             data_matrix.dtype))
         image_data.SetNumberOfScalarComponents(1)
         image_data.AllocateScalars()
     else:
-        image_data.AllocateScalars(vtk.util.numpy_support.get_vtk_array_type(
+        image_data.AllocateScalars(vtkmodules.util.numpy_support.get_vtk_array_type(
             data_matrix.dtype), 1)
 
     lx, ly, lz = image_data.GetDimensions()

diff --git a/src/openalea/phenomenal/version.py b/src/openalea/phenomenal/version.py
@@ -3,7 +3,7 @@
 
 major = 1
 minor = 9
-post = 2
+post = 3
 
 __version__ = ".".join([str(s) for s in (major, minor, post)])
 # }}