@ohif/app 3.13.0-beta.122 → 3.13.0-beta.124

package/dist/{3568.bundle.45dc681ef6890166.js → 3568.bundle.9aa4b4b27294ff6d.js}

@@ -3174,6 +3174,8 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
     }
     viewport.removeActors([uid]);
     const oldMapper = actor.getMapper();
+    const sharedImageData = oldMapper.getInputData();
+    const originalScalars = sharedImageData.getPointData().getScalars() ?? null;
     const mapper = (0,esm.convertMapperToNotSharedMapper)(oldMapper);
     actor.setMapper(mapper);
     mapper.setBlendMode(esm.Enums.BlendModes.LABELMAP_EDGE_PROJECTION_BLEND);
@@ -3190,9 +3192,16 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
         .getProperty()
         .getIndependentComponents();
     actor.getProperty().setIndependentComponents(true);
+    const oldUseLabelOutline = actor.getProperty().getUseLabelOutline();
+    const oldLabelOutlineOpacity = actor.getProperty().getLabelOutlineOpacity();
+    const oldLabelOutlineThickness = actor
+        .getProperty()
+        .getLabelOutlineThickness();
+    const representationUID = volumeInputArray[0].representationUID ??
+        `${segmentationId}-${enums.SegmentationRepresentations.Labelmap}`;
     viewport.addActor({
         ...defaultActor,
-        representationUID: `${segmentationId}-${enums.SegmentationRepresentations.Labelmap}`,
+        representationUID,
     });
     internalCache.set(uid, {
         added: true,
@@ -3204,7 +3213,7 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
         preLoad: load,
     });
     function onSegmentationDataModified(evt) {
-        const { segmentationId } = evt.detail;
+        const { segmentationId, modifiedSlicesToUse } = evt.detail;
         const { representationData } = (0,getSegmentation/* .getSegmentation */.T)(segmentationId);
         const { volumeId: segVolumeId } = representationData.Labelmap;
         if (segVolumeId !== segImageVolume.volumeId) {
@@ -3214,19 +3223,30 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
         const segVoxelManager = segmentationVolume.voxelManager;
         const imageData = mapper.getInputData();
         const array = imageData.getPointData().getArray(0);
-        const baseData = array.getData();
+        const combinedData = array.getData();
         const newComp = 2;
         const dims = segImageData.getDimensions();
-        const slices = Array.from({ length: dims[2] }, (_, i) => i);
+        const sliceSize = dims[0] * dims[1];
+        const slices = modifiedSlicesToUse?.length
+            ? modifiedSlicesToUse
+            : Array.from({ length: dims[2] }, (_, i) => i);
         for (const z of slices) {
-            for (let y = 0; y < dims[1]; ++y) {
-                for (let x = 0; x < dims[0]; ++x) {
-                    const iTuple = x + dims[0] * (y + dims[1] * z);
-                    baseData[iTuple * newComp + 1] = segVoxelManager.getAtIndex(iTuple);
+            const sliceStart = z * sliceSize;
+            const sliceImage = esm.cache.getImage(segmentationVolume.imageIds?.[z]);
+            const sliceData = sliceImage?.voxelManager?.getScalarData?.();
+            if (sliceData?.length === sliceSize) {
+                for (let i = 0; i < sliceSize; ++i) {
+                    combinedData[(sliceStart + i) * newComp + 1] = sliceData[i];
+                }
+            }
+            else {
+                for (let i = 0; i < sliceSize; ++i) {
+                    const iTuple = sliceStart + i;
+                    combinedData[iTuple * newComp + 1] = segVoxelManager.getAtIndex(iTuple);
                 }
             }
         }
-        array.setData(baseData);
+        array.setData(combinedData);
         imageData.modified();
         viewport.render();
     }
@@ -3235,7 +3255,7 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
         if (evt.detail.viewportId !== viewport.id) {
             return;
         }
-        esm.eventTarget.removeEventListener(enums.Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
+        esm.eventTarget.removeEventListenerDebounced(enums.Events.SEGMENTATION_DATA_MODIFIED, onSegmentationDataModified);
         esm.eventTarget.removeEventListener(enums.Events.SEGMENTATION_REPRESENTATION_REMOVED, onSegmentationRepresentationRemoved);
         const actorEntry = viewport.getActor(uid);
         if (actorEntry) {
@@ -3246,11 +3266,22 @@ async function addVolumesAsIndependentComponents({ viewport, volumeInputs, segme
             return;
         }
         actor.setMapper(oldMapper);
+        const pointData = sharedImageData.getPointData();
+        if (originalScalars) {
+            pointData.setScalars(originalScalars);
+        }
+        else {
+            pointData.removeArray('Pixels');
+        }
+        sharedImageData.modified();
         actor.getProperty().setColorMixPreset(oldColorMixPreset);
         actor
             .getProperty()
             .setForceNearestInterpolation(1, oldForceNearestInterpolation);
         actor.getProperty().setIndependentComponents(oldIndependentComponents);
+        actor.getProperty().setUseLabelOutline(oldUseLabelOutline);
+        actor.getProperty().setLabelOutlineOpacity(oldLabelOutlineOpacity);
+        actor.getProperty().setLabelOutlineThickness(oldLabelOutlineThickness);
         viewport.addActor({
             ...defaultActor,
         });

package/dist/{3760.bundle.040c5960d2324a23.js → 3760.bundle.b45b0dae2238e5ca.js}

@@ -111,8 +111,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var es = __webpack_require__(29084);
 // EXTERNAL MODULE: ../../../node_modules/@xstate/react/es/index.js + 8 modules
 var react_es = __webpack_require__(12269);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3682 modules
-var src = __webpack_require__(39987);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3684 modules
+var src = __webpack_require__(42255);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
 
 const RESPONSE = {
@@ -1087,8 +1087,8 @@ var src = __webpack_require__(50679);
 var thumbnailNoImageModalities = __webpack_require__(88555);
 // EXTERNAL MODULE: ../../../extensions/default/src/Panels/StudyBrowser/PanelStudyBrowser.tsx + 3 modules
 var PanelStudyBrowser = __webpack_require__(36341);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3682 modules
-var ui_next_src = __webpack_require__(39987);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3684 modules
+var ui_next_src = __webpack_require__(42255);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/untrackSeriesModal.tsx
 
 
@@ -1267,8 +1267,8 @@ function getImageSrcFromImageId(cornerstone, imageId) {
   });
 }
 /* export default */ const PanelStudyBrowserTracking_getImageSrcFromImageId = (getImageSrcFromImageId);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 147 modules
-var default_src = __webpack_require__(7825);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 148 modules
+var default_src = __webpack_require__(50904);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/index.tsx
 
 //
@@ -1329,8 +1329,8 @@ function _createGetImageSrcFromImageIdFn(extensionManager) {
   }
 }
 /* export default */ const panels_PanelStudyBrowserTracking = (WrappedPanelStudyBrowserTracking);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 200 modules
-var cornerstone_src = __webpack_require__(86714);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 211 modules
+var cornerstone_src = __webpack_require__(75609);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 

package/dist/{5189.bundle.ea191ea99047fd6f.js → 5189.bundle.84584748945c30ec.js}

@@ -11,8 +11,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 147 modules
-var src = __webpack_require__(7825);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 148 modules
+var src = __webpack_require__(50904);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by css-extract-rspack-plugin
 
@@ -46,8 +46,8 @@ const listComponentGenerator = props => {
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/components/ViewportOverlay/ViewportOverlay.css
 // extracted by css-extract-rspack-plugin
 
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3682 modules
-var ui_next_src = __webpack_require__(39987);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3684 modules
+var ui_next_src = __webpack_require__(42255);
 // EXTERNAL MODULE: ../../../node_modules/moment/moment.js
 var moment = __webpack_require__(14867);
 var moment_default = /*#__PURE__*/__webpack_require__.n(moment);

package/dist/{5448.bundle.5686ebb99c379f64.js → 5448.bundle.2f95037652efed71.js}

@@ -8,8 +8,8 @@ __webpack_require__.d(__webpack_exports__, {
 /* import */ var prop_types__rspack_import_0 = __webpack_require__(97598);
 /* import */ var prop_types__rspack_import_0_default = /*#__PURE__*/__webpack_require__.n(prop_types__rspack_import_0);
 /* import */ var react__rspack_import_1 = __webpack_require__(86326);
-/* import */ var _ohif_ui_next__rspack_import_2 = __webpack_require__(39987);
-/* import */ var _ohif_extension_cornerstone__rspack_import_3 = __webpack_require__(86714);
+/* import */ var _ohif_ui_next__rspack_import_2 = __webpack_require__(42255);
+/* import */ var _ohif_extension_cornerstone__rspack_import_3 = __webpack_require__(75609);
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 
 

package/dist/{5910.bundle.0f19608f3e76859b.js → 5910.bundle.c7e18d6fa8052576.js}

@@ -14,10 +14,10 @@ var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3682 modules
-var src = __webpack_require__(39987);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 200 modules
-var cornerstone_src = __webpack_require__(86714);
+// EXTERNAL MODULE: ../../ui-next/src/index.ts + 3684 modules
+var src = __webpack_require__(42255);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 211 modules
+var cornerstone_src = __webpack_require__(75609);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
 function promptHydrateRT({

package/dist/{6495.bundle.a6764fdb8c0c252f.js → 6495.bundle.5ad5a10d2c9dcba1.js}

@@ -4333,7 +4333,7 @@ const onSegmentationDataModified = function (evt) {
     if (representationData.Labelmap) {
         (0,_labelmap_onLabelmapSegmentationDataModified_js__rspack_import_1/* ["default"] */.A)(evt);
     }
-    (0,_stateManagement_segmentation_SegmentationRenderingEngine_js__rspack_import_0/* .triggerSegmentationRenderBySegmentationId */.fy)(segmentationId);
+    (0,_stateManagement_segmentation_SegmentationRenderingEngine_js__rspack_import_0/* .triggerSegmentationRenderForModified */.X8)(segmentationId);
 };
 /* export default */ const __rspack_default_export = (onSegmentationDataModified);
 
@@ -5060,7 +5060,7 @@ __webpack_require__.d(__webpack_exports__, {
   store: () => (/* reexport module object */ _store_index_js__rspack_import_1),
   synchronizers: () => (/* reexport module object */ _synchronizers_index_js__rspack_import_5),
   utilities: () => (/* reexport module object */ _utilities_index_js__rspack_import_7),
-  version: () => (/* reexport safe */ (/* inlined export _version_js__rspack_import_4 */"5.4.13"))
+  version: () => (/* reexport safe */ (/* inlined export _version_js__rspack_import_4 */"5.4.17"))
 });
 /* import */ var _init_js__rspack_import_0 = __webpack_require__(70210);
 /* import */ var _store_index_js__rspack_import_1 = __webpack_require__(37872);
@@ -6291,6 +6291,7 @@ __webpack_require__.d(__webpack_exports__, {
 },
 88330(__unused_rspack___webpack_module__, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
+  X8: () => (triggerSegmentationRenderForModified),
   fy: () => (triggerSegmentationRenderBySegmentationId),
   h6: () => (triggerSegmentationRender)
 });
@@ -6475,6 +6476,50 @@ function triggerSegmentationRender(viewportId) {
 function triggerSegmentationRenderBySegmentationId(segmentationId) {
     segmentationRenderingEngine.renderSegmentation(segmentationId);
 }
+const DEFERRED_SEGMENTATION_RENDER_DELAY_MS = 240;
+const deferredSegmentationRenderTimers = new Map();
+function isProjectionHeavySegmentationViewport(viewport) {
+    const blendMode = viewport.getBlendMode?.();
+    if (blendMode === _cornerstonejs_core__rspack_import_0.Enums.BlendModes.LABELMAP_EDGE_PROJECTION_BLEND) {
+        return true;
+    }
+    const planarViewport = viewport;
+    if (typeof planarViewport.getDisplaySetPresentation !== 'function') {
+        return false;
+    }
+    const dataIds = [];
+    const sourceDataId = planarViewport.getSourceDataId?.();
+    if (sourceDataId) {
+        dataIds.push(sourceDataId);
+    }
+    planarViewport.getActors?.().forEach((actorEntry) => {
+        if (actorEntry.representationUID) {
+            dataIds.push(String(actorEntry.representationUID));
+        }
+    });
+    return dataIds.some((dataId) => (planarViewport.getDisplaySetPresentation(dataId)?.slabThickness ?? 0) > 0);
+}
+function triggerSegmentationRenderForModified(segmentationId) {
+    const viewportIds = segmentationRenderingEngine._getViewportIdsForSegmentation(segmentationId);
+    viewportIds.forEach((viewportId) => {
+        const { viewport } = (0,_cornerstonejs_core__rspack_import_0.getEnabledElementByViewportId)(viewportId) || {};
+        if (!viewport) {
+            return;
+        }
+        if (!isProjectionHeavySegmentationViewport(viewport)) {
+            segmentationRenderingEngine.renderSegmentationsForViewport(viewportId);
+            return;
+        }
+        const existingTimer = deferredSegmentationRenderTimers.get(viewportId);
+        if (existingTimer !== undefined) {
+            clearTimeout(existingTimer);
+        }
+        deferredSegmentationRenderTimers.set(viewportId, setTimeout(() => {
+            deferredSegmentationRenderTimers.delete(viewportId);
+            segmentationRenderingEngine.renderSegmentationsForViewport(viewportId);
+        }, DEFERRED_SEGMENTATION_RENDER_DELAY_MS));
+    });
+}
 const segmentationRenderingEngine = new SegmentationRenderingEngine();
 
 
@@ -45750,7 +45795,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 },
 80274() {
-const version = '5.4.13';
+const version = '5.4.17';
 
 
 },

package/dist/{7248.bundle.ffc730f7131663b5.js → 7248.bundle.ff49139ac01030d9.js}

@@ -65,8 +65,8 @@ var react = __webpack_require__(86326);
 var src = __webpack_require__(50679);
 // EXTERNAL MODULE: ../../i18n/src/index.js + 300 modules
 var i18n_src = __webpack_require__(90119);
-// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 200 modules
-var cornerstone_src = __webpack_require__(86714);
+// EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 211 modules
+var cornerstone_src = __webpack_require__(75609);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 83 modules
 var esm = __webpack_require__(86186);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
@@ -1452,12 +1452,14 @@ function hydrateStructuredReport({
   // For 3d annotations there are no image IDs,
   // so we need to find the display sets by frame of reference to get the SeriesInstanceUIDs
   const frameOfReferenceUIDs = getFrameOfReferenceUIDs(hydratableMeasurementsInSR, sopInstanceUIDToImageId);
+  const displaySetsByFrameOfReferenceUID = new Map();
   for (const FrameOfReferenceUID of frameOfReferenceUIDs) {
     const displaySetsFOR = displaySetService.getDisplaySetsBy(ds => ds.FrameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet);
-    const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID);
+    const ds = getReferencedDisplaySet(displaySet, displaySetsFOR, FrameOfReferenceUID, displaySetService);
     if (!ds) {
       continue;
     }
+    displaySetsByFrameOfReferenceUID.set(FrameOfReferenceUID, ds);
     if (!SeriesInstanceUIDs.includes(ds.SeriesInstanceUID)) {
       SeriesInstanceUIDs.push(ds.SeriesInstanceUID);
     }
@@ -1480,7 +1482,7 @@ function hydrateStructuredReport({
     const frameNumber = toolData.annotation.data && toolData.annotation.data.frameNumber || 1;
     const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
     if (!imageId) {
-      return getReferenceData3D(toolData, servicesManager);
+      return getReferenceData3D(toolData, servicesManager, displaySetsByFrameOfReferenceUID);
     }
     const instance = core_dist_esm.metaData.get('instance', imageId);
     const {
@@ -1602,21 +1604,37 @@ function chooseDisplaySet(displaySets, reference) {
     console.warn('No display set found for', reference);
     return;
   }
-  if (displaySets.length === 1) {
-    return displaySets[0];
+  const sortedDisplaySets = src/* ["default"].utils.sortDisplaySetsCopy */.Ay.utils.sortDisplaySetsCopy(displaySets);
+  if (sortedDisplaySets.length === 1) {
+    return sortedDisplaySets[0];
   }
-  const volumeDs = displaySets.find(ds => ds.isReconstructable);
+  const volumeDs = sortedDisplaySets.find(ds => ds.isReconstructable);
   if (volumeDs) {
     return volumeDs;
   }
-  return displaySets[0];
+  return sortedDisplaySets[0];
+}
+
+/**
+ * SCOORD3D only identifies a frame of reference, so many series can be valid
+ * candidates. The SR loader has already selected and recorded a stable display
+ * set for each measurement. Reuse that selection during hydration so the
+ * viewport series and annotation volume cannot depend on display-set load order.
+ */
+function getReferencedDisplaySet(srDisplaySet, displaySets, FrameOfReferenceUID, displaySetService) {
+  const referencedDisplaySetInstanceUID = srDisplaySet.measurements?.find(measurement => measurement.coords?.some(coord => coord.ValueType === 'SCOORD3D' && coord.ReferencedFrameOfReferenceSequence === FrameOfReferenceUID))?.displaySetInstanceUID;
+  const referencedDisplaySet = referencedDisplaySetInstanceUID ? displaySetService.getDisplaySetByUID(referencedDisplaySetInstanceUID) : undefined;
+  if (referencedDisplaySet?.FrameOfReferenceUID === FrameOfReferenceUID && !referencedDisplaySet.isDerivedDisplaySet) {
+    return referencedDisplaySet;
+  }
+  return chooseDisplaySet(displaySets, FrameOfReferenceUID);
 }
 
 /**
  * Gets the additional reference data appropriate for a 3d reference.
  * This will choose a volume id, frame of reference and a plane restriction.
  */
-function getReferenceData3D(toolData, servicesManager) {
+function getReferenceData3D(toolData, servicesManager, displaySetsByFrameOfReferenceUID = new Map()) {
   const {
     FrameOfReferenceUID
   } = toolData.annotation.metadata;
@@ -1632,7 +1650,7 @@ function getReferenceData3D(toolData, servicesManager) {
       FrameOfReferenceUID
     };
   }
-  const ds = chooseDisplaySet(displaySetsFOR, toolData.annotation);
+  const ds = displaySetsByFrameOfReferenceUID.get(FrameOfReferenceUID) || chooseDisplaySet(displaySetsFOR, toolData.annotation);
   const cameraView = chooseCameraView(ds, points);
   const viewReference = {
     ...cameraView,