@cornerstonejs/tools 1.59.1 → 1.60.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.59.1",
+  "version": "1.60.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.59.1",
+    "@cornerstonejs/core": "^1.60.0",
     "@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": "f8957765edd911ce0e78ed21f8de92ca4b01f516"
+  "gitHead": "d3576b0ceede627af81fe21d424846fe7da3cc25"
 }

package/src/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.ts

@@ -139,7 +139,9 @@ class FrameOfReferenceSpecificAnnotationManager implements IAnnotationManager {
     }
 
     if (toolName) {
-      return annotations[groupKey][toolName];
+      return annotations[groupKey][toolName]
+        ? annotations[groupKey][toolName]
+        : [];
     }
 
     return annotations[groupKey];

package/src/utilities/scroll.ts

@@ -86,14 +86,8 @@ export function scrollVolume(
 
   const desiredStepIndex = currentStepIndex + delta;
 
-  if (
-    (desiredStepIndex > numScrollSteps || desiredStepIndex < 0) &&
-    viewport.getCurrentImageId() // Check that we are in the plane of acquistion
-  ) {
-    // One common use case of this trigger might be to load the next
-    // volume in a time series or the next segment of a partially loaded volume.
-
-    const VolumeScrollEventDetail = {
+  const VolumeScrollEventDetail: EventTypes.VolumeScrollOutOfBoundsEventDetail =
+    {
       volumeId,
       viewport,
       delta,
@@ -103,10 +97,23 @@ export function scrollVolume(
       currentImageId: viewport.getCurrentImageId(),
     };
 
+  if (
+    (desiredStepIndex > numScrollSteps || desiredStepIndex < 0) &&
+    viewport.getCurrentImageId() // Check that we are in the plane of acquistion
+  ) {
+    // One common use case of this trigger might be to load the next
+    // volume in a time series or the next segment of a partially loaded volume.
+
     csUtils.triggerEvent(
       eventTarget,
       EVENTS.VOLUME_SCROLL_OUT_OF_BOUNDS,
-      VolumeScrollEventDetail as EventTypes.VolumeScrollOutOfBoundsEventDetail
+      VolumeScrollEventDetail
+    );
+  } else {
+    csUtils.triggerEvent(
+      eventTarget,
+      EVENTS.VOLUME_VIEWPORT_SCROLL,
+      VolumeScrollEventDetail
     );
   }
 }