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

LT-290 Allow to display studies which are not associated

Browse Source
This commit is contained in:
Evren Ozkan 2016-11-03 09:52:29 -04:00 committed by Erik Ziegler
parent 9ac196a916
commit 7fa242d0aa
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,29 +62,24 @@ Template.viewer.onCreated(() => {
ViewerStudies.insert(study); ViewerStudies.insert(study);
}); });
if (instance.data.currentTimepointId) { instance.data.timepointApi = new OHIF.measurements.TimepointApi(instance.data.currentTimepointId);
instance.data.timepointApi = new OHIF.measurements.TimepointApi(instance.data.currentTimepointId); const timepointsPromise = instance.data.timepointApi.retrieveTimepoints();
const timepointsPromise = instance.data.timepointApi.retrieveTimepoints(); timepointsPromise.then(() => {
timepointsPromise.then(() => { Session.set('TimepointsReady', true);
Session.set('TimepointsReady', true); });
});
instance.data.measurementApi = new OHIF.measurements.MeasurementApi(instance.data.currentTimepointId); instance.data.measurementApi = new OHIF.measurements.MeasurementApi(instance.data.currentTimepointId);
const measurementsPromise = instance.data.measurementApi.retrieveMeasurements(); const measurementsPromise = instance.data.measurementApi.retrieveMeasurements();
measurementsPromise.then(() => { measurementsPromise.then(() => {
Session.set('MeasurementsReady', true); Session.set('MeasurementsReady', true);
instance.data.measurementApi.syncMeasurementsAndToolData(); instance.data.measurementApi.syncMeasurementsAndToolData();
}); });
// Provide the necessary data to the Measurement API and Timepoint API // Provide the necessary data to the Measurement API and Timepoint API
const prior = instance.data.timepointApi.prior(); const prior = instance.data.timepointApi.prior();
if (prior) { if (prior) {
instance.data.measurementApi.priorTimepointId = prior.timepointId; instance.data.measurementApi.priorTimepointId = prior.timepointId;
}
} else {
console.warn('No current timepoint specified');
instance.data.measurementApi = new OHIF.measurements.MeasurementApi();
} }
}); });