@cornerstonejs/tools 2.18.3 → 2.18.4

package/dist/esm/tools/segmentation/strategies/BrushStrategy.d.ts

@@ -67,7 +67,13 @@ export default class BrushStrategy {
             }) => import("../../../types").NamedStatistics;
         };
         labelmapInterpolation: {
-            interpolate: (operationData: InitializedOperationData, configuration: import("@itk-wasm/morphological-contour-interpolation").MorphologicalContourInterpolationOptions) => InitializedOperationData;
+            interpolate: (operationData: InitializedOperationData, configuration: {
+                label?: number;
+                axis?: number;
+                noHeuristicAlignment?: boolean;
+                noUseDistanceTransform?: boolean;
+                useCustomSlicePositions?: boolean;
+            }) => Promise<InitializedOperationData>;
         };
     };
     protected static childFunctions: {

package/dist/esm/tools/segmentation/strategies/compositions/index.d.ts

@@ -38,7 +38,13 @@ declare const _default: {
         }) => import("../../../../types").NamedStatistics;
     };
     labelmapInterpolation: {
-        interpolate: (operationData: import("../BrushStrategy").InitializedOperationData, configuration: import("@itk-wasm/morphological-contour-interpolation").MorphologicalContourInterpolationOptions) => import("../BrushStrategy").InitializedOperationData;
+        interpolate: (operationData: import("../BrushStrategy").InitializedOperationData, configuration: {
+            label?: number;
+            axis?: number;
+            noHeuristicAlignment?: boolean;
+            noUseDistanceTransform?: boolean;
+            useCustomSlicePositions?: boolean;
+        }) => Promise<import("../BrushStrategy").InitializedOperationData>;
     };
 };
 export default _default;

package/dist/esm/tools/segmentation/strategies/compositions/labelmapInterpolation.d.ts

@@ -1,6 +1,12 @@
-import type { MorphologicalContourInterpolationOptions } from '@itk-wasm/morphological-contour-interpolation';
 import type { InitializedOperationData } from '../BrushStrategy';
+type MorphologicalContourInterpolationOptions = {
+    label?: number;
+    axis?: number;
+    noHeuristicAlignment?: boolean;
+    noUseDistanceTransform?: boolean;
+    useCustomSlicePositions?: boolean;
+};
 declare const _default: {
-    interpolate: (operationData: InitializedOperationData, configuration: MorphologicalContourInterpolationOptions) => InitializedOperationData;
+    interpolate: (operationData: InitializedOperationData, configuration: MorphologicalContourInterpolationOptions) => Promise<InitializedOperationData>;
 };
 export default _default;

package/dist/esm/tools/segmentation/strategies/compositions/labelmapInterpolation.js

@@ -1,12 +1,10 @@
-import { morphologicalContourInterpolation } from '@itk-wasm/morphological-contour-interpolation';
-import { utilities } from '@cornerstonejs/core';
+import { utilities, peerImport } from '@cornerstonejs/core';
 import StrategyCallbacks from '../../../../enums/StrategyCallbacks';
 import getItkImage from '../utils/getItkImage';
 import { triggerSegmentationDataModified } from '../../../../stateManagement/segmentation/triggerSegmentationEvents';
 import PreviewMethods from './preview';
-const { VoxelManager } = utilities;
 export default {
-    [StrategyCallbacks.Interpolate]: (operationData, configuration) => {
+    [StrategyCallbacks.Interpolate]: async (operationData, configuration) => {
         const { segmentationImageData, segmentIndex, preview, segmentationVoxelManager, previewSegmentIndex, previewVoxelManager, } = operationData;
         if (preview) {
             const callback = ({ index }) => {
@@ -15,7 +13,18 @@ export default {
             previewVoxelManager.forEach(callback);
         }
         const inputImage = getItkImage(segmentationImageData, 'interpolation');
-        const outputPromise = morphologicalContourInterpolation(inputImage, {
+        let itkModule;
+        try {
+            itkModule = await peerImport('@itk-wasm/morphological-contour-interpolation');
+            if (!itkModule) {
+                throw new Error('Module not found');
+            }
+        }
+        catch (error) {
+            console.debug("Warning: '@itk-wasm/morphological-contour-interpolation' module not found. Please install it separately.");
+            return operationData;
+        }
+        const outputPromise = itkModule.morphologicalContourInterpolation(inputImage, {
             ...configuration,
             label: segmentIndex,
             webWorker: false,

package/dist/esm/workers/polySegConverters.js

@@ -2,7 +2,6 @@ import { expose } from 'comlink';
 import { utilities } from '@cornerstonejs/core';
 import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
 import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
-import ICRPolySeg from '@icr/polyseg-wasm';
 import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
 import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
 import vtkContourLoopExtraction from '@kitware/vtk.js/Filters/General/ContourLoopExtraction';
@@ -15,6 +14,15 @@ const polySegConverters = {
     polySegInitializing: false,
     polySegInitializingPromise: null,
     async initializePolySeg(progressCallback) {
+        let ICRPolySeg;
+        try {
+            ICRPolySeg = (await import('@icr/polyseg-wasm')).default;
+        }
+        catch (error) {
+            console.error(error);
+            console.debug("Warning: '@icr/polyseg-wasm' module not found. Please install it separately.");
+            return;
+        }
         if (this.polySegInitializing) {
             await this.polySegInitializingPromise;
             return;
@@ -51,10 +59,7 @@ const polySegConverters = {
     },
     async convertContourToVolumeLabelmap(args, ...callbacks) {
         const [progressCallback] = callbacks;
-        const polySeg = await new ICRPolySeg();
-        await polySeg.initialize({
-            updateProgress: progressCallback,
-        });
+        await this.initializePolySeg(progressCallback);
         const { segmentIndices, scalarData, annotationUIDsInSegmentMap, dimensions, origin, direction, spacing, } = args;
         const segmentationVoxelManager = utilities.VoxelManager.createScalarVolumeVoxelManager({
             dimensions,
@@ -124,10 +129,7 @@ const polySegConverters = {
     },
     async convertContourToStackLabelmap(args, ...callbacks) {
         const [progressCallback] = callbacks;
-        const polySeg = await new ICRPolySeg();
-        await polySeg.initialize({
-            updateProgress: progressCallback,
-        });
+        await this.initializePolySeg(progressCallback);
         const { segmentationsInfo, annotationUIDsInSegmentMap, segmentIndices } = args;
         const segmentationVoxelManagers = new Map();
         segmentationsInfo.forEach((segmentationInfo, referencedImageId) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.18.3",
+  "version": "2.18.4",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -104,7 +104,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.18.3",
+    "@cornerstonejs/core": "^2.18.4",
     "@kitware/vtk.js": "32.9.0",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -123,5 +123,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "cc92461656c37883686759ab4b495219046f4be7"
+  "gitHead": "6649bfeca6a7b2b094062edae63b17972ac38352"
 }