@cornerstonejs/tools 5.1.2 → 5.1.4

package/dist/esm/utilities/segmentation/getSegmentIndexAtWorldPoint.js

@@ -1,9 +1,9 @@
 import { BaseVolumeViewport, cache, utilities } from '@cornerstonejs/core';
-import getViewportICamera from '../getViewportICamera';
 import { SegmentationRepresentations } from '../../enums';
 import { getSegmentation, getCurrentLabelmapImageIdsForViewport, } from '../../stateManagement/segmentation/segmentationState';
 import { getAnnotation } from '../../stateManagement';
 import { isPointInsidePolyline3D } from '../math/polyline';
+import filterAnnotationsForDisplay from '../planar/filterAnnotationsForDisplay';
 import { getLabelmapActorEntry } from '../../stateManagement/segmentation/helpers/getSegmentationActor';
 import getViewportLabelmapRenderMode from '../../stateManagement/segmentation/helpers/getViewportLabelmapRenderMode';
 import { getLabelmaps, getOrCreateLabelmapVolume, getSegmentIndexForLabelValue, } from '../../stateManagement/segmentation/helpers/labelmapSegmentationState';
@@ -75,25 +75,21 @@ export function getSegmentIndexAtWorldForLabelmap(segmentation, worldPoint, { vi
 }
 export function getSegmentIndexAtWorldForContour(segmentation, worldPoint, { viewport }) {
     const contourData = segmentation.representationData.Contour;
-    const segmentIndices = Array.from(contourData.annotationUIDsMap.keys());
-    const { viewPlaneNormal } = getViewportICamera(viewport);
-    for (const segmentIndex of segmentIndices) {
-        const annotationsSet = contourData.annotationUIDsMap.get(segmentIndex);
-        if (!annotationsSet) {
-            continue;
-        }
-        for (const annotationUID of annotationsSet) {
+    const segmentIndexByAnnotation = new Map();
+    for (const [segmentIndex, annotationUIDs] of contourData.annotationUIDsMap) {
+        for (const annotationUID of annotationUIDs) {
             const annotation = getAnnotation(annotationUID);
-            if (!annotation) {
-                continue;
-            }
-            const { polyline } = annotation.data.contour;
-            if (!utilities.isEqual(viewPlaneNormal, annotation.metadata.viewPlaneNormal)) {
-                continue;
-            }
-            if (isPointInsidePolyline3D(worldPoint, polyline)) {
-                return Number(segmentIndex);
+            if (annotation) {
+                segmentIndexByAnnotation.set(annotation, Number(segmentIndex));
             }
         }
     }
+    const displayableAnnotations = filterAnnotationsForDisplay(viewport, Array.from(segmentIndexByAnnotation.keys()));
+    for (const annotation of displayableAnnotations) {
+        const { polyline } = annotation.data
+            .contour;
+        if (isPointInsidePolyline3D(worldPoint, polyline)) {
+            return segmentIndexByAnnotation.get(annotation);
+        }
+    }
 }

package/dist/esm/version.d.ts

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

package/dist/esm/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -104,15 +104,16 @@
   },
   "dependencies": {
     "@types/offscreencanvas": "2019.7.3",
+    "clipper2-ts": "2.0.1",
     "comlink": "4.4.2",
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.1.2",
+    "@cornerstonejs/core": "5.1.4",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.1.2",
+    "@cornerstonejs/core": "5.1.4",
     "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -131,5 +132,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "50f6fe315e3e0fb9e3f12dc1fe50c9cc0e8a6bb9"
+  "gitHead": "357796f885445b74f801c5ab727d708345b4e729"
 }