@cornerstonejs/core 1.14.2 → 1.14.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -46,5 +46,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7fb460c47629f6694a78c6bed836b432e1af13a3"
+  "gitHead": "96dc1772a2f77a7626c07e19434b42753e9d4188"
 }

package/src/utilities/calculateViewportsSpatialRegistration.ts

@@ -1,9 +1,15 @@
 import { vec3, mat4 } from 'gl-matrix';
 import { IStackViewport } from '../types';
-import { StackViewport } from '../RenderingEngine';
 import spatialRegistrationMetadataProvider from './spatialRegistrationMetadataProvider';
 import { metaData } from '..';
-import isEqual from './isEqual';
+
+/**
+ * Defines the allowed difference as a percent between the unit normals before
+ * two planes are considered not coplanar.  Since this value is small compared
+ * to the unit lenght, this value is approximately the angular difference, measured
+ * in radians.  That is, allow about a 3 degrees variation.
+ */
+const ALLOWED_DELTA = 0.05;
 
 /**
  * It calculates the registration matrix between two viewports (currently only
@@ -21,40 +27,28 @@ function calculateViewportsSpatialRegistration(
   viewport1: IStackViewport,
   viewport2: IStackViewport
 ): void {
-  if (
-    !(viewport1 instanceof StackViewport) ||
-    !(viewport2 instanceof StackViewport)
-  ) {
-    throw new Error(
-      'calculateViewportsSpatialRegistration: Both viewports must be StackViewports, volume viewports are not supported yet'
-    );
-  }
-
-  const isSameFrameOfReference =
-    viewport1.getFrameOfReferenceUID() === viewport2.getFrameOfReferenceUID();
-
-  if (isSameFrameOfReference) {
-    return;
-  }
-
   const imageId1 = viewport1.getCurrentImageId();
   const imageId2 = viewport2.getCurrentImageId();
 
   const imagePlaneModule1 = metaData.get('imagePlaneModule', imageId1);
   const imagePlaneModule2 = metaData.get('imagePlaneModule', imageId2);
 
-  const isSameImagePlane =
-    imagePlaneModule1 &&
-    imagePlaneModule2 &&
-    isEqual(
-      imagePlaneModule1.imageOrientationPatient,
-      imagePlaneModule2.imageOrientationPatient
-    );
+  if (!imagePlaneModule1 || !imagePlaneModule2) {
+    console.log('Viewport spatial registration requires image plane module');
+    return;
+  }
+  const { imageOrientationPatient: iop2 } = imagePlaneModule2;
+  const isSameImagePlane = imagePlaneModule1.imageOrientationPatient.every(
+    (v, i) => Math.abs(v - iop2[i]) < ALLOWED_DELTA
+  );
 
   if (!isSameImagePlane) {
-    throw new Error(
-      'Viewport spatial registration only supported for same orientation (hence translation only) for now'
+    console.log(
+      'Viewport spatial registration only supported for same orientation (hence translation only) for now',
+      imagePlaneModule1?.imageOrientationPatient,
+      imagePlaneModule2?.imageOrientationPatient
     );
+    return;
   }
 
   const imagePositionPatient1 = imagePlaneModule1.imagePositionPatient;
@@ -67,7 +61,6 @@ function calculateViewportsSpatialRegistration(
   );
 
   const mat = mat4.fromTranslation(mat4.create(), translation);
-
   spatialRegistrationMetadataProvider.add([viewport1.id, viewport2.id], mat);
 }