fix: Remove dead code and fix rectangle roi rehydration (#5490)

* Remove dead code and fix rectangle roi rehydration

* Revert bun.lock

* Remove hardcoded modality

* Add e2e tests

* Update screewnshots

* Adjustments to tests

* disabvle test for now

* Add test again

* Use ohif data soure

* Revert changes

* Test

* Update testdata to include point

* Improve tests

* Update screenshot

---------

Co-authored-by: Andrey Fedorov <andrey.fedorov@gmail.com>
Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>

extensions/cornerstone-dicom-sr/src/utils/SRSCOOR3DProbeMapper.ts

@@ -1,71 +0,0 @@
-const SRSCOOR3DProbe = {
-  toAnnotation: measurement => {},
-
-  /**
-   * Maps cornerstone annotation event data to measurement service format.
-   *
-   * @param {Object} cornerstone Cornerstone event data
-   * @return {Measurement} Measurement instance
-   */
-  toMeasurement: ({ servicesManager, getValueTypeFromToolType }, csToolsEventDetail) => {
-    const { displaySetService } = servicesManager.services;
-    const { annotation } = csToolsEventDetail;
-    const { metadata, data, annotationUID } = annotation;
-
-    if (!metadata || !data) {
-      console.warn('Probe tool: Missing metadata or data');
-      return null;
-    }
-
-    const { toolName, FrameOfReferenceUID } = metadata;
-    const { points } = data.handles;
-
-    const displaySets = displaySetService
-      .getActiveDisplaySets()
-      .filter(ds => ds.FrameOfReferenceUID === FrameOfReferenceUID);
-    const displaySet = displaySets.filter(ds => ds.isReconstructable)[0] || displaySets[0];
-
-    const { StudyInstanceUID: referenceStudyUID, SeriesInstanceUID: referenceSeriesUID } =
-      displaySets[0] || {};
-
-    const displayText = getDisplayText(annotation);
-    return {
-      uid: annotationUID,
-      points,
-      metadata,
-      referenceStudyUID,
-      referenceSeriesUID,
-      displaySetInstanceUID: displaySet?.displaySetInstanceUID,
-      toolName: metadata.toolName,
-      label: data.label,
-      displayText: displayText,
-      data: data.cachedStats,
-      type: getValueTypeFromToolType?.(toolName) ?? null,
-    };
-  },
-};
-
-function getDisplayText(annotation) {
-  const { data } = annotation;
-
-  if (!data) {
-    return [''];
-  }
-  const { labels } = data;
-
-  const displayText = [];
-
-  for (const label of labels) {
-    // make this generic
-    if (label.label === '33636980076') {
-      displayText.push(`Finding Site: ${label.value}`);
-    }
-  }
-
-  return {
-    primary: displayText,
-    secondary: [],
-  };
-}
-
-export default SRSCOOR3DProbe;

extensions/cornerstone-dicom-sr/src/utils/addSRAnnotation.ts

@@ -64,33 +64,34 @@ export default function addSRAnnotation({ measurement, imageId = null, frameNumb
   const { ValueType: valueType, GraphicType: graphicType } = measurement.coords[0];
   const graphicTypePoints = renderableData[graphicType];
 
-  /** TODO: Read the tool name from the DICOM SR identification type in the future. */
+  /**
+   * TODO: Read the tool name from the DICOM SR identification type in the future.
+   */
   let frameOfReferenceUID = null;
   let planeRestriction = null;
 
+  /**
+   * Store the view reference for use in initial navigation
+   */
   if (imageId) {
     const imagePlaneModule = metaData.get('imagePlaneModule', imageId);
     frameOfReferenceUID = imagePlaneModule?.frameOfReferenceUID;
   }
 
+  /**
+   * Store the view reference for use in initial navigation
+   */
   if (valueType === 'SCOORD3D') {
-    const adapter = MeasurementReport.getAdapterForTrackingIdentifier(
-      measurement.TrackingIdentifier
-    );
-    if (!adapter) {
-      toolName = toolNames.SRSCOORD3DPoint;
-    }
-
-    // get the ReferencedFrameOfReferenceUID from the measurement
     frameOfReferenceUID = measurement.coords[0].ReferencedFrameOfReferenceSequence;
-
     planeRestriction = {
       FrameOfReferenceUID: frameOfReferenceUID,
       point: graphicTypePoints[0][0],
     };
   }
 
-  // Store the view reference for use in initial navigation
+  /**
+   * Store the view reference for use in initial navigation
+   */
   measurement.viewReference = {
     planeRestriction,
     FrameOfReferenceUID: frameOfReferenceUID,