@cornerstonejs/core 1.14.2 → 1.14.4

package/dist/cjs/utilities/calculateViewportsSpatialRegistration.js

@@ -4,28 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const gl_matrix_1 = require("gl-matrix");
-const RenderingEngine_1 = require("../RenderingEngine");
 const spatialRegistrationMetadataProvider_1 = __importDefault(require("./spatialRegistrationMetadataProvider"));
 const __1 = require("..");
-const isEqual_1 = __importDefault(require("./isEqual"));
+const ALLOWED_DELTA = 0.05;
 function calculateViewportsSpatialRegistration(viewport1, viewport2) {
-    if (!(viewport1 instanceof RenderingEngine_1.StackViewport) ||
-        !(viewport2 instanceof RenderingEngine_1.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 = __1.metaData.get('imagePlaneModule', imageId1);
     const imagePlaneModule2 = __1.metaData.get('imagePlaneModule', imageId2);
-    const isSameImagePlane = imagePlaneModule1 &&
-        imagePlaneModule2 &&
-        (0, isEqual_1.default)(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 === null || imagePlaneModule1 === void 0 ? void 0 : imagePlaneModule1.imageOrientationPatient, imagePlaneModule2 === null || imagePlaneModule2 === void 0 ? void 0 : imagePlaneModule2.imageOrientationPatient);
+        return;
     }
     const imagePositionPatient1 = imagePlaneModule1.imagePositionPatient;
     const imagePositionPatient2 = imagePlaneModule2.imagePositionPatient;

package/dist/cjs/utilities/calculateViewportsSpatialRegistration.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculateViewportsSpatialRegistration.js","sourceRoot":"","sources":["../../../src/utilities/calculateViewportsSpatialRegistration.ts"],"names":[],"mappings":";;;;;AAAA,yCAAuC;AAEvC,wDAAmD;AACnD,gHAAwF;AACxF,0BAA8B;AAC9B,wDAAgC;AAchC,SAAS,qCAAqC,CAC5C,SAAyB,EACzB,SAAyB;IAEzB,IACE,CAAC,CAAC,SAAS,YAAY,+BAAa,CAAC;QACrC,CAAC,CAAC,SAAS,YAAY,+BAAa,CAAC,EACrC;QACA,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;KACH;IAED,MAAM,sBAAsB,GAC1B,SAAS,CAAC,sBAAsB,EAAE,KAAK,SAAS,CAAC,sBAAsB,EAAE,CAAC;IAE5E,IAAI,sBAAsB,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAErE,MAAM,gBAAgB,GACpB,iBAAiB;QACjB,iBAAiB;QACjB,IAAA,iBAAO,EACL,iBAAiB,CAAC,uBAAuB,EACzC,iBAAiB,CAAC,uBAAuB,CAC1C,CAAC;IAEJ,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;KACH;IAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IACrE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IAErE,MAAM,WAAW,GAAG,gBAAI,CAAC,QAAQ,CAC/B,gBAAI,CAAC,MAAM,EAAE,EACb,qBAAqB,EACrB,qBAAqB,CACtB,CAAC;IAEF,MAAM,GAAG,GAAG,gBAAI,CAAC,eAAe,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;IAE7D,6CAAmC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAC7E,CAAC;AAED,kBAAe,qCAAqC,CAAC"}
+{"version":3,"file":"calculateViewportsSpatialRegistration.js","sourceRoot":"","sources":["../../../src/utilities/calculateViewportsSpatialRegistration.ts"],"names":[],"mappings":";;;;;AAAA,yCAAuC;AAEvC,gHAAwF;AACxF,0BAA8B;AAQ9B,MAAM,aAAa,GAAG,IAAI,CAAC;AAc3B,SAAS,qCAAqC,CAC5C,SAAyB,EACzB,SAAyB;IAEzB,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAErE,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,EAAE;QAC5C,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;QACzE,OAAO;KACR;IACD,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC;IAC5D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,uBAAuB,CAAC,KAAK,CACtE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAChD,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,GAAG,CACT,oGAAoG,EACpG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,uBAAuB,EAC1C,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,uBAAuB,CAC3C,CAAC;QACF,OAAO;KACR;IAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IACrE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IAErE,MAAM,WAAW,GAAG,gBAAI,CAAC,QAAQ,CAC/B,gBAAI,CAAC,MAAM,EAAE,EACb,qBAAqB,EACrB,qBAAqB,CACtB,CAAC;IAEF,MAAM,GAAG,GAAG,gBAAI,CAAC,eAAe,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;IAC7D,6CAAmC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAC7E,CAAC;AAED,kBAAe,qCAAqC,CAAC"}

package/dist/esm/utilities/calculateViewportsSpatialRegistration.js

@@ -1,26 +1,21 @@
 import { vec3, mat4 } from 'gl-matrix';
-import { StackViewport } from '../RenderingEngine';
 import spatialRegistrationMetadataProvider from './spatialRegistrationMetadataProvider';
 import { metaData } from '..';
-import isEqual from './isEqual';
+const ALLOWED_DELTA = 0.05;
 function calculateViewportsSpatialRegistration(viewport1, viewport2) {
-    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;
     const imagePositionPatient2 = imagePlaneModule2.imagePositionPatient;

package/dist/esm/utilities/calculateViewportsSpatialRegistration.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculateViewportsSpatialRegistration.js","sourceRoot":"","sources":["../../../src/utilities/calculateViewportsSpatialRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,mCAAmC,MAAM,uCAAuC,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAchC,SAAS,qCAAqC,CAC5C,SAAyB,EACzB,SAAyB;IAEzB,IACE,CAAC,CAAC,SAAS,YAAY,aAAa,CAAC;QACrC,CAAC,CAAC,SAAS,YAAY,aAAa,CAAC,EACrC;QACA,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;KACH;IAED,MAAM,sBAAsB,GAC1B,SAAS,CAAC,sBAAsB,EAAE,KAAK,SAAS,CAAC,sBAAsB,EAAE,CAAC;IAE5E,IAAI,sBAAsB,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAErE,MAAM,gBAAgB,GACpB,iBAAiB;QACjB,iBAAiB;QACjB,OAAO,CACL,iBAAiB,CAAC,uBAAuB,EACzC,iBAAiB,CAAC,uBAAuB,CAC1C,CAAC;IAEJ,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;KACH;IAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IACrE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IAErE,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAC/B,IAAI,CAAC,MAAM,EAAE,EACb,qBAAqB,EACrB,qBAAqB,CACtB,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;IAE7D,mCAAmC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAC7E,CAAC;AAED,eAAe,qCAAqC,CAAC"}
+{"version":3,"file":"calculateViewportsSpatialRegistration.js","sourceRoot":"","sources":["../../../src/utilities/calculateViewportsSpatialRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,mCAAmC,MAAM,uCAAuC,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAQ9B,MAAM,aAAa,GAAG,IAAI,CAAC;AAc3B,SAAS,qCAAqC,CAC5C,SAAyB,EACzB,SAAyB;IAEzB,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAErE,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,EAAE;QAC5C,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;QACzE,OAAO;KACR;IACD,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC;IAC5D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,uBAAuB,CAAC,KAAK,CACtE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAChD,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,GAAG,CACT,oGAAoG,EACpG,iBAAiB,EAAE,uBAAuB,EAC1C,iBAAiB,EAAE,uBAAuB,CAC3C,CAAC;QACF,OAAO;KACR;IAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IACrE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;IAErE,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAC/B,IAAI,CAAC,MAAM,EAAE,EACb,qBAAqB,EACrB,qBAAqB,CACtB,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;IAC7D,mCAAmC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;AAC7E,CAAC;AAED,eAAe,qCAAqC,CAAC"}