TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ghadeer Albattarni 2026-04-06 12:03:28 -04:00 committed by GitHub
parent 74e656b174
commit 0e933c256e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/cornerstone-dicom-rt/src/getSopClassHandlerModule.ts
View File

@ -56,7 +56,7 @@ function _getDisplaySetsFromSeries(
StudyInstanceUID, StudyInstanceUID,
SOPClassHandlerId, SOPClassHandlerId,
SOPClassUID, SOPClassUID,
frameOfReferenceUID: null, FrameOfReferenceUID: null,
referencedImages: null, referencedImages: null,
referencedSeriesInstanceUID: null, referencedSeriesInstanceUID: null,
referencedDisplaySetInstanceUID: null, referencedDisplaySetInstanceUID: null,
@ -96,7 +96,7 @@ function _getDisplaySetsFromSeries(
displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence; displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence;
displaySet.referencedSeriesInstanceUID = referencedSeries.SeriesInstanceUID; displaySet.referencedSeriesInstanceUID = referencedSeries.SeriesInstanceUID;
displaySet.frameOfReferenceUID = displaySet.FrameOfReferenceUID =
instance.ReferencedFrameOfReferenceSequence?.[0]?.FrameOfReferenceUID; instance.ReferencedFrameOfReferenceSequence?.[0]?.FrameOfReferenceUID;
const { displaySetService } = servicesManager.services; const { displaySetService } = servicesManager.services;
@ -117,7 +117,7 @@ function _getDisplaySetsFromSeries(
if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) { if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID; displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
displaySet.isReconstructable = addedDisplaySet.isReconstructable; displaySet.isReconstructable = addedDisplaySet.isReconstructable;
displaySet.frameOfReferenceUID = addedDisplaySet.frameOfReferenceUID; displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
unsubscribe(); unsubscribe();
} }
} }
@ -126,7 +126,7 @@ function _getDisplaySetsFromSeries(
const [referencedDisplaySet] = referencedDisplaySets; const [referencedDisplaySet] = referencedDisplaySets;
displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID; displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
displaySet.isReconstructable = referencedDisplaySet.isReconstructable; displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
displaySet.frameOfReferenceUID = referencedDisplaySet.frameOfReferenceUID; displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
} }
displaySet.load = ({ headers, createSegmentation = true }) => displaySet.load = ({ headers, createSegmentation = true }) =>

6
extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.ts
View File

@ -50,7 +50,7 @@ function _getDisplaySetsFromSeries(
StudyInstanceUID, StudyInstanceUID,
SOPClassHandlerId, SOPClassHandlerId,
SOPClassUID, SOPClassUID,
frameOfReferenceUID: FrameOfReferenceUID, FrameOfReferenceUID,
referencedImages: null, referencedImages: null,
referencedSeriesInstanceUID: null, referencedSeriesInstanceUID: null,
referencedDisplaySetInstanceUID: null, referencedDisplaySetInstanceUID: null,
@ -106,7 +106,7 @@ function _getDisplaySetsFromSeries(
if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) { if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID; displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
displaySet.isReconstructable = addedDisplaySet.isReconstructable; displaySet.isReconstructable = addedDisplaySet.isReconstructable;
displaySet.frameOfReferenceUID = addedDisplaySet.frameOfReferenceUID; displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
unsubscribe(); unsubscribe();
} }
} }
@ -114,7 +114,7 @@ function _getDisplaySetsFromSeries(
} else { } else {
displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID; displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
displaySet.isReconstructable = referencedDisplaySet.isReconstructable; displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
displaySet.frameOfReferenceUID = referencedDisplaySet.frameOfReferenceUID; displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
} }
displaySet.load = async ({ headers }) => displaySet.load = async ({ headers }) =>

2
extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts
View File

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

4
extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
View File

@ -145,7 +145,7 @@ export default function hydrateStructuredReport(
for (const FrameOfReferenceUID of frameOfReferenceUIDs) { for (const FrameOfReferenceUID of frameOfReferenceUIDs) {
const displaySetsFOR = displaySetService.getDisplaySetsBy( const displaySetsFOR = displaySetService.getDisplaySetsBy(
ds => ds.frameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet ds => ds.FrameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet
); );
const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID); const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID);
if (!ds) { if (!ds) {
@ -335,7 +335,7 @@ function getReferenceData3D(toolData, servicesManager: Types.ServicesManager) {
const { points } = toolData.annotation.data.handles; const { points } = toolData.annotation.data.handles;
const { displaySetService } = servicesManager.services; const { displaySetService } = servicesManager.services;
const displaySetsFOR = displaySetService.getDisplaySetsBy( const displaySetsFOR = displaySetService.getDisplaySetsBy(
ds => ds.frameOfReferenceUID === FrameOfReferenceUID ds => ds.FrameOfReferenceUID === FrameOfReferenceUID
); );
if (!displaySetsFOR.length || !points?.length) { if (!displaySetsFOR.length || !points?.length) {
return { return {

4
extensions/cornerstone/src/components/ViewportDataOverlaySettingMenu/utils.ts
View File

@ -80,8 +80,8 @@ export function getEnhancedDisplaySets({ viewportId, services }) {
// Check if Frame of Reference matches // Check if Frame of Reference matches
if ( if (
displaySet.frameOfReferenceUID && displaySet.FrameOfReferenceUID &&
displaySet.frameOfReferenceUID !== backgroundDisplaySet.frameOfReferenceUID displaySet.FrameOfReferenceUID !== backgroundDisplaySet.FrameOfReferenceUID
) { ) {
return { return {
...displaySet, ...displaySet,

2
extensions/cornerstone/src/getSopClassHandlerModule.js
View File

@ -82,7 +82,7 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
SOPInstanceUID, SOPInstanceUID,
SeriesInstanceUID, SeriesInstanceUID,
StudyInstanceUID, StudyInstanceUID,
frameOfReferenceUID: FrameOfReferenceUID, FrameOfReferenceUID,
SOPClassHandlerId, SOPClassHandlerId,
SOPClassUID, SOPClassUID,
SeriesDescription: SeriesDescription || 'Microscopy Data', SeriesDescription: SeriesDescription || 'Microscopy Data',

2
extensions/default/src/getSopClassHandlerModule.js
View File

@ -113,7 +113,7 @@ const makeDisplaySet = (instances, index) => {
label: label:
instance.SeriesDescription || instance.SeriesDescription ||
`${i18n.t('Series')} ${instance.SeriesNumber} - ${i18n.t(instance.Modality)}`, `${i18n.t('Series')} ${instance.SeriesNumber} - ${i18n.t(instance.Modality)}`,
frameOfReferenceUID: instance.FrameOfReferenceUID, FrameOfReferenceUID: instance.FrameOfReferenceUID,
}); });
const imageIds = dataSource.getImageIdsForDisplaySet(imageSet); const imageIds = dataSource.getImageIdsForDisplaySet(imageSet);

6
extensions/dicom-microscopy/src/services/MicroscopyService.ts
View File

@ -329,16 +329,16 @@ export default class MicroscopyService extends PubSubService {
const studyMetadata = DicomMetadataStore.getStudy(StudyInstanceUID); const studyMetadata = DicomMetadataStore.getStudy(StudyInstanceUID);
const smDisplaySet = displaySets.find(ds => ds.Modality === 'SM'); const smDisplaySet = displaySets.find(ds => ds.Modality === 'SM');
const { frameOfReferenceUID, othersFrameOfReferenceUID } = smDisplaySet; const { FrameOfReferenceUID, othersFrameOfReferenceUID } = smDisplaySet;
if (!studyMetadata) { if (!studyMetadata) {
return; return;
} }
let derivedDisplaySets = frameOfReferenceUID let derivedDisplaySets = FrameOfReferenceUID
? displaySets.filter( ? displaySets.filter(
ds => ds =>
ds.ReferencedFrameOfReferenceUID === frameOfReferenceUID || ds.ReferencedFrameOfReferenceUID === FrameOfReferenceUID ||
// sometimes each depth instance has the different FrameOfReferenceID // sometimes each depth instance has the different FrameOfReferenceID
othersFrameOfReferenceUID.includes(ds.ReferencedFrameOfReferenceUID) othersFrameOfReferenceUID.includes(ds.ReferencedFrameOfReferenceUID)
) )

2
extensions/dicom-microscopy/src/utils/getSourceDisplaySet.js
View File

@ -22,7 +22,7 @@ export default function getSourceDisplaySet(allDisplaySets, microscopySRDisplayS
const referencedDisplaySet = otherDisplaySets.find( const referencedDisplaySet = otherDisplaySets.find(
displaySet => displaySet =>
displaySet.Modality === 'SM' && displaySet.Modality === 'SM' &&
(displaySet.frameOfReferenceUID === ReferencedFrameOfReferenceUID || (displaySet.FrameOfReferenceUID === ReferencedFrameOfReferenceUID ||
// sometimes each depth instance has the different FrameOfReferenceID // sometimes each depth instance has the different FrameOfReferenceID
displaySet.othersFrameOfReferenceUID.includes(ReferencedFrameOfReferenceUID)) displaySet.othersFrameOfReferenceUID.includes(ReferencedFrameOfReferenceUID))
); );

2
platform/core/src/types/DisplaySet.ts
View File

@ -61,7 +61,7 @@ export type DisplaySet = {
* The FrameOfReferenceUID shared by every frame within this display set. * 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. * It will be undefined if the frames do not all share the same Frame of Reference.
*/ */
frameOfReferenceUID?: string; FrameOfReferenceUID?: string;
SeriesDate?: string; SeriesDate?: string;
SeriesTime?: string; SeriesTime?: string;