revert: rename DisplaySet.frameOfReferenceUID back to FrameOfReferenceUID (#5943)

2026-04-06 12:03:28 -04:00 · 2026-04-06 12:03:28 -04:00 · 0e933c256e
commit 0e933c256e
parent 74e656b174
10 changed files with 19 additions and 19 deletions
--- a/extensions/cornerstone-dicom-rt/src/getSopClassHandlerModule.ts
+++ b/extensions/cornerstone-dicom-rt/src/getSopClassHandlerModule.ts
@ -56,7 +56,7 @@ function _getDisplaySetsFromSeries(
    StudyInstanceUID,
    SOPClassHandlerId,
    SOPClassUID,
-    frameOfReferenceUID: null,
+    FrameOfReferenceUID: null,
    referencedImages: null,
    referencedSeriesInstanceUID: null,
    referencedDisplaySetInstanceUID: null,
@ -96,7 +96,7 @@ function _getDisplaySetsFromSeries(
  displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence;
  displaySet.referencedSeriesInstanceUID = referencedSeries.SeriesInstanceUID;

-  displaySet.frameOfReferenceUID =
+  displaySet.FrameOfReferenceUID =
    instance.ReferencedFrameOfReferenceSequence?.[0]?.FrameOfReferenceUID;

  const { displaySetService } = servicesManager.services;
@ -117,7 +117,7 @@ function _getDisplaySetsFromSeries(
        if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
          displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
          displaySet.isReconstructable = addedDisplaySet.isReconstructable;
-          displaySet.frameOfReferenceUID = addedDisplaySet.frameOfReferenceUID;
+          displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
          unsubscribe();
        }
      }
@ -126,7 +126,7 @@ function _getDisplaySetsFromSeries(
    const [referencedDisplaySet] = referencedDisplaySets;
    displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
    displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
-    displaySet.frameOfReferenceUID = referencedDisplaySet.frameOfReferenceUID;
+    displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
  }

  displaySet.load = ({ headers, createSegmentation = true }) =>
--- a/extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.ts
+++ b/extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.ts
@ -50,7 +50,7 @@ function _getDisplaySetsFromSeries(
    StudyInstanceUID,
    SOPClassHandlerId,
    SOPClassUID,
-    frameOfReferenceUID: FrameOfReferenceUID,
+    FrameOfReferenceUID,
    referencedImages: null,
    referencedSeriesInstanceUID: null,
    referencedDisplaySetInstanceUID: null,
@ -106,7 +106,7 @@ function _getDisplaySetsFromSeries(
        if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
          displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
          displaySet.isReconstructable = addedDisplaySet.isReconstructable;
-          displaySet.frameOfReferenceUID = addedDisplaySet.frameOfReferenceUID;
+          displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
          unsubscribe();
        }
      }
@ -114,7 +114,7 @@ function _getDisplaySetsFromSeries(
  } else {
    displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
    displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
-    displaySet.frameOfReferenceUID = referencedDisplaySet.frameOfReferenceUID;
+    displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
  }

  displaySet.load = async ({ headers }) =>
--- a/extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts
+++ b/extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts
@ -230,7 +230,7 @@ async function _load(

 function _measurementBelongsToDisplaySet({ measurement, displaySet }) {
  return (
-    measurement.coords[0].ReferencedFrameOfReferenceSequence === displaySet.frameOfReferenceUID
+    measurement.coords[0].ReferencedFrameOfReferenceSequence === displaySet.FrameOfReferenceUID
  );
 }

--- a/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
+++ b/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
@ -145,7 +145,7 @@ export default function hydrateStructuredReport(

  for (const FrameOfReferenceUID of frameOfReferenceUIDs) {
    const displaySetsFOR = displaySetService.getDisplaySetsBy(
-      ds => ds.frameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet
+      ds => ds.FrameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet
    );
    const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID);
    if (!ds) {
@ -335,7 +335,7 @@ function getReferenceData3D(toolData, servicesManager: Types.ServicesManager) {
  const { points } = toolData.annotation.data.handles;
  const { displaySetService } = servicesManager.services;
  const displaySetsFOR = displaySetService.getDisplaySetsBy(
-    ds => ds.frameOfReferenceUID === FrameOfReferenceUID
+    ds => ds.FrameOfReferenceUID === FrameOfReferenceUID
  );
  if (!displaySetsFOR.length || !points?.length) {
    return {
--- a/extensions/cornerstone/src/components/ViewportDataOverlaySettingMenu/utils.ts
+++ b/extensions/cornerstone/src/components/ViewportDataOverlaySettingMenu/utils.ts
@ -80,8 +80,8 @@ export function getEnhancedDisplaySets({ viewportId, services }) {

    // Check if Frame of Reference matches
    if (
-      displaySet.frameOfReferenceUID &&
-      displaySet.frameOfReferenceUID !== backgroundDisplaySet.frameOfReferenceUID
+      displaySet.FrameOfReferenceUID &&
+      displaySet.FrameOfReferenceUID !== backgroundDisplaySet.FrameOfReferenceUID
    ) {
      return {
        ...displaySet,
--- a/extensions/cornerstone/src/getSopClassHandlerModule.js
+++ b/extensions/cornerstone/src/getSopClassHandlerModule.js
@ -82,7 +82,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
    SOPInstanceUID,
    SeriesInstanceUID,
    StudyInstanceUID,
-    frameOfReferenceUID: FrameOfReferenceUID,
+    FrameOfReferenceUID,
    SOPClassHandlerId,
    SOPClassUID,
    SeriesDescription: SeriesDescription || 'Microscopy Data',
--- a/extensions/default/src/getSopClassHandlerModule.js
+++ b/extensions/default/src/getSopClassHandlerModule.js
@ -113,7 +113,7 @@ const makeDisplaySet = (instances, index) => {
    label:
      instance.SeriesDescription ||
      `${i18n.t('Series')} ${instance.SeriesNumber} - ${i18n.t(instance.Modality)}`,
-    frameOfReferenceUID: instance.FrameOfReferenceUID,
+    FrameOfReferenceUID: instance.FrameOfReferenceUID,
  });

  const imageIds = dataSource.getImageIdsForDisplaySet(imageSet);
--- a/extensions/dicom-microscopy/src/services/MicroscopyService.ts
+++ b/extensions/dicom-microscopy/src/services/MicroscopyService.ts
@ -329,16 +329,16 @@ export default class MicroscopyService extends PubSubService {
    const studyMetadata = DicomMetadataStore.getStudy(StudyInstanceUID);
    const smDisplaySet = displaySets.find(ds => ds.Modality === 'SM');

-    const { frameOfReferenceUID, othersFrameOfReferenceUID } = smDisplaySet;
+    const { FrameOfReferenceUID, othersFrameOfReferenceUID } = smDisplaySet;

    if (!studyMetadata) {
      return;
    }

-    let derivedDisplaySets = frameOfReferenceUID
+    let derivedDisplaySets = FrameOfReferenceUID
      ? displaySets.filter(
          ds =>
-            ds.ReferencedFrameOfReferenceUID === frameOfReferenceUID ||
+            ds.ReferencedFrameOfReferenceUID === FrameOfReferenceUID ||
            // sometimes each depth instance has the different FrameOfReferenceID
            othersFrameOfReferenceUID.includes(ds.ReferencedFrameOfReferenceUID)
        )
--- a/extensions/dicom-microscopy/src/utils/getSourceDisplaySet.js
+++ b/extensions/dicom-microscopy/src/utils/getSourceDisplaySet.js
@ -22,7 +22,7 @@ export default function getSourceDisplaySet(allDisplaySets, microscopySRDisplayS
  const referencedDisplaySet = otherDisplaySets.find(
    displaySet =>
      displaySet.Modality === 'SM' &&
-      (displaySet.frameOfReferenceUID === ReferencedFrameOfReferenceUID ||
+      (displaySet.FrameOfReferenceUID === ReferencedFrameOfReferenceUID ||
        // sometimes each depth instance has the different FrameOfReferenceID
        displaySet.othersFrameOfReferenceUID.includes(ReferencedFrameOfReferenceUID))
  );
--- a/platform/core/src/types/DisplaySet.ts
+++ b/platform/core/src/types/DisplaySet.ts
@ -61,7 +61,7 @@ export type DisplaySet = {
   * The FrameOfReferenceUID shared by every frame within this display set.
   * It will be undefined if the frames do not all share the same Frame of Reference.
   */
-  frameOfReferenceUID?: string;
+  FrameOfReferenceUID?: string;

  SeriesDate?: string;
  SeriesTime?: string;