Merge pull request #1878 from plt-joey/metadata-equality

Fixing error loading when orientation is decimals different among slices of a series

Author: ivmartel

src/dicom/dataElement.js

@@ -89,3 +89,18 @@ export function safeGet(tags, key) {
   }
   return res;
 };
+
+/**
+ * Safely get all of an elements' values from a list of elements.
+ *
+ * @param {Object<string, DataElement>} tags The list of tags.
+ * @param {string} key The tag key as for example '00100020'.
+ * @returns {any[]|undefined} The elements' values or undefined.
+ */
+export function safeGetAll(tags, key) {
+  let res;
+  if (typeof tags[key] !== 'undefined') {
+    res = tags[key].value;
+  }
+  return res;
+};

src/image/image.js

@@ -13,7 +13,7 @@ import {isMonochrome} from '../dicom/dicomElementsWrapper';
 // doc imports
 /* eslint-disable no-unused-vars */
 import {Geometry} from './geometry';
-import {Matrix33} from '../math/matrix';
+import {Matrix33, REAL_WORLD_EPSILON} from '../math/matrix';
 import {NumberRange} from '../math/stats';
 import {DataElement} from '../dicom/dataElement';
 import {RGB} from '../utils/colour';
@@ -781,7 +781,7 @@ export class Image {
       throw new Error('Cannot append a slice with different number of rows');
     }
     if (!this.#geometry.getOrientation().isSimilar(
-      rhs.getGeometry().getOrientation(), 0.0001)) {
+      rhs.getGeometry().getOrientation(), REAL_WORLD_EPSILON)) {
       throw new Error('Cannot append a slice with different orientation');
     }
     if (this.#photometricInterpretation !==
@@ -791,10 +791,16 @@ export class Image {
     }
     // all meta should be equal
     for (const key in this.#meta) {
-      if (key === 'windowPresets' || key === 'numberOfFiles' ||
-        key === 'custom') {
+      if (
+        key === 'windowPresets' ||
+        key === 'numberOfFiles' ||
+        key === 'custom' ||
+        // This was already checked with #geometry.getOrientation()
+        key === 'ImageOrientationPatient'
+      ) {
         continue;
       }
+
       if (this.#meta[key] !== rhs.getMeta()[key]) {
         throw new Error('Cannot append a slice with different ' + key +
           ': ' + this.#meta[key] + ' != ' + rhs.getMeta()[key]);

src/image/imageFactory.js

@@ -4,7 +4,7 @@ import {RescaleSlopeAndIntercept} from './rsi';
 import {WindowLevel} from './windowLevel';
 import {Image} from './image';
 import {ColourMap} from './luts';
-import {safeGet} from '../dicom/dataElement';
+import {safeGet, safeGetAll} from '../dicom/dataElement';
 import {
   isJpeg2000TransferSyntax,
   isJpegBaselineTransferSyntax,
@@ -253,6 +253,10 @@ export class ImageFactory {
       return safeGet(dataElements, key);
     };
 
+    const safeGetAllLocal = function (key) {
+      return safeGetAll(dataElements, key);
+    };
+
     // defaults
     meta.TransferSyntaxUID = safeGetLocal('00020010');
     meta.MediaStorageSOPClassUID = safeGetLocal('00020002');
@@ -287,7 +291,7 @@ export class ImageFactory {
     meta.DeviceSerialNumber = safeGetLocal('00181000');
     meta.SoftwareVersions = safeGetLocal('00181020');
 
-    meta.ImageOrientationPatient = safeGetLocal('00200037');
+    meta.ImageOrientationPatient = safeGetAllLocal('00200037');
     meta.FrameOfReferenceUID = safeGetLocal('00200052');
 
     // PixelRepresentation -> is signed

tests/pacs/viewer.js

@@ -128,7 +128,7 @@ function viewerSetup() {
 
   // bind events
   _app.addEventListener('error', function (event) {
-    console.error('load error', event);
+    console.error('load error', event, event.error);
     // abort load
     _app.abortLoad(event.dataid);
   });