@cornerstonejs/tools 1.81.0 → 1.81.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.81.0",
+  "version": "1.81.2",
   "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.81.0",
+    "@cornerstonejs/core": "^1.81.2",
     "@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": "3d2483dd331bd759752c81b01a0d3d6dce76663d"
+  "gitHead": "c40bb7db80f4ec39a8597563dd8379f8adf79785"
 }

package/src/tools/MIPJumpToClickTool.ts

@@ -46,16 +46,14 @@ class MIPJumpToClickTool extends BaseTool {
     const { viewport, renderingEngine } = enabledElement;
 
     // 2. Getting the target volume that is clicked on
-    const targetId = this.getTargetId(viewport as Types.IVolumeViewport);
+    const volumeId = this.getTargetVolumeId(viewport);
 
-    if (!targetId.startsWith('volumeId')) {
+    if (!volumeId) {
       throw new Error(
         `MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`
       );
     }
 
-    const volumeId = utilities.getVolumeId(targetId);
-
     // 3. Criteria function to search for the point (maximum intensity)
     let maxIntensity = -Infinity;
     const maxFn = (intensity, point) => {

package/src/tools/StackScrollTool.ts

@@ -35,14 +35,12 @@ class StackScrollTool extends BaseTool {
   _dragCallback(evt: EventTypes.InteractionEventType) {
     const { deltaPoints, viewportId, renderingEngineId } = evt.detail;
     const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
-
-    const targetId = this.getTargetId(viewport);
     const { debounceIfNotLoaded, invert, loop } = this.configuration;
-
     const deltaPointY = deltaPoints.canvas[1];
+
     let volumeId;
     if (viewport instanceof VolumeViewport) {
-      volumeId = targetId.split(/volumeId:|\?/)[1];
+      volumeId = this.getTargetVolumeId(viewport);
     }
 
     const pixelsPerImage = this._getPixelPerImage(viewport);

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -34,8 +34,7 @@ class StackScrollMouseWheelTool extends BaseTool {
     const { viewport } = getEnabledElement(element);
     const delta = direction * (invert ? -1 : 1);
 
-    const targetId = this.getTargetId(viewport);
-    const volumeId = utilities.getVolumeId(targetId);
+    const volumeId = this.getTargetVolumeId(viewport);
 
     scroll(viewport, {
       delta,

package/src/tools/WindowLevelTool.ts

@@ -49,8 +49,8 @@ class WindowLevelTool extends BaseTool {
 
     const properties = viewport.getProperties();
     if (viewport instanceof VolumeViewport) {
-      const targetId = this.getTargetId(viewport as Types.IVolumeViewport);
-      volumeId = utilities.getVolumeId(targetId);
+      volumeId = this.getTargetVolumeId(viewport);
+
       viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(
         volumeId,
         renderingEngine.id

package/src/tools/base/BaseTool.ts

@@ -152,7 +152,7 @@ abstract class BaseTool implements IBaseTool {
    * @returns the volumeId for the viewport if specified in the tool configuration,
    * or the first actorUID in the viewport if not.
    */
-  private getTargetVolumeId(viewport: Types.IViewport): string | undefined {
+  protected getTargetVolumeId(viewport: Types.IViewport): string | undefined {
     if (this.configuration.volumeId) {
       return this.configuration.volumeId;
     }