IDC2797: add linking and report UI for SR displaySets (#2834)
This commit is contained in:
1 parent
5150ed9427
commit
67b70eaa98
8 files changed
+91
-56
No files matched your search
@@ -48,7 +48,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
|
||||
);
|
||||
document.dispatchEvent(selectionFired);
|
||||
});
|
||||
} else {
|
||||
} else if (Modality !== 'SR') {
|
||||
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
|
||||
}
|
||||
|
||||
|
||||
@@ -262,7 +262,11 @@ class Viewer extends Component {
|
||||
const { currentTimepointId } = this;
|
||||
|
||||
this.timepointApi.retrieveTimepoints({ PatientID });
|
||||
this.measurementApi.retrieveMeasurements(PatientID, [currentTimepointId]);
|
||||
this.measurementApi
|
||||
.retrieveMeasurements(PatientID, [currentTimepointId])
|
||||
.then(() => {
|
||||
this._updateThumbnails();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -608,9 +612,30 @@ const _isDisplaySetActive = function(
|
||||
if (
|
||||
displaySet.Modality !== 'SEG' &&
|
||||
displaySet.Modality !== 'RTSTRUCT' &&
|
||||
displaySet.Modality !== 'RTDOSE'
|
||||
displaySet.Modality !== 'RTDOSE' &&
|
||||
displaySet.Modality !== 'SR'
|
||||
) {
|
||||
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
|
||||
} else if (displaySet.Modality === 'SR') {
|
||||
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
|
||||
|
||||
if (!active && displaySet.getSourceDisplaySet) {
|
||||
const referencedDisplaySet = displaySet.getSourceDisplaySet(
|
||||
studies,
|
||||
false
|
||||
);
|
||||
if (referencedDisplaySet && referencedDisplaySet.length !== 0) {
|
||||
for (let i = 0; i < referencedDisplaySet.length; i++) {
|
||||
if (
|
||||
referencedDisplaySet[i].displaySetInstanceUID ===
|
||||
activeDisplaySetInstanceUID
|
||||
) {
|
||||
active = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (displaySet.getSourceDisplaySet) {
|
||||
if (displaySet.Modality === 'SEG') {
|
||||
const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
|
||||
|
||||
@@ -173,7 +173,7 @@ class ViewerMain extends Component {
|
||||
);
|
||||
document.dispatchEvent(selectionFired);
|
||||
});
|
||||
} else {
|
||||
} else if (Modality !== 'SR') {
|
||||
displaySet = displaySet.getSourceDisplaySet(this.props.studies);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user