Allowing locations schema overriding

This commit is contained in:
Bruno Alves de Faria 2017-02-20 08:41:42 -03:00
parent e743d6bc79
commit 60a001043b
2 changed files with 8 additions and 3 deletions

View File

@ -3,6 +3,7 @@ import { OHIF } from 'meteor/ohif:core';
import { measurementTools } from './measurementTools'; import { measurementTools } from './measurementTools';
import { retrieveMeasurements, storeMeasurements, retrieveTimepoints, storeTimepoints, removeTimepoint, updateTimepoint, disassociateStudy } from './dataExchange'; import { retrieveMeasurements, storeMeasurements, retrieveTimepoints, storeTimepoints, removeTimepoint, updateTimepoint, disassociateStudy } from './dataExchange';
import { validateMeasurements } from './dataValidation'; import { validateMeasurements } from './dataValidation';
import { FieldLesionLocation, FieldLesionLocationResponse } from 'meteor/ohif:lesiontracker/both/schema/fields';
console.log('OHIF-LesionTracker: Defining Configuration for Measurements'); console.log('OHIF-LesionTracker: Defining Configuration for Measurements');
@ -20,6 +21,10 @@ OHIF.measurements.MeasurementApi.setConfiguration({
}, },
dataValidation: { dataValidation: {
validation: validateMeasurements validation: validateMeasurements
},
schema: {
nonTargetLocation: FieldLesionLocation,
nonTargetResponse: FieldLesionLocationResponse
} }
}); });

View File

@ -2,7 +2,6 @@ import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import { SimpleSchema } from 'meteor/aldeed:simple-schema'; import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { FieldLesionLocation, FieldLesionLocationResponse } from 'meteor/ohif:lesiontracker/both/schema/fields';
Template.dialogNonTargetMeasurement.onCreated(() => { Template.dialogNonTargetMeasurement.onCreated(() => {
const instance = Template.instance(); const instance = Template.instance();
@ -10,9 +9,10 @@ Template.dialogNonTargetMeasurement.onCreated(() => {
instance.measurementTypeId = 'nonTarget'; instance.measurementTypeId = 'nonTarget';
const timepointApi = instance.data.timepointApi; const timepointApi = instance.data.timepointApi;
const config = OHIF.measurements.MeasurementApi.getConfiguration();
instance.schema = new SimpleSchema({ instance.schema = new SimpleSchema({
location: FieldLesionLocation, location: config.schema.nonTargetLocation,
response: FieldLesionLocationResponse response: config.schema.nonTargetResponse
}); });
// Remove the measurement from the collection // Remove the measurement from the collection