Skip to content

Commit

Permalink
fix(export_scene_macro): support latest ParaView
Browse files Browse the repository at this point in the history
* fix import errors
* fix Python3 compatibility
* fix typo (pd.GetNumberOfArrays() instead of cd.GetNumberOfArrays()), fixes Kitware#2499
  • Loading branch information
dasmy committed Jul 6, 2022
1 parent c1a773d commit 0ae063c
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Utilities/ParaView/export-scene-macro.py
Expand Up @@ -25,11 +25,11 @@
from paraview.vtk import *

try:
from vtk.vtkFiltersGeometryPython import vtkCompositeDataGeometryFilter
from vtk.vtkCommonCorePython import vtkUnsignedCharArray
from vtk.vtkFiltersGeometry import vtkCompositeDataGeometryFilter
from vtk.vtkCommonCore import vtkUnsignedCharArray
except:
from vtkFiltersGeometryPython import vtkCompositeDataGeometryFilter
from vtkCommonCorePython import vtkUnsignedCharArray
from vtkFiltersGeometry import vtkCompositeDataGeometryFilter
from vtkCommonCore import vtkUnsignedCharArray

USER_HOME = os.path.expanduser('~')
ROOT_OUTPUT_DIRECTORY = EXPORT_DIRECTORY.replace('${USER_HOME}', USER_HOME)
Expand Down Expand Up @@ -96,9 +96,9 @@ def dumpDataArray(datasetDir, dataDir, array, root = {}, compress = True):
newArray.SetNumberOfTuples(arraySize)
for i in range(arraySize):
newArray.SetValue(i, -1 if array.GetValue(i) < 0 else array.GetValue(i))
pBuffer = buffer(newArray)
pBuffer = memoryview(newArray)
else:
pBuffer = buffer(array)
pBuffer = memoryview(array)

pMd5 = hashlib.md5(pBuffer).hexdigest()
pPath = os.path.join(dataDir, pMd5)
Expand Down Expand Up @@ -241,7 +241,7 @@ def dumpAllArrays(datasetDir, dataDir, dataset, root = {}, compress = True):

# Cell data
cd = dataset.GetCellData()
cd_size = pd.GetNumberOfArrays()
cd_size = cd.GetNumberOfArrays()
for i in range(cd_size):
array = cd.GetArray(i)
if array:
Expand Down Expand Up @@ -430,6 +430,7 @@ def mkdir_p(path):
renProp = renProps.GetItemAsObject(rpIdx)
if not renProp.GetVisibility():
continue

if hasattr(renProp, 'GetMapper'):
mapper = renProp.GetMapper()
dataObject = mapper.GetInputDataObject(0, 0);
Expand Down

0 comments on commit 0ae063c

Please sign in to comment.