[IDC-1670] Better display of derived datasets in side panel. (#1962)
* WIP
* WIP
* WIP
* WIP
* Working click on seg.
* Load SEG if not loaded and set active.
* RTSTRUCT
* feat: 🎸 Display SEG and RTSTRUCT in side panel
* Throw error if dataset not available.
* Add delay in microscopy viewer e2e test.
* Add delay in microscopy viewer e2e test.
This commit is contained in:
1 parent
b7ab88b0f1
commit
f8fc31bcac
13 files changed
+245
-91
No files matched your search
@@ -139,9 +139,11 @@ export class StudyMetadata extends Metadata {
|
||||
if (displaySet) {
|
||||
displaySet.sopClassModule = true;
|
||||
|
||||
displaySet.isDerived
|
||||
? this._addDerivedDisplaySet(displaySet)
|
||||
: displaySets.push(displaySet);
|
||||
if (displaySet.isDerived) {
|
||||
this._addDerivedDisplaySet(displaySet);
|
||||
}
|
||||
|
||||
displaySets.push(displaySet);
|
||||
|
||||
return displaySets;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,8 @@ describe('OHIF Microscopy Extension', () => {
|
||||
});
|
||||
|
||||
it('drags and drop a SM thumbnail into viewport', () => {
|
||||
// Waiting for series list to load all displaySets (lots of SRs, before defining which dom element to grab.)
|
||||
cy.wait(3000);
|
||||
cy.get('[data-cy="thumbnail-list"]')
|
||||
.contains('SM')
|
||||
.drag('.viewport-drop-target');
|
||||
|
||||
@@ -80,6 +80,7 @@ const ViewportGrid = function(props) {
|
||||
// - When updating a panel, ensure that the currently enabled plugin
|
||||
// in the viewport is capable of rendering this display set. If not
|
||||
// then use the most capable available plugin
|
||||
|
||||
const pluginName =
|
||||
!layout.plugin && displaySet && displaySet.plugin
|
||||
? displaySet.plugin
|
||||
|
||||
@@ -4,6 +4,8 @@ import { StudyBrowser } from '@ohif/ui';
|
||||
import cloneDeep from 'lodash.clonedeep';
|
||||
import findDisplaySetByUID from './findDisplaySetByUID';
|
||||
|
||||
const { studyMetadataManager } = OHIF.utils;
|
||||
|
||||
const { setActiveViewportSpecificData } = OHIF.redux.actions;
|
||||
|
||||
// TODO
|
||||
@@ -39,11 +41,27 @@ const mapStateToProps = (state, ownProps) => {
|
||||
const mapDispatchToProps = (dispatch, ownProps) => {
|
||||
return {
|
||||
onThumbnailClick: displaySetInstanceUID => {
|
||||
const displaySet = findDisplaySetByUID(
|
||||
let displaySet = findDisplaySetByUID(
|
||||
ownProps.studyMetadata,
|
||||
displaySetInstanceUID
|
||||
);
|
||||
|
||||
if (displaySet.isDerived) {
|
||||
const { Modality } = displaySet;
|
||||
|
||||
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
|
||||
|
||||
if (!displaySet) {
|
||||
throw new Error(
|
||||
`Referenced series for ${Modality} dataset not present.`
|
||||
);
|
||||
}
|
||||
|
||||
if (!displaySet) {
|
||||
throw new Error('Source data not present');
|
||||
}
|
||||
}
|
||||
|
||||
dispatch(setActiveViewportSpecificData(displaySet));
|
||||
},
|
||||
};
|
||||
|
||||
@@ -133,12 +133,23 @@ class ViewerMain extends Component {
|
||||
StudyInstanceUID,
|
||||
displaySetInstanceUID,
|
||||
}) => {
|
||||
const displaySet = this.findDisplaySet(
|
||||
let displaySet = this.findDisplaySet(
|
||||
this.props.studies,
|
||||
StudyInstanceUID,
|
||||
displaySetInstanceUID
|
||||
);
|
||||
|
||||
if (displaySet.isDerived) {
|
||||
const { Modality } = displaySet;
|
||||
displaySet = displaySet.getSourceDisplaySet(this.props.studies);
|
||||
|
||||
if (!displaySet) {
|
||||
throw new Error(
|
||||
`Referenced series for ${Modality} dataset not present.`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
this.props.setViewportSpecificData(viewportIndex, displaySet);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user