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

Fixing merge issues

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-01-31 18:07:52 -02:00
parent e8b60c9f0b
commit 55901e2b38
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js
View File

@ -22,7 +22,6 @@ export class MetadataProvider {
const instanceMetadata = data.instance; const instanceMetadata = data.instance;
const seriesMetadata = data.series; const seriesMetadata = data.series;
const studyMetadata = data.study; const studyMetadata = data.study;
const imageIndex = data.imageIndex;
const numImages = data.numImages; const numImages = data.numImages;
const metadata = {}; const metadata = {};
@ -62,6 +61,15 @@ export class MetadataProvider {
this.metadataLookup[imageId] = metadata; this.metadataLookup[imageId] = metadata;
} }
/**
* Return the metadata for the given imageId
* @param {String} imageId The Cornerstone ImageId
* @returns image metadata
*/
getMetadata(imageId) {
return this.metadataLookup[imageId];
}
/** /**
* Adds a set of metadata to the Cornerstone metadata provider given a specific * Adds a set of metadata to the Cornerstone metadata provider given a specific
* imageId, type, and dataset * imageId, type, and dataset
@ -77,7 +85,6 @@ export class MetadataProvider {
this.metadataLookup[imageId] = $.extend(this.metadataLookup[imageId], metadata); this.metadataLookup[imageId] = $.extend(this.metadataLookup[imageId], metadata);
} }
getFromDataSet(dataSet, type, tag) { getFromDataSet(dataSet, type, tag) {
if (!dataSet) { if (!dataSet) {
return; return;
@ -254,4 +261,4 @@ export class MetadataProvider {
return imageMetadata[type]; return imageMetadata[type];
} }
} }
}; }

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

@ -1,5 +1,6 @@
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session';
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 'meteor/ohif:viewerbase';
@ -16,6 +17,7 @@ class ConformanceCriteria {
this.maxTargets = new ReactiveVar(null); this.maxTargets = new ReactiveVar(null);
const validate = _.debounce(trialCriteriaType => { const validate = _.debounce(trialCriteriaType => {
if (Session.get('MeasurementsReady')) return;
this.validate(trialCriteriaType); this.validate(trialCriteriaType);
}, 300); }, 300);
@ -131,7 +133,7 @@ class ConformanceCriteria {
measurements.forEach(measurement => { measurements.forEach(measurement => {
const { studyInstanceUid, imageId } = measurement; const { studyInstanceUid, imageId } = measurement;
const metadata = this.getImageMetadata(studyInstanceUid, imageId); const metadata = this.getImageInstanceMetadata(studyInstanceUid, imageId);
const timepointId = measurement.timepointId; const timepointId = measurement.timepointId;
const timepoint = this.timepointApi.timepoints.findOne({ timepointId }); const timepoint = this.timepointApi.timepoints.findOne({ timepointId });
@ -153,7 +155,7 @@ class ConformanceCriteria {
return data; return data;
} }
getImageMetadata(studyInstanceUid, imageId) { getImageInstanceMetadata(studyInstanceUid, imageId) {
const study = OHIF.viewer.Studies.findBy({ studyInstanceUid }); const study = OHIF.viewer.Studies.findBy({ studyInstanceUid });
// Stop here if the study was not found // Stop here if the study was not found
@ -161,22 +163,8 @@ class ConformanceCriteria {
return; return;
} }
let foundImage; const metadata = OHIF.cornerstone.metadataProvider.getMetadata(imageId);
_.each(study.displaySets, displaySet => { return metadata ? metadata.instance : undefined;
if (foundImage) {
return;
}
_.each(displaySet.images, image => {
if (foundImage) {
return;
} else if (OHIF.viewerbase.getImageId(image) === imageId) {
foundImage = image;
}
});
});
return foundImage;
} }
} }