@ohif/app 3.7.0-beta.77 → 3.7.0-beta.79

package/dist/{181.bundle.9406be756cfb7968981c.js → 181.bundle.9a76ce585a7139d4862f.js}

@@ -19,8 +19,8 @@ var index_esm = __webpack_require__(7023);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 326 modules
-var esm = __webpack_require__(99116);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 327 modules
+var esm = __webpack_require__(99777);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 337 modules
 var dist_esm = __webpack_require__(45754);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules

package/dist/{202.bundle.591726b6144882ba0ee0.js → 202.bundle.6c3b5e9f37d88388e5c8.js}

@@ -11,11 +11,11 @@
 /* harmony export */ });
 /* unused harmony export helpers */
 /* harmony import */ var dcmjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(67540);
-/* harmony import */ var ndarray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(87513);
-/* harmony import */ var ndarray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ndarray__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11677);
-/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(58955);
+/* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58955);
+/* harmony import */ var ndarray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(87513);
+/* harmony import */ var ndarray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ndarray__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11677);
+/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(45451);
 
 
@@ -564,9 +564,34 @@ var graphicTypeEquals = function (graphicType) {
     };
 };
 
+var datasetToDict = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.datasetToDict;
+/**
+ * Trigger file download from an array buffer
+ * @param bufferOrDataset - ArrayBuffer or DicomDataset
+ * @param filename - name of the file to download
+ */
+function downloadDICOMData(bufferOrDataset, filename) {
+    var blob;
+    if (bufferOrDataset instanceof ArrayBuffer) {
+        blob = new Blob([bufferOrDataset], { type: "application/dicom" });
+    }
+    else {
+        if (!bufferOrDataset._meta) {
+            throw new Error("Dataset must have a _meta property");
+        }
+        var buffer = buffer__WEBPACK_IMPORTED_MODULE_1__/* .Buffer */ .lW.from(datasetToDict(bufferOrDataset).write());
+        blob = new Blob([buffer], { type: "application/dicom" });
+    }
+    var link = document.createElement("a");
+    link.href = window.URL.createObjectURL(blob);
+    link.download = filename;
+    link.click();
+}
+
 var index$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   codeMeaningEquals: codeMeaningEquals,
+  downloadDICOMData: downloadDICOMData,
   graphicTypeEquals: graphicTypeEquals,
   toArray: toArray
 });
@@ -2002,7 +2027,7 @@ function generateToolState$3(imageIds, arrayBuffer, metadataProvider) {
   for (var i = 0; i < PerFrameFunctionalGroupsSequence.length; i++) {
     var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[i];
     var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
-    var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_1___default()(new Uint8Array(pixelData.buffer, i * sliceLength, sliceLength), [multiframe.Rows, multiframe.Columns]);
+    var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_2___default()(new Uint8Array(pixelData.buffer, i * sliceLength, sliceLength), [multiframe.Rows, multiframe.Columns]);
     var alignedPixelDataI = alignPixelDataWithSourceData$1(pixelDataI2D, ImageOrientationPatientI, validOrientations);
     if (!alignedPixelDataI) {
       console.warn("This segmentation object is not in-plane with the source data. Bailing out of IO. It'd be better to render this with vtkjs. ");
@@ -2259,8 +2284,7 @@ var _utilities$orientatio = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .utilities */ .
   flipMatrix2D = _utilities$orientatio.flipMatrix2D,
   rotateMatrix902D = _utilities$orientatio.rotateMatrix902D,
   nearlyEqual = _utilities$orientatio.nearlyEqual;
-var datasetToDict = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.datasetToDict,
-  BitArray$1 = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.BitArray,
+var BitArray$1 = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.BitArray,
   DicomMessage = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.DicomMessage,
   DicomMetaDictionary$1 = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .data */ .aT.DicomMetaDictionary;
 var Normalizer$2 = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .normalizers */ .oq.Normalizer;
@@ -2299,12 +2323,13 @@ function generateSegmentation$2(images, inputLabelmaps3D) {
 }
 
 /**
- * fillSegmentation - Fills a derived segmentation dataset with cornerstoneTools `LabelMap3D` data.
+ * Fills a given segmentation object with data from the input labelmaps3D
  *
- * @param  {object[]} segmentation An empty segmentation derived dataset.
- * @param  {Object|Object[]} inputLabelmaps3D The cornerstone `Labelmap3D` object, or an array of objects.
- * @param  {Object} userOptions Options object to override default options.
- * @returns {Blob}           description
+ * @param segmentation - The segmentation object to be filled.
+ * @param inputLabelmaps3D - An array of 3D labelmaps, or a single 3D labelmap.
+ * @param userOptions - Optional configuration settings. Will override the default options.
+ *
+ * @returns {object} The filled segmentation object.
  */
 function fillSegmentation$1(segmentation, inputLabelmaps3D) {
   var userOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -2386,11 +2411,7 @@ function fillSegmentation$1(segmentation, inputLabelmaps3D) {
     // If no rleEncoding, at least bitpack the data.
     segmentation.bitPackPixelData();
   }
-  var buffer = buffer__WEBPACK_IMPORTED_MODULE_3__/* .Buffer */ .lW.from(datasetToDict(segmentation.dataset).write());
-  var segBlob = new Blob([buffer], {
-    type: "application/dicom"
-  });
-  return segBlob;
+  return segmentation;
 }
 function _getLabelmapsFromReferencedFrameIndicies(labelmap3D, referencedFrameIndicies) {
   var labelmaps2D = labelmap3D.labelmaps2D;
@@ -2851,7 +2872,7 @@ function checkSEGsOverlapping(pixelData, multiframe, imageIds, validOrientations
         var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[_frameSegment];
         var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
         var view = readFromUnpackedChunks(pixelData, _frameSegment * sliceLength, sliceLength);
-        var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_1___default()(view, [Rows, Columns]);
+        var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_2___default()(view, [Rows, Columns]);
         var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
         if (!alignedPixelDataI) {
           console.warn("Individual SEG frames are out of plane with respect to the first SEG frame, this is not yet supported, skipping this frame.");
@@ -2893,7 +2914,7 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
   var tempBuffer = labelmapBufferArray[m].slice(0);
 
   // temp list for checking overlaps
-  var tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default()(segmentsOnFrameArray[m]);
+  var tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3___default()(segmentsOnFrameArray[m]);
 
   /** split overlapping SEGs algorithm for each segment:
    *  A) copy the labelmapBuffer in the array with index 0
@@ -2920,7 +2941,7 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
       // and handle scenarios where the portion of data is in one chunk
       // and the other portion is in another chunk
       var view = readFromUnpackedChunks(pixelData, _i2 * sliceLength, sliceLength);
-      var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_1___default()(view, [Rows, Columns]);
+      var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_2___default()(view, [Rows, Columns]);
       var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
       if (!alignedPixelDataI) {
         throw new Error("Individual SEG frames are out of plane with respect to the first SEG frame. " + "This is not yet supported. Aborting segmentation loading.");
@@ -2952,7 +2973,7 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
               M++;
             }
             tempBuffer = labelmapBufferArray[m].slice(0);
-            tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default()(segmentsOnFrameArray[m]);
+            tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3___default()(segmentsOnFrameArray[m]);
             _i2 = 0;
             break;
           } else {
@@ -2978,12 +2999,12 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
       if (_ret2 === "continue") continue;
     }
     labelmapBufferArray[m] = tempBuffer.slice(0);
-    segmentsOnFrameArray[m] = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default()(tempSegmentsOnFrame);
+    segmentsOnFrameArray[m] = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3___default()(tempSegmentsOnFrame);
 
     // reset temp variables/buffers for new segment
     m = 0;
     tempBuffer = labelmapBufferArray[m].slice(0);
-    tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default()(segmentsOnFrameArray[m]);
+    tempSegmentsOnFrame = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_3___default()(segmentsOnFrameArray[m]);
   }
 }
 var getSegmentIndex = function getSegmentIndex(multiframe, frame) {
@@ -3015,7 +3036,7 @@ function insertPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray, labelmapBu
         var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[i];
         var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
         var view = readFromUnpackedChunks(pixelData, i * sliceLength, sliceLength);
-        var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_1___default()(view, [Rows, Columns]);
+        var pixelDataI2D = ndarray__WEBPACK_IMPORTED_MODULE_2___default()(view, [Rows, Columns]);
         var alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
         if (!alignedPixelDataI) {
           throw new Error("Individual SEG frames are out of plane with respect to the first SEG frame. " + "This is not yet supported. Aborting segmentation loading.");
@@ -4872,6 +4893,7 @@ var SegmentationDerivation = dcmjs__WEBPACK_IMPORTED_MODULE_0__/* .derivations *
  * @param labelmaps - An array of the 3D Volumes that contain the segmentation data.
  */
 function generateSegmentation(images, labelmaps, metadata, options) {
+    if (options === void 0) { options = {}; }
     var segmentation = _createMultiframeSegmentationFromReferencedImages(images, metadata, options);
     return fillSegmentation$1(segmentation, labelmaps, options);
 }
@@ -4891,7 +4913,7 @@ function _createMultiframeSegmentationFromReferencedImages(images, metadata, opt
         var instance = metadata.get("instance", image.imageId);
         return __assign(__assign(__assign({}, image), instance), { 
             // Todo: move to dcmjs tag style
-            SOPClassUID: instance.SopClassUID, SOPInstanceUID: instance.SopInstanceUID, PixelData: image.getPixelData(), _vrMap: {
+            SOPClassUID: instance.SopClassUID || instance.SOPClassUID, SOPInstanceUID: instance.SopInstanceUID || instance.SOPInstanceUID, PixelData: image.getPixelData(), _vrMap: {
                 PixelData: "OW"
             }, _meta: {} });
     });

package/dist/{663.bundle.f4704358d88979413fc2.js → 663.bundle.5175469e25c5196a739c.js}

@@ -29,8 +29,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var src = __webpack_require__(34491);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(45451);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 326 modules
-var dist_esm = __webpack_require__(99116);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 327 modules
+var dist_esm = __webpack_require__(99777);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 337 modules
 var core_dist_esm = __webpack_require__(45754);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
@@ -1622,8 +1622,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
 }
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 326 modules
-var dist_esm = __webpack_require__(99116);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 327 modules
+var dist_esm = __webpack_require__(99777);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 

package/dist/{754.bundle.a5c9246c77659eab2739.js → 754.bundle.6618bdd7f648b532c682.js}

@@ -2664,7 +2664,7 @@ function hasSharedArrayBuffer() {
         return false;
     }
 }
-async function init(configuration = {}) {
+async function init(configuration = config) {
     if (csRenderInitialized) {
         return csRenderInitialized;
     }
@@ -29931,26 +29931,21 @@ addProvider(spatialRegistrationMetadataProvider.get.bind(spatialRegistrationMeta
 
 
 
-
-
+const ALLOWED_DELTA = 0.05;
 function calculateViewportsSpatialRegistration(viewport1, viewport2) {
-    if (!(viewport1 instanceof RenderingEngine_StackViewport) ||
-        !(viewport2 instanceof RenderingEngine_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 = getMetaData('imagePlaneModule', imageId1);
     const imagePlaneModule2 = getMetaData('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;
@@ -46643,6 +46638,15 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
         volumeActor.getProperty().setRGBTransferFunction(0, newRGBTransferFunction);
         return newRGBTransferFunction;
     }
+    setInterpolationType(interpolationType, volumeId) {
+        const applicableVolumeActorInfo = this._getApplicableVolumeActor(volumeId);
+        if (!applicableVolumeActorInfo) {
+            return;
+        }
+        const { volumeActor } = applicableVolumeActorInfo;
+        const volumeProperty = volumeActor.getProperty();
+        volumeProperty.setInterpolationType(interpolationType);
+    }
     setVOI(voiRange, volumeId, suppressEvents = false) {
         const applicableVolumeActorInfo = this._getApplicableVolumeActor(volumeId);
         if (!applicableVolumeActorInfo) {
@@ -46678,7 +46682,7 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
             triggerEvent(this.element, enums_Events.VOI_MODIFIED, eventDetail);
         }
     }
-    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, } = {}, volumeId, suppressEvents = false) {
+    setProperties({ voiRange, VOILUTFunction, invert, colormap, preset, interpolationType, } = {}, volumeId, suppressEvents = false) {
         if (colormap?.name) {
             this.setColormap(colormap, volumeId, suppressEvents);
         }
@@ -46688,6 +46692,9 @@ class BaseVolumeViewport extends RenderingEngine_Viewport {
         if (voiRange !== undefined) {
             this.setVOI(voiRange, volumeId, suppressEvents);
         }
+        if (typeof interpolationType !== 'undefined') {
+            this.setInterpolationType(interpolationType);
+        }
         if (VOILUTFunction !== undefined) {
             this.setVOILUTFunction(VOILUTFunction, volumeId, suppressEvents);
         }
@@ -48292,6 +48299,7 @@ class StackViewport extends RenderingEngine_Viewport {
         super(props);
         this.voiUpdatedWithSetProperties = false;
         this.invert = false;
+        this.initialInvert = false;
         this.stackInvalidated = false;
         this._publishCalibratedEvent = false;
         this.useNativeDataType = false;
@@ -48794,7 +48802,7 @@ class StackViewport extends RenderingEngine_Viewport {
             this.setRotation(0);
         }
         this.setInterpolationType(enums_InterpolationType.LINEAR);
-        this.setInvertColor(false);
+        this.setInvertColor(this.initialInvert);
     }
     _setPropertiesFromCache() {
         const { interpolationType, invert } = this;
@@ -49487,7 +49495,8 @@ class StackViewport extends RenderingEngine_Viewport {
         this.setVOI(this._getInitialVOIRange(image), {
             forceRecreateLUTFunction: !!monochrome1,
         });
-        this.setInvertColor(this.invert || !!monochrome1);
+        this.initialInvert = !!monochrome1;
+        this.setInvertColor(this.invert || this.initialInvert);
         this.cameraFocalPointOnRender = this.getCamera().focalPoint;
         this.stackInvalidated = false;
         if (this._publishCalibratedEvent) {
@@ -49541,6 +49550,7 @@ class StackViewport extends RenderingEngine_Viewport {
         }
         this.currentImageIdIndex = imageIdIndex;
         this.hasPixelSpacing = true;
+        this.viewportStatus = enums_ViewportStatus.PRE_RENDER;
         const imageId = await this._loadAndDisplayImage(this.imageIds[imageIdIndex], imageIdIndex);
         return imageId;
     }

package/dist/{774.bundle.8ba82ee206266eb2da5e.js → 774.bundle.d365320749c4f67cda70.js}

@@ -935,6 +935,8 @@ function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
         const scalingParameters = esm.utilities.getScalingParameters(imageId);
         const hasNegativeRescale = scalingParameters.rescaleIntercept < 0 ||
             scalingParameters.rescaleSlope < 0;
+        const hasFloatRescale = scalingParameters.rescaleIntercept % 1 !== 0 ||
+            scalingParameters.rescaleSlope % 1 !== 0;
         const { BitsAllocated, PixelRepresentation, PhotometricInterpretation, ImageOrientationPatient, PixelSpacing, Columns, Rows, } = volumeMetadata;
         const rowCosineVec = gl_matrix_esm/* vec3.fromValues */.R3.fromValues(ImageOrientationPatient[0], ImageOrientationPatient[1], ImageOrientationPatient[2]);
         const colCosineVec = gl_matrix_esm/* vec3.fromValues */.R3.fromValues(ImageOrientationPatient[3], ImageOrientationPatient[4], ImageOrientationPatient[5]);
@@ -972,7 +974,7 @@ function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
                     : new Uint8Array(length * numComponents);
                 break;
             case 16:
-                if (!use16BitDataType) {
+                if (!use16BitDataType || hasFloatRescale) {
                     sizeInBytes = length * 4;
                     scalarData = useSharedArrayBuffer
                         ? cornerstoneStreamingImageVolumeLoader_createFloat32SharedArray(length)