@ohif/app 3.9.1 → 3.9.3

package/dist/{1185.bundle.023fe7179faaa50019d3.js → 1185.bundle.9f4c770baf52abcf3c6d.js}

@@ -82,26 +82,6 @@ function formatDICOMTime(time, strFormat = 'HH:mm:ss') {
   return moment_default()(time, 'HH:mm:ss').format(strFormat);
 }
 
-/**
- * Formats a patient name for display purposes
- *
- * @param {string} name
- * @returns {string} formatted name.
- */
-function formatPN(name) {
-  if (!name) {
-    return '';
-  }
-  if (typeof name === 'object') {
-    name = name.Alphabetic;
-    if (!name) {
-      return '';
-    }
-  }
-  const cleaned = name.split('^').filter(s => !!s).join(', ').trim();
-  return cleaned === ',' || cleaned === '' ? '' : cleaned;
-}
-
 /**
  * Gets compression type
  *
@@ -122,6 +102,8 @@ function getCompression(imageId) {
   }
   return 'Lossless / Uncompressed';
 }
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(80818);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/Overlays/CustomizableViewportOverlay.css
 // extracted by mini-css-extract-plugin
 
@@ -133,7 +115,11 @@ function getCompression(imageId) {
 
 
 
+
 const EPSILON = 1e-4;
+const {
+  formatPN
+} = core_src/* utils */.Wp;
 const OverlayItemComponents = {
   'ohif.overlayItem': OverlayItem,
   'ohif.overlayItem.windowLevel': VOIOverlayItem,
@@ -337,7 +323,7 @@ function CustomizableViewportOverlay({
       servicesManager,
       customization: item,
       formatters: {
-        formatPN: formatPN,
+        formatPN,
         formatDate: formatDICOMDate,
         formatTime: formatDICOMTime,
         formatNumberPrecision: formatNumberPrecision
@@ -747,7 +733,7 @@ const useViewportActionCornersContext = () => (0,react__WEBPACK_IMPORTED_MODULE_
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(62051);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(37415);
+/* harmony import */ var _ohif_core_src_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5971);
 
 
 
@@ -941,8 +927,8 @@ const Enums = {
   CORNERSTONE_3D_TOOLS_SOURCE_VERSION
 };
 /* harmony default export */ const enums = (Enums);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/loaders/index.js
 var loaders = __webpack_require__(19742);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/RequestType.js
@@ -983,8 +969,8 @@ function initWADOImageLoader(userAuthenticationService, appConfig, extensionMana
 function destroy() {
   console.debug('Destroying WADO Image Loader');
 }
-// 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);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(71353);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/getActiveViewportEnabledElement.ts
@@ -1106,8 +1092,8 @@ function onCompletedCalibrationLine(servicesManager, csToolsEvent) {
     });
   });
 }
-// EXTERNAL MODULE: ../../core/src/utils/index.ts + 29 modules
-var utils = __webpack_require__(37415);
+// EXTERNAL MODULE: ../../core/src/utils/index.ts + 28 modules
+var utils = __webpack_require__(5971);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/tools/OverlayPlaneModuleProvider.ts
 
 const _cachedOverlayMetadata = new Map();
@@ -4408,9 +4394,9 @@ const initMeasurementService = (measurementService, displaySetService, cornersto
   /* Mappings */
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'Length', Length.matchingCriteria, Length.toAnnotation, Length.toMeasurement);
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'Crosshairs', Length.matchingCriteria, () => {
-    console.warn('Crosshairs mapping not implemented.');
+    return null;
   }, () => {
-    console.warn('Crosshairs mapping not implemented.');
+    return null;
   });
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'Bidirectional', Bidirectional.matchingCriteria, Bidirectional.toAnnotation, Bidirectional.toMeasurement);
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'EllipticalROI', EllipticalROI.matchingCriteria, EllipticalROI.toAnnotation, EllipticalROI.toMeasurement);
@@ -5278,7 +5264,7 @@ function interleaveTopToBottom({
   const AllRequests = [];
   volumes.forEach(volume => {
     const requests = volume.getImageLoadRequests();
-    if (!requests.length || !requests[0] || !requests[0].imageId) {
+    if (!requests?.[0]?.imageId) {
       return;
     }
 
@@ -5652,6 +5638,8 @@ var useLutPresentationStore = __webpack_require__(10182);
 var usePositionPresentationStore = __webpack_require__(44646);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/stores/useSegmentationPresentationStore.ts + 1 modules
 var useSegmentationPresentationStore = __webpack_require__(2847);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 40 modules
+var esm_utilities = __webpack_require__(49035);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/init.tsx
 
 
@@ -5674,6 +5662,7 @@ var useSegmentationPresentationStore = __webpack_require__(2847);
 
 
 
+
 
 
 const {
@@ -5755,9 +5744,18 @@ async function init({
   const metadataProvider = src/* default.classes */.Ay.classes.MetadataProvider;
   esm.volumeLoader.registerVolumeLoader('cornerstoneStreamingImageVolume', loaders/* cornerstoneStreamingImageVolumeLoader */.FC);
   esm.volumeLoader.registerVolumeLoader('cornerstoneStreamingDynamicImageVolume', loaders/* cornerstoneStreamingDynamicImageVolumeLoader */.Mr);
-  hangingProtocolService.registerImageLoadStrategy('interleaveCenter', interleaveCenterLoader);
-  hangingProtocolService.registerImageLoadStrategy('interleaveTopToBottom', interleaveTopToBottom);
-  hangingProtocolService.registerImageLoadStrategy('nth', interleaveNthLoader);
+
+  // Register strategies using the wrapper
+  const imageLoadStrategies = {
+    interleaveCenter: interleaveCenterLoader,
+    interleaveTopToBottom: interleaveTopToBottom,
+    nth: interleaveNthLoader
+  };
+  Object.entries(imageLoadStrategies).forEach(([name, strategyFn]) => {
+    hangingProtocolService.registerImageLoadStrategy(name, createMetadataWrappedStrategy(strategyFn));
+  });
+
+  // ... existing code ...
 
   // add metadata providers
   esm.metaData.addProvider(esm.utilities.calibratedPixelSpacingMetadataProvider.get.bind(esm.utilities.calibratedPixelSpacingMetadataProvider)); // this provider is required for Calibration tool
@@ -5920,6 +5918,27 @@ function initializeWebWorkerProgressHandler(uiNotificationService) {
     }
   });
 }
+
+/**
+ * Creates a wrapped image load strategy with metadata handling
+ * @param strategyFn - The image loading strategy function to wrap
+ * @returns A wrapped strategy function that handles metadata configuration
+ */
+const createMetadataWrappedStrategy = strategyFn => {
+  return args => {
+    const clonedConfig = esm_utilities.imageRetrieveMetadataProvider.clone();
+    esm_utilities.imageRetrieveMetadataProvider.clear();
+    try {
+      const result = strategyFn(args);
+      return result;
+    } finally {
+      // Ensure metadata is always restored, even if there's an error
+      setTimeout(() => {
+        esm_utilities.imageRetrieveMetadataProvider.restore(clonedConfig);
+      }, 10);
+    }
+  };
+};
 function CPUModal() {
   return /*#__PURE__*/react.createElement("div", null, /*#__PURE__*/react.createElement("p", null, "Your computer does not have enough GPU power to support the default GPU rendering mode. OHIF has switched to CPU rendering mode. Please note that CPU rendering does not support all features such as Volume Rendering, Multiplanar Reconstruction, and Segmentation Overlays."));
 }
@@ -9089,7 +9108,7 @@ const frameView = {
         required: true
       }, {
         attribute: 'isDisplaySetFromUrl',
-        weight: 10,
+        weight: 20,
         constraint: {
           equals: true
         }
@@ -11719,12 +11738,22 @@ class SegmentationService extends src/* PubSubService */.Rc {
     // We should parse the segmentation as separate slices to support overlapping segments.
     // This parsing should occur in the CornerstoneJS library adapters.
     // For now, we use the volume returned from the library and chop it here.
+    let firstSegmentedSliceImageId = null;
     for (let i = 0; i < derivedSegmentationImages.length; i++) {
       const voxelManager = derivedSegmentationImages[i].voxelManager;
       const scalarData = voxelManager.getScalarData();
-      scalarData.set(volumeScalarData.slice(i * scalarData.length, (i + 1) * scalarData.length));
+      const sliceData = volumeScalarData.slice(i * scalarData.length, (i + 1) * scalarData.length);
+      scalarData.set(sliceData);
       voxelManager.setScalarData(scalarData);
+
+      // Check if this slice has any non-zero voxels and we haven't found one yet
+      if (!firstSegmentedSliceImageId && sliceData.some(value => value !== 0)) {
+        firstSegmentedSliceImageId = derivedSegmentationImages[i].referencedImageId;
+      }
     }
+
+    // assign the first non zero voxel image id to the segDisplaySet
+    segDisplaySet.firstSegmentedSliceImageId = firstSegmentedSliceImageId;
     this._broadcastEvent(SegmentationService_EVENTS.SEGMENTATION_LOADING_COMPLETE, {
       segmentationId,
       segDisplaySet
@@ -11772,7 +11801,12 @@ class SegmentationService extends src/* PubSubService */.Rc {
       throw new Error('To create the contours from RT displaySet, the displaySet should be loaded first. You can perform rtDisplaySet.load() before calling this method.');
     }
     const rtDisplaySetUID = rtDisplaySet.displaySetInstanceUID;
-
+    const referencedDisplaySet = this.servicesManager.services.displaySetService.getDisplaySetByUID(rtDisplaySet.referencedDisplaySetInstanceUID);
+    const referencedImageIdsWithGeometry = Array.from(structureSet.ReferencedSOPInstanceUIDsSet);
+    const referencedImageIds = referencedDisplaySet.instances.map(image => image.imageId);
+    // find the first image id that contains a referenced SOP instance UID
+    const firstSegmentedSliceImageId = referencedImageIds.find(imageId => referencedImageIdsWithGeometry.some(referencedId => imageId.includes(referencedId)));
+    rtDisplaySet.firstSegmentedSliceImageId = firstSegmentedSliceImageId;
     // Map ROI contours to RT Struct Data
     const allRTStructData = mapROIContoursToRTStructData(structureSet, rtDisplaySetUID);
 
@@ -13305,6 +13339,20 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
    * individual resize observers
    */
   resize(isGridResize = false) {
+    // https://stackoverflow.com/a/26279685
+    // This resize() call, among other things, rerenders the viewports. But when the entire viewer is
+    // display: none'd, it makes the size of all hidden elements 0, including the viewport canvas and its containers.
+    // Even if the viewer is later displayed again, trying to render when the size is 0 permanently "breaks" the
+    // viewport, making it fully black even after the size is normal again. So just ignore resize events when hidden:
+    const areViewportsHidden = Array.from(this.viewportsById.values()).every(viewportInfo => {
+      const element = viewportInfo.getElement();
+      return element.clientWidth === 0 && element.clientHeight === 0;
+    });
+    if (areViewportsHidden) {
+      console.warn('Ignoring resize when viewports have size 0');
+      return;
+    }
+
     // if there is a grid resize happening, it means the viewport grid
     // has been manipulated (e.g., panels closed, added, etc.) and we need
     // to resize all viewports, so we will add a timeout here to make sure
@@ -13727,9 +13775,6 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     // is being used to navigate to the initial view position for measurement
     // navigation and other navigation forcing specific views.
     let initialImageIndexToUse = presentations?.positionPresentation?.initialImageIndex ?? initialImageIndex;
-    if (initialImageIndexToUse === undefined || initialImageIndexToUse === null) {
-      initialImageIndexToUse = this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
-    }
     const {
       rotation,
       flipHorizontal,
@@ -13767,13 +13812,23 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       dist_esm.utilities.stackContextPrefetch.enable(element);
     });
     let imageIdsToSet = imageIds;
-    const res = this._processExtraDisplaySetsForViewport(viewport);
-    imageIdsToSet = res?.imageIds ?? imageIdsToSet;
+    const overlayProcessingResult = this._processExtraDisplaySetsForViewport(viewport);
+    imageIdsToSet = overlayProcessingResult?.imageIds ?? imageIdsToSet;
+    const referencedImageId = presentations?.positionPresentation?.viewReference?.referencedImageId;
+    if (referencedImageId) {
+      initialImageIndexToUse = imageIdsToSet.indexOf(referencedImageId);
+    }
+    if (initialImageIndexToUse === undefined || initialImageIndexToUse === null) {
+      initialImageIndexToUse = this._getInitialImageIndexForViewport(viewportInfo, imageIds) || 0;
+    }
     return viewport.setStack(imageIdsToSet, initialImageIndexToUse).then(() => {
       viewport.setProperties({
         ...properties
       });
       this.setPresentations(viewport.id, presentations, viewportInfo);
+      if (overlayProcessingResult?.addOverlayFn) {
+        overlayProcessingResult.addOverlayFn();
+      }
       if (displayArea) {
         viewport.setDisplayArea(displayArea);
       }
@@ -13955,8 +14010,13 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     });
 
     // For SEG and RT viewports
-    this._processExtraDisplaySetsForViewport(viewport);
+    const {
+      addOverlayFn
+    } = this._processExtraDisplaySetsForViewport(viewport) || {};
     await viewport.setVolumes(volumeInputArray);
+    if (addOverlayFn) {
+      addOverlayFn();
+    }
     volumesProperties.forEach(({
       properties,
       volumeId
@@ -13995,9 +14055,9 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
     }
     const referenceDisplaySet = displaySetService.getDisplaySetByUID(segOrRTSOverlayDisplaySet.referencedDisplaySetInstanceUID);
     const imageIds = referenceDisplaySet.images.map(image => image.imageId);
-    this.addOverlayRepresentationForDisplaySet(segOrRTSOverlayDisplaySet, viewport);
     return {
-      imageIds
+      imageIds,
+      addOverlayFn: () => this.addOverlayRepresentationForDisplaySet(segOrRTSOverlayDisplaySet, viewport)
     };
   }
   addOverlayRepresentationForDisplaySet(displaySet, viewport) {
@@ -14140,6 +14200,11 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         id: viewportId
       }) => {
         const presentation = this._getPositionPresentation(viewportId);
+
+        // During a resize, the slice index should remain unchanged. This is a temporary fix for
+        // a larger issue regarding the definition of slice index with slab thickness.
+        // We need to revisit this to make it more robust and understandable.
+        delete presentation.viewReference.sliceIndex;
         this.beforeResizePositionPresentations.set(viewportId, presentation);
       });
 
@@ -14148,7 +14213,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       renderingEngine.resize(isImmediate);
       renderingEngine.render();
 
-      // Reset the camera for viewports that should reset their camera on resize,
+      // Reset the camera for all viewports using position presentation to maintain relative size/position
       // which means only those viewports that have a zoom level of 1.
       this.beforeResizePositionPresentations.forEach((positionPresentation, viewportId) => {
         this.setPresentations(viewportId, {
@@ -14905,10 +14970,6 @@ function getDicomMicroscopySopClassHandler({
 function getSopClassHandlerModule(params) {
   return [getDicomMicroscopySopClassHandler(params)];
 }
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 40 modules
-var esm_utilities = __webpack_require__(49035);
-// EXTERNAL MODULE: ../../../extensions/default/src/stores/useToggleOneUpViewportGridStore.ts
-var useToggleOneUpViewportGridStore = __webpack_require__(73325);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
 var lodash_debounce = __webpack_require__(62051);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
@@ -15378,6 +15439,12 @@ function PanelSegmentation({
     const referencedImageIds = Labelmap.referencedImageIds;
     const firstImageId = referencedImageIds[0];
     const instance = esm.metaData.get('instance', firstImageId);
+    if (!instance) {
+      return {
+        segmentationId,
+        isExportable: false
+      };
+    }
     const {
       SOPInstanceUID,
       SeriesInstanceUID
@@ -16738,7 +16805,7 @@ const cornerstoneExtension = {
     useLutPresentationStore/* useLutPresentationStore */.I.getState().clearLutPresentationStore();
     usePositionPresentationStore/* usePositionPresentationStore */.q.getState().clearPositionPresentationStore();
     useSynchronizersStore/* useSynchronizersStore */.U.getState().clearSynchronizersStore();
-    useToggleOneUpViewportGridStore/* useToggleOneUpViewportGridStore */.Y.getState().clearToggleOneUpViewportGridStore();
+    default_src.useToggleOneUpViewportGridStore.getState().clearToggleOneUpViewportGridStore();
     useSegmentationPresentationStore/* useSegmentationPresentationStore */.v.getState().clearSegmentationPresentationStore();
     segmentationService.removeAllSegmentations();
   },
@@ -16841,7 +16908,7 @@ const cornerstoneExtension = {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29463);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80818);
 /* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35647);
 var _ViewportActionCornersService;
 
@@ -17114,7 +17181,7 @@ const useLutPresentationStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__/* .creat
 
 
 const PRESENTATION_TYPE_ID = 'positionPresentationId';
-const DEBUG_STORE = true;
+const DEBUG_STORE = false;
 
 /**
  * Represents the state and actions for managing position presentations.

package/dist/{1266.bundle.e9abd5c45b5236544151.js → 1266.bundle.0097d9c4ba974905a833.js}

@@ -1,5 +1,5 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[1266,2591,4182,1801],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[1266,4182],{
 
 /***/ 35589:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -15,8 +15,8 @@ __webpack_require__.d(__webpack_exports__, {
   toolbarButtons: () => (/* reexport */ src_toolbarButtons)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js
 var i18next = __webpack_require__(40680);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/package.json
@@ -762,6 +762,11 @@ const performCustomizations = customizationService => {
     id: 'PanelSegmentation.disableEditing',
     disableEditing: true
   }
+  // to only show current study in the panel study browser
+  // {
+  //   id: 'PanelStudyBrowser.studyMode',
+  //   mode: 'primary',
+  // },
   // To disable editing in the MeasurementTable
   // {
   //   id: 'PanelMeasurement.disableEditing',

package/dist/{1374.bundle.019bbc010eeb66109e8b.js → 1374.bundle.2e1fa65e28731d98969a.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../ui/src/index.js + 690 modules
 var src = __webpack_require__(35647);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var core_src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(80818);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js