@cornerstonejs/tools 1.45.1 → 1.47.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.45.1",
+  "version": "1.47.0",
   "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.45.1",
+    "@cornerstonejs/core": "^1.47.0",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
@@ -53,5 +53,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "acd22f0138a44d468688195e5f074dd6932e57ba"
+  "gitHead": "b1235a2e36cda555341dfbd164ef45e519c4efd5"
 }

package/src/tools/MIPJumpToClickTool.ts

@@ -54,7 +54,7 @@ class MIPJumpToClickTool extends BaseTool {
       );
     }
 
-    const volumeId = targetId.split('volumeId:')[1];
+    const volumeId = targetId.split(/volumeId:|\?/)[1];
 
     // 3. Criteria function to search for the point (maximum intensity)
     let maxIntensity = -Infinity;

package/src/tools/StackScrollTool.ts

@@ -42,7 +42,7 @@ class StackScrollTool extends BaseTool {
     const deltaPointY = deltaPoints.canvas[1];
     let volumeId;
     if (viewport instanceof VolumeViewport) {
-      volumeId = targetId.split('volumeId:')[1];
+      volumeId = targetId.split(/volumeId:|\?/)[1];
     }
 
     const pixelsPerImage = this._getPixelPerImage(viewport);

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -35,7 +35,7 @@ class StackScrollMouseWheelTool extends BaseTool {
     const delta = direction * (invert ? -1 : 1);
 
     const targetId = this.getTargetId(viewport);
-    const volumeId = targetId.split('volumeId:')[1];
+    const volumeId = targetId.split(/volumeId:|\?/)[1];
 
     scroll(viewport, {
       delta,

package/src/tools/WindowLevelTool.ts

@@ -51,7 +51,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 = targetId.split(/volumeId:|\?/)[1];
       viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/base/AnnotationDisplayTool.ts

@@ -137,7 +137,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
     } else if (viewport instanceof VideoViewport) {
       referencedImageId = targetId.split('videoId:')[1];
     } else {
-      const volumeId = targetId.split('volumeId:')[1];
+      const volumeId = targetId.split(/volumeId:|\?/)[1];
       const imageVolume = cache.getVolume(volumeId);
 
       referencedImageId = utilities.getClosestImageId(

package/src/tools/base/AnnotationTool.ts

@@ -301,7 +301,7 @@ abstract class AnnotationTool extends AnnotationDisplayTool {
     imageId?: string
   ): boolean {
     if (viewport instanceof BaseVolumeViewport) {
-      const volumeId = targetId.split('volumeId:')[1];
+      const volumeId = targetId.split(/volumeId:|\?/)[1];
       const volume = cache.getVolume(volumeId);
       return volume.scaling?.PT !== undefined;
     }

package/src/tools/base/BaseTool.ts

@@ -206,7 +206,7 @@ abstract class BaseTool implements IBaseTool {
 
       return viewports[0].getImageData();
     } else if (targetId.startsWith('volumeId:')) {
-      const volumeId = targetId.split('volumeId:')[1];
+      const volumeId = targetId.split(/volumeId:|\?/)[1];
       const viewports = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id
@@ -248,17 +248,14 @@ abstract class BaseTool implements IBaseTool {
    * @returns targetId
    */
   protected getTargetId(viewport: Types.IViewport): string | undefined {
-    if (viewport instanceof StackViewport) {
-      return `imageId:${viewport.getCurrentImageId()}`;
-    } else if (viewport instanceof BaseVolumeViewport) {
+    const targetId = viewport.getTargetId?.();
+    if (targetId) {
+      return targetId;
+    }
+    if (viewport instanceof BaseVolumeViewport) {
       return `volumeId:${this.getTargetVolumeId(viewport)}`;
-    } else if (viewport instanceof VideoViewport) {
-      return `videoId:${viewport.getCurrentImageId()}`;
-    } else {
-      throw new Error(
-        'getTargetId: viewport must be a StackViewport or VolumeViewport'
-      );
     }
+    throw new Error('getTargetId: viewport must have a getTargetId method');
   }
 }
 

package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts

@@ -104,7 +104,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
       throw new Error('Stack Viewport Not implemented');
     } else {
       const targetId = this.getTargetId(viewport);
-      volumeId = targetId.split('volumeId:')[1];
+      volumeId = targetId.split(/volumeId:|\?/)[1];
       imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,
@@ -269,8 +269,8 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
     const { viewportId, renderingEngineId, viewport } = enabledElement;
 
     const { cachedStats } = data;
-    const volumeId = this.getTargetId(viewport);
-    const imageVolume = cache.getVolume(volumeId.split('volumeId:')[1]);
+    const targetId = this.getTargetId(viewport);
+    const imageVolume = cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
 
     // Todo: this shouldn't be here, this is a performance issue
     // Since we are extending the RectangleROI class, we need to

package/src/tools/segmentation/RectangleROIThresholdTool.ts

@@ -90,7 +90,7 @@ class RectangleROIThresholdTool extends RectangleROITool {
     if (viewport instanceof StackViewport) {
       referencedImageId = targetId.split('imageId:')[1];
     } else {
-      volumeId = targetId.split('volumeId:')[1];
+      volumeId = targetId.split(/volumeId:|\?/)[1];
       const imageVolume = cache.getVolume(volumeId);
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,

package/src/utilities/viewport/isViewportPreScaled.ts

@@ -12,7 +12,9 @@ function isViewportPreScaled(
   if (viewport instanceof BaseVolumeViewport) {
     const targetIdTokens = targetId.split('volumeId:');
     const volumeId =
-      targetIdTokens.length > 1 ? targetIdTokens[1] : targetIdTokens[0];
+      targetIdTokens.length > 1
+        ? targetIdTokens[1].split('?')[0]
+        : targetIdTokens[0];
     const volume = cache.getVolume(volumeId);
     return !!volume?.scaling && Object.keys(volume.scaling).length > 0;
   } else if (viewport instanceof StackViewport) {