@cornerstonejs/tools 2.0.0-beta.20 → 2.0.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -29,13 +29,12 @@
     "clean": "rm -rf node_modules/.cache/storybook && shx rm -rf dist",
     "clean:deep": "yarn run clean && shx rm -rf node_modules",
     "dev": "tsc --project ./tsconfig.esm.json --watch",
-    "build:update-api": "yarn run build && api-extractor run --local",
+    "build:update-api": "yarn run build:esm && api-extractor run --local",
     "prepublishOnly": "yarn run build",
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^2.0.0-beta.20",
-    "@icr/polyseg-wasm": "0.4.0",
+    "@cornerstonejs/core": "^2.0.0-beta.21",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
     "lodash.get": "^4.4.2"
@@ -44,8 +43,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@icr/polyseg-wasm": "0.4.0",
-    "@kitware/vtk.js": "30.4.1",
+    "@kitware/vtk.js": "32.1.0",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
     "d3-array": "^3.2.3",
@@ -63,5 +61,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7606aa14c5a072bc63b24d82cbe347eb80cf5c6a"
+  "gitHead": "de2d08d4edbae4ca48831cc44a57737717b10b22"
 }

package/dist/esm/stateManagement/segmentation/addRepresentation.d.ts

@@ -1,3 +0,0 @@
-import { SegmentationRepresentationConfig, RepresentationPublicInput } from '../../types/SegmentationStateTypes';
-declare function addRepresentation(viewportId: string, representationInput: RepresentationPublicInput, initialConfig?: SegmentationRepresentationConfig): Promise<string>;
-export { addRepresentation };

package/dist/esm/stateManagement/segmentation/addRepresentations.d.ts

@@ -1,3 +0,0 @@
-import { SegmentationRepresentationConfig, RepresentationPublicInput } from '../../types/SegmentationStateTypes';
-declare function addRepresentations(viewportId: string, representationInputArray: RepresentationPublicInput[], segmentationRepresentationConfig?: SegmentationRepresentationConfig): Promise<string[]>;
-export default addRepresentations;

package/dist/esm/stateManagement/segmentation/addRepresentations.js

@@ -1,9 +0,0 @@
-import { addRepresentation } from './addRepresentation';
-async function addRepresentations(viewportId, representationInputArray, segmentationRepresentationConfig) {
-    const promises = representationInputArray.map((representationInput) => {
-        return addRepresentation(viewportId, representationInput, segmentationRepresentationConfig);
-    });
-    const segmentationRepresentationUIDs = await Promise.all(promises);
-    return segmentationRepresentationUIDs;
-}
-export default addRepresentations;

package/dist/esm/stateManagement/segmentation/helpers/getRepresentationRenderingConfig.d.ts

@@ -1,2 +0,0 @@
-import { RepresentationPublicInput } from '../../../types';
-export declare function getRepresentationRenderingConfig(representationInput: RepresentationPublicInput): {};

package/dist/esm/stateManagement/segmentation/removeRepresentationsFromViewport.d.ts

@@ -1,2 +0,0 @@
-declare function removeRepresentationsFromViewport(viewportId: string, segmentationRepresentationUIDs?: string[] | undefined, immediate?: boolean): void;
-export default removeRepresentationsFromViewport;

package/dist/esm/utilities/pointInShapeCallback.d.ts

@@ -1,18 +0,0 @@
-import { vec3 } from 'gl-matrix';
-import type { Types } from '@cornerstonejs/core';
-import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
-import BoundsIJK from '../types/BoundsIJK';
-export type PointInShape = {
-    value: number;
-    index: number;
-    pointIJK: vec3;
-    pointLPS: vec3 | number[];
-};
-export type PointInShapeCallback = ({ value, index, pointIJK, pointLPS, }: {
-    value: number;
-    index: number;
-    pointIJK: vec3;
-    pointLPS: vec3;
-}) => void;
-export type ShapeFnCriteria = (pointLPS: vec3, pointIJK: vec3) => boolean;
-export default function pointInShapeCallback(imageData: vtkImageData | Types.CPUImageData, pointInShapeFn: ShapeFnCriteria, callback?: PointInShapeCallback, boundsIJK?: BoundsIJK): Array<PointInShape>;

package/dist/esm/utilities/pointInShapeCallback.js

@@ -1,82 +0,0 @@
-import { vec3 } from 'gl-matrix';
-export default function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
-    let iMin, iMax, jMin, jMax, kMin, kMax;
-    let scalarData;
-    const { numComps } = imageData;
-    if (imageData.getScalarData) {
-        scalarData = imageData.getScalarData();
-    }
-    else {
-        scalarData = imageData
-            .getPointData()
-            .getScalars()
-            .getData();
-    }
-    const dimensions = imageData.getDimensions();
-    if (!boundsIJK) {
-        iMin = 0;
-        iMax = dimensions[0];
-        jMin = 0;
-        jMax = dimensions[1];
-        kMin = 0;
-        kMax = dimensions[2];
-    }
-    else {
-        [[iMin, iMax], [jMin, jMax], [kMin, kMax]] = boundsIJK;
-    }
-    const start = vec3.fromValues(iMin, jMin, kMin);
-    const direction = imageData.getDirection();
-    const rowCosines = direction.slice(0, 3);
-    const columnCosines = direction.slice(3, 6);
-    const scanAxisNormal = direction.slice(6, 9);
-    const spacing = imageData.getSpacing();
-    const [rowSpacing, columnSpacing, scanAxisSpacing] = spacing;
-    const worldPosStart = imageData.indexToWorld(start);
-    const rowStep = vec3.fromValues(rowCosines[0] * rowSpacing, rowCosines[1] * rowSpacing, rowCosines[2] * rowSpacing);
-    const columnStep = vec3.fromValues(columnCosines[0] * columnSpacing, columnCosines[1] * columnSpacing, columnCosines[2] * columnSpacing);
-    const scanAxisStep = vec3.fromValues(scanAxisNormal[0] * scanAxisSpacing, scanAxisNormal[1] * scanAxisSpacing, scanAxisNormal[2] * scanAxisSpacing);
-    const xMultiple = numComps ||
-        scalarData.length / dimensions[2] / dimensions[1] / dimensions[0];
-    const yMultiple = dimensions[0] * xMultiple;
-    const zMultiple = dimensions[1] * yMultiple;
-    const pointsInShape = [];
-    const currentPos = vec3.clone(worldPosStart);
-    for (let k = kMin; k <= kMax; k++) {
-        const startPosJ = vec3.clone(currentPos);
-        for (let j = jMin; j <= jMax; j++) {
-            const startPosI = vec3.clone(currentPos);
-            for (let i = iMin; i <= iMax; i++) {
-                const pointIJK = [i, j, k];
-                if (pointInShapeFn(currentPos, pointIJK)) {
-                    const index = k * zMultiple + j * yMultiple + i * xMultiple;
-                    let value;
-                    if (xMultiple > 2) {
-                        value = [
-                            scalarData[index],
-                            scalarData[index + 1],
-                            scalarData[index + 2],
-                        ];
-                    }
-                    else {
-                        value = scalarData[index];
-                    }
-                    pointsInShape.push({
-                        value,
-                        index,
-                        pointIJK,
-                        pointLPS: currentPos.slice(),
-                    });
-                    if (callback) {
-                        callback({ value, index, pointIJK, pointLPS: currentPos });
-                    }
-                }
-                vec3.add(currentPos, currentPos, rowStep);
-            }
-            vec3.copy(currentPos, startPosI);
-            vec3.add(currentPos, currentPos, columnStep);
-        }
-        vec3.copy(currentPos, startPosJ);
-        vec3.add(currentPos, currentPos, scanAxisStep);
-    }
-    return pointsInShape;
-}

package/dist/esm/utilities/pointInSurroundingSphereCallback.d.ts

@@ -1,4 +0,0 @@
-import type { Types } from '@cornerstonejs/core';
-import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
-import { PointInShapeCallback } from './pointInShapeCallback';
-export default function pointInSurroundingSphereCallback(imageData: vtkImageData, circlePoints: [Types.Point3, Types.Point3], callback: PointInShapeCallback, viewport?: Types.IVolumeViewport): void;

package/dist/esm/utilities/pointInSurroundingSphereCallback.js

@@ -1,63 +0,0 @@
-import { utilities as csUtils } from '@cornerstonejs/core';
-import { vec3 } from 'gl-matrix';
-import { pointInSphere } from './math/sphere';
-import pointInShapeCallback from './pointInShapeCallback';
-import { getBoundingBoxAroundShape } from './boundingBox';
-const { transformWorldToIndex } = csUtils;
-export default function pointInSurroundingSphereCallback(imageData, circlePoints, callback, viewport) {
-    const { boundsIJK, centerWorld, radiusWorld } = _getBounds(circlePoints, imageData, viewport);
-    const sphereObj = {
-        center: centerWorld,
-        radius: radiusWorld,
-    };
-    pointInShapeCallback(imageData, (pointLPS) => pointInSphere(sphereObj, pointLPS), callback, boundsIJK);
-}
-function _getBounds(circlePoints, imageData, viewport) {
-    const [bottom, top] = circlePoints;
-    const centerWorld = vec3.fromValues((bottom[0] + top[0]) / 2, (bottom[1] + top[1]) / 2, (bottom[2] + top[2]) / 2);
-    const radiusWorld = vec3.distance(bottom, top) / 2;
-    let boundsIJK;
-    if (!viewport) {
-        const centerIJK = transformWorldToIndex(imageData, centerWorld);
-        const spacings = imageData.getSpacing();
-        const minSpacing = Math.min(...spacings);
-        const maxRadiusIJK = Math.ceil(radiusWorld / minSpacing);
-        boundsIJK = [
-            [centerIJK[0] - maxRadiusIJK, centerIJK[0] + maxRadiusIJK],
-            [centerIJK[1] - maxRadiusIJK, centerIJK[1] + maxRadiusIJK],
-            [centerIJK[2] - maxRadiusIJK, centerIJK[2] + maxRadiusIJK],
-        ];
-        return {
-            boundsIJK,
-            centerWorld: centerWorld,
-            radiusWorld,
-        };
-    }
-    boundsIJK = _computeBoundsIJKWithCamera(imageData, viewport, circlePoints, centerWorld, radiusWorld);
-    return {
-        boundsIJK,
-        centerWorld: centerWorld,
-        radiusWorld,
-    };
-}
-function _computeBoundsIJKWithCamera(imageData, viewport, circlePoints, centerWorld, radiusWorld) {
-    const [bottom, top] = circlePoints;
-    const dimensions = imageData.getDimensions();
-    const camera = viewport.getCamera();
-    const viewUp = vec3.fromValues(camera.viewUp[0], camera.viewUp[1], camera.viewUp[2]);
-    const viewPlaneNormal = vec3.fromValues(camera.viewPlaneNormal[0], camera.viewPlaneNormal[1], camera.viewPlaneNormal[2]);
-    const viewRight = vec3.create();
-    vec3.cross(viewRight, viewUp, viewPlaneNormal);
-    const topLeftWorld = vec3.create();
-    const bottomRightWorld = vec3.create();
-    vec3.scaleAndAdd(topLeftWorld, top, viewPlaneNormal, radiusWorld);
-    vec3.scaleAndAdd(bottomRightWorld, bottom, viewPlaneNormal, -radiusWorld);
-    vec3.scaleAndAdd(topLeftWorld, topLeftWorld, viewRight, -radiusWorld);
-    vec3.scaleAndAdd(bottomRightWorld, bottomRightWorld, viewRight, radiusWorld);
-    const sphereCornersIJK = [
-        transformWorldToIndex(imageData, topLeftWorld),
-        (transformWorldToIndex(imageData, bottomRightWorld)),
-    ];
-    const boundsIJK = getBoundingBoxAroundShape(sphereCornersIJK, dimensions);
-    return boundsIJK;
-}

package/dist/esm/utilities/segmentation/triggerSegmentationRenderForViewports.d.ts

@@ -1,3 +0,0 @@
-declare function triggerSegmentationRenderForViewports(viewportIds?: string[]): void;
-export { triggerSegmentationRenderForViewports };
-export default triggerSegmentationRenderForViewports;

package/dist/esm/utilities/segmentation/triggerSegmentationRenderForViewports.js

@@ -1,6 +0,0 @@
-import { segmentationRenderingEngine } from '../../tools/displayTools/SegmentationRenderingEngine';
-function triggerSegmentationRenderForViewports(viewportIds) {
-    segmentationRenderingEngine.renderSegmentationsForViewports(viewportIds);
-}
-export { triggerSegmentationRenderForViewports };
-export default triggerSegmentationRenderForViewports;