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

Applying ohif:viewerbase namespaces to ohif:measurements

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2017-01-30 00:50:46 -02:00
parent 65a4b75d16
commit c9236b96f9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { _ } from 'meteor/underscore'; import { _ } from 'meteor/underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase';
import { CriteriaEvaluator } from './CriteriaEvaluator'; import { CriteriaEvaluator } from './CriteriaEvaluator';
import * as evaluations from './evaluations'; import * as evaluations from './evaluations';
@ -153,7 +154,7 @@ class ConformanceCriteria {
} }
getImageMetadata(studyInstanceUid, imageId) { getImageMetadata(studyInstanceUid, imageId) {
const study = ViewerStudies.findOne({ studyInstanceUid }); const study = OHIF.viewer.Studies.findBy({ studyInstanceUid });
// Stop here if the study was not found // Stop here if the study was not found
if (!study) { if (!study) {
@ -169,7 +170,7 @@ class ConformanceCriteria {
_.each(displaySet.images, image => { _.each(displaySet.images, image => {
if (foundImage) { if (foundImage) {
return; return;
} else if (getImageId(image) === imageId) { } else if (OHIF.viewerbase.getImageId(image) === imageId) {
foundImage = image; foundImage = image;
} }
}); });

2
Packages/ohif-measurements/client/lib/exportPdf.js
View File

@ -4,7 +4,7 @@ import { MeasurementReport } from 'meteor/ohif:measurements/client/reports/measu
OHIF.measurements.exportPdf = (measurementApi, timepointApi) => { OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
const currentTimepoint = timepointApi.current(); const currentTimepoint = timepointApi.current();
const { timepointId } = currentTimepoint; const { timepointId } = currentTimepoint;
const study = ViewerStudies.findOne({ const study = OHIF.viewer.Studies.findBy({
studyInstanceUid: currentTimepoint.studyInstanceUids[0] studyInstanceUid: currentTimepoint.studyInstanceUids[0]
}); });
const report = new MeasurementReport({ const report = new MeasurementReport({