@ohif/app 3.7.0-beta.41 → 3.7.0-beta.43

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

@@ -412,35 +412,6 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
                     (0,esm.triggerEvent)(esm.eventTarget, esm.Enums.Events.IMAGE_VOLUME_LOADING_COMPLETED, eventDetail);
                 }
             }
-            const successCallback = (imageIdIndex, imageId, scalingParameters) => {
-                const frameIndex = this._imageIdIndexToFrameIndex(imageIdIndex);
-                const cachedImage = esm.cache.getCachedImageBasedOnImageURI(imageId);
-                if (loadStatus.cancelled) {
-                    console.warn('volume load cancelled, returning for imageIdIndex: ', imageIdIndex);
-                    return;
-                }
-                if (!cachedImage || !cachedImage.image) {
-                    return updateTextureAndTriggerEvents(this, imageIdIndex, imageId);
-                }
-                const imageScalarData = this._scaleIfNecessary(cachedImage.image, scalingParameters);
-                const { pixelsPerImage, bytesPerImage } = this.cornerstoneImageMetaData;
-                const TypedArray = scalarData.constructor;
-                let byteOffset = bytesPerImage * frameIndex;
-                const bytePerPixel = bytesPerImage / pixelsPerImage;
-                if (scalarData.BYTES_PER_ELEMENT !== bytePerPixel) {
-                    byteOffset *= scalarData.BYTES_PER_ELEMENT / bytePerPixel;
-                }
-                const volumeBufferView = new TypedArray(arrayBuffer, byteOffset, pixelsPerImage);
-                cachedImage.imageLoadObject.promise
-                    .then((image) => {
-                    volumeBufferView.set(imageScalarData);
-                    updateTextureAndTriggerEvents(this, imageIdIndex, imageId);
-                })
-                    .catch((err) => {
-                    errorCallback.call(this, err, imageIdIndex, imageId);
-                });
-                return;
-            };
             const updateTextureAndTriggerEvents = (volume, imageIdIndex, imageId) => {
                 const frameIndex = this._imageIdIndexToFrameIndex(imageIdIndex);
                 cachedFrames[imageIdIndex] = true;
@@ -479,6 +450,22 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
                     });
                 }
             };
+            const successCallback = (imageIdIndex, imageId, scalingParameters) => {
+                const frameIndex = this._imageIdIndexToFrameIndex(imageIdIndex);
+                const cachedImage = esm.cache.getCachedImageBasedOnImageURI(imageId);
+                const cachedVolume = esm.cache.getVolumeContainingImageId(imageId);
+                if (loadStatus.cancelled) {
+                    console.warn('volume load cancelled, returning for imageIdIndex: ', imageIdIndex);
+                    return;
+                }
+                if (!cachedImage?.image &&
+                    !(cachedVolume && cachedVolume.volume !== this)) {
+                    return updateTextureAndTriggerEvents(this, imageIdIndex, imageId);
+                }
+                const isFromImageCache = !!cachedImage;
+                const cachedImageOrVolume = cachedImage || cachedVolume.volume;
+                this.handleImageComingFromCache(cachedImageOrVolume, isFromImageCache, scalingParameters, scalarData, frameIndex, arrayBuffer, updateTextureAndTriggerEvents, imageIdIndex, imageId, errorCallback);
+            };
             function errorCallback(error, imageIdIndex, imageId) {
                 this.framesProcessed++;
                 if (this.framesProcessed === totalNumFrames) {
@@ -668,7 +655,7 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
             rgba: false,
             spacing: this.spacing,
             dimensions: this.dimensions,
-            PhotometricInterpretation,
+            photometricInterpretation: PhotometricInterpretation,
             voiLUTFunction: VOILUTFunction,
             invert: PhotometricInterpretation === 'MONOCHROME1',
         };
@@ -703,6 +690,28 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
     clearLoadCallbacks() {
         this.loadStatus.callbacks = [];
     }
+    handleImageComingFromCache(cachedImageOrVolume, isFromImageCache, scalingParameters, scalarData, frameIndex, arrayBuffer, updateTextureAndTriggerEvents, imageIdIndex, imageId, errorCallback) {
+        const imageLoadObject = isFromImageCache
+            ? cachedImageOrVolume.imageLoadObject
+            : cachedImageOrVolume.convertToCornerstoneImage(imageId, imageIdIndex);
+        imageLoadObject.promise
+            .then((cachedImage) => {
+            const imageScalarData = this._scaleIfNecessary(cachedImage, scalingParameters);
+            const { pixelsPerImage, bytesPerImage } = this.cornerstoneImageMetaData;
+            const TypedArray = scalarData.constructor;
+            let byteOffset = bytesPerImage * frameIndex;
+            const bytePerPixel = bytesPerImage / pixelsPerImage;
+            if (scalarData.BYTES_PER_ELEMENT !== bytePerPixel) {
+                byteOffset *= scalarData.BYTES_PER_ELEMENT / bytePerPixel;
+            }
+            const volumeBufferView = new TypedArray(arrayBuffer, byteOffset, pixelsPerImage);
+            volumeBufferView.set(imageScalarData);
+            updateTextureAndTriggerEvents(this, imageIdIndex, imageId);
+        })
+            .catch((err) => {
+            errorCallback.call(this, err, imageIdIndex, imageId);
+        });
+    }
     getImageLoadRequests(_priority) {
         throw new Error('Abstract method');
     }
@@ -774,10 +783,10 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
     _removeFromCache() {
         esm.cache.removeVolumeLoadObject(this.volumeId);
     }
-    convertToCornerstoneImage(imageId, imageIdIndex) {
+    getCornerstoneImage(imageId, imageIdIndex) {
         const { imageIds } = this;
         const frameIndex = this._imageIdIndexToFrameIndex(imageIdIndex);
-        const { bytesPerImage, pixelsPerImage, windowCenter, windowWidth, numComponents, color, dimensions, spacing, invert, voiLUTFunction, } = this.cornerstoneImageMetaData;
+        const { bytesPerImage, pixelsPerImage, windowCenter, windowWidth, numComponents, color, dimensions, spacing, invert, voiLUTFunction, photometricInterpretation, } = this.cornerstoneImageMetaData;
         const scalarData = this._getScalarDataByImageIdIndex(imageIdIndex);
         const volumeBuffer = scalarData.buffer;
         const TypedArray = scalarData.constructor;
@@ -795,7 +804,7 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
         const intercept = modalityLutModule.rescaleIntercept
             ? modalityLutModule.rescaleIntercept
             : 0;
-        const image = {
+        return {
             imageId,
             intercept,
             windowCenter,
@@ -819,12 +828,25 @@ class BaseStreamingImageVolume_BaseStreamingImageVolume extends esm.ImageVolume
             columnPixelSpacing: spacing[0],
             rowPixelSpacing: spacing[1],
             invert,
+            photometricInterpretation,
         };
+    }
+    convertToCornerstoneImage(imageId, imageIdIndex) {
+        return this.getCornerstoneImageLoadObject(imageId, imageIdIndex);
+    }
+    getCornerstoneImageLoadObject(imageId, imageIdIndex) {
+        const image = this.getCornerstoneImage(imageId, imageIdIndex);
         const imageLoadObject = {
             promise: Promise.resolve(image),
         };
         return imageLoadObject;
     }
+    getCornerstoneImages() {
+        const { imageIds } = this;
+        return imageIds.map((imageId, imageIdIndex) => {
+            return this.getCornerstoneImage(imageId, imageIdIndex);
+        });
+    }
     _convertToImages() {
         const byteLength = this.sizeInBytes;
         const numImages = this.imageIds.length;

package/dist/{821.bundle.3a7b408c415336b6a010.js → 821.bundle.d4120df6baeed120be9e.js}

@@ -2148,8 +2148,10 @@ function ViewerLayout(_ref) {
     // Todo: Handle parameters in a better way.
     const query = new URLSearchParams(window.location.search);
     const configUrl = query.get('configUrl');
+    const dataSourceName = pathname.substring(dataSourceIdx + 1);
+    const existingDataSource = extensionManager.getDataSources(dataSourceName);
     const searchQuery = new URLSearchParams();
-    if (dataSourceIdx !== -1) {
+    if (dataSourceIdx !== -1 && existingDataSource) {
       searchQuery.append('datasources', pathname.substring(dataSourceIdx + 1));
     }
     if (configUrl) {
@@ -2175,8 +2177,8 @@ function ViewerLayout(_ref) {
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.7.0-beta.41";
-  const commitHash = "72207e6c785269db70d8f717c06ab3b27b1d0dd9";
+  const versionNumber = "3.7.0-beta.43";
+  const commitHash = "156c1ba60bbf3186bd6964e40a13e005fcebf5bc";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',

package/dist/{869.bundle.51e2fc87fab5cb911ec1.js → 869.bundle.c9c018e6757410919ed8.js}

@@ -467,8 +467,9 @@ function OHIFCornerstoneSEGViewport(props) {
         patientSex: PatientSex || '',
         patientAge: PatientAge || '',
         MRN: PatientID || '',
-        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
-        spacing: SpacingBetweenSlices !== undefined ? `${parseFloat(SpacingBetweenSlices).toFixed(2)}mm` : '',
+        thickness: SliceThickness ? src.utils.roundNumber(SliceThickness, 2) : '',
+        thicknessUnits: SliceThickness !== undefined ? 'mm' : '',
+        spacing: SpacingBetweenSlices !== undefined ? src.utils.roundNumber(SpacingBetweenSlices, 2) : '',
         scanner: ManufacturerModelName || ''
       }
     }

package/dist/{925.bundle.150debc1fe2cafa1e036.js → 925.bundle.a2f1103d968c53a2b8fb.js}

@@ -144,6 +144,7 @@ __webpack_require__.d(segmentationState_namespaceObject, {
   addColorLUT: () => (addColorLUT),
   addSegmentation: () => (addSegmentation),
   addSegmentationRepresentation: () => (addSegmentationRepresentation),
+  getAllSegmentationRepresentations: () => (getAllSegmentationRepresentations),
   getColorLUT: () => (getColorLUT),
   getDefaultSegmentationStateManager: () => (getDefaultSegmentationStateManager),
   getGlobalConfig: () => (getGlobalConfig),
@@ -2649,6 +2650,14 @@ class SegmentationStateManager {
         }
         return toolGroupSegRepresentationsWithConfig.segmentationRepresentations;
     }
+    getAllSegmentationRepresentations() {
+        const toolGroupSegReps = {};
+        Object.entries(this.state.toolGroups).forEach(([toolGroupId, toolGroupSegRepresentationsWithConfig]) => {
+            toolGroupSegReps[toolGroupId] =
+                toolGroupSegRepresentationsWithConfig.segmentationRepresentations;
+        });
+        return toolGroupSegReps;
+    }
     addSegmentationRepresentation(toolGroupId, segmentationRepresentation) {
         if (!this.state.toolGroups[toolGroupId]) {
             this.state.toolGroups[toolGroupId] = {
@@ -2904,7 +2913,14 @@ function getSegmentationRepresentations(toolGroupId) {
     const segmentationStateManager = getDefaultSegmentationStateManager();
     return segmentationStateManager.getSegmentationRepresentations(toolGroupId);
 }
+function getAllSegmentationRepresentations() {
+    const segmentationStateManager = getDefaultSegmentationStateManager();
+    return segmentationStateManager.getAllSegmentationRepresentations();
+}
 function getToolGroupIdsWithSegmentation(segmentationId) {
+    if (!segmentationId) {
+        throw new Error('getToolGroupIdsWithSegmentation: segmentationId is empty');
+    }
     const segmentationStateManager = getDefaultSegmentationStateManager();
     const state = segmentationStateManager.getState();
     const toolGroupIds = Object.keys(state.toolGroups);
@@ -6491,9 +6507,6 @@ function fillCircle(enabledElement, operationData, threshold = false) {
         fillCircle_transformWorldToIndex(imageData, bottomRightWorld),
     ];
     const boundsIJK = boundingBox_getBoundingBoxAroundShape(ellipsoidCornersIJK, dimensions);
-    if (boundsIJK.every(([min, max]) => min !== max)) {
-        throw new Error('Oblique segmentation tools are not supported yet');
-    }
     const ellipseObj = {
         center: center,
         xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
@@ -7064,9 +7077,7 @@ function registerCursor(toolName, iconContent, viewBox) {
     });
 }
 function getDefinedSVGCursorDescriptor(name) {
-    if (Object.prototype.hasOwnProperty.call(CursorSVG, name)) {
-        return CursorSVG[name];
-    }
+    return CursorSVG[name];
 }
 const svgCursorNames = Object.keys(CursorSVG);
 
@@ -18409,9 +18420,6 @@ function fillRectangle(enabledElement, operationData, inside = true) {
         });
     });
     const boundsIJK = boundingBox_getBoundingBoxAroundShape(rectangleCornersIJK, dimensions);
-    if (boundsIJK.every(([min, max]) => min !== max)) {
-        throw new Error('Oblique segmentation tools are not supported yet');
-    }
     const pointInRectangle = () => true;
     const callback = ({ value, index, pointIJK }) => {
         if (segmentsLocked.includes(value)) {
@@ -18449,9 +18457,6 @@ function eraseRectangle(enabledElement, operationData, inside = true) {
         return eraseRectangle_transformWorldToIndex(imageData, world);
     });
     const boundsIJK = boundingBox_getBoundingBoxAroundShape(rectangleCornersIJK, dimensions);
-    if (boundsIJK.every(([min, max]) => min !== max)) {
-        throw new Error('Oblique segmentation tools are not supported yet');
-    }
     const pointInShape = () => true;
     const callback = ({ value, index }) => {
         if (segmentsLocked.includes(value)) {
@@ -22038,7 +22043,7 @@ function cancelActiveManipulations(element) {
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/store/SynchronizerManager/Synchronizer.js
 
 class Synchronizer {
-    constructor(synchronizerId, eventName, eventHandler) {
+    constructor(synchronizerId, eventName, eventHandler, options) {
         this._viewportOptions = {};
         this._onEvent = (evt) => {
             if (this._ignoreFiredEvents === true) {
@@ -22066,6 +22071,7 @@ class Synchronizer {
         this._ignoreFiredEvents = false;
         this._sourceViewports = [];
         this._targetViewports = [];
+        this._options = options || {};
         this.id = synchronizerId;
     }
     isDisabled() {
@@ -22154,7 +22160,7 @@ class Synchronizer {
                 if (targetIsSource) {
                     continue;
                 }
-                this._eventHandler(this, sourceViewport, targetViewport, sourceEvent);
+                this._eventHandler(this, sourceViewport, targetViewport, sourceEvent, this._options);
             }
         }
         catch (ex) {
@@ -22216,12 +22222,12 @@ function _getViewportElement(vp) {
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/store/SynchronizerManager/createSynchronizer.js
 
 
-function createSynchronizer(synchronizerId, eventName, eventHandler) {
+function createSynchronizer(synchronizerId, eventName, eventHandler, options) {
     const synchronizerWithSameIdExists = state.synchronizers.some((sync) => sync.id === synchronizerId);
     if (synchronizerWithSameIdExists) {
         throw new Error(`Synchronizer with id '${synchronizerId}' already exists.`);
     }
-    const synchronizer = new SynchronizerManager_Synchronizer(synchronizerId, eventName, eventHandler);
+    const synchronizer = new SynchronizerManager_Synchronizer(synchronizerId, eventName, eventHandler, options);
     state.synchronizers.push(synchronizer);
     return synchronizer;
 }
@@ -22920,7 +22926,7 @@ function createCameraPositionSynchronizer(synchronizerName) {
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/synchronizers/callbacks/voiSyncCallback.js
 
-function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, voiModifiedEvent) {
+function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, voiModifiedEvent, options) {
     const eventDetail = voiModifiedEvent.detail;
     const { volumeId, range, invertStateChanged, invert } = eventDetail;
     const renderingEngine = (0,esm.getRenderingEngine)(targetViewport.renderingEngineId);
@@ -22931,7 +22937,7 @@ function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, v
     const tProperties = {
         voiRange: range,
     };
-    if (invertStateChanged) {
+    if (options.syncInvertState && invertStateChanged) {
         tProperties.invert = invert;
     }
     if (tViewport instanceof esm.BaseVolumeViewport) {
@@ -22950,8 +22956,8 @@ function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, v
 
 
 
-function createVOISynchronizer(synchronizerName) {
-    const VOISynchronizer = SynchronizerManager_createSynchronizer(synchronizerName, esm.Enums.Events.VOI_MODIFIED, voiSyncCallback);
+function createVOISynchronizer(synchronizerName, options = { syncInvertState: true }) {
+    const VOISynchronizer = SynchronizerManager_createSynchronizer(synchronizerName, esm.Enums.Events.VOI_MODIFIED, voiSyncCallback, options);
     return VOISynchronizer;
 }