@cornerstonejs/tools 1.41.0 → 1.42.1

package/src/utilities/segmentation/segmentContourAction.ts

@@ -0,0 +1,169 @@
+import { getEnabledElement, type Types } from '@cornerstonejs/core';
+
+import type { Annotation } from '../../types/AnnotationTypes';
+import * as segmentation from '../../stateManagement/segmentation';
+import {
+  state as annotationState,
+  config as annotationConfig,
+} from '../../stateManagement/annotation';
+import { jumpToSlice } from '../viewport';
+import contourAndFindLargestBidirectional from './contourAndFindLargestBidirectional';
+import createBidirectionalToolData from './createBidirectionalToolData';
+import BidirectionalTool from '../../tools/annotation/BidirectionalTool';
+
+export type Segment = {
+  segmentationId: string;
+  segmentIndex: number;
+  label: string;
+
+  style?: any;
+  containedSegmentIndices?: (number) => boolean;
+};
+
+export type SegmentContourActionConfiguration = {
+  getSegment?: (
+    enabledElement: Types.IEnabledElement,
+    configuration: SegmentContourActionConfiguration
+  ) => Segment;
+
+  /**
+   * Optional map for data about each segment
+   */
+  segmentationId?: string;
+  segmentIndex?: number;
+  segmentData?: Map<number, Segment>;
+  toolGroupId?: string;
+};
+
+export default function segmentContourAction(
+  element: HTMLDivElement,
+  configuration
+) {
+  const { data: configurationData } = configuration;
+  const enabledElement = getEnabledElement(element);
+  const segment = (configurationData.getSegment || defaultGetSegment)(
+    enabledElement,
+    configurationData
+  );
+  if (!segment) {
+    return;
+  }
+  const FrameOfReferenceUID = enabledElement.viewport.getFrameOfReferenceUID();
+  const segmentationsList = segmentation.state.getSegmentations();
+  const { segmentIndex, segmentationId } = segment;
+  const bidirectionals = annotationState.getAnnotations(
+    this.toolName || BidirectionalTool.toolName,
+    FrameOfReferenceUID
+  );
+  let hasExistingActiveSegment = false;
+  const existingLargestBidirectionals = bidirectionals.filter(
+    (existingBidirectionalItem) => {
+      const { segment } = existingBidirectionalItem.data;
+      if (!segment) {
+        return;
+      }
+      if (
+        segment.segmentationId === segmentationId &&
+        segment.segmentIndex === segmentIndex
+      ) {
+        hasExistingActiveSegment = true;
+        existingBidirectionalItem.data.segment = segment;
+      }
+      return !!segment;
+    }
+  );
+  if (!hasExistingActiveSegment) {
+    // Just create a dummy annotation object containing just enough information
+    // to create a real one.
+    existingLargestBidirectionals.push({
+      data: { segment },
+    } as unknown as Annotation);
+  }
+
+  let newBidirectional;
+  existingLargestBidirectionals.forEach((existingLargestBidirectional) => {
+    const segments = [];
+    const { segment: updateSegment } = existingLargestBidirectional.data;
+    const { segmentIndex, segmentationId } = updateSegment;
+    segments[segmentIndex] = updateSegment;
+    annotationState.removeAnnotation(
+      existingLargestBidirectional.annotationUID
+    );
+    const bidirectionalData = contourAndFindLargestBidirectional({
+      ...segmentationsList.find(
+        (segmentation) => segmentation.segmentationId === segmentationId
+      ),
+      segments,
+    });
+
+    if (!bidirectionalData) {
+      return;
+    }
+    const bidirectionalToolData = createBidirectionalToolData(
+      bidirectionalData,
+      enabledElement.viewport
+    );
+    bidirectionalToolData.annotationUID =
+      existingLargestBidirectional.annotationUID;
+    bidirectionalToolData.data.segment = updateSegment;
+
+    const annotationUID = annotationState.addAnnotation(
+      bidirectionalToolData,
+      FrameOfReferenceUID
+    );
+
+    if (
+      updateSegment.segmentIndex === segment.segmentIndex &&
+      updateSegment.segmentationId === segment.segmentationId
+    ) {
+      newBidirectional = bidirectionalData;
+      const { style } = segment;
+      if (style) {
+        annotationConfig.style.setAnnotationStyles(annotationUID, style);
+      }
+    }
+  });
+
+  if (newBidirectional) {
+    const { referencedImageId } = newBidirectional;
+    const imageIds = enabledElement.viewport.getImageIds();
+    const imageIndex = imageIds.findIndex(
+      (imageId) => imageId === referencedImageId
+    );
+
+    // TODO - figure out why this is reversed
+    jumpToSlice(element, {
+      imageIndex: imageIds.length - 1 - imageIndex,
+    });
+    enabledElement.viewport.render();
+  } else {
+    console.warn('No bidirectional found');
+  }
+
+  return newBidirectional;
+}
+
+export function defaultGetSegment(
+  enabledElement: Types.IEnabledElement,
+  configuration: SegmentContourActionConfiguration
+): Segment {
+  const segmentationsList = segmentation.state.getSegmentations();
+  if (!segmentationsList.length) {
+    return;
+  }
+  const segmentationId =
+    configuration.segmentationId || segmentationsList[0].segmentationId;
+  const segmentIndex =
+    configuration.segmentIndex ??
+    segmentation.segmentIndex.getActiveSegmentIndex(segmentationId);
+  if (!segmentIndex) {
+    return;
+  }
+  const segmentData = configuration.segmentData?.get(segmentIndex);
+  return {
+    label: `Segment ${segmentIndex}`,
+    segmentIndex,
+    segmentationId,
+    ...segmentData,
+  };
+}

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;