@cornerstonejs/tools 1.42.0 → 1.42.1

package/src/types/LabelmapTypes.ts

@@ -42,11 +42,8 @@ export type LabelmapSegmentationDataVolume = {
 
 export type LabelmapSegmentationDataStack = {
   /**
-   * This is a Map from referenced imageId to the segmentation (Derived) imageId that
-   * has been used to create the derived labelmap.
-   * Todo: later I guess we can have it as Record<string, metadata> where metadata
-   * can contain a derived image arbitrary information, for use cases such that the labelmap is
-   * derived from another image that is irrelevant to the current viewport.
+   * This is a Map from referenced imageId to the segmentation (Derived) imageIds (can be
+   * multiple) that are associated with it.
    */
   imageIdReferenceMap: Map<string, string>;
 };

package/src/utilities/index.ts

@@ -1,3 +1,5 @@
+import { utilities } from '@cornerstonejs/core';
+
 import {
   getAnnotationNearPoint,
   getAnnotationNearPointOnEnabledElement,
@@ -21,7 +23,6 @@ import jumpToSlice from './viewport/jumpToSlice';
 import pointInShapeCallback from './pointInShapeCallback';
 import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
 import scroll from './scroll';
-import roundNumber from './roundNumber';
 import { pointToString } from './pointToString';
 import annotationFrameRange from './annotationFrameRange';
 
@@ -44,6 +45,8 @@ import * as dynamicVolume from './dynamicVolume';
 import * as polyDataUtils from './polyData/utils';
 import * as voi from './voi';
 
+const roundNumber = utilities.roundNumber;
+
 // Events
 import { triggerEvent } from '@cornerstonejs/core';
 

package/src/utilities/segmentation/createImageIdReferenceMap.ts

@@ -0,0 +1,23 @@
+/**
+ * Creates a map that associates each imageId with a set of segmentation imageIds.
+ * Note that this function assumes that the imageIds and segmentationImageIds arrays
+ * are the same length and same order.
+ *
+ * @param imageIdsArray - An array of imageIds.
+ * @param segmentationImageIds - An array of segmentation imageIds.
+ * @returns A map that maps each imageId to a set of segmentation imageIds.
+ */
+function createImageIdReferenceMap(
+  imageIdsArray: string[],
+  segmentationImageIds: string[]
+): Map<string, string> {
+  const imageIdReferenceMap = new Map<string, string>(
+    imageIdsArray.map((imageId, index) => {
+      return [imageId, segmentationImageIds[index]];
+    })
+  );
+
+  return imageIdReferenceMap;
+}
+
+export { createImageIdReferenceMap };

package/src/utilities/segmentation/index.ts

@@ -15,6 +15,7 @@ import {
   setBrushThresholdForToolGroup,
 } from './brushThresholdForToolGroup';
 import thresholdSegmentationByRange from './thresholdSegmentationByRange';
+import { createImageIdReferenceMap } from './createImageIdReferenceMap';
 import contourAndFindLargestBidirectional from './contourAndFindLargestBidirectional';
 import createBidirectionalToolData from './createBidirectionalToolData';
 import segmentContourAction from './segmentContourAction';
@@ -33,6 +34,7 @@ export {
   getBrushThresholdForToolGroup,
   setBrushThresholdForToolGroup,
   thresholdSegmentationByRange,
+  createImageIdReferenceMap,
   contourAndFindLargestBidirectional,
   createBidirectionalToolData,
   segmentContourAction,

package/src/utilities/segmentation/thresholdSegmentationByRange.ts

@@ -64,7 +64,7 @@ function thresholdSegmentationByRange(
 }
 
 function _handleDifferentSizeVolume(
-  scalarData: Types.VolumeScalarData,
+  scalarData: Types.PixelDataTypedArray,
   segmentationIndex: number,
   volumeInfo: any,
   volumeInfoList: any,
@@ -112,7 +112,7 @@ function _handleDifferentSizeVolume(
 }
 
 function _handleSameSizeVolume(
-  scalarData: Types.VolumeScalarData,
+  scalarData: Types.PixelDataTypedArray,
   segmentationIndex: number,
   volumeInfo: any
 ) {

package/src/utilities/segmentation/triggerSegmentationRender.ts

@@ -113,18 +113,23 @@ class SegmentationRenderingEngine {
     }
 
     const { viewportsInfo } = toolGroup;
-    const viewports = [];
 
-    viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
-      const renderingEngine = getRenderingEngine(renderingEngineId);
+    const viewports = viewportsInfo
+      .map(({ viewportId, renderingEngineId }) => {
+        const renderingEngine = getRenderingEngine(renderingEngineId);
 
-      if (!renderingEngine) {
-        console.warn('rendering Engine has been destroyed');
-        return;
-      }
+        if (!renderingEngine) {
+          console.warn('rendering Engine has been destroyed');
+          return;
+        }
 
-      viewports.push(renderingEngine.getViewport(viewportId));
-    });
+        const viewport = renderingEngine.getViewport(viewportId);
+
+        if (viewport) {
+          return viewport;
+        }
+      })
+      .filter(Boolean);
 
     const segmentationDisplayToolInstance = toolGroup.getToolInstance(
       SegmentationDisplayTool.toolName
@@ -173,7 +178,7 @@ class SegmentationRenderingEngine {
     viewports.forEach(({ element }) => {
       element.addEventListener(
         Enums.Events.IMAGE_RENDERED,
-        onSegmentationRender
+        onSegmentationRender as EventListener
       );
     });
 

package/src/utilities/stackPrefetch/stackContextPrefetch.ts

@@ -14,7 +14,7 @@ import {
   clearFromImageIds,
   getPromiseRemovedHandler,
 } from './stackPrefetchUtils';
-import roundNumber from '../roundNumber';
+import { roundNumber } from '../../utilities';
 
 let configuration = {
   maxImagesToPrefetch: Infinity,

package/src/utilities/stackPrefetch/stackPrefetchUtils.ts

@@ -52,9 +52,13 @@ export function getStackData(element) {
   const { viewport } = enabledElement;
 
   if (!(viewport instanceof StackViewport)) {
-    throw new Error(
+    // we shouldn't throw error here, since the viewport might have
+    // changed from stack to volume during prefetch
+    console.warn(
       'stackPrefetch: element must be a StackViewport, VolumeViewport stackPrefetch not yet implemented'
     );
+
+    return null;
   }
 
   return {

package/dist/cjs/utilities/roundNumber.d.ts

@@ -1,2 +0,0 @@
-declare function roundNumber(value: string | number | (string | number)[], precision?: number): string;
-export default roundNumber;

package/dist/cjs/utilities/roundNumber.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function roundNumber(value, precision = 2) {
-    if (Array.isArray(value)) {
-        return value.map((v) => roundNumber(v, precision)).join(', ');
-    }
-    if (value === undefined || value === null || value === '') {
-        return 'NaN';
-    }
-    value = Number(value);
-    if (value < 0.0001) {
-        return `${value}`;
-    }
-    const fixedPrecision = value >= 100
-        ? precision - 2
-        : value >= 10
-            ? precision - 1
-            : value >= 1
-                ? precision
-                : value >= 0.1
-                    ? precision + 1
-                    : value >= 0.01
-                        ? precision + 2
-                        : value >= 0.001
-                            ? precision + 3
-                            : precision + 4;
-    return value.toFixed(fixedPrecision);
-}
-exports.default = roundNumber;
-//# sourceMappingURL=roundNumber.js.map

package/dist/cjs/utilities/roundNumber.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":";;AAYA,SAAS,WAAW,CAClB,KAA4C,EAC5C,SAAS,GAAG,CAAC;IAEb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC/D;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM,EAAE;QAClB,OAAO,GAAG,KAAK,EAAE,CAAC;KACnB;IACD,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,kBAAe,WAAW,CAAC"}

package/dist/esm/utilities/roundNumber.js

@@ -1,28 +0,0 @@
-function roundNumber(value, precision = 2) {
-    if (Array.isArray(value)) {
-        return value.map((v) => roundNumber(v, precision)).join(', ');
-    }
-    if (value === undefined || value === null || value === '') {
-        return 'NaN';
-    }
-    value = Number(value);
-    if (value < 0.0001) {
-        return `${value}`;
-    }
-    const fixedPrecision = value >= 100
-        ? precision - 2
-        : value >= 10
-            ? precision - 1
-            : value >= 1
-                ? precision
-                : value >= 0.1
-                    ? precision + 1
-                    : value >= 0.01
-                        ? precision + 2
-                        : value >= 0.001
-                            ? precision + 3
-                            : precision + 4;
-    return value.toFixed(fixedPrecision);
-}
-export default roundNumber;
-//# sourceMappingURL=roundNumber.js.map

package/dist/esm/utilities/roundNumber.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":"AAYA,SAAS,WAAW,CAClB,KAA4C,EAC5C,SAAS,GAAG,CAAC;IAEb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC/D;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM,EAAE;QAClB,OAAO,GAAG,KAAK,EAAE,CAAC;KACnB;IACD,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,eAAe,WAAW,CAAC"}

package/dist/types/utilities/roundNumber.d.ts

@@ -1,3 +0,0 @@
-declare function roundNumber(value: string | number | (string | number)[], precision?: number): string;
-export default roundNumber;
-//# sourceMappingURL=roundNumber.d.ts.map

package/dist/types/utilities/roundNumber.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"roundNumber.d.ts","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":"AAYA,iBAAS,WAAW,CAClB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAC5C,SAAS,SAAI,GACZ,MAAM,CA0BR;AAED,eAAe,WAAW,CAAC"}

package/src/utilities/roundNumber.ts

@@ -1,44 +0,0 @@
-/**
- * Truncates decimal points to that there is at least 1+precision significant
- * digits.
- *
- * For example, with the default precision 2 (3 significant digits)
- * * Values larger than 100 show no information after the decimal point
- * * Values between 10 and 99 show 1 decimal point
- * * Values between 1 and 9 show 2 decimal points
- *
- * @param value - to return a fixed measurement value from
- * @param precision - defining how many digits after 1..9 are desired
- */
-function roundNumber(
-  value: string | number | (string | number)[],
-  precision = 2
-): string {
-  if (Array.isArray(value)) {
-    return value.map((v) => roundNumber(v, precision)).join(', ');
-  }
-  if (value === undefined || value === null || value === '') {
-    return 'NaN';
-  }
-  value = Number(value);
-  if (value < 0.0001) {
-    return `${value}`;
-  }
-  const fixedPrecision =
-    value >= 100
-      ? precision - 2
-      : value >= 10
-      ? precision - 1
-      : value >= 1
-      ? precision
-      : value >= 0.1
-      ? precision + 1
-      : value >= 0.01
-      ? precision + 2
-      : value >= 0.001
-      ? precision + 3
-      : precision + 4;
-  return value.toFixed(fixedPrecision);
-}
-
-export default roundNumber;