@cornerstonejs/tools 0.67.2 → 0.67.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.67.2",
+  "version": "0.67.4",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,7 +26,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^0.46.2",
+    "@cornerstonejs/core": "^0.47.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -49,5 +49,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "1e5e0ec2e760c409d532f14b145f52853a9f50ec"
+  "gitHead": "fe634bf0a19f588638aaa21d4bcbbc8df33897b3"
 }

package/src/drawingSvg/drawCircle.ts

@@ -15,11 +15,12 @@ function drawCircle(
   options = {},
   dataId = ''
 ): void {
-  const { color, fill, width, lineWidth } = Object.assign(
+  const { color, fill, width, lineWidth, lineDash } = Object.assign(
     {
       color: 'dodgerblue',
       fill: 'transparent',
       width: '2',
+      lineDash: undefined,
       lineWidth: undefined,
     },
     options
@@ -40,6 +41,7 @@ function drawCircle(
     stroke: color,
     fill,
     'stroke-width': strokeWidth,
+    'stroke-dasharray': lineDash,
   };
 
   if (existingCircleElement) {

package/src/tools/CrosshairsTool.ts

@@ -1793,9 +1793,9 @@ class CrosshairsTool extends AnnotationTool {
     for (let i = 0; i < otherViewportAnnotations.length; ++i) {
       const annotation = otherViewportAnnotations[i];
       if (
-        otherViewportsAnnotationsWithUniqueCameras.find(
+        otherViewportsAnnotationsWithUniqueCameras.some(
           (element) => element === annotation
-        ) === true
+        )
       ) {
         continue;
       }

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -1,11 +1,7 @@
-import {
-  getEnabledElement,
-  VolumeViewport,
-  StackViewport,
-} from '@cornerstonejs/core';
+import { getEnabledElement } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { MouseWheelEventType } from '../types/EventTypes';
-import { scrollVolume } from '../utilities/scroll';
+import scroll from '../utilities/scroll';
 
 /**
  * The StackScrollMouseWheelTool is a tool that allows the user to scroll through a
@@ -37,20 +33,15 @@ class StackScrollMouseWheelTool extends BaseTool {
     const { viewport } = getEnabledElement(element);
     const delta = direction * (invert ? -1 : 1);
 
-    if (viewport instanceof StackViewport) {
-      viewport.scroll(
-        delta,
-        this.configuration.debounceIfNotLoaded,
-        this.configuration.loop
-      );
-    } else if (viewport instanceof VolumeViewport) {
-      const targetId = this.getTargetId(viewport);
-      const volumeId = targetId.split('volumeId:')[1];
-      // TODO: add loop implemention for scroll volume.
-      scrollVolume(viewport, volumeId, delta);
-    } else {
-      throw new Error('StackScrollMouseWheelTool: Unsupported viewport type');
-    }
+    const targetId = this.getTargetId(viewport);
+    const volumeId = targetId.split('volumeId:')[1];
+
+    scroll(viewport, {
+      delta,
+      debounceLoading: this.configuration.debounceIfNotLoaded,
+      loop: this.configuration.loop,
+      volumeId,
+    });
   }
 }
 

package/src/tools/annotation/RectangleROITool.ts

@@ -653,7 +653,7 @@ class RectangleROITool extends AnnotationTool {
       // force to recalculate the stats from the points
       if (
         !data.cachedStats[targetId] ||
-        data.cachedStats[targetId].unit === undefined
+        data.cachedStats[targetId].areaUnit === undefined
       ) {
         data.cachedStats[targetId] = {
           Modality: null,

package/src/tools/base/AnnotationDisplayTool.ts

@@ -189,8 +189,7 @@ abstract class AnnotationDisplayTool extends BaseTool {
       referencedImageId = utilities.getClosestImageId(
         imageVolume,
         worldPos,
-        viewPlaneNormal,
-        viewUp
+        viewPlaneNormal
       );
     }
 

package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts

@@ -109,8 +109,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,
         worldPos,
-        viewPlaneNormal,
-        viewUp
+        viewPlaneNormal
       );
     }
 
@@ -257,8 +256,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
       const imageId = csUtils.getClosestImageId(
         imageVolume,
         RectanglePoints[0],
-        viewPlaneNormal,
-        metadata.viewUp
+        viewPlaneNormal
       );
       projectionPointsImageIds.push(imageId);
     }

package/src/tools/segmentation/RectangleROIThresholdTool.ts

@@ -95,8 +95,7 @@ class RectangleROIThresholdTool extends RectangleROITool {
       referencedImageId = csUtils.getClosestImageId(
         imageVolume,
         worldPos,
-        viewPlaneNormal,
-        viewUp
+        viewPlaneNormal
       );
     }
 

package/src/utilities/scroll.ts

@@ -5,6 +5,7 @@ import {
   eventTarget,
   EVENTS,
   utilities as csUtils,
+  getEnabledElement,
 } from '@cornerstonejs/core';
 import { ScrollOptions, EventTypes } from '../types';
 
@@ -21,6 +22,20 @@ export default function scroll(
   viewport: Types.IStackViewport | Types.IVolumeViewport,
   options: ScrollOptions
 ): void {
+  // check if viewport is disabled then throw error
+  const enabledElement = getEnabledElement(viewport.element);
+
+  if (!enabledElement) {
+    throw new Error('Scroll::Viewport is not enabled (it might be disabled)');
+  }
+
+  if (
+    viewport instanceof StackViewport &&
+    viewport.getImageIds().length === 0
+  ) {
+    throw new Error('Scroll::Stack Viewport has no images');
+  }
+
   const { type: viewportType } = viewport;
   const { volumeId, delta } = options;