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

PWV-1: Converting measurements series data and imageId

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-10-13 18:58:38 +01:00 committed by Erik Ziegler
parent bbf00cce80
commit cd2427274a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Packages/ohif-measurements/both/configuration/measurements.js
View File

@ -14,14 +14,12 @@ class MeasurementApi {
return configuration; return configuration;
} }
constructor(currentTimepointId, configuration) { constructor(currentTimepointId) {
if (currentTimepointId) { if (currentTimepointId) {
this.currentTimepointId = currentTimepointId; this.currentTimepointId = currentTimepointId;
} }
this.config = configuration || MeasurementApi.getConfiguration(); configuration.measurementTools.forEach(tool => {
this.config.measurementTools.forEach(tool => {
const measurementTypeId = tool.id; const measurementTypeId = tool.id;
this[measurementTypeId] = new Mongo.Collection(null); this[measurementTypeId] = new Mongo.Collection(null);
@ -34,13 +32,13 @@ class MeasurementApi {
timepointId = this.currentTimepointId; timepointId = this.currentTimepointId;
} }
const retrievalFn = this.config.dataExchange.retrieve; const retrievalFn = configuration.dataExchange.retrieve;
if (!_.isFunction(retrievalFn)) { if (!_.isFunction(retrievalFn)) {
return; return;
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
retrievalFn().then(measurementData => { retrievalFn(timepointId).then(measurementData => {
OHIF.log.info('Measurement data retrieval'); OHIF.log.info('Measurement data retrieval');
OHIF.log.info(measurementData); OHIF.log.info(measurementData);
@ -60,13 +58,13 @@ class MeasurementApi {
} }
storeMeasurements(timepointId) { storeMeasurements(timepointId) {
const storeFn = this.config.dataExchange.store; const storeFn = configuration.dataExchange.store;
if (!_.isFunction(storeFn)) { if (!_.isFunction(storeFn)) {
return; return;
} }
let measurementData = {}; let measurementData = {};
this.config.measurementTools.forEach(tool => { configuration.measurementTools.forEach(tool => {
const measurementTypeId = tool.id; const measurementTypeId = tool.id;
measurementData[measurementTypeId] = this[measurementTypeId].find().fetch(); measurementData[measurementTypeId] = this[measurementTypeId].find().fetch();
}); });
@ -77,14 +75,14 @@ class MeasurementApi {
} }
validateMeasurements() { validateMeasurements() {
const validateFn = this.config.dataValidation.validateMeasurements; const validateFn = configuration.dataValidation.validateMeasurements;
if (validateFn && validateFn instanceof Function) { if (validateFn && validateFn instanceof Function) {
validateFn(); validateFn();
} }
} }
syncMeasurementsAndToolData() { syncMeasurementsAndToolData() {
this.config.measurementTools.forEach(tool => { configuration.measurementTools.forEach(tool => {
const measurements = this[tool.id].find().fetch(); const measurements = this[tool.id].find().fetch();
measurements.forEach(measurement => { measurements.forEach(measurement => {
OHIF.measurements.syncMeasurementAndToolData(measurement); OHIF.measurements.syncMeasurementAndToolData(measurement);