@cornerstonejs/core 3.32.4 → 3.32.6

package/dist/esm/RenderingEngine/BaseVolumeViewport.d.ts

@@ -43,7 +43,8 @@ declare abstract class BaseVolumeViewport extends Viewport {
     isReferenceViewable(viewRef: ViewReference, options?: ReferenceCompatibleOptions): boolean;
     scroll(delta?: number): void;
     abstract isInAcquisitionPlane(): boolean;
-    setViewPlane(planeRestriction: PlaneRestriction, viewPlaneNormal: any): void;
+    setBestOrentation(inPlaneVector1: any, inPlaneVector2: any): void;
+    setViewPlane(planeRestriction: PlaneRestriction): void;
     setViewReference(viewRef: ViewReference): void;
     private setThreshold;
     setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, slabThickness, }?: VolumeViewportProperties, volumeId?: string, suppressEvents?: boolean): void;

package/dist/esm/RenderingEngine/BaseVolumeViewport.js

@@ -30,6 +30,7 @@ import uuidv4 from '../utilities/uuidv4';
 import * as metaData from '../metaData';
 import { getCameraVectors } from './helpers/getCameraVectors';
 import { isContextPoolRenderingEngine } from './helpers/isContextPoolRenderingEngine';
+import mprCameraValues from '../constants/mprCameraValues';
 class BaseVolumeViewport extends Viewport {
     constructor(props) {
         super(props);
@@ -605,37 +606,39 @@ class BaseVolumeViewport extends Viewport {
         });
         this.render();
     }
-    setViewPlane(planeRestriction, viewPlaneNormal) {
-        const { point, inPlaneVector1, inPlaneVector2, FrameOfReferenceUID } = planeRestriction;
-        if (!inPlaneVector1) {
-            return this.setViewReference({
-                FrameOfReferenceUID,
-                cameraFocalPoint: point,
-            });
+    setBestOrentation(inPlaneVector1, inPlaneVector2) {
+        if (!inPlaneVector1 && !inPlaneVector2) {
+            return;
         }
-        if (inPlaneVector2) {
-            const planeNormal = (vec3.cross(vec3.create(), inPlaneVector1, inPlaneVector2));
-            vec3.normalize(planeNormal, planeNormal);
-            return this.setViewReference({
-                FrameOfReferenceUID,
-                cameraFocalPoint: point,
-                viewPlaneNormal: planeNormal,
-            });
+        const { viewPlaneNormal } = this.getCamera();
+        if (isCompatible(viewPlaneNormal, inPlaneVector2) &&
+            isCompatible(viewPlaneNormal, inPlaneVector1)) {
+            return;
         }
-        const dotNormal = vec3.dot(viewPlaneNormal, inPlaneVector1);
-        if (isEqual(dotNormal, 0)) {
-            return this.setViewReference({
-                FrameOfReferenceUID,
-                viewPlaneNormal,
-                cameraFocalPoint: point,
-            });
+        const acquisition = this._getAcquisitionPlaneOrientation();
+        if (isCompatible(acquisition.viewPlaneNormal, inPlaneVector2) &&
+            isCompatible(acquisition.viewPlaneNormal, inPlaneVector1)) {
+            this.setOrientation(acquisition);
+            return;
         }
-        const planeNormal = (vec3.cross(vec3.create(), viewPlaneNormal, inPlaneVector1));
+        for (const orientation of (Object.values(mprCameraValues))) {
+            if (isCompatible(orientation.viewPlaneNormal, inPlaneVector2) &&
+                isCompatible(orientation.viewPlaneNormal, inPlaneVector1)) {
+                this.setOrientation(orientation);
+                return;
+            }
+        }
+        const planeNormal = (vec3.cross(vec3.create(), inPlaneVector2 || acquisition.viewPlaneNormal, inPlaneVector1));
         vec3.normalize(planeNormal, planeNormal);
-        return this.setViewReference({
+        this.setOrientation({ viewPlaneNormal: planeNormal });
+    }
+    setViewPlane(planeRestriction) {
+        const { point, inPlaneVector1, inPlaneVector2, FrameOfReferenceUID } = planeRestriction;
+        this.setBestOrentation(inPlaneVector1, inPlaneVector2);
+        this.setViewReference({
             FrameOfReferenceUID,
-            viewPlaneNormal: planeNormal,
             cameraFocalPoint: point,
+            viewPlaneNormal: this.getCamera().viewPlaneNormal,
         });
     }
     setViewReference(viewRef) {
@@ -645,10 +648,10 @@ class BaseVolumeViewport extends Viewport {
         const volumeId = this.getVolumeId();
         const { FrameOfReferenceUID: refFrameOfReference, cameraFocalPoint, referencedImageId, planeRestriction, viewPlaneNormal: refViewPlaneNormal, viewUp, } = viewRef;
         let { sliceIndex } = viewRef;
-        const { focalPoint, viewPlaneNormal, position } = this.getCamera();
-        if (planeRestriction?.inPlaneVector1 && !refViewPlaneNormal) {
-            return this.setViewPlane(planeRestriction, viewPlaneNormal);
+        if (planeRestriction && !refViewPlaneNormal) {
+            return this.setViewPlane(planeRestriction);
         }
+        const { focalPoint, viewPlaneNormal, position } = this.getCamera();
         const isNegativeNormal = isEqualNegative(viewPlaneNormal, refViewPlaneNormal);
         const isSameNormal = isEqual(viewPlaneNormal, refViewPlaneNormal);
         if (typeof sliceIndex === 'number' &&
@@ -1137,4 +1140,7 @@ class BaseVolumeViewport extends Viewport {
         }
     }
 }
+function isCompatible(viewPlaneNormal, vector) {
+    return !vector || isEqual(vec3.dot(viewPlaneNormal, vector), 0);
+}
 export default BaseVolumeViewport;

package/dist/esm/loaders/volumeLoader.js

@@ -72,7 +72,7 @@ export function createAndCacheDerivedVolume(referencedVolumeId, options) {
     const { metadata, dimensions, spacing, origin, direction } = referencedVolume;
     const referencedImageIds = referencedVolume.isDynamicVolume()
         ? referencedVolume.getCurrentDimensionGroupImageIds()
-        : referencedVolume.imageIds ?? [];
+        : (referencedVolume.imageIds ?? []);
     const derivedImages = createAndCacheDerivedImages(referencedImageIds, {
         targetBuffer: options.targetBuffer,
         voxelRepresentation,
@@ -150,7 +150,7 @@ export function createLocalVolume(volumeId, options = {}) {
     const sliceLength = dimensions[0] * dimensions[1];
     const dataType = scalarData
         ? scalarData.constructor.name
-        : targetBuffer?.type ?? 'Float32Array';
+        : (targetBuffer?.type ?? 'Float32Array');
     const totalNumberOfVoxels = sliceLength * dimensions[2];
     let byteLength;
     switch (dataType) {

package/dist/esm/types/OrientationVectors.d.ts

@@ -1,6 +1,6 @@
 import type { Point3 } from './Point3';
 interface OrientationVectors {
     viewPlaneNormal: Point3;
-    viewUp: Point3;
+    viewUp?: Point3;
 }
 export type { OrientationVectors as default };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.32.4";
+export declare const version = "3.32.6";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.32.4';
+export const version = '3.32.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.32.4",
+  "version": "3.32.6",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -76,8 +76,8 @@
     "build": "yarn run build:esm",
     "build:all": "yarn run build:esm",
     "dev": "tsc --project ./tsconfig.json --watch",
-    "format-check": "npx eslint ./src --quiet",
     "api-check": "api-extractor --debug run ",
+    "lint": "oxlint .",
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "ab88654e25aefb7f43a807c0f38ce601af4c20a4"
+  "gitHead": "af40281b222938a78ea1db18d9dd1b85a975e99c"
 }