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

LT-382: Fixing image loading after time points disassociation

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-11-22 16:28:42 -02:00
parent e43d66df14
commit 79f3c482c1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LesionTracker/client/components/viewer/viewer.js
View File

@ -1,6 +1,7 @@
import { Template } from 'meteor/templating';
import { Session } from 'meteor/session';
import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore';
Session.set('ViewerMainReady', false);
Session.set('TimepointsReady', false);
@ -73,15 +74,18 @@ Template.viewer.onCreated(() => {
const patientId = instance.data.studies[0].patientId;
// LT-382: Preventing HP to keep identifying studies in timepoints that might be removed
instance.data.studies.forEach(study => (delete study.timepointType));
// TODO: Consider combining the retrieval calls into one?
const timepointsPromise = instance.data.timepointApi.retrieveTimepoints(patientId);
timepointsPromise.then(() => {
const timepoints = instance.data.timepointApi.all();
// Set timepointType in studies to be used in hanging protocol engine
timepoints.forEach(function(timepoint) {
timepoint.studyInstanceUids.forEach(function(studyInstanceUid) {
const study = _.find(instance.data.studies, function (element) {
timepoints.forEach(timepoint => {
timepoint.studyInstanceUids.forEach(studyInstanceUid => {
const study = _.find(instance.data.studies, element => {
return element.studyInstanceUid === studyInstanceUid;
});
if (!study) {
@ -204,4 +208,4 @@ Template.viewer.onDestroyed(() => {
Session.set('ViewerMainReady', false);
Session.set('TimepointsReady', false);
Session.set('MeasurementsReady', false);
});
});

4
Packages/ohif-hanging-protocols/client/protocolEngine.js
View File

@ -636,9 +636,7 @@ HP.ProtocolEngine = class ProtocolEngine {
}
if (!currentViewportData.displaySetInstanceUid) {
// TODO: REMOVE - Temporary for RSNA - LT-382
OHIF.log.warn('No matching display set found?');
// throw 'No matching display set found?';
throw 'No matching display set found?';
}
viewportData.push(currentViewportData);