@kitware/vtk.js 28.12.3 → 28.12.5

package/Imaging/Core/ImageReslice.js

@@ -29,7 +29,7 @@ function vtkImageReslice(publicAPI, model) {
   const superClass = {
     ...publicAPI
   };
-  let indexMatrix = null;
+  const indexMatrix = mat4.identity(new Float64Array(16));
   let optimizedTransform = null;
   function getImageResliceSlabTrap(tmpPtr, inComponents, sampleCount, f) {
     const n = sampleCount - 1;
@@ -218,7 +218,7 @@ function vtkImageReslice(publicAPI, model) {
     let interpolationMode = model.interpolationMode;
     model.usePermuteExecute = false;
     if (model.optimization) {
-      if (model.slabSliceSpacingFraction === 1.0 && model.interpolator.isSeparable() && publicAPI.isPermutationMatrix(indexMatrix)) {
+      if (optimizedTransform == null && model.slabSliceSpacingFraction === 1.0 && model.interpolator.isSeparable() && publicAPI.isPermutationMatrix(indexMatrix)) {
         model.usePermuteExecute = true;
         if (publicAPI.canUseNearestNeighbor(indexMatrix, outWholeExt)) {
           interpolationMode = InterpolationMode.NEAREST;
@@ -286,7 +286,7 @@ function vtkImageReslice(publicAPI, model) {
     const rescaleScalars = model.scalarShift !== 0.0 || model.scalarScale !== 1.0;
 
     // is nearest neighbor optimization possible?
-    const optimizeNearest = interpolationMode === InterpolationMode.NEAREST && borderMode === ImageBorderMode.CLAMP && !(perspective || convertScalars != null || rescaleScalars) && inputScalarType === outScalars.getDataType() && fullSize === inScalars.getNumberOfTuples() && model.border === true && nsamples <= 1;
+    const optimizeNearest = interpolationMode === InterpolationMode.NEAREST && borderMode === ImageBorderMode.CLAMP && !(optimizedTransform != null || perspective || convertScalars != null || rescaleScalars) && inputScalarType === outScalars.getDataType() && fullSize === inScalars.getNumberOfTuples() && model.border === true && nsamples <= 1;
 
     // get pixel information
     const scalarType = outScalars.getDataType();
@@ -306,11 +306,6 @@ function vtkImageReslice(publicAPI, model) {
       origin[i] = newmat[4 * 3 + i];
     }
 
-    // get the input origin and spacing for conversion purposes
-    model.interpolator.getOrigin();
-    const inSpacing = model.interpolator.getSpacing();
-    [1.0 / inSpacing[0], 1.0 / inSpacing[1], 1.0 / inSpacing[2]];
-
     // allocate an output row of type double
     let floatPtr = null;
     if (!optimizeNearest) {
@@ -409,6 +404,16 @@ function vtkImageReslice(publicAPI, model) {
                   inPoint[1] *= f;
                   inPoint[2] *= f;
                 }
+                if (optimizedTransform !== null) {
+                  // get the input origin and spacing for conversion purposes
+                  const inOrigin = model.interpolator.getOrigin();
+                  const inSpacing = model.interpolator.getSpacing();
+                  const inInvSpacing = [1.0 / inSpacing[0], 1.0 / inSpacing[1], 1.0 / inSpacing[2]];
+
+                  // apply the AbstractTransform if there is one
+                  // TBD: handle inDirection
+                  publicAPI.applyTransform(optimizedTransform, inPoint, inOrigin, inInvSpacing);
+                }
                 if (model.interpolator.checkBoundsIJK(inPoint)) {
                   // do the interpolation
                   isInBounds = 1;
@@ -541,63 +546,29 @@ function vtkImageReslice(publicAPI, model) {
    * @returns
    */
   publicAPI.getIndexMatrix = (input, output) => {
-    // first verify that we have to update the matrix
-    if (indexMatrix === null) {
-      indexMatrix = mat4.identity(new Float64Array(16));
-    }
-    const inOrigin = input.getOrigin();
-    const inSpacing = input.getSpacing();
-    const inDirection = input.getDirection();
-    const outOrigin = output.getOrigin();
-    const outSpacing = output.getSpacing();
     const transform = mat4.identity(new Float64Array(16));
-    const inMatrix = mat4.identity(new Float64Array(16));
-    const outMatrix = mat4.identity(new Float64Array(16));
+    optimizedTransform = null;
     if (model.resliceAxes) {
       mat4.copy(transform, model.resliceAxes);
     }
     if (model.resliceTransform) {
       if (model.resliceTransform.isA('vtkHomogeneousTransform')) {
-        // transform->PostMultiply();
-        // transform->Concatenate(
-        // mat4.multiply(transform, transform, model.resliceTransform.getMatrix());
         mat4.multiply(transform, model.resliceTransform.getMatrix(), transform);
       } else {
         // TODO
         vtkWarningMacro('Non homogeneous transform have not yet been ported');
       }
     }
-    if (!vtkMath.isIdentity3x3(inDirection)) {
-      const imageTransform = vtkMatrixBuilder.buildFromRadian().translate(inOrigin[0], inOrigin[1], inOrigin[2]).multiply3x3(inDirection).translate(-inOrigin[0], -inOrigin[1], -inOrigin[2]);
-      mat4.multiply(transform, imageTransform.getMatrix(), transform);
-    }
-
-    // check to see if we have an identity matrix
-    let isIdentity = vtkMath.isIdentity(transform);
 
     // the outMatrix takes OutputData indices to OutputData coordinates,
+    const outMatrix = output.getIndexToWorld();
+    mat4.multiply(transform, transform, outMatrix);
+
     // the inMatrix takes InputData coordinates to InputData indices
-    for (let i = 0; i < 3; i++) {
-      if ((inSpacing[i] !== outSpacing[i] || inOrigin[i] !== outOrigin[i]) || optimizedTransform != null ) {
-        isIdentity = false;
-      }
-      inMatrix[4 * i + i] = 1.0 / inSpacing[i];
-      inMatrix[4 * 3 + i] = -inOrigin[i] / inSpacing[i];
-      outMatrix[4 * i + i] = outSpacing[i];
-      outMatrix[4 * 3 + i] = outOrigin[i];
-    }
-    if (!isIdentity) {
-      // transform.PreMultiply();
-      // transform.Concatenate(outMatrix);
-      mat4.multiply(transform, transform, outMatrix);
-
-      // the optimizedTransform requires data coords, not
-      // index coords, as its input
-      {
-        // transform->PostMultiply();
-        // transform->Concatenate(inMatrix);
-        mat4.multiply(transform, inMatrix, transform);
-      }
+    // the optimizedTransform requires data coords, not index coords, as its input
+    if (optimizedTransform == null) {
+      const inMatrix = input.getWorldToIndex();
+      mat4.multiply(transform, inMatrix, transform);
     }
     mat4.copy(indexMatrix, transform);
     return indexMatrix;

package/macros2.js

@@ -154,6 +154,9 @@ function safeArrays(model) {
     }
   });
 }
+function isTypedArray(value) {
+  return Object.values(TYPED_ARRAYS).some(ctor => value instanceof ctor);
+}
 
 // ----------------------------------------------------------------------------
 // shallow equals
@@ -346,6 +349,8 @@ function obj() {
         jsonArchive[keyName] = jsonArchive[keyName].getState();
       } else if (Array.isArray(jsonArchive[keyName])) {
         jsonArchive[keyName] = jsonArchive[keyName].map(getStateArrayMapFunc);
+      } else if (isTypedArray(jsonArchive[keyName])) {
+        jsonArchive[keyName] = Array.from(jsonArchive[keyName]);
       }
     });
 

package/package.json

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