@cornerstonejs/tools 1.74.3 → 1.74.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.74.3",
+  "version": "1.74.5",
   "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.74.3",
+    "@cornerstonejs/core": "^1.74.5",
     "@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": "43f4c288a89aa69a7b2268b1f13b874737e23d7d"
+  "gitHead": "f8792648a99e3c204beb04743e4fe4e615aac8fc"
 }

package/src/tools/displayTools/Contour/contourDisplay.ts

@@ -1,4 +1,8 @@
-import { getEnabledElementByIds, Types } from '@cornerstonejs/core';
+import {
+  getEnabledElementByIds,
+  StackViewport,
+  Types,
+} from '@cornerstonejs/core';
 
 import Representations from '../../../enums/SegmentationRepresentations';
 import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
@@ -59,7 +63,7 @@ function removeSegmentationRepresentation(
  * @param toolGroupConfig - This is the configuration object for the tool group
  */
 async function render(
-  viewport: Types.IVolumeViewport,
+  viewport: StackViewport | Types.IVolumeViewport,
   representationConfig: ToolGroupSpecificRepresentation,
   toolGroupConfig: SegmentationRepresentationConfig
 ): Promise<void> {

package/src/tools/displayTools/Contour/contourHandler/handleContourSegmentation.ts

@@ -2,7 +2,8 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 
 import { addAnnotation } from '../../../../stateManagement';
-import { cache, Types, utilities } from '@cornerstonejs/core';
+import { cache, Types, utilities, StackViewport } from '@cornerstonejs/core';
+import { getClosestImageIdForStackViewport } from '../../../../utilities/annotationHydration';
 
 import {
   SegmentationRepresentationConfig,
@@ -15,7 +16,7 @@ import { addContourSegmentationAnnotation } from '../../../../utilities/contourS
 import { validateGeometry } from './utils';
 
 function handleContourSegmentation(
-  viewport: Types.IVolumeViewport,
+  viewport: StackViewport | Types.IVolumeViewport,
   geometryIds: string[],
   annotationUIDsMap: Map<number, Set<string>>,
   contourRepresentation: ToolGroupSpecificContourRepresentation,
@@ -33,7 +34,7 @@ function handleContourSegmentation(
 }
 
 function updateContourSets(
-  viewport: Types.IVolumeViewport,
+  viewport: Types.IVolumeViewport | StackViewport,
   geometryIds: string[],
   contourRepresentation: ToolGroupSpecificContourRepresentation,
   contourRepresentationConfig: SegmentationRepresentationConfig
@@ -112,7 +113,7 @@ function updateContourSets(
 }
 
 function addContourSetsToElement(
-  viewport: Types.IVolumeViewport,
+  viewport: StackViewport | Types.IVolumeViewport,
   geometryIds: string[],
   contourRepresentation: ToolGroupSpecificContourRepresentation,
   contourRepresentationConfig: SegmentationRepresentationConfig
@@ -166,7 +167,11 @@ function addContourSetsToElement(
         isLocked: true,
         isVisible: true,
         metadata: {
-          referencedImageId: viewport.getCurrentImageId(),
+          referencedImageId: getClosestImageIdForStackViewport(
+            viewport as StackViewport,
+            points[0],
+            viewport.getCamera().viewPlaneNormal
+          ),
           toolName: 'PlanarFreehandContourSegmentationTool',
           FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
           viewPlaneNormal: viewport.getCamera().viewPlaneNormal,

package/src/utilities/annotationHydration.ts

@@ -140,4 +140,4 @@ function calculateDistanceToImage(
 
   return Math.abs(dot);
 }
-export { annotationHydration };
+export { annotationHydration, getClosestImageIdForStackViewport };

package/src/utilities/index.ts

@@ -28,7 +28,10 @@ import { pointToString } from './pointToString';
 import annotationFrameRange from './annotationFrameRange';
 import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
 import getViewportForAnnotation from './getViewportForAnnotation';
-import { annotationHydration } from './annotationHydration';
+import {
+  annotationHydration,
+  getClosestImageIdForStackViewport,
+} from './annotationHydration';
 // name spaces
 import * as contours from './contours';
 import * as segmentation from './segmentation';
@@ -98,4 +101,5 @@ export {
   annotationFrameRange,
   contourSegmentation,
   annotationHydration,
+  getClosestImageIdForStackViewport,
 };