@cornerstonejs/tools 1.29.0 → 1.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.29.0",
+  "version": "1.30.1",
   "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.29.0",
+    "@cornerstonejs/core": "^1.30.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7e7c3eb2156c26f594af9e664405f64d9e269f4d"
+  "gitHead": "fd8028a7f840ce13335bc96e014e35aaed8ebc8f"
 }

package/src/tools/StackScrollTool.ts

@@ -1,9 +1,4 @@
-import {
-  getEnabledElementByIds,
-  VolumeViewport,
-  StackViewport,
-  utilities as csUtils,
-} from '@cornerstonejs/core';
+import { getEnabledElementByIds, VolumeViewport } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { scroll } from '../utilities';
 import { PublicToolProps, ToolProps, EventTypes } from '../types';
@@ -45,7 +40,6 @@ class StackScrollTool extends BaseTool {
     const { debounceIfNotLoaded, invert, loop } = this.configuration;
 
     const deltaPointY = deltaPoints.canvas[1];
-
     let volumeId;
     if (viewport instanceof VolumeViewport) {
       volumeId = targetId.split('volumeId:')[1];
@@ -76,21 +70,11 @@ class StackScrollTool extends BaseTool {
 
   _getPixelPerImage(viewport) {
     const { element } = viewport;
-    const numberOfSlices = this._getNumberOfSlices(viewport);
+    const numberOfSlices = viewport.getNumberOfSlices();
 
     // The Math.max here makes it easier to mouseDrag-scroll small or really large image stacks
     return Math.max(2, element.offsetHeight / Math.max(numberOfSlices, 8));
   }
-
-  _getNumberOfSlices(viewport) {
-    if (viewport instanceof VolumeViewport) {
-      const { numberOfSlices } =
-        csUtils.getImageSliceDataForVolumeViewport(viewport);
-      return numberOfSlices;
-    } else if (viewport instanceof StackViewport) {
-      return viewport.getImageIds().length;
-    }
-  }
 }
 
 StackScrollTool.toolName = 'StackScroll';

package/src/tools/WindowLevelTool.ts

@@ -48,6 +48,7 @@ class WindowLevelTool extends BaseTool {
       viewportsContainingVolumeUID;
     let isPreScaled = false;
 
+    const properties = viewport.getProperties();
     if (viewport instanceof VolumeViewport) {
       const targetId = this.getTargetId(viewport as Types.IVolumeViewport);
       volumeId = targetId.split('volumeId:')[1];
@@ -55,7 +56,6 @@ class WindowLevelTool extends BaseTool {
         volumeId,
         renderingEngine.id
       );
-      const properties = viewport.getProperties();
       ({ lower, upper } = properties.voiRange);
       const volume = cache.getVolume(volumeId);
       if (!volume) {
@@ -63,11 +63,10 @@ class WindowLevelTool extends BaseTool {
       }
       modality = volume.metadata.Modality;
       isPreScaled = volume.scaling && Object.keys(volume.scaling).length > 0;
-    } else if (viewport instanceof StackViewport) {
-      const properties = viewport.getProperties();
-      modality = viewport.modality;
+    } else if (properties.voiRange) {
+      modality = (viewport as any).modality;
       ({ lower, upper } = properties.voiRange);
-      const { preScale } = viewport.getImageData();
+      const { preScale = { scaled: false } } = viewport.getImageData?.() || {};
       isPreScaled =
         preScale.scaled && preScale.scalingParameters?.suvbw !== undefined;
     } else {
@@ -98,22 +97,17 @@ class WindowLevelTool extends BaseTool {
       });
     }
 
-    if (viewport instanceof StackViewport) {
-      viewport.setProperties({
-        voiRange: newRange,
-      });
+    viewport.setProperties({
+      voiRange: newRange,
+    });
 
-      viewport.render();
-      return;
-    }
+    viewport.render();
 
     if (viewport instanceof VolumeViewport) {
-      viewport.setProperties({
-        voiRange: newRange,
-      });
-
       viewportsContainingVolumeUID.forEach((vp) => {
-        vp.render();
+        if (viewport !== vp) {
+          vp.render();
+        }
       });
       return;
     }
@@ -208,6 +202,9 @@ class WindowLevelTool extends BaseTool {
     const { imageData } = viewport.getImageData();
     const dimensions = imageData.getDimensions();
 
+    if (imageData.getRange) {
+      return imageData.getRange();
+    }
     let scalarData;
     // if getScalarData is a method on imageData
     if (imageData.getScalarData) {