@ohif/app 3.9.0 → 3.9.2

package/dist/{8228.bundle.55ac03d7165248f47d4e.js → 8228.bundle.0a7997d04c82dd8c11c5.js}

@@ -19,8 +19,8 @@ var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../ui/src/index.js + 690 modules
 var src = __webpack_require__(35647);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 114 modules
-var default_src = __webpack_require__(71520);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 115 modules
+var default_src = __webpack_require__(55630);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 

package/dist/{8523.bundle.648334132159465cdc41.js → 8523.bundle.c0ec85de98ba380ebeb4.js}

@@ -933,7 +933,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);
@@ -16552,6 +16552,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 = [];
@@ -16602,10 +16608,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);
@@ -16639,8 +16649,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);
@@ -22061,12 +22075,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;
@@ -22099,6 +22121,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),
@@ -22133,6 +22159,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;
+}
 
 
 
@@ -54877,7 +54916,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     }
     return result;
   };
-  publicAPI.useHalfFloat = () => model.enableHalfFloat && model.canUseHalfFloat;
+  publicAPI.useHalfFloat = () => model.enableUseHalfFloat && model.canUseHalfFloat;
 
   //----------------------------------------------------------------------------
   publicAPI.setInternalFormat = iFormat => {
@@ -55511,18 +55550,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();

package/dist/{9551.bundle.13a3eec1e003a46095bc.js → 9551.bundle.63b2679dd7beee6396d8.js}

@@ -632,7 +632,7 @@ function modeFactory({
           minValue: 'Minimum Value',
           maxValue: 'Maximum Value',
           meanValue: 'Mean Value',
-          volume: 'Volume',
+          volume: 'Volume (ml)',
           suvPeak: 'SUV Peak',
           suvMax: 'Maximum SUV',
           suvMaxIJK: 'SUV Max IJK',