diff --git a/Packages/ohif-design/styles/components/radio.styl b/Packages/ohif-design/styles/components/radio.styl index cb1daa771..c776eb1bd 100644 --- a/Packages/ohif-design/styles/components/radio.styl +++ b/Packages/ohif-design/styles/components/radio.styl @@ -5,9 +5,7 @@ cursor: pointer input - height: 0 - width: 0 - visibility: hidden + display: none span padding-left: 23px diff --git a/Packages/ohif-measurements/client/components/longitudinal/dropdown.js b/Packages/ohif-measurements/client/components/longitudinal/dropdown.js index 23f0e8e4e..1f6ce7fc7 100644 --- a/Packages/ohif-measurements/client/components/longitudinal/dropdown.js +++ b/Packages/ohif-measurements/client/components/longitudinal/dropdown.js @@ -33,22 +33,6 @@ const getAssociationAssessment = () => { return assessment; }; -/** - * Loads multiple unassociated studies in the Viewer - */ -const viewStudies = () => { - OHIF.log.info('viewStudies'); - const selectedStudies = OHIF.studylist.getSelectedStudies(); - - if (!selectedStudies || !selectedStudies.length) { - return; - } - - const studyInstanceUids = selectedStudies.map(study => study.studyInstanceUid).join(';'); - - Router.go('viewerStudies', { studyInstanceUids }); -}; - /** * Removes all present study / timepoint associations from the Clinical Trial */ @@ -86,7 +70,7 @@ const removeTimepointAssociations = event => { Meteor.startup(() => { OHIF.studylist.dropdown.setItems([{ - action: viewStudies, + action: OHIF.studylist.viewStudies, text: 'View', separatorAfter: true }, { diff --git a/Packages/ohif-study-list/client/lib/index.js b/Packages/ohif-study-list/client/lib/index.js index 13efcdfb9..070cf7246 100644 --- a/Packages/ohif-study-list/client/lib/index.js +++ b/Packages/ohif-study-list/client/lib/index.js @@ -9,3 +9,4 @@ import './retrieveStudiesMetadata.js'; import './retrieveStudyMetadata.js'; import './studylist.js'; import './viewSeriesDetails.js'; +import './viewStudies.js'; diff --git a/Packages/ohif-study-list/client/lib/viewStudies.js b/Packages/ohif-study-list/client/lib/viewStudies.js new file mode 100644 index 000000000..adc5ef9e2 --- /dev/null +++ b/Packages/ohif-study-list/client/lib/viewStudies.js @@ -0,0 +1,18 @@ +import { OHIF } from 'meteor/ohif:core'; +import { Router } from 'meteor/iron:router'; + +/** + * Loads multiple unassociated studies in the Viewer + */ +OHIF.studylist.viewStudies = () => { + OHIF.log.info('viewStudies'); + const selectedStudies = OHIF.studylist.getSelectedStudies(); + + if (!selectedStudies || !selectedStudies.length) { + return; + } + + const studyInstanceUids = selectedStudies.map(study => study.studyInstanceUid).join(';'); + + Router.go('viewerStudies', { studyInstanceUids }); +}; diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index 61ce052b7..dd12359c9 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -489,7 +489,8 @@ const setDisplaySet = (data, displaySetInstanceUid, templateData) => { // If we didn't find anything, stop here if (!data.displaySet) { - throw new OHIFError('Display set not found in specified study!'); + data.displaySet = study.displaySets[0]; + // throw new OHIFError('Display set not found in specified study!'); } // Otherwise, load pass the data object into loadSeriesIntoViewport