@cornerstonejs/tools 5.1.0 → 5.1.2

package/dist/esm/utilities/viewport/isViewportPreScaled.js

@@ -1,16 +1,5 @@
-import { cache, StackViewport, BaseVolumeViewport, utilities, } from '@cornerstonejs/core';
+import { utilities } from '@cornerstonejs/core';
 function isViewportPreScaled(viewport, targetId) {
-    if (viewport instanceof BaseVolumeViewport) {
-        const volumeId = utilities.getVolumeId(targetId);
-        const volume = cache.getVolume(volumeId);
-        return !!volume?.scaling && Object.keys(volume.scaling).length > 0;
-    }
-    else if (viewport instanceof StackViewport) {
-        const { preScale } = viewport.getImageData() || {};
-        return !!preScale?.scaled;
-    }
-    else {
-        return false;
-    }
+    return !!utilities.getScalingDescriptor(viewport, targetId)?.isPreScaled;
 }
 export { isViewportPreScaled };

package/dist/esm/utilities/voi/colorbar/ViewportColorbar.js

@@ -71,7 +71,7 @@ class ViewportColorbar extends Colorbar {
     }
     onVoiChange(voiRange) {
         super.onVoiChange(voiRange);
-        const { viewport } = this.enabledElement;
+        const viewport = this.enabledElement.viewport;
         if (viewport instanceof StackViewport) {
             viewport.setProperties({
                 voiRange: voiRange,
@@ -84,6 +84,16 @@ class ViewportColorbar extends Colorbar {
             viewport.setProperties({ voiRange }, volumeId);
             viewportsContainingVolumeUID.forEach((vp) => vp.render());
         }
+        else if (utilities.isGenericViewport(viewport)) {
+            const { _volumeId: dataId } = this;
+            if (dataId) {
+                viewport.setDisplaySetPresentation(dataId, { voiRange });
+            }
+            else {
+                viewport.setDisplaySetPresentation({ voiRange });
+            }
+            viewport.render();
+        }
     }
     static _getImageRange(element, volumeId) {
         const enabledElement = getEnabledElement(element);
@@ -96,11 +106,13 @@ class ViewportColorbar extends Colorbar {
         const scalarData = imageData.getPointData().getScalars();
         let imageRange;
         if (!scalarData) {
-            if (!volumeId) {
-                throw new Error('volumeId is required when scalarData is not available');
+            const inputVoxelManager = imageData.get('voxelManager')?.voxelManager;
+            const volume = volumeId ? cache.getVolume(volumeId) : undefined;
+            const voxelManager = inputVoxelManager ?? volume?.voxelManager;
+            if (!voxelManager?.getRange) {
+                return defaultImageRange;
             }
-            const volume = cache.getVolume(volumeId);
-            const [minValue, maxValue] = volume.voxelManager.getRange();
+            const [minValue, maxValue] = voxelManager.getRange();
             imageRange = [minValue, maxValue];
         }
         else {

package/dist/esm/utilities/voi/windowlevel/extractWindowLevelRegionToolData.d.ts

@@ -1,5 +1,5 @@
 import type { Types } from '@cornerstonejs/core';
-declare function extractWindowLevelRegionToolData(viewport: Types.IVolumeViewport | Types.IStackViewport): {
+declare function extractWindowLevelRegionToolData(viewport: Types.IViewport): {
     scalarData: Types.PixelDataTypedArray;
     minPixelValue: number;
     maxPixelValue: number;

package/dist/esm/utilities/voi/windowlevel/extractWindowLevelRegionToolData.js

@@ -1,4 +1,4 @@
-import { utilities as csUtils, StackViewport, VolumeViewport, } from '@cornerstonejs/core';
+import { cache, utilities as csUtils, StackViewport, VolumeViewport, } from '@cornerstonejs/core';
 function extractWindowLevelRegionToolData(viewport) {
     if (viewport instanceof VolumeViewport) {
         return extractImageDataVolume(viewport);
@@ -6,6 +6,9 @@ function extractWindowLevelRegionToolData(viewport) {
     if (viewport instanceof StackViewport) {
         return extractImageDataStack(viewport);
     }
+    if (csUtils.isGenericViewport(viewport)) {
+        return extractImageDataGeneric(viewport);
+    }
     throw new Error('Viewport not supported');
 }
 function extractImageDataVolume(viewport) {
@@ -39,4 +42,28 @@ function extractImageDataStack(viewport) {
         color,
     };
 }
+function extractImageDataGeneric(viewport) {
+    const imageId = viewport.getCurrentImageId();
+    if (!imageId) {
+        console.warn('WindowLevelRegionTool: the current native viewport slice has no backing image (reformatted/oblique volume plane); skipping region window level.');
+        return undefined;
+    }
+    const image = cache.getImage(imageId);
+    if (!image) {
+        throw new Error('Viewport not supported');
+    }
+    const scalarData = image.getPixelData();
+    const { rows, columns, color } = image;
+    const { min: minPixelValue, max: maxPixelValue } = csUtils.getMinMax(scalarData);
+    return {
+        scalarData,
+        width: columns,
+        height: rows,
+        minPixelValue,
+        maxPixelValue,
+        rows,
+        columns,
+        color,
+    };
+}
 export { extractWindowLevelRegionToolData };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.1.0";
+export declare const version = "5.1.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.1.0';
+export const version = '5.1.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,11 +108,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.1.0",
+    "@cornerstonejs/core": "5.1.2",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.1.0",
+    "@cornerstonejs/core": "5.1.2",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -131,5 +131,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "f86b3b590f646412726bfb8bbea8e6724f36cbf1"
+  "gitHead": "50f6fe315e3e0fb9e3f12dc1fe50c9cc0e8a6bb9"
 }