@cornerstonejs/tools 1.47.4 → 1.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.47.4",
+  "version": "1.48.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.47.4",
+    "@cornerstonejs/core": "^1.48.0",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
@@ -53,5 +53,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "659f9ca5a410b3e915b0ac95c61765cfd061be8d"
+  "gitHead": "ace7497b03ab306f179a3673f25a575c3152fc9e"
 }

package/src/stateManagement/segmentation/config/segmentationVisibility.ts

@@ -4,21 +4,41 @@ import { getSegmentationRepresentations } from '../../../stateManagement/segment
 import { ToolGroupSpecificRepresentation } from '../../../types/SegmentationStateTypes';
 import { triggerSegmentationRepresentationModified } from '../triggerSegmentationEvents';
 import SegmentationRepresentations from '../../../enums/SegmentationRepresentations';
+import { isVolumeSegmentation } from '../../../tools/segmentation/strategies/utils/stackVolumeCheck';
 
 function getUniqueSegmentIndices(segmentationId) {
   const segmentation = SegmentationState.getSegmentation(segmentationId);
 
   if (segmentation.type === SegmentationRepresentations.Labelmap) {
-    const volume = cache.getVolume(segmentationId);
-    const scalarData = volume.getScalarData();
+    const labelmapData =
+      segmentation.representationData[SegmentationRepresentations.Labelmap];
 
     const keySet = {};
-    for (let i = 0; i < scalarData.length; i++) {
-      const segmentIndex = scalarData[i];
-      if (segmentIndex !== 0 && !keySet[segmentIndex]) {
-        keySet[segmentIndex] = true;
+
+    if (isVolumeSegmentation(labelmapData)) {
+      const volume = cache.getVolume(segmentationId);
+      const scalarData = volume.getScalarData();
+
+      for (let i = 0; i < scalarData.length; i++) {
+        const segmentIndex = scalarData[i];
+        if (segmentIndex !== 0 && !keySet[segmentIndex]) {
+          keySet[segmentIndex] = true;
+        }
       }
+    } else {
+      labelmapData.imageIdReferenceMap.forEach((segmentationImageId) => {
+        const image = cache.getImage(segmentationImageId);
+        const scalarData = image.getPixelData();
+
+        for (let i = 0; i < scalarData.length; i++) {
+          const segmentIndex = scalarData[i];
+          if (segmentIndex !== 0 && !keySet[segmentIndex]) {
+            keySet[segmentIndex] = true;
+          }
+        }
+      });
     }
+
     return Object.keys(keySet).map((it) => parseInt(it, 10));
   } else if (segmentation.type === SegmentationRepresentations.Contour) {
     const annotationUIDsMap =

package/src/tools/annotation/AngleTool.ts

@@ -3,6 +3,7 @@ import {
   getEnabledElement,
   triggerEvent,
   eventTarget,
+  utilities as csUtils,
 } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 
@@ -823,7 +824,15 @@ class AngleTool extends AnnotationTool {
         [worldPos1, worldPos2],
         [worldPos2, worldPos3]
       );
+      const { dimensions, imageData } = this.getTargetIdImage(
+        targetId,
+        renderingEngine
+      );
 
+      // Decide if there's at least one handle is outside of image
+      this.isHandleOutsideImage = [worldPos1, worldPos2, worldPos3]
+        .map((worldPos) => csUtils.transformWorldToIndex(imageData, worldPos))
+        .some((index) => !csUtils.indexWithinDimensions(index, dimensions));
       cachedStats[targetId] = {
         angle: isNaN(angle) ? 'Incomplete Angle' : angle,
       };