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

package/dist/{1447.bundle.e01fc0a6bedb558ddbbd.js → 1447.bundle.3c71e9ea053b7069b73e.js}

@@ -10371,8 +10371,8 @@ function AboutModalDefault() {
     name
   } = (0,browser_detect_es5/* default */.A)();
   const browser = `${name[0].toUpperCase()}${name.substr(1)} ${version}`;
-  const versionNumber = "3.12.0-beta.41";
-  const commitHash = "6a1df9de4ad3c10a4653f18e03aff6bda4962fd1";
+  const versionNumber = "3.12.0-beta.43";
+  const commitHash = "851e74d7b867a806befb5d85fd71ff9a75e9f2d2";
   const [main, beta] = versionNumber.split('-');
   return /*#__PURE__*/react.createElement(ui_next_src/* AboutModal */.VTU, {
     className: "w-[400px]"

package/dist/{4113.bundle.35b2bf02f79a9705f3de.js → 4113.bundle.3edfb5a8a5aab9679211.js}

@@ -256,8 +256,59 @@ const toolNames = {
 const {
   MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
-function addSRAnnotation(measurement, imageId, frameNumber) {
+
+/**
+ * Adds a DICOM SR (Structured Report) annotation to the annotation manager.
+ * This function processes measurement data from DICOM SR and converts it into
+ * a format suitable for display in the Cornerstone3D viewer.
+ *
+ * @param {Object} params - The parameters object
+ * @param {Object} params.measurement - The DICOM SR measurement data containing coordinates, labels, and metadata
+ * @param {Array} params.measurement.coords - Array of coordinate objects with GraphicType, ValueType, and other properties
+ * @param {string} params.measurement.TrackingUniqueIdentifier - Unique identifier for the measurement
+ * @param {string} params.measurement.TrackingIdentifier - Tracking identifier for adapter lookup
+ * @param {Array} [params.measurement.labels] - Optional array of label objects
+ * @param {string} [params.measurement.displayText] - Optional display text for the annotation
+ * @param {Object} [params.measurement.textBox] - Optional text box configuration
+ * @param {string|null} [params.imageId] - Optional image ID for the referenced image (defaults to null)
+ * @param {number|null} [params.frameNumber] - Optional frame number for multi-frame images (defaults to null)
+ * @param {Object} params.displaySet - The display set containing the image
+ * @param {string} params.displaySet.displaySetInstanceUID - Unique identifier for the display set
+ * @returns {void}
+ *
+ * @example
+ * ```typescript
+ * addSRAnnotation({
+ *   measurement: {
+ *     TrackingUniqueIdentifier: '1.2.3.4.5',
+ *     TrackingIdentifier: 'POINT',
+ *     coords: [{
+ *       GraphicType: 'POINT',
+ *       ValueType: 'SCOORD',
+ *       // ... other coordinate properties
+ *     }],
+ *     labels: [{ value: 'Measurement Point' }],
+ *     displayText: 'Point measurement'
+ *   },
+ *   imageId: 'wadouri:file://path/to/image.dcm', // Optional
+ *   frameNumber: 0, // Optional
+ *   displaySet: { displaySetInstanceUID: '1.2.3.4' }
+ * });
+ * ```
+ */
+function addSRAnnotation({
+  measurement,
+  imageId = null,
+  frameNumber = null,
+  displaySet
+}) {
+  /** @type {string} The tool name to use for the annotation, defaults to DICOMSRDisplay */
   let toolName = tools_toolNames.DICOMSRDisplay;
+
+  /** 
+   * @type {Object} Renderable data organized by graphic type
+   * Groups coordinate data by GraphicType for efficient rendering
+   */
   const renderableData = measurement.coords.reduce((acc, coordProps) => {
     acc[coordProps.GraphicType] = acc[coordProps.GraphicType] || [];
     acc[coordProps.GraphicType].push(utils_getRenderableData({
@@ -302,10 +353,16 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
     FrameOfReferenceUID: frameOfReferenceUID,
     referencedImageId: imageId
   };
+
+  /**
+   * @type {Types.Annotation} The annotation object to be added to the annotation manager
+   * Contains all necessary metadata and data for rendering the DICOM SR measurement
+   */
   const SRAnnotation = {
     annotationUID: TrackingUniqueIdentifier,
     highlighted: false,
     isLocked: false,
+    isPreview: toolName === tools_toolNames.DICOMSRDisplay,
     invalidated: false,
     metadata: {
       toolName,
@@ -313,7 +370,8 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
       valueType,
       graphicType,
       FrameOfReferenceUID: frameOfReferenceUID,
-      referencedImageId: imageId
+      referencedImageId: imageId,
+      displaySetInstanceUID: displaySet.displaySetInstanceUID
     },
     data: {
       label: measurement.labels?.[0]?.value || undefined,
@@ -331,8 +389,11 @@ function addSRAnnotation(measurement, imageId, frameNumber) {
   };
 
   /**
-   * const annotationManager = annotation.annotationState.getAnnotationManager();
-   * was not triggering annotation_added events.
+   * Add the annotation to the annotation state manager.
+   * Note: Using annotation.state.addAnnotation() instead of annotationManager.addAnnotation()
+   * because the latter was not triggering annotation_added events properly.
+   * 
+   * @param {Types.Annotation} SRAnnotation - The annotation to add
    */
   dist_esm.annotation.state.addAnnotation(SRAnnotation);
 }
@@ -459,9 +520,10 @@ function addInstances(instances, _displaySetService) {
  * DICOM SR SOP Class Handler
  * For all referenced images in the TID 1500/300 sections, add an image to the
  * display.
- * @param instances is a set of instances all from the same series
- * @param servicesManager is the services that can be used for creating
- * @returns The list of display sets created for the given instances object
+ * @param {InstanceMetadata[]} instances - A set of instances all from the same series
+ * @param {AppTypes.ServicesManager} servicesManager - The services that can be used for creating
+ * @param {AppTypes.ExtensionManager} extensionManager - The extension manager
+ * @returns {Types.DisplaySet[]} The list of display sets created for the given instances object
  */
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
   // If the series has no instances, stop here
@@ -589,15 +651,6 @@ function _measurementBelongsToDisplaySet({
 }) {
   return measurement.coords[0].ReferencedFrameOfReferenceSequence === displaySet.FrameOfReferenceUID;
 }
-
-/**
- * Checks if measurements can be added to a display set.
- *
- * @param srDisplaySet - The source display set containing measurements.
- * @param newDisplaySet - The new display set to check if measurements can be added.
- * @param dataSource - The data source used to retrieve image IDs.
- * @param servicesManager - The services manager.
- */
 function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dataSource, servicesManager) {
   const {
     customizationService
@@ -639,11 +692,10 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
       measurement,
       displaySet: newDisplaySet
     })) {
-      _measurementBelongsToDisplaySet({
+      addSRAnnotation({
         measurement,
         displaySet: newDisplaySet
       });
-      addSRAnnotation(measurement, null, null);
       measurement.loaded = true;
       measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
       unloadedMeasurements.splice(j, 1);
@@ -660,9 +712,12 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
     const key = `${ReferencedSOPInstanceUID}:${frame}`;
     const imageId = imageIdMap.get(key);
     if (imageId && _measurementReferencesSOPInstanceUID(measurement, ReferencedSOPInstanceUID, frame)) {
-      addSRAnnotation(measurement, imageId, frame);
-
-      // Update measurement properties
+      addSRAnnotation({
+        measurement,
+        imageId,
+        frameNumber: frame,
+        displaySet: newDisplaySet
+      });
       measurement.loaded = true;
       measurement.imageId = imageId;
       measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
@@ -675,10 +730,10 @@ function _checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, newDisplaySet, dat
 
 /**
  * Checks if a measurement references a specific SOP Instance UID.
- * @param measurement - The measurement object.
- * @param SOPInstanceUID - The SOP Instance UID to check against.
- * @param frameNumber - The frame number to check against (optional).
- * @returns True if the measurement references the specified SOP Instance UID, false otherwise.
+ * @param {any} measurement - The measurement object.
+ * @param {string} sopInstanceUID - The SOP Instance UID to check against.
+ * @param {number} frameNumber - The frame number to check against (optional).
+ * @returns {boolean} True if the measurement references the specified SOP Instance UID, false otherwise.
  */
 function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frameNumber) {
   const {
@@ -708,10 +763,8 @@ function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frame
 /**
  * Retrieves the SOP class handler module.
  *
- * @param {Object} options - The options for retrieving the SOP class handler module.
- * @param {Object} options.servicesManager - The services manager.
- * @param {Object} options.extensionManager - The extension manager.
- * @returns {Array} An array containing the SOP class handler module.
+ * @param {OhifTypes.Extensions.ExtensionParams} params - The extension parameters.
+ * @returns {Array} An array containing the SOP class handler modules.
  */
 function getSopClassHandlerModule(params) {
   const {
@@ -735,8 +788,8 @@ function getSopClassHandlerModule(params) {
 /**
  * Retrieves the measurements from the ImagingMeasurementReportContentSequence.
  *
- * @param {Array} ImagingMeasurementReportContentSequence - The ImagingMeasurementReportContentSequence array.
- * @returns {Array} - The array of measurements.
+ * @param {any[]} imagingMeasurementReportContentSequence - The ImagingMeasurementReportContentSequence array.
+ * @returns {any[]} The array of measurements.
  */
 function _getMeasurements(ImagingMeasurementReportContentSequence) {
   const ImagingMeasurements = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === enums/* CodeNameCodeSequenceValues */.n7.ImagingMeasurements);
@@ -759,8 +812,8 @@ function _getMeasurements(ImagingMeasurementReportContentSequence) {
 /**
  * Retrieves merged content sequences by tracking unique identifiers.
  *
- * @param {Array} MeasurementGroups - The measurement groups.
- * @returns {Object} - The merged content sequences by tracking unique identifiers.
+ * @param {any[]} measurementGroups - The measurement groups.
+ * @returns {Object} The merged content sequences by tracking unique identifiers.
  */
 function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups) {
   const mergedContentSequencesByTrackingUniqueIdentifiers = {};
@@ -793,8 +846,8 @@ function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups
  * it calls the _processTID1410Measurement function.
  * Otherwise, it calls the _processNonGeometricallyDefinedMeasurement function.
  *
- * @param {Array<Object>} mergedContentSequence - The merged content sequence to process.
- * @returns {any} - The processed measurement result.
+ * @param {any[]} mergedContentSequence - The merged content sequence to process.
+ * @returns {any} The processed measurement result.
  */
 function _processMeasurement(mergedContentSequence) {
   if (mergedContentSequence.some(group => isScoordOr3d(group) && !isTextPosition(group))) {
@@ -808,8 +861,8 @@ function _processMeasurement(mergedContentSequence) {
  * TID 1410 style measurements have a SCOORD or SCOORD3D at the top level,
  * and non-geometric representations where each NUM has "INFERRED FROM" SCOORD/SCOORD3D.
  *
- * @param mergedContentSequence - The merged content sequence containing the measurements.
- * @returns The measurement object containing the loaded status, labels, coordinates, tracking unique identifier, and tracking identifier.
+ * @param {any[]} mergedContentSequence - The merged content sequence containing the measurements.
+ * @returns {any} The measurement object containing the loaded status, labels, coordinates, tracking unique identifier, and tracking identifier.
  */
 function _processTID1410Measurement(mergedContentSequence) {
   // Need to deal with TID 1410 style measurements, which will have a SCOORD or SCOORD3D at the top level,
@@ -868,8 +921,8 @@ function _processTID1410Measurement(mergedContentSequence) {
 /**
  * Processes the non-geometrically defined measurement from the merged content sequence.
  *
- * @param mergedContentSequence The merged content sequence containing the measurement data.
- * @returns The processed measurement object.
+ * @param {any[]} mergedContentSequence The merged content sequence containing the measurement data.
+ * @returns {any} The processed measurement object.
  */
 function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
   const NUMContentItems = mergedContentSequence.filter(group => group.ValueType === 'NUM');
@@ -938,8 +991,8 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
 
 /**
  * Extracts coordinates from a graphic item of type SCOORD or SCOORD3D.
- * @param {object} graphicItem - The graphic item containing the coordinates.
- * @returns {object} - The extracted coordinates.
+ * @param {any} graphicItem - The graphic item containing the coordinates.
+ * @returns {any} The extracted coordinates.
  */
 const _getCoordsFromSCOORDOrSCOORD3D = graphicItem => {
   const {
@@ -959,9 +1012,9 @@ const _getCoordsFromSCOORDOrSCOORD3D = graphicItem => {
 
 /**
  * Retrieves the label and value from the provided ConceptNameCodeSequence and MeasuredValueSequence.
- * @param {Object} ConceptNameCodeSequence - The ConceptNameCodeSequence object.
- * @param {Object} MeasuredValueSequence - The MeasuredValueSequence object.
- * @returns {Object} - An object containing the label and value.
+ * @param {any} conceptNameCodeSequence - The ConceptNameCodeSequence object.
+ * @param {any} measuredValueSequence - The MeasuredValueSequence object.
+ * @returns {Object} An object containing the label and value.
  *                    The label represents the CodeMeaning from the ConceptNameCodeSequence.
  *                    The value represents the formatted NumericValue and CodeValue from the MeasuredValueSequence.
  *                    Example: { label: 'Long Axis', value: '31.00 mm' }
@@ -987,8 +1040,8 @@ function _getLabelFromMeasuredValueSequence(ConceptNameCodeSequence, MeasuredVal
 /**
  * Retrieves a list of referenced images from the Imaging Measurement Report Content Sequence.
  *
- * @param {Array} ImagingMeasurementReportContentSequence - The Imaging Measurement Report Content Sequence.
- * @returns {Array} - The list of referenced images.
+ * @param {any[]} imagingMeasurementReportContentSequence - The Imaging Measurement Report Content Sequence.
+ * @returns {any[]} The list of referenced images.
  */
 function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
   const ImageLibrary = ImagingMeasurementReportContentSequence.find(item => item.ConceptNameCodeSequence.CodeValue === enums/* CodeNameCodeSequenceValues */.n7.ImageLibrary);
@@ -1030,7 +1083,7 @@ function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
  * Otherwise, the sequence is wrapped in an array and returned.
  *
  * @param {any} sequence - The DICOM sequence to convert.
- * @returns {any[]} - The converted array.
+ * @returns {any[]} The converted array.
  */
 function _getSequenceAsArray(sequence) {
   if (!sequence) {
@@ -2268,8 +2321,7 @@ function init({
   servicesManager
 }) {
   const {
-    measurementService,
-    cornerstoneViewportService
+    measurementService
   } = servicesManager.services;
   addToolInstance(tools_toolNames.DICOMSRDisplay, DICOMSRDisplayTool);
   addToolInstance(tools_toolNames.SRLength, dist_esm.LengthTool);

package/dist/{7656.bundle.895648e6ae0045998bf9.js → 7656.bundle.3d4e565ee35e891f3b76.js}

@@ -1613,7 +1613,17 @@ function useViewportSegmentations({
         return;
       }
       const representations = segmentationService.getSegmentationRepresentations(viewportId);
-      const newSegmentationsWithRepresentations = representations.map(representation => {
+
+      // Deduplicate representations by segmentationId to prevent showing
+      // the same segmentation multiple times in the panel when it has
+      // multiple representation types (e.g., labelmap and surface)
+      const uniqueSegmentationMap = new Map();
+      representations.forEach(representation => {
+        if (!uniqueSegmentationMap.has(representation.segmentationId)) {
+          uniqueSegmentationMap.set(representation.segmentationId, representation);
+        }
+      });
+      const newSegmentationsWithRepresentations = Array.from(uniqueSegmentationMap.values()).map(representation => {
         const segmentation = segmentationService.getSegmentation(representation.segmentationId);
         const mappedSegmentation = mapSegmentationToDisplay(segmentation, customizationService);
         return {
@@ -5982,7 +5992,7 @@ const connectMeasurementServiceToTools = ({
     if (measurement?.metadata?.referencedImageId) {
       imageId = measurement.metadata.referencedImageId;
       frameNumber = getSOPInstanceAttributes(measurement.metadata.referencedImageId).frameNumber;
-    } else {
+    } else if (instance) {
       imageId = dataSource.getImageIdsForInstance({
         instance
       });
@@ -23207,8 +23217,7 @@ function AccordionGroup(props) {
     grouping,
     items,
     children,
-    sourceChildren,
-    type
+    sourceChildren
   } = props;
   const childProps = (0,src/* useSystem */.Jg)();
   let defaultValue = props.defaultValue;
@@ -23575,8 +23584,6 @@ function StudySummaryWithActions(props) {
 ;// ../../../extensions/cornerstone/src/components/StudyMeasurements.tsx
 
 
-// import { AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
-
 
 
 
@@ -23636,8 +23643,7 @@ function StudyMeasurements(props) {
     grouping = {},
     children
   } = props;
-  const system = (0,src/* useSystem */.Jg)();
-  const activeDisplaySets = (0,src/* useActiveViewportDisplaySets */.BZ)(system);
+  const activeDisplaySets = (0,src/* useActiveViewportDisplaySets */.BZ)();
   const activeStudyUID = activeDisplaySets?.[0]?.StudyInstanceUID;
   return /*#__PURE__*/react.createElement(AccordionGroup, {
     grouping: {
@@ -23735,6 +23741,7 @@ function PanelMeasurement(props) {
     }));
     return cloned;
   }
+
   // Need to merge defaults on the content props to ensure they get passed to children
   return /*#__PURE__*/react.createElement(components_StudyMeasurements, {
     items: displayMeasurements