@cornerstonejs/tools 1.66.5 → 1.66.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.66.5",
+  "version": "1.66.7",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.66.5",
+    "@cornerstonejs/core": "^1.66.7",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "23c01d5231da3a5283a0d042e4eb5abac3aed44e"
+  "gitHead": "7e318e04ab84565f2365252b6dc5a78ca1f0bb52"
 }

package/src/drawingSvg/drawArrow.ts

@@ -17,7 +17,7 @@ export default function drawArrow(
 
   const { color, width, lineWidth, lineDash } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       width: '2',
       lineWidth: undefined,
       lineDash: undefined,

package/src/drawingSvg/drawCircle.ts

@@ -25,7 +25,7 @@ function drawCircle(
     strokeOpacity,
   } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       fill: 'transparent',
       width: '2',
       lineDash: undefined,

package/src/drawingSvg/drawEllipseByCoordinates.ts

@@ -15,7 +15,7 @@ function drawEllipseByCoordinates(
 ): void {
   const { color, width, lineWidth, lineDash } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       width: '2',
       lineWidth: undefined,
       lineDash: undefined,

package/src/drawingSvg/drawHandle.ts

@@ -16,7 +16,7 @@ function drawHandle(
   const { color, handleRadius, width, lineWidth, fill, type, opacity } =
     Object.assign(
       {
-        color: 'dodgerblue',
+        color: 'rgb(0, 255, 0)',
         handleRadius: '6',
         width: '2',
         lineWidth: undefined,

package/src/drawingSvg/drawLine.ts

@@ -21,7 +21,7 @@ export default function drawLine(
 
   const { color, width, lineWidth, lineDash, shadow } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       width: '2',
       lineWidth: undefined,
       lineDash: undefined,

package/src/drawingSvg/drawPath.ts

@@ -32,7 +32,7 @@ export default function drawPath(
 
   const pointsArrays = hasSubArrays ? points : [points];
   const {
-    color = 'dodgerblue',
+    color = 'rgb(0, 255, 0)',
     width = 10,
     fillColor = 'none',
     fillOpacity = 0,

package/src/drawingSvg/drawPolyline.ts

@@ -30,7 +30,7 @@ export default function drawPolyline(
   }
 
   const {
-    color = 'dodgerblue',
+    color = 'rgb(0, 255, 0)',
     width = 10,
     fillColor = 'none',
     fillOpacity = 0,

package/src/drawingSvg/drawRect.ts

@@ -22,7 +22,7 @@ export default function drawRect(
     lineDash,
   } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       width: '2',
       lineWidth: undefined,
       lineDash: undefined,

package/src/drawingSvg/drawRedactionRect.ts

@@ -18,7 +18,7 @@ export default function drawRedactionRect(
     lineDash,
   } = Object.assign(
     {
-      color: 'dodgerblue',
+      color: 'rgb(0, 255, 0)',
       width: '2',
       lineWidth: undefined,
       lineDash: undefined,

package/src/tools/MIPJumpToClickTool.ts

@@ -1,11 +1,10 @@
 import { BaseTool } from './base';
 import { getEnabledElement, VolumeViewport } from '@cornerstonejs/core';
-import type { Types } from '@cornerstonejs/core';
+import { type Types, utilities } from '@cornerstonejs/core';
 import { getPointInLineOfSightWithCriteria } from '../utilities/planar';
 import jumpToWorld from '../utilities/viewport/jumpToWorld';
 import { PublicToolProps, ToolProps } from '../types';
 import { getToolGroupForViewport } from '../store/ToolGroupManager';
-import { getVolumeId } from '../utilities/getVolumeId';
 
 /**
  * On a Maximum Intensity Projection (MIP) viewport, MIPJumpToClickTool allows the
@@ -55,7 +54,7 @@ class MIPJumpToClickTool extends BaseTool {
       );
     }
 
-    const volumeId = getVolumeId(targetId);
+    const volumeId = utilities.getVolumeId(targetId);
 
     // 3. Criteria function to search for the point (maximum intensity)
     let maxIntensity = -Infinity;

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -1,8 +1,7 @@
-import { getEnabledElement } from '@cornerstonejs/core';
+import { getEnabledElement, utilities } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { MouseWheelEventType } from '../types/EventTypes';
 import scroll from '../utilities/scroll';
-import { getVolumeId } from '../utilities/getVolumeId';
 
 /**
  * The StackScrollMouseWheelTool is a tool that allows the user to scroll through a
@@ -36,7 +35,7 @@ class StackScrollMouseWheelTool extends BaseTool {
     const delta = direction * (invert ? -1 : 1);
 
     const targetId = this.getTargetId(viewport);
-    const volumeId = getVolumeId(targetId);
+    const volumeId = utilities.getVolumeId(targetId);
 
     scroll(viewport, {
       delta,

package/src/tools/WindowLevelTool.ts

@@ -2,13 +2,11 @@ import { BaseTool } from './base';
 import {
   getEnabledElement,
   VolumeViewport,
-  StackViewport,
-  utilities,
   cache,
   Types,
+  utilities,
 } from '@cornerstonejs/core';
 import { EventTypes } from '../types';
-import { getVolumeId } from '../utilities/getVolumeId';
 
 // Todo: should move to configuration
 const DEFAULT_MULTIPLIER = 4;
@@ -52,7 +50,7 @@ class WindowLevelTool extends BaseTool {
     const properties = viewport.getProperties();
     if (viewport instanceof VolumeViewport) {
       const targetId = this.getTargetId(viewport as Types.IVolumeViewport);
-      volumeId = getVolumeId(targetId);
+      volumeId = utilities.getVolumeId(targetId);
       viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/base/AnnotationDisplayTool.ts

@@ -15,7 +15,6 @@ import filterAnnotationsForDisplay from '../../utilities/planar/filterAnnotation
 import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 import { getState } from '../../stateManagement/annotation/config';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 /**
  * Abstract class for tools which create and display annotations on the
@@ -138,7 +137,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
     } else if (viewport instanceof VideoViewport) {
       referencedImageId = targetId.split('videoId:')[1];
     } else {
-      const volumeId = getVolumeId(targetId);
+      const volumeId = utilities.getVolumeId(targetId);
       const imageVolume = cache.getVolume(volumeId);
 
       referencedImageId = utilities.getClosestImageId(

package/src/tools/base/AnnotationTool.ts

@@ -24,7 +24,6 @@ import {
 import { addAnnotation } from '../../stateManagement/annotation/annotationState';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
 import { triggerAnnotationModified } from '../../stateManagement/annotation/helpers/state';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 /**
  * Abstract class for tools which create and display annotations on the
@@ -369,7 +368,7 @@ abstract class AnnotationTool extends AnnotationDisplayTool {
     imageId?: string
   ): boolean {
     if (viewport instanceof BaseVolumeViewport) {
-      const volumeId = getVolumeId(targetId);
+      const volumeId = csUtils.getVolumeId(targetId);
       const volume = cache.getVolume(volumeId);
       return volume.scaling?.PT !== undefined;
     }

package/src/tools/base/BaseTool.ts

@@ -3,7 +3,6 @@ import { Types } from '@cornerstonejs/core';
 import ToolModes from '../../enums/ToolModes';
 import StrategyCallbacks from '../../enums/StrategyCallbacks';
 import { InteractionTypes, ToolProps, PublicToolProps } from '../../types';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 export interface IBaseTool {
   /** ToolGroup ID the tool instance belongs to */
@@ -209,7 +208,7 @@ abstract class BaseTool implements IBaseTool {
 
       return viewports[0].getImageData();
     } else if (targetId.startsWith('volumeId:')) {
-      const volumeId = getVolumeId(targetId);
+      const volumeId = utilities.getVolumeId(targetId);
       const viewports = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/segmentation/CircleROIStartEndThresholdTool.ts

@@ -46,7 +46,6 @@ import {
 } from '../../utilities/math/circle';
 import { pointInEllipse } from '../../utilities/math/ellipse';
 import { pointInShapeCallback } from '../../utilities';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 const { transformWorldToIndex } = csUtils;
 
@@ -97,7 +96,6 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
     const eventDetail = evt.detail;
     const { currentPoints, element } = eventDetail;
     const worldPos = currentPoints.world;
-    const canvasPos = currentPoints.canvas;
 
     const enabledElement = getEnabledElement(element);
     const { viewport, renderingEngine } = enabledElement;
@@ -112,7 +110,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
       throw new Error('Stack Viewport Not implemented');
     } else {
       const targetId = this.getTargetId(viewport);
-      volumeId = getVolumeId(targetId);
+      volumeId = csUtils.getVolumeId(targetId);
       imageVolume = cache.getVolume(volumeId);
 
       referencedImageId = csUtils.getClosestImageId(

package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts

@@ -39,7 +39,6 @@ import { RectangleROIStartEndThresholdAnnotation } from '../../types/ToolSpecifi
 import RectangleROITool from '../annotation/RectangleROITool';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
 import { pointInShapeCallback } from '../../utilities/';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 const { transformWorldToIndex } = csUtils;
 
@@ -112,7 +111,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
       throw new Error('Stack Viewport Not implemented');
     } else {
       const targetId = this.getTargetId(viewport);
-      volumeId = getVolumeId(targetId);
+      volumeId = csUtils.getVolumeId(targetId);
       imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,

package/src/tools/segmentation/RectangleROIThresholdTool.ts

@@ -27,7 +27,6 @@ import {
 import { RectangleROIThresholdAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 import RectangleROITool from '../annotation/RectangleROITool';
 import { StyleSpecifier } from '../../types/AnnotationStyle';
-import { getVolumeId } from '../../utilities/getVolumeId';
 
 /**
  * This tool is exactly the RectangleROITool but only draws a rectangle on the image,
@@ -88,7 +87,7 @@ class RectangleROIThresholdTool extends RectangleROITool {
     if (viewport instanceof StackViewport) {
       referencedImageId = targetId.split('imageId:')[1];
     } else {
-      volumeId = getVolumeId(targetId);
+      volumeId = csUtils.getVolumeId(targetId);
       const imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,

package/src/utilities/index.ts

@@ -48,7 +48,6 @@ import * as dynamicVolume from './dynamicVolume';
 import * as polyDataUtils from './polyData/utils';
 import * as voi from './voi';
 import * as contourSegmentation from './contourSegmentation';
-import { getVolumeId } from './getVolumeId';
 
 const roundNumber = utilities.roundNumber;
 
@@ -71,7 +70,6 @@ export {
   getCalibratedLengthUnits,
   getCalibratedAreaUnits,
   getCalibratedScale,
-  getVolumeId,
   segmentation,
   contours,
   triggerAnnotationRenderForViewportIds,

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

@@ -1 +0,0 @@
-export declare const getVolumeId: (targetId: string) => string;

package/dist/cjs/utilities/getVolumeId.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVolumeId = void 0;
-const getVolumeId = (targetId) => {
-    const prefix = 'volumeId:';
-    const str = targetId.includes(prefix)
-        ? targetId.substring(prefix.length)
-        : targetId;
-    if (str.startsWith('nifti:')) {
-        return str;
-    }
-    const index = str.indexOf('?');
-    return index === -1 ? str : str.substring(0, index);
-};
-exports.getVolumeId = getVolumeId;
-//# sourceMappingURL=getVolumeId.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getVolumeId.js","sourceRoot":"","sources":["../../../src/utilities/getVolumeId.ts"],"names":[],"mappings":";;;AAAO,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,WAAW,CAAC;IAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC;IAEb,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB"}

package/dist/esm/utilities/getVolumeId.js

@@ -1,12 +0,0 @@
-export const getVolumeId = (targetId) => {
-    const prefix = 'volumeId:';
-    const str = targetId.includes(prefix)
-        ? targetId.substring(prefix.length)
-        : targetId;
-    if (str.startsWith('nifti:')) {
-        return str;
-    }
-    const index = str.indexOf('?');
-    return index === -1 ? str : str.substring(0, index);
-};
-//# sourceMappingURL=getVolumeId.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getVolumeId.js","sourceRoot":"","sources":["../../../src/utilities/getVolumeId.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,WAAW,CAAC;IAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC;IAEb,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC,CAAC"}

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

@@ -1,2 +0,0 @@
-export declare const getVolumeId: (targetId: string) => string;
-//# sourceMappingURL=getVolumeId.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getVolumeId.d.ts","sourceRoot":"","sources":["../../../src/utilities/getVolumeId.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,aAAc,MAAM,WAY3C,CAAC"}

package/src/utilities/getVolumeId.ts

@@ -1,13 +0,0 @@
-export const getVolumeId = (targetId: string) => {
-  const prefix = 'volumeId:';
-  const str = targetId.includes(prefix)
-    ? targetId.substring(prefix.length)
-    : targetId;
-
-  if (str.startsWith('nifti:')) {
-    return str;
-  }
-
-  const index = str.indexOf('?');
-  return index === -1 ? str : str.substring(0, index);
-};