@cornerstonejs/core 3.9.0 → 3.9.2

package/dist/esm/RenderingEngine/RenderingEngine.js

@@ -159,7 +159,7 @@ class RenderingEngine {
         }
     }
     getViewport(viewportId) {
-        return this._viewports.get(viewportId);
+        return this._viewports?.get(viewportId);
     }
     getViewports() {
         this._throwIfDestroyed();

package/dist/esm/RenderingEngine/StackViewport.js

@@ -1651,7 +1651,7 @@ class StackViewport extends Viewport {
         const imageIds = this.getImageIds();
         const imageData = this.getImageData();
         const { direction, spacing } = imageData;
-        const imageId = getClosestImageId({ direction: direction, spacing, imageIds }, worldPos, this.getCamera().viewPlaneNormal);
+        const imageId = getClosestImageId({ direction, spacing, imageIds }, worldPos, this.getCamera().viewPlaneNormal, { ignoreSpacing: true });
         const index = imageIds.indexOf(imageId);
         if (index === -1) {
             return false;

package/dist/esm/utilities/getClosestImageId.d.ts

@@ -4,4 +4,6 @@ export default function getClosestImageId(imageVolume: IImageVolume | {
     direction: mat3;
     spacing: Point3;
     imageIds: string[];
-}, worldPos: Point3, viewPlaneNormal: Point3): string;
+}, worldPos: Point3, viewPlaneNormal: Point3, options?: {
+    ignoreSpacing?: boolean;
+}): string | undefined;

package/dist/esm/utilities/getClosestImageId.js

@@ -2,28 +2,51 @@ import { vec3 } from 'gl-matrix';
 import * as metaData from '../metaData';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
 import { EPSILON } from '../constants';
-export default function getClosestImageId(imageVolume, worldPos, viewPlaneNormal) {
+export default function getClosestImageId(imageVolume, worldPos, viewPlaneNormal, options) {
     const { direction, spacing, imageIds } = imageVolume;
-    if (!imageIds.length) {
+    const { ignoreSpacing = false } = options || {};
+    if (!imageIds?.length) {
         return;
     }
     const kVector = direction.slice(6, 9);
-    const dotProducts = vec3.dot(kVector, viewPlaneNormal);
-    if (Math.abs(dotProducts) < 1 - EPSILON) {
+    const dotProduct = vec3.dot(kVector, viewPlaneNormal);
+    if (Math.abs(dotProduct) < 1 - EPSILON) {
+        console.debug('View plane normal is not parallel to the image scan axis. Unable to find closest imageId.');
         return;
     }
-    const spacingInNormalDirection = getSpacingInNormalDirection({ direction, spacing }, viewPlaneNormal);
-    const halfSpacingInNormalDirection = spacingInNormalDirection / 2;
-    let imageIdForTool;
+    let halfSpacingInNormalDirection;
+    if (!ignoreSpacing) {
+        const spacingInNormalDirection = getSpacingInNormalDirection({ direction, spacing }, viewPlaneNormal);
+        halfSpacingInNormalDirection = spacingInNormalDirection / 2;
+    }
+    let closestImageId;
+    let minDistance = Infinity;
     for (let i = 0; i < imageIds.length; i++) {
         const imageId = imageIds[i];
-        const { imagePositionPatient } = metaData.get('imagePlaneModule', imageId);
+        const imagePlaneModule = metaData.get('imagePlaneModule', imageId);
+        if (!imagePlaneModule?.imagePositionPatient) {
+            console.warn(`Missing imagePositionPatient for imageId: ${imageId}`);
+            continue;
+        }
+        const { imagePositionPatient } = imagePlaneModule;
         const dir = vec3.create();
         vec3.sub(dir, worldPos, imagePositionPatient);
-        const dot = vec3.dot(dir, viewPlaneNormal);
-        if (Math.abs(dot) < halfSpacingInNormalDirection) {
-            imageIdForTool = imageId;
+        const distance = Math.abs(vec3.dot(dir, viewPlaneNormal));
+        if (ignoreSpacing) {
+            if (distance < minDistance) {
+                minDistance = distance;
+                closestImageId = imageId;
+            }
         }
+        else {
+            if (distance < halfSpacingInNormalDirection && distance < minDistance) {
+                minDistance = distance;
+                closestImageId = imageId;
+            }
+        }
+    }
+    if (closestImageId === undefined) {
+        console.debug('No imageId found within the specified criteria (half spacing or absolute closest).');
     }
-    return imageIdForTool;
+    return closestImageId;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -91,5 +91,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "e44475d4c419201d7042d4648c0335d1b2eebe41"
+  "gitHead": "7fdba50da86956a4c35e45dbdc21ab3b8decea72"
 }