@kitware/vtk.js 21.4.0 → 21.4.1

package/Common/DataModel/ITKHelper.js

@@ -2,9 +2,9 @@ import macro from '../../macros.js';
 import vtkImageData from './ImageData.js';
 import vtkDataArray from '../Core/DataArray.js';
 
-var vtkErrorMacro = macro.vtkErrorMacro; // see itk.js/PixelTypes.js
+var vtkErrorMacro = macro.vtkErrorMacro; // see itk.js PixelTypes.js
 
-var ITKPixelTypes = {
+var ITKJSPixelTypes = {
   Unknown: 0,
   Scalar: 1,
   RGB: 2,
@@ -21,6 +21,25 @@ var ITKPixelTypes = {
   Matrix: 13,
   VariableLengthVector: 14,
   VariableSizeMatrix: 15
+}; // itk-wasm pixel types from https://github.com/InsightSoftwareConsortium/itk-wasm/blob/master/src/core/PixelTypes.ts
+
+var ITKWASMPixelTypes = {
+  Unknown: 'Unknown',
+  Scalar: 'Scalar',
+  RGB: 'RGB',
+  RGBA: 'RGBA',
+  Offset: 'Offset',
+  Vector: 'Vector',
+  Point: 'Point',
+  CovariantVector: 'CovariantVector',
+  SymmetricSecondRankTensor: 'SymmetricSecondRankTensor',
+  DiffusionTensor3D: 'DiffusionTensor3D',
+  Complex: 'Complex',
+  FixedArray: 'FixedArray',
+  Array: 'Array',
+  Matrix: 'Matrix',
+  VariableLengthVector: 'VariableLengthVector',
+  VariableSizeMatrix: 'VariableSizeMatrix'
 };
 /**
  * Converts an itk.js image to a vtk.js image.
@@ -35,7 +54,10 @@ function convertItkToVtkImage(itkImage) {
     spacing: [1, 1, 1]
   };
   var dimensions = [1, 1, 1];
-  var direction = [1, 0, 0, 0, 1, 0, 0, 0, 1];
+  var direction = [1, 0, 0, 0, 1, 0, 0, 0, 1]; // Check whether itkImage is an itk.js Image or an itk-wasm Image?
+
+  var isITKWasm = itkImage.direction.data === undefined;
+  var ITKPixelTypes = isITKWasm ? ITKWASMPixelTypes : ITKJSPixelTypes;
 
   for (var idx = 0; idx < itkImage.imageType.dimension; ++idx) {
     vtkImage.origin[idx] = itkImage.origin[idx];
@@ -47,7 +69,11 @@ function convertItkToVtkImage(itkImage) {
       // matrix on the vtkImageData is a webGL matrix, which uses a
       // column-major data layout. Transpose the direction matrix from
       // itkImage when instantiating that vtkImageData direction matrix.
-      direction[col + idx * 3] = itkImage.direction.data[idx + col * itkImage.imageType.dimension];
+      if (isITKWasm) {
+        direction[col + idx * 3] = itkImage.direction[idx + col * itkImage.imageType.dimension];
+      } else {
+        direction[col + idx * 3] = itkImage.direction.data[idx + col * itkImage.imageType.dimension];
+      }
     }
   } // Create VTK Image Data
 
@@ -66,7 +92,7 @@ function convertItkToVtkImage(itkImage) {
   imageData.getPointData().setScalars(pointData); // Associate the point data that are 3D vectors / tensors
   // Refer to itk-js/src/PixelTypes.js for numerical values
 
-  switch (itkImage.imageType.pixelType) {
+  switch (ITKPixelTypes[itkImage.imageType.pixelType]) {
     case ITKPixelTypes.Scalar:
       break;
 
@@ -148,7 +174,7 @@ function convertVtkToItkImage(vtkImage) {
   var itkImage = {
     imageType: {
       dimension: 3,
-      pixelType: ITKPixelTypes.Scalar,
+      pixelType: ITKJSPixelTypes.Scalar,
       componentType: '',
       components: 1
     },
@@ -176,10 +202,10 @@ function convertVtkToItkImage(vtkImage) {
   var vtkArray;
 
   if (pointData.getTensors() !== null) {
-    itkImage.imageType.pixelType = ITKPixelTypes.DiffusionTensor3D;
+    itkImage.imageType.pixelType = ITKJSPixelTypes.DiffusionTensor3D;
     vtkArray = pointData.getTensors();
   } else if (pointData.getVectors() != null) {
-    itkImage.imageType.pixelType = ITKPixelTypes.Vector;
+    itkImage.imageType.pixelType = ITKJSPixelTypes.Vector;
     vtkArray = pointData.getVectors();
   } else {
     vtkArray = pointData.getScalars();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "21.4.0",
+  "version": "21.4.1",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",