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

Fixing radio CSS issues and moving viewStudies to ohif:study-list package

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-03-27 08:28:21 -03:00
parent dc405e53da
commit bc533c14ad
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/ohif-design/styles/components/radio.styl
View File

@ -5,9 +5,7 @@
cursor: pointer
input
height: 0
width: 0
visibility: hidden
display: none
span
padding-left: 23px

18
Packages/ohif-measurements/client/components/longitudinal/dropdown.js
View File

@ -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
}, {

1
Packages/ohif-study-list/client/lib/index.js
View File

@ -9,3 +9,4 @@ import './retrieveStudiesMetadata.js';
import './retrieveStudyMetadata.js';
import './studylist.js';
import './viewSeriesDetails.js';
import './viewStudies.js';

18
Packages/ohif-study-list/client/lib/viewStudies.js Normal file
View File

@ -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 });
};

3
Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -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