@ohif/app 3.9.0 → 3.9.2

package/dist/{app.bundle.8e454976c3d4c3348750.js → app.bundle.632bc6188462e1c95a41.js}

@@ -934,7 +934,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
         sliceIndex ??= currentIndex;
         const { viewPlaneNormal, focalPoint } = this.getCamera();
         const querySeparator = volumeId.includes('?') ? '&' : '?';
-        return `volumeId:${volumeId}${querySeparator}sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(',')}&focalPoint=${focalPoint.join(',')}`;
+        return `volumeId:${volumeId}${querySeparator}sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(',')}`;
     }
     _addVolumeId(volumeId) {
         this.volumeIds.add(volumeId);
@@ -16844,6 +16844,12 @@ var cache = __webpack_require__(49038);
 
 
 
+function convertDataType(data, targetDataType) {
+    const Constructor = (0,getBufferConfiguration/* getConstructorFromType */.j)(targetDataType);
+    const convertedData = new Constructor(data.length);
+    convertedData.set(data);
+    return convertedData;
+}
 function vtkStreamingOpenGLTexture(publicAPI, model) {
     model.classHierarchy.push('vtkStreamingOpenGLTexture');
     model.updatedFrames = [];
@@ -16894,10 +16900,14 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 if (!image) {
                     continue;
                 }
-                const data = image.voxelManager.getScalarData();
+                let data = image.voxelManager.getScalarData();
                 const gl = model.context;
-                const dataType = data.constructor.name;
-                const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+                if (volume.dataType !== data.constructor.name) {
+                    data = convertDataType(data, volume.dataType);
+                }
+                const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                    data,
+                ]);
                 publicAPI.bind();
                 const zOffset = i;
                 gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);
@@ -16931,8 +16941,12 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 constructor = data.constructor;
             }
             const gl = model.context;
-            const dataType = data.constructor.name;
-            const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+            if (volume.dataType !== data.constructor.name) {
+                data = convertDataType(data, volume.dataType);
+            }
+            const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                data,
+            ]);
             publicAPI.bind();
             let zOffset = i;
             gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);
@@ -25049,12 +25063,20 @@ const deepMerge = (target = {}, source = {}, optionsArgument = undefined) => {
 /* harmony import */ var _getScalingParameters__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32173);
 /* harmony import */ var _hasFloatScalingParameters__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30169);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(59693);
+/* harmony import */ var _cache_cache__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(49038);
+
 
 
 
 
 
 
+const constructorToTypedArray = {
+    Uint8Array: 'Uint8Array',
+    Int16Array: 'Int16Array',
+    Uint16Array: 'Uint16Array',
+    Float32Array: 'Float32Array',
+};
 function generateVolumePropsFromImageIds(imageIds, volumeId) {
     const volumeMetadata = (0,_makeVolumeMetadata__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(imageIds);
     const { ImageOrientationPatient, PixelSpacing, Columns, Rows } = volumeMetadata;
@@ -25087,6 +25109,10 @@ function generateVolumePropsFromImageIds(imageIds, volumeId) {
 function _determineDataType(imageIds, volumeMetadata) {
     const { BitsAllocated, PixelRepresentation } = volumeMetadata;
     const signed = PixelRepresentation === 1;
+    const cachedDataType = _getDataTypeFromCache(imageIds);
+    if (cachedDataType) {
+        return cachedDataType;
+    }
     const [firstIndex, middleIndex, lastIndex] = [
         0,
         Math.floor(imageIds.length / 2),
@@ -25121,6 +25147,19 @@ function _determineDataType(imageIds, volumeMetadata) {
             throw new Error(`Bits allocated of ${BitsAllocated} is not defined to generate scalarData for the volume.`);
     }
 }
+function _getDataTypeFromCache(imageIds) {
+    const indices = [0, Math.floor(imageIds.length / 2), imageIds.length - 1];
+    const images = indices.map((i) => _cache_cache__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Ay.getImage(imageIds[i]));
+    if (!images.every(Boolean)) {
+        return null;
+    }
+    const constructorName = images[0].getPixelData().constructor.name;
+    if (images.every((img) => img.getPixelData().constructor.name === constructorName) &&
+        constructorName in constructorToTypedArray) {
+        return constructorToTypedArray[constructorName];
+    }
+    return null;
+}
 
 
 
@@ -25768,6 +25807,15 @@ const imageRetrieveMetadataProvider = {
     add: (key, payload) => {
         retrieveConfigurationState.set(key, payload);
     },
+    clone: () => {
+        return new Map(retrieveConfigurationState);
+    },
+    restore: (state) => {
+        retrieveConfigurationState.clear();
+        state.forEach((value, key) => {
+            retrieveConfigurationState.set(key, value);
+        });
+    },
     get: (type, ...queries) => {
         if (type === IMAGE_RETRIEVE_CONFIGURATION) {
             return queries
@@ -26693,7 +26741,10 @@ function calculateViewportsSpatialRegistration(viewport1, viewport2) {
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getViewportImageCornersInWorld.js
 function getViewportImageCornersInWorld(viewport) {
-    const { imageData, dimensions } = viewport.getImageData();
+    const { imageData, dimensions } = viewport.getImageData() || {};
+    if (!imageData || !dimensions) {
+        return [];
+    }
     const { canvas } = viewport;
     const ratio = window.devicePixelRatio;
     const topLeftCanvas = [0, 0];
@@ -30108,6 +30159,10 @@ function getPixelDataTypeFromMinMax(min, max) {
     }
     return pixelDataType || Float32Array;
 }
+function validatePixelDataType(min, max, type) {
+    const pixelDataType = getPixelDataTypeFromMinMax(min, max);
+    return pixelDataType === type;
+}
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/imageLoader/convertColorSpace.js
 
@@ -31760,7 +31815,7 @@ const workerFn = () => {
     const instance = new Worker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u(1927), __webpack_require__.b), { type: undefined });
     return instance;
 };
-function init(options) {
+function init(options = {}) {
     setOptions(options);
     imageLoader_registerLoaders();
     const workerManager = (0,esm.getWebWorkerManager)();
@@ -66971,7 +67026,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     }
     return result;
   };
-  publicAPI.useHalfFloat = () => model.enableHalfFloat && model.canUseHalfFloat;
+  publicAPI.useHalfFloat = () => model.enableUseHalfFloat && model.canUseHalfFloat;
 
   //----------------------------------------------------------------------------
   publicAPI.setInternalFormat = iFormat => {
@@ -67605,18 +67660,21 @@ function vtkOpenGLTexture(publicAPI, model) {
   }
   function setCanUseHalfFloat(dataType, offset, scale, preferSizeOverAccuracy) {
     publicAPI.getOpenGLDataType(dataType);
+
+    // Don't consider halfFloat and convert back to Float when the range of data does not generate an accurate halfFloat
+    // AND it is not preferable to have a smaller texture than an exact texture.
+    const isExactHalfFloat = hasExactHalfFloat(offset, scale) || preferSizeOverAccuracy;
     let useHalfFloat = false;
     if (model._openGLRenderWindow.getWebgl2()) {
-      useHalfFloat = model.openGLDataType === model.context.HALF_FLOAT;
+      // If OES_texture_float_linear is not available, and using a half float would still be exact, force half floats
+      // This is because half floats are always texture filterable in webgl2, while full *32F floats are not (unless the extension is present)
+      const forceHalfFloat = model.openGLDataType === model.context.FLOAT && model.context.getExtension('OES_texture_float_linear') === null && isExactHalfFloat;
+      useHalfFloat = forceHalfFloat || model.openGLDataType === model.context.HALF_FLOAT;
     } else {
       const halfFloatExt = model.context.getExtension('OES_texture_half_float');
       useHalfFloat = halfFloatExt && model.openGLDataType === halfFloatExt.HALF_FLOAT_OES;
     }
-
-    // Don't consider halfFloat and convert back to Float when the range of data does not generate an accurate halfFloat
-    // AND it is not preferable to have a smaller texture than an exact texture.
-    const isHalfFloat = useHalfFloat && (hasExactHalfFloat(offset, scale) || preferSizeOverAccuracy);
-    model.canUseHalfFloat = isHalfFloat;
+    model.canUseHalfFloat = useHalfFloat && isExactHalfFloat;
   }
   function processDataArray(dataArray, preferSizeOverAccuracy) {
     const numComps = dataArray.getNumberOfComponents();
@@ -95921,8 +95979,8 @@ function WorkList({
     };
   });
   const hasStudies = numOfStudies > 0;
-  const versionNumber = "3.9.0";
-  const commitHash = "b41706320067b0d9eee181009453fc2a77b4171b";
+  const versionNumber = "3.9.2";
+  const commitHash = "e5286d9fc2449da50b738e7e6208d489cce1633e";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -96708,7 +96766,7 @@ function ViewerViewportGrid(props) {
         isActive: isActive
       }, /*#__PURE__*/react.createElement("div", {
         "data-cy": "viewport-pane",
-        className: classnames_default()('flex h-full w-full flex-col', {
+        className: classnames_default()('flex h-full w-full min-w-[5px] flex-col', {
           'pointer-events-none': !isActive && (appConfig?.activateViewportBeforeInteraction ?? true)
         })
       }, /*#__PURE__*/react.createElement(ViewportComponent, {
@@ -96797,35 +96855,35 @@ modes.push("@ohif/mode-preclinical-4d");
 async function loadModule(module) {
   if (typeof module !== 'string') return module;
   if (module === "@ohif/extension-default") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(1520), __webpack_require__.e(2591)]).then(__webpack_require__.bind(__webpack_require__, 71520));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(5630), __webpack_require__.e(2591)]).then(__webpack_require__.bind(__webpack_require__, 55630));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(4182)]).then(__webpack_require__.bind(__webpack_require__, 11185));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(4182)]).then(__webpack_require__.bind(__webpack_require__, 11185));
     return imported.default;
   }
   if (module === "@ohif/extension-measurement-tracking") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5261), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(3200)]).then(__webpack_require__.bind(__webpack_require__, 71903));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5261), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(3200)]).then(__webpack_require__.bind(__webpack_require__, 71903));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-sr") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1801)]).then(__webpack_require__.bind(__webpack_require__, 85687));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1801)]).then(__webpack_require__.bind(__webpack_require__, 85687));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-seg") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(7197)]).then(__webpack_require__.bind(__webpack_require__, 96975));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3970), __webpack_require__.e(5630), __webpack_require__.e(7197)]).then(__webpack_require__.bind(__webpack_require__, 96975));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-pmap") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5139)]).then(__webpack_require__.bind(__webpack_require__, 82098));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5139)]).then(__webpack_require__.bind(__webpack_require__, 82098));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dynamic-volume") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(717)]).then(__webpack_require__.bind(__webpack_require__, 14696));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(717)]).then(__webpack_require__.bind(__webpack_require__, 14696));
     return imported.default;
   }
   if (module === "@ohif/extension-dicom-microscopy") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(5807), __webpack_require__.e(1520), __webpack_require__.e(5247)]).then(__webpack_require__.bind(__webpack_require__, 22801));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(5807), __webpack_require__.e(5630), __webpack_require__.e(5247)]).then(__webpack_require__.bind(__webpack_require__, 22801));
     return imported.default;
   }
   if (module === "@ohif/extension-dicom-pdf") {
@@ -96837,7 +96895,7 @@ async function loadModule(module) {
     return imported.default;
   }
   if (module === "@ohif/extension-tmtv") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(3198)]).then(__webpack_require__.bind(__webpack_require__, 57289));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(3198)]).then(__webpack_require__.bind(__webpack_require__, 57289));
     return imported.default;
   }
   if (module === "@ohif/extension-test") {
@@ -96849,7 +96907,7 @@ async function loadModule(module) {
     return imported.default;
   }
   if (module === "@ohif/mode-longitudinal") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1266)]).then(__webpack_require__.bind(__webpack_require__, 35589));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1266)]).then(__webpack_require__.bind(__webpack_require__, 35589));
     return imported.default;
   }
   if (module === "@ohif/mode-segmentation") {
@@ -97351,9 +97409,9 @@ function ModeRoute({
       const hangingProtocolIdToUse = hangingProtocolService.getProtocolById(runTimeHangingProtocolId) ? runTimeHangingProtocolId : hangingProtocol;
 
       // Determine the index of the stageId if the hangingProtocolIdToUse is defined
-      const stageIndex = hangingProtocolIdToUse ? hangingProtocolService.getStageIndex(hangingProtocolIdToUse, {
+      const stageIndex = Array.isArray(hangingProtocolIdToUse) ? -1 : hangingProtocolService.getStageIndex(hangingProtocolIdToUse, {
         stageId: runTimeStageId || undefined
-      }) : -1;
+      });
       // Ensure that the stage index is never negative
       // If stageIndex is negative (e.g., if stage wasn't found), use 0 as the default
       const stageIndexToUse = Math.max(0, stageIndex);
@@ -103004,14 +103062,17 @@ class UIDialogService extends pubSubServiceInterface/* PubSubService */.R {
     id,
     content,
     contentProps,
-    onStart,
-    onDrag,
-    onStop,
+    onStart = () => {},
+    onDrag = () => {},
+    onStop = () => {},
     centralize = false,
     preservePosition = true,
     isDraggable = true,
     showOverlay = false,
-    defaultPosition
+    defaultPosition = {
+      x: 0,
+      y: 0
+    }
   }) {
     return this.serviceImplementation._create({
       id,
@@ -107350,7 +107411,7 @@ class CustomizationService extends pubSubServiceInterface/* PubSubService */.R {
       return customization;
     }
     const parent = this.getCustomization(customizationType);
-    const result = parent ? Object.assign(Object.create(parent), customization) : customization;
+    const result = parent ? Object.assign({}, parent, customization) : customization;
     // Execute an nested type information
     return result.transform?.(this) || result;
   }
@@ -108481,7 +108542,7 @@ class StudyPrefetcherService extends pubSubServiceInterface/* PubSubService */.R
     this._displaySetLoadingStates.clear();
     this._imageIdsToDisplaySetsMap.clear();
     this._inflightRequests.clear();
-    this.imageLoadPoolManager.clearRequestStack(IMAGE_REQUEST_TYPE);
+    this.imageLoadPoolManager.clearRequestStack(this.requestType);
     this._broadcastEvent(this.EVENTS.SERVICE_STOPPED, {});
   }
 
@@ -109723,7 +109784,11 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
 }
 // EXTERNAL MODULE: ../../core/src/utils/toNumber.js
 var toNumber = __webpack_require__(37827);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
+var esm = __webpack_require__(3823);
 ;// CONCATENATED MODULE: ../../core/src/utils/combineFrameInstance.ts
+
+
 /**
  * Combine the Per instance frame data, the shared frame data
  * and the root data objects.
@@ -109738,21 +109803,34 @@ const combineFrameInstance = (frame, instance) => {
   const {
     PerFrameFunctionalGroupsSequence,
     SharedFunctionalGroupsSequence,
-    NumberOfFrames
+    NumberOfFrames,
+    SpacingBetweenSlices
   } = instance;
   if (PerFrameFunctionalGroupsSequence || NumberOfFrames > 1) {
     const frameNumber = Number.parseInt(frame || 1);
-    const shared = (SharedFunctionalGroupsSequence ? Object.values(SharedFunctionalGroupsSequence[0]) : []).filter(it => !!it).map(it => it[0]).filter(it => it !== undefined && typeof it === 'object');
-    const perFrame = (PerFrameFunctionalGroupsSequence ? Object.values(PerFrameFunctionalGroupsSequence[frameNumber - 1]) : []).filter(it => !!it).map(it => it[0]).filter(it => it !== undefined && typeof it === 'object');
+    const shared = SharedFunctionalGroupsSequence ? Object.values(SharedFunctionalGroupsSequence[0]).filter(Boolean).map(it => it[0]).filter(it => typeof it === 'object') : [];
+    const perFrame = PerFrameFunctionalGroupsSequence ? Object.values(PerFrameFunctionalGroupsSequence[frameNumber - 1]).filter(Boolean).map(it => it[0]).filter(it => typeof it === 'object') : [];
 
     // this is to fix NM multiframe datasets with position and orientation
     // information inside DetectorInformationSequence
     if (!instance.ImageOrientationPatient && instance.DetectorInformationSequence) {
       instance.ImageOrientationPatient = instance.DetectorInformationSequence[0].ImageOrientationPatient;
     }
+    let ImagePositionPatientToUse = instance.ImagePositionPatient;
     if (!instance.ImagePositionPatient && instance.DetectorInformationSequence) {
-      instance.ImagePositionPatient = instance.DetectorInformationSequence[0].ImagePositionPatient;
+      const imagePositionPatient = instance.DetectorInformationSequence[0].ImagePositionPatient;
+      const imageOrientationPatient = instance.ImageOrientationPatient;
+
+      // Calculate the position for the current frame
+      if (imageOrientationPatient && SpacingBetweenSlices) {
+        const rowOrientation = esm/* vec3.fromValues */.eR.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
+        const colOrientation = esm/* vec3.fromValues */.eR.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
+        const normalVector = esm/* vec3.cross */.eR.cross(esm/* vec3.create */.eR.create(), rowOrientation, colOrientation);
+        const position = esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(esm/* vec3.create */.eR.create(), imagePositionPatient, normalVector, SpacingBetweenSlices * (frameNumber - 1));
+        ImagePositionPatientToUse = [position[0], position[1], position[2]];
+      }
     }
+    console.debug('🚀 ~ ImagePositionPatientToUse:', ImagePositionPatientToUse);
     const newInstance = Object.assign(instance, {
       frameNumber: frameNumber
     });
@@ -109768,7 +109846,7 @@ const combineFrameInstance = (frame, instance) => {
     // back to the dicomMetaStore so we don't have to do this again.
     return {
       ...newInstance,
-      ImagePositionPatient: newInstance.ImagePositionPatient ?? [0, 0, frameNumber]
+      ImagePositionPatient: ImagePositionPatientToUse ?? newInstance.ImagePositionPatient ?? [0, 0, frameNumber]
     };
   } else {
     return instance;
@@ -109786,7 +109864,6 @@ const combineFrameInstance = (frame, instance) => {
 
 class MetadataProvider {
   constructor() {
-    this.studies = new Map();
     this.imageURIToUIDs = new Map();
     this.imageUIDsByImageId = new Map();
     // Can be used to store custom metadata for a specific type.
@@ -109795,6 +109872,10 @@ class MetadataProvider {
     this.customMetadata = new Map();
   }
   addImageIdToUIDs(imageId, uids) {
+    if (!imageId) {
+      throw new Error('MetadataProvider::Empty imageId');
+    }
+
     // This method is a fallback for when you don't have WADO-URI or WADO-RS.
     // You can add instances fetched by any method by calling addInstance, and hook an imageId to point at it here.
     // An example would be dicom hosted at some random site.
@@ -109810,6 +109891,9 @@ class MetadataProvider {
     this.customMetadata.get(type)[imageURI] = metadata;
   }
   _getInstance(imageId) {
+    if (!imageId) {
+      throw new Error('MetadataProvider::Empty imageId');
+    }
     const uids = this.getUIDsFromImageID(imageId);
     if (!uids) {
       return;
@@ -110181,17 +110265,6 @@ class MetadataProvider {
     return;
   }
   getUIDsFromImageID(imageId) {
-    if (!imageId) {
-      throw new Error('MetadataProvider::Empty imageId');
-    }
-    // TODO: adding csiv here is not really correct. Probably need to use
-    // metadataProvider.addImageIdToUIDs(imageId, {
-    //   StudyInstanceUID,
-    //   SeriesInstanceUID,
-    //   SOPInstanceUID,
-    // })
-    // somewhere else
-
     const cachedUIDs = this.imageUIDsByImageId.get(imageId);
     if (cachedUIDs) {
       return cachedUIDs;
@@ -115009,7 +115082,7 @@ const detectionOptions = {
   }
 });
 ;// CONCATENATED MODULE: ../../i18n/package.json
-const package_namespaceObject = /*#__PURE__*/JSON.parse('{"rE":"3.9.0-beta.111"}');
+const package_namespaceObject = {"rE":"3.9.1"};
 ;// CONCATENATED MODULE: ../../i18n/src/utils.js
 const languagesMap = {
   ar: 'Arabic',
@@ -239568,13 +239641,6 @@ SidePanel.propTypes = {
   side: prop_types_default().oneOf(['left', 'right']).isRequired,
   className: (prop_types_default()).string,
   activeTabIndex: (prop_types_default()).number,
-  tabs: prop_types_default().oneOfType([prop_types_default().arrayOf(prop_types_default().shape({
-    iconName: (prop_types_default()).string.isRequired,
-    iconLabel: (prop_types_default()).string.isRequired,
-    name: (prop_types_default()).string.isRequired,
-    label: (prop_types_default()).string.isRequired,
-    content: (prop_types_default()).func // TODO: Should be node, but it keeps complaining?
-  }))]),
   onOpen: (prop_types_default()).func,
   onClose: (prop_types_default()).func,
   onActiveTabIndexChange: (prop_types_default()).func,
@@ -240929,7 +240995,7 @@ const Thumbnail = ({
   };
   const renderThumbnailPreset = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('flex h-full w-full flex-col items-center justify-center gap-[2px] p-[4px]', isActive && 'bg-popover')
+      className: classnames_default()('flex h-full w-full flex-col items-center justify-center gap-[2px] p-[4px]', isActive && 'bg-popover rounded')
     }, /*#__PURE__*/react.createElement("div", {
       className: "h-[114px] w-[128px]"
     }, /*#__PURE__*/react.createElement("div", {
@@ -241016,7 +241082,7 @@ const Thumbnail = ({
   };
   const renderListPreset = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('flex h-full w-full items-center justify-between pr-[8px] pl-[8px] pt-[4px] pb-[4px]', isActive && 'bg-popover')
+      className: classnames_default()('flex h-full w-full items-center justify-between pr-[8px] pl-[8px] pt-[4px] pb-[4px]', isActive && 'bg-popover rounded')
     }, /*#__PURE__*/react.createElement("div", {
       className: "relative flex h-[32px] items-center gap-[8px]"
     }, /*#__PURE__*/react.createElement("div", {
@@ -241268,6 +241334,7 @@ const StudyItem = ({
     collapsible: true,
     onClick: onClick,
     onKeyDown: () => {},
+    className: "flex-shrink-0",
     role: "button",
     tabIndex: 0,
     defaultValue: isActive ? 'study-item' : undefined
@@ -241488,9 +241555,9 @@ const StudyBrowser = ({
     });
   };
   return /*#__PURE__*/react.createElement("div", {
-    className: "ohif-scrollbar invisible-scrollbar bg-bkg-low flex flex-1 flex-col gap-[4px] overflow-auto",
+    className: "ohif-scrollbar invisible-scrollbar bg-bkg-low flex flex-1 flex-col gap-[4px] overflow-auto pt-px",
     "data-cy": 'studyBrowser-panel'
-  }, /*#__PURE__*/react.createElement("div", null, showSettings && /*#__PURE__*/react.createElement("div", {
+  }, showSettings && /*#__PURE__*/react.createElement("div", {
     className: "w-100 bg-bkg-low flex h-[48px] items-center justify-center gap-[10px] px-[8px] py-[10px]"
   }, /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(StudyBrowserViewOptions, {
     tabs: tabs,
@@ -241498,7 +241565,7 @@ const StudyBrowser = ({
     activeTabName: activeTabName
   }), /*#__PURE__*/react.createElement(StudyBrowserSort, {
     servicesManager: servicesManager
-  }))), getTabContent()));
+  }))), getTabContent());
 };
 StudyBrowser.propTypes = {
   onClickTab: (prop_types_default()).func.isRequired,
@@ -242193,9 +242260,7 @@ const DataRow = ({
     return /*#__PURE__*/react.createElement("div", {
       key: cleanText,
       className: "whitespace-pre-wrap"
-    }, indentation, cleanText.includes(':') ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
-      className: "font-medium"
-    }, cleanText.split(':')[0], ":"), cleanText.split(':')[1]) : /*#__PURE__*/react.createElement("span", {
+    }, indentation, /*#__PURE__*/react.createElement("span", {
       className: "font-medium"
     }, cleanText));
   };
@@ -242303,11 +242368,13 @@ const DataRow = ({
     className: "text-foreground"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-2"
-  }, isLocked ? 'Unlock' : 'Lock')))))), details && details.primary?.length > 0 && /*#__PURE__*/react.createElement("div", {
+  }, isLocked ? 'Unlock' : 'Lock')))))), details && (details.primary?.length > 0 || details.secondary?.length > 0) && /*#__PURE__*/react.createElement("div", {
     className: "ml-7 px-2 py-2"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "text-secondary-foreground text-base leading-normal"
-  }, renderDetails(details.primary))));
+    className: "text-secondary-foreground flex items-center gap-1 text-base leading-normal"
+  }, details.primary?.length > 0 && renderDetails(details.primary), details.secondary?.length > 0 && /*#__PURE__*/react.createElement("div", {
+    className: "text-muted-foreground ml-auto text-sm"
+  }, renderDetails(details.secondary)))));
 };
 /* harmony default export */ const DataRow_DataRow = (DataRow);
 ;// CONCATENATED MODULE: ../../ui-next/src/components/DataRow/index.ts
@@ -242493,7 +242560,7 @@ const SegmentationSegments = ({
     return null;
   }
   const segmentCount = Object.keys(representationToUse.segments).length;
-  const height = mode === 'collapsed' ? 'h-[600px]' : `h-[${segmentCount * 200}px]`;
+  const height = mode === 'collapsed' ? 'h-[900px]' : `h-[${segmentCount * 200}px]`;
   return /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
     className: `ohif-scrollbar invisible-scrollbar bg-bkg-low space-y-px ${height}`,
     showArrows: true
@@ -243244,24 +243311,24 @@ Stack: ${error.stack}
   }, /*#__PURE__*/react.createElement(Dialog_DialogContent, {
     className: "border-input h-[50vh] w-[90vw] border-2 sm:max-w-[900px]"
   }, /*#__PURE__*/react.createElement(DialogHeader, null, /*#__PURE__*/react.createElement(Dialog_DialogTitle, {
-    className: "text-xl"
-  }, title), /*#__PURE__*/react.createElement(Dialog_DialogDescription, {
-    className: "text-lg"
-  }, subtitle)), /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
-    className: "h-[calc(90vh-120px)]"
+    className: "text-muted-foreground flex justify-between text-xl"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "space-y-4 pr-4 font-mono text-base"
-  }, /*#__PURE__*/react.createElement("div", {
-    className: "flex justify-end"
-  }, /*#__PURE__*/react.createElement("button", {
+    className: "flex items-center"
+  }, title), /*#__PURE__*/react.createElement("button", {
     onClick: () => {
       copyErrorDetails();
       setShowDetails(false);
     },
-    className: "text-aqua-pale hover:text-aqua-pale/80 flex items-center gap-2 rounded bg-gray-800 px-4 py-2"
+    className: "text-aqua-pale hover:text-aqua-pale/80 flex items-center gap-2 rounded bg-gray-800 px-4 py-2 font-light"
   }, /*#__PURE__*/react.createElement(Icons.Code, {
     className: "h-4 w-4"
-  }), t('Copy Details'))), /*#__PURE__*/react.createElement("div", {
+  }), t('Copy Details'))), /*#__PURE__*/react.createElement(Dialog_DialogDescription, {
+    className: "text-lg"
+  }, subtitle)), /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
+    className: "h-[100%]"
+  }, /*#__PURE__*/react.createElement("div", {
+    className: "space-y-4 pr-4 font-mono text-base"
+  }, /*#__PURE__*/react.createElement("div", {
     className: "space-y-4"
   }, /*#__PURE__*/react.createElement("p", {
     className: "text-aqua-pale break-words text-lg"
@@ -265568,7 +265635,7 @@ const SidePanel_SidePanel = ({
       position: side === 'left' ? 'right' : 'left',
       key: index,
       content: getToolTipContent(childComponent.label, childComponent.disabled),
-      className: classnames_default()('flex items-center', side === 'left' ? 'justify-end ' : 'justify-start ')
+      className: classnames_default()('flex items-center', side === 'left' ? 'justify-end' : 'justify-start')
     }, /*#__PURE__*/react.createElement("div", {
       id: `${childComponent.name}-btn`,
       "data-cy": `${childComponent.name}-btn`,
@@ -265606,7 +265673,7 @@ const SidePanel_SidePanel = ({
   const getTabGridComponent = () => {
     const numCols = getNumGridColumns(tabs.length, gridWidth);
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('flex grow ', side === 'right' ? 'justify-start' : 'justify-end')
+      className: classnames_default()('flex grow', side === 'right' ? 'justify-start' : 'justify-end')
     }, /*#__PURE__*/react.createElement("div", {
       className: classnames_default()('bg-primary-dark text-primary-active flex flex-wrap'),
       style: getGridStyle(side, tabs.length, gridWidth, expandedWidth)
@@ -265645,7 +265712,7 @@ const SidePanel_SidePanel = ({
   };
   const getOneTabComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('text-primary-active flex	 grow cursor-pointer select-none justify-center self-center text-[13px]'),
+      className: classnames_default()('text-primary-active flex grow cursor-pointer select-none justify-center self-center text-[13px]'),
       style: {
         ...(side === 'left' ? {
           marginLeft: `${closeIconWidth}px`
@@ -265659,7 +265726,7 @@ const SidePanel_SidePanel = ({
   };
   const getOpenStateComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: "bg-primary-dark flex select-none rounded-t pt-1.5 pb-[2px]\t"
+      className: "bg-primary-dark flex select-none rounded-t pt-1.5 pb-[2px]"
     }, getCloseIcon(), tabs.length === 1 ? getOneTabComponent() : getTabGridComponent());
   };
   return /*#__PURE__*/react.createElement("div", {
@@ -421563,7 +421630,7 @@ function __disposeResources(env) {
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "" + ({"572":"polySeg","3054":"histogram-worker","3584":"suv-peak-worker"}[chunkId] || chunkId) + ".bundle." + {"149":"b8d177954628f4631fc0","213":"38caad239bcfec1d28fb","572":"b79ae514989e86301c71","717":"62437bfeb54f01269abe","1185":"a6e220f00576d6926fe7","1266":"8fd38b710e91305721e5","1374":"f56c07364d8f6ed2d00e","1436":"773756cd51b69e887bac","1520":"fde5eb31364855194519","1801":"c552846463998fdc9ad4","1927":"49539e3ab5b0aad1399c","2424":"c7b6d3475da1ffff744b","2591":"e1bbdc34a55bee082ff2","2701":"8c1ff2e0faaa7d2f4716","2825":"ba60e0011bcebdf7a413","3054":"f0e060cf2637a2ca94b7","3121":"d3e7092e305cf6cecdb5","3198":"9b80ca2f1d99a7f9a4fe","3200":"45b19ea468d6208f0e7e","3334":"0e6ba24024018199ab66","3584":"76dd4fdf82aaa2c3ad41","3970":"31942cc0c12a008e7ba0","4182":"ec850ce1f74b1f6fe559","4202":"5c8120ed4841da0af211","4834":"4bfa1bd1d4a163de3350","5139":"b185b1df3847a2025829","5247":"03fa8aac71d4e597d708","5261":"74682659cce85f3ae592","5687":"3a558ac2eb26f5295668","5807":"dac5ce36534a71c77723","6939":"9b79da82315a25f37d96","7159":"9f4856182f1eda29c59d","7197":"db0d51e5529d88a4cd7f","7955":"699bffabae3a9915c326","8008":"1ab47eccf7608fe14e92","8228":"55ac03d7165248f47d4e","8259":"4385bd89c3f7f4ced27c","8295":"4ecb27f9e58526f12bcb","8558":"3b0654ad2a52ac9786dd","9551":"13a3eec1e003a46095bc","9611":"767595c93877e5166c03","9862":"7146682e56aa66130ae6"}[chunkId] + ".js";
+/******/ 			return "" + ({"572":"polySeg","3054":"histogram-worker","3584":"suv-peak-worker"}[chunkId] || chunkId) + ".bundle." + {"213":"8c04fecea2e3796e4d73","572":"6e85073e3abf2e6e6078","717":"3a4b8835adf03e4554c7","1185":"d328aabb2b43e9ea1f96","1266":"46de27eda2ef1fce1243","1374":"1ee8326c0748c7b1a7c0","1436":"27ae9c87e9fc7f52cad3","1801":"c552846463998fdc9ad4","1927":"2b2fa0b539d6ac5b0dc3","2424":"38b19314ebd984c9d393","2591":"e1bbdc34a55bee082ff2","2701":"8c1ff2e0faaa7d2f4716","2825":"0307cae794e8b057c674","3054":"f0e060cf2637a2ca94b7","3121":"d3e7092e305cf6cecdb5","3198":"ab612063af0d67397377","3200":"ccb809fb554332d9a0f5","3334":"0e6ba24024018199ab66","3584":"1f483dc7131d7c26b517","3900":"3937999d1ee1f391647a","3970":"31942cc0c12a008e7ba0","4182":"ec850ce1f74b1f6fe559","4202":"5c8120ed4841da0af211","4834":"c25348524be5214e90d6","5139":"db30dc02cf41e91c8985","5247":"1a1d7c27de482e4a73f3","5261":"74682659cce85f3ae592","5630":"1bd2402f37597078c1a1","5687":"05de4787676bf79f9906","5807":"dac5ce36534a71c77723","6939":"9b79da82315a25f37d96","7159":"9f4856182f1eda29c59d","7197":"42a975bb7ae4a8df2d00","7955":"f6c5edb284bdf8b80f2a","8008":"d4187a30e8f656a21316","8228":"0a7997d04c82dd8c11c5","8259":"990db2fa9ce0800319e9","8295":"4ecb27f9e58526f12bcb","8558":"63714e2329c22c9cb9da","9551":"63b2679dd7beee6396d8","9611":"78a4ffb439f65cfd0379","9862":"aa2f8e0010f1be1bc87d"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/