@cornerstonejs/tools 1.66.4 → 1.66.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.66.4",
+  "version": "1.66.5",
   "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.4",
+    "@cornerstonejs/core": "^1.66.5",
     "@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": "4d12d9d2ecf38805e7c9ca7e93bf36372bfe85ff"
+  "gitHead": "23c01d5231da3a5283a0d042e4eb5abac3aed44e"
 }

package/src/tools/WindowLevelTool.ts

@@ -8,6 +8,7 @@ import {
   Types,
 } from '@cornerstonejs/core';
 import { EventTypes } from '../types';
+import { getVolumeId } from '../utilities/getVolumeId';
 
 // Todo: should move to configuration
 const DEFAULT_MULTIPLIER = 4;
@@ -51,7 +52,7 @@ class WindowLevelTool extends BaseTool {
     const properties = viewport.getProperties();
     if (viewport instanceof VolumeViewport) {
       const targetId = this.getTargetId(viewport as Types.IVolumeViewport);
-      volumeId = targetId.split(/volumeId:|\?/)[1];
+      volumeId = getVolumeId(targetId);
       viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/segmentation/CircleROIStartEndThresholdTool.ts

@@ -46,6 +46,7 @@ import {
 } from '../../utilities/math/circle';
 import { pointInEllipse } from '../../utilities/math/ellipse';
 import { pointInShapeCallback } from '../../utilities';
+import { getVolumeId } from '../../utilities/getVolumeId';
 
 const { transformWorldToIndex } = csUtils;
 
@@ -111,7 +112,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
       throw new Error('Stack Viewport Not implemented');
     } else {
       const targetId = this.getTargetId(viewport);
-      volumeId = targetId.split(/volumeId:|\?/)[1];
+      volumeId = getVolumeId(targetId);
       imageVolume = cache.getVolume(volumeId);
 
       referencedImageId = csUtils.getClosestImageId(

package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts

@@ -39,6 +39,7 @@ 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;
 
@@ -111,7 +112,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
       throw new Error('Stack Viewport Not implemented');
     } else {
       const targetId = this.getTargetId(viewport);
-      volumeId = targetId.split(/volumeId:|\?/)[1];
+      volumeId = getVolumeId(targetId);
       imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,

package/src/tools/segmentation/RectangleROIThresholdTool.ts

@@ -27,6 +27,7 @@ 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,
@@ -87,7 +88,7 @@ class RectangleROIThresholdTool extends RectangleROITool {
     if (viewport instanceof StackViewport) {
       referencedImageId = targetId.split('imageId:')[1];
     } else {
-      volumeId = targetId.split(/volumeId:|\?/)[1];
+      volumeId = getVolumeId(targetId);
       const imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,

package/src/utilities/index.ts

@@ -48,6 +48,7 @@ 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;
 
@@ -70,6 +71,7 @@ export {
   getCalibratedLengthUnits,
   getCalibratedAreaUnits,
   getCalibratedScale,
+  getVolumeId,
   segmentation,
   contours,
   triggerAnnotationRenderForViewportIds,