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

LT-92: removing unecessary code

Browse Source
This commit is contained in:
Leonardo Campos 2017-01-16 16:55:51 -02:00 committed by Bruno Alves de Faria
parent 5366e1217d
commit 7ef0dd812b
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
View File

@ -10,10 +10,14 @@ class ConformanceCriteria {
this.timepointApi = timepointApi; this.timepointApi = timepointApi;
this.results = []; this.results = [];
const validate = _.debounce(trialCriteriaType => {
this.validate(trialCriteriaType);
}, 300);
Tracker.autorun(() => { Tracker.autorun(() => {
const trialCriteriaType = TrialCriteriaTypes.findOne({ selected: true }); const trialCriteriaType = TrialCriteriaTypes.findOne({ selected: true });
this.measurementApi.changeObserver.depend(); this.measurementApi.changeObserver.depend();
this.validate(trialCriteriaType); validate(trialCriteriaType);
}); });
} }
@ -25,9 +29,9 @@ class ConformanceCriteria {
mergedData.targets = mergedData.targets.concat(followupData.targets); mergedData.targets = mergedData.targets.concat(followupData.targets);
mergedData.nonTargets = mergedData.nonTargets.concat(followupData.nonTargets); mergedData.nonTargets = mergedData.nonTargets.concat(followupData.nonTargets);
const resultBoth = this.validateTimepoint('both', trialCriteriaType, mergedData);
const resultBaseline = this.validateTimepoint('baseline', trialCriteriaType, baselineData); const resultBaseline = this.validateTimepoint('baseline', trialCriteriaType, baselineData);
const resultFollowup = this.validateTimepoint('followup', trialCriteriaType, followupData); const resultFollowup = this.validateTimepoint('followup', trialCriteriaType, followupData);
const resultBoth = this.validateTimepoint('both', trialCriteriaType, mergedData);
const results = resultBaseline.concat(resultFollowup).concat(resultBoth); const results = resultBaseline.concat(resultFollowup).concat(resultBoth);
console.warn('>>>> validate', results); console.warn('>>>> validate', results);

6
Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
View File

@ -20,11 +20,9 @@ export class NonTargetResponseCriterion extends BaseCriterion {
items.forEach(item => { items.forEach(item => {
const measurement = item.measurement; const measurement = item.measurement;
const response = measurement.response.toLowerCase(); const response = (measurement.response || '').toLowerCase();
const timepoint = item.timepoint;
const timepointType = timepoint.timepointType.toLowerCase();
if ((timepointType === 'baseline') && (response !== 'present')) { if (response !== 'present') {
measurements.push(measurement); measurements.push(measurement);
} }
}); });

5
Packages/ohif-measurements/client/conformance/criteria/TargetType.js
View File

@ -20,11 +20,8 @@ export class TargetTypeCriterion extends BaseCriterion {
items.forEach(item => { items.forEach(item => {
const measurement = item.measurement; const measurement = item.measurement;
const toolType = measurement.toolType.toLowerCase();
const timepoint = item.timepoint;
const timepointType = timepoint.timepointType.toLowerCase();
if ((timepointType === 'baseline') && (toolType !== 'bidirectional')) { if (measurement.toolType !== 'bidirectional') {
measurements.push(measurement); measurements.push(measurement);
} }
}); });