@kitware/vtk.js 34.15.4 → 34.16.0

package/Filters/General/ImageMarchingSquares.js

@@ -79,24 +79,37 @@ function vtkImageMarchingSquares(publicAPI, model) {
   /**
    * Retrieve pixel coordinates.
    * @param {Vector3} ijk origin of the pixel
-   * @param {Vector3} origin origin of the image
-   * @param {Vector3} spacing spacing of the image
    * @param {number} kernelX index of the X element
    * @param {number} kernelY index of the Y element
+   * @param {Function} indexToWorld function to convert index to world coordinates
    */
-  publicAPI.getPixelPoints = (ijk, origin, spacing, kernelX, kernelY) => {
-    const i = ijk[kernelX];
-    const j = ijk[kernelY];
-
-    // (i,i+1),(j,j+1),(k,k+1) - i varies fastest; then j; then k
-    pixelPts[0] = origin[kernelX] + i * spacing[kernelX]; // 0
-    pixelPts[1] = origin[kernelY] + j * spacing[kernelY];
-    pixelPts[2] = pixelPts[0] + spacing[kernelX]; // 1
-    pixelPts[3] = pixelPts[1];
-    pixelPts[4] = pixelPts[0]; // 2
-    pixelPts[5] = pixelPts[1] + spacing[kernelY];
-    pixelPts[6] = pixelPts[2]; // 3
-    pixelPts[7] = pixelPts[5];
+  publicAPI.getPixelPoints = (ijk, kernelX, kernelY, indexToWorld) => {
+    // pixelPts = a flattened world coordinates array of [ (i,j,k), (i+1,j,k), (i,j+1,k), (i+1,j+1,k)]
+
+    // 0: i, j, k
+    const neighborIJK = [...ijk];
+    indexToWorld(neighborIJK, pixelPts);
+
+    // 1: i+1, j, k
+    neighborIJK[kernelX] += 1;
+    const temp = indexToWorld(neighborIJK, []);
+    pixelPts[3] = temp[0];
+    pixelPts[4] = temp[1];
+    pixelPts[5] = temp[2];
+
+    // 2: i+1, j+1, k
+    neighborIJK[kernelY] += 1;
+    indexToWorld(neighborIJK, temp);
+    pixelPts[9] = temp[0];
+    pixelPts[10] = temp[1];
+    pixelPts[11] = temp[2];
+
+    // 3: i, j+1, k
+    neighborIJK[kernelX] -= 1;
+    indexToWorld(neighborIJK, temp);
+    pixelPts[6] = temp[0];
+    pixelPts[7] = temp[1];
+    pixelPts[8] = temp[2];
   };
 
   /**
@@ -104,7 +117,6 @@ function vtkImageMarchingSquares(publicAPI, model) {
    * @param {number[]} cVal list of contour values
    * @param {Vector3} ijk origin of the pixel
    * @param {Vector3} dims dimensions of the image
-   * @param {Vector3} origin origin of the image
    * @param {Vector3} spacing sapcing of the image
    * @param {TypedArray} scalars list of scalar values
    * @param {number[]} points list of points
@@ -112,9 +124,9 @@ function vtkImageMarchingSquares(publicAPI, model) {
    * @param {Vector3} increments IJK slice increments
    * @param {number} kernelX index of the X element
    * @param {number} kernelY index of the Y element
+   * @param {Function} indexToWorld function to convert index to world coordinates
    */
-  publicAPI.produceLines = (cVal, ijk, dims, origin, spacing, scalars, points, lines, increments, kernelX, kernelY) => {
-    const k = ijk[model.slicingMode];
+  publicAPI.produceLines = (cVal, ijk, dims, scalars, points, lines, increments, kernelX, kernelY, indexToWorld) => {
     const CASE_MASK = [1, 2, 8, 4]; // case table is actually for quad
     const xyz = [];
     let pId;
@@ -131,8 +143,7 @@ function vtkImageMarchingSquares(publicAPI, model) {
       return; // don't get the pixel coordinates, nothing to do
     }
 
-    publicAPI.getPixelPoints(ijk, origin, spacing, kernelX, kernelY);
-    const z = origin[model.slicingMode] + k * spacing[model.slicingMode];
+    publicAPI.getPixelPoints(ijk, kernelX, kernelY, indexToWorld);
     for (let idx = 0; pixelLines[idx] >= 0; idx += 2) {
       lines.push(2);
       for (let eid = 0; eid < 2; eid++) {
@@ -143,11 +154,11 @@ function vtkImageMarchingSquares(publicAPI, model) {
         }
         if (pId === undefined) {
           const t = (cVal - pixelScalars[edgeVerts[0]]) / (pixelScalars[edgeVerts[1]] - pixelScalars[edgeVerts[0]]);
-          const x0 = pixelPts.slice(edgeVerts[0] * 2, (edgeVerts[0] + 1) * 2);
-          const x1 = pixelPts.slice(edgeVerts[1] * 2, (edgeVerts[1] + 1) * 2);
-          xyz[kernelX] = x0[0] + t * (x1[0] - x0[0]);
-          xyz[kernelY] = x0[1] + t * (x1[1] - x0[1]);
-          xyz[model.slicingMode] = z;
+          const x0 = pixelPts.slice(edgeVerts[0] * 3, (edgeVerts[0] + 1) * 3);
+          const x1 = pixelPts.slice(edgeVerts[1] * 3, (edgeVerts[1] + 1) * 3);
+          xyz[0] = x0[0] + t * (x1[0] - x0[0]);
+          xyz[1] = x0[1] + t * (x1[1] - x0[1]);
+          xyz[2] = x0[2] + t * (x1[2] - x0[2]);
           pId = points.length / 3;
           points.push(xyz[0], xyz[1], xyz[2]);
           if (model.mergePoints) {
@@ -172,13 +183,12 @@ function vtkImageMarchingSquares(publicAPI, model) {
     console.time('msquares');
 
     // Retrieve output and volume data
-    const origin = input.getOrigin();
-    const spacing = input.getSpacing();
     const dims = input.getDimensions();
     const extent = input.getExtent();
     const increments = input.computeIncrements(extent);
     const scalars = input.getPointData().getScalars().getData();
     const [kernelX, kernelY] = getKernels();
+    const indexToWorld = input.indexToWorld;
 
     // Points - dynamic array
     const points = [];
@@ -200,7 +210,7 @@ function vtkImageMarchingSquares(publicAPI, model) {
         ijk[kernelY] = j;
         for (let i = 0; i < dims[kernelX] - 1; ++i) {
           ijk[kernelX] = i;
-          publicAPI.produceLines(model.contourValues[cv], ijk, dims, origin, spacing, scalars, points, lines, increments, kernelX, kernelY);
+          publicAPI.produceLines(model.contourValues[cv], ijk, dims, scalars, points, lines, increments, kernelX, kernelY, indexToWorld);
         }
       }
       edgeLocator.initialize();

package/Rendering/Core/ColorTransferFunction/ColorMaps.json.js

@@ -595,6 +595,197 @@ var vtkColorMaps = [
 			1
 		]
 	},
+	{
+		ColorSpace: "RGB",
+		Name: "Grayscale-DICOM-sigmoid",
+		Notes: "This is a 16 point sample of a sigmoid grayscale colormap described in the DICOM standard. See equation C.11-1 in section C.11.2",
+		NanColor: [
+			1,
+			0,
+			0
+		],
+		BelowRangeColor: [
+			0,
+			0,
+			0
+		],
+		AboveRangeColor: [
+			1,
+			1,
+			1
+		],
+		RGBPoints: [
+			-1,
+			0.01798620996209156,
+			0.01798620996209156,
+			0.01798620996209156,
+			-0.8666666666666667,
+			0.030275691986950463,
+			0.030275691986950463,
+			0.030275691986950463,
+			-0.7333333333333334,
+			0.05053016223541345,
+			0.05053016223541345,
+			0.05053016223541345,
+			-0.6,
+			0.08317269649392238,
+			0.08317269649392238,
+			0.08317269649392238,
+			-0.4666666666666667,
+			0.13392788832407365,
+			0.13392788832407365,
+			0.13392788832407365,
+			-0.33333333333333337,
+			0.2086085273260449,
+			0.2086085273260449,
+			0.2086085273260449,
+			-0.19999999999999996,
+			0.31002551887238755,
+			0.31002551887238755,
+			0.31002551887238755,
+			-0.06666666666666665,
+			0.4337256058045608,
+			0.4337256058045608,
+			0.4337256058045608,
+			0.06666666666666665,
+			0.5662743941954392,
+			0.5662743941954392,
+			0.5662743941954392,
+			0.19999999999999996,
+			0.6899744811276125,
+			0.6899744811276125,
+			0.6899744811276125,
+			0.33333333333333326,
+			0.791391472673955,
+			0.791391472673955,
+			0.791391472673955,
+			0.46666666666666656,
+			0.8660721116759263,
+			0.8660721116759263,
+			0.8660721116759263,
+			0.6000000000000001,
+			0.9168273035060777,
+			0.9168273035060777,
+			0.9168273035060777,
+			0.7333333333333334,
+			0.9494698377645865,
+			0.9494698377645865,
+			0.9494698377645865,
+			0.8666666666666667,
+			0.9697243080130495,
+			0.9697243080130495,
+			0.9697243080130495,
+			1,
+			0.9820137900379085,
+			0.9820137900379085,
+			0.9820137900379085
+		]
+	},
+	{
+		ColorSpace: "RGB",
+		Name: "Inverted-Grayscale",
+		NanColor: [
+			1,
+			0,
+			0
+		],
+		RGBPoints: [
+			0,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0
+		]
+	},
+	{
+		ColorSpace: "RGB",
+		Name: "Inverted-Grayscale-DICOM-sigmoid",
+		Notes: "This is a 16 point sample of a sigmoid inverted-grayscale colormap described in the DICOM standard. See equation C.11-1 in section C.11.2",
+		BelowRangeColor: [
+			1,
+			1,
+			1
+		],
+		AboveRangeColor: [
+			0,
+			0,
+			0
+		],
+		NanColor: [
+			1,
+			0,
+			0
+		],
+		RGBPoints: [
+			-1,
+			0.9820137900379085,
+			0.9820137900379085,
+			0.9820137900379085,
+			-0.8666666666666667,
+			0.9697243080130495,
+			0.9697243080130495,
+			0.9697243080130495,
+			-0.7333333333333334,
+			0.9494698377645866,
+			0.9494698377645866,
+			0.9494698377645866,
+			-0.6,
+			0.9168273035060777,
+			0.9168273035060777,
+			0.9168273035060777,
+			-0.4666666666666667,
+			0.8660721116759263,
+			0.8660721116759263,
+			0.8660721116759263,
+			-0.33333333333333337,
+			0.791391472673955,
+			0.791391472673955,
+			0.791391472673955,
+			-0.19999999999999996,
+			0.6899744811276125,
+			0.6899744811276125,
+			0.6899744811276125,
+			-0.06666666666666665,
+			0.5662743941954391,
+			0.5662743941954391,
+			0.5662743941954391,
+			0.06666666666666665,
+			0.43372560580456077,
+			0.43372560580456077,
+			0.43372560580456077,
+			0.19999999999999996,
+			0.3100255188723875,
+			0.3100255188723875,
+			0.3100255188723875,
+			0.33333333333333326,
+			0.20860852732604496,
+			0.20860852732604496,
+			0.20860852732604496,
+			0.46666666666666656,
+			0.13392788832407365,
+			0.13392788832407365,
+			0.13392788832407365,
+			0.6000000000000001,
+			0.08317269649392234,
+			0.08317269649392234,
+			0.08317269649392234,
+			0.7333333333333334,
+			0.05053016223541351,
+			0.05053016223541351,
+			0.05053016223541351,
+			0.8666666666666667,
+			0.03027569198695046,
+			0.03027569198695046,
+			0.03027569198695046,
+			1,
+			0.01798620996209155,
+			0.01798620996209155,
+			0.01798620996209155
+		]
+	},
 	{
 		ColorSpace: "RGB",
 		Name: "BkRd",

package/package.json

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