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

Changed naming in study and series metadata for consistency

Browse Source
This commit is contained in:
Erik Ziegler 2015-11-20 15:23:58 +01:00
parent b28e84076f
commit 4a482c1d12
8 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/lesiontracker/compatibility/nonTargetTool.js
View File

@ -83,10 +83,15 @@
} }
function createNewMeasurement(mouseEventData) { function createNewMeasurement(mouseEventData) {
var imageId = mouseEventData.image.imageId;
// Get seriesInstanceUId & studyInstanceUId // Get studyInstanceUid
var seriesInstanceUid = cornerstoneTools.metaData.get('series', mouseEventData.image.imageId).instanceUid; var study = cornerstoneTools.metaData.get('study', imageId);
var studyInstanceUid = cornerstoneTools.metaData.get('study', mouseEventData.image.imageId).instanceUid; var studyInstanceUid = study.studyInstanceUid;
// Get seriesInstanceUid
var series = cornerstoneTools.metaData.get('series', imageId);
var seriesInstanceUid = series.seriesInstanceUid;
// create the measurement data for this tool with the end handle activated // create the measurement data for this tool with the end handle activated
var measurementData = { var measurementData = {

2
Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js
View File

@ -12,7 +12,7 @@ function getLesionLocationCallback(measurementData, eventData, doneCallback) {
var element = eventData.element; var element = eventData.element;
var enabledElement = cornerstone.getEnabledElement(element); var enabledElement = cornerstone.getEnabledElement(element);
var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId); var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId);
var timepoint = Timepoints.findOne({timepointName: study.date}); var timepoint = Timepoints.findOne({timepointName: study.studyDate});
if (!timepoint) { if (!timepoint) {
return; return;
} }

10
Packages/lesiontracker/components/lesionTable/lesionTable.js
View File

@ -28,10 +28,12 @@ function updateLesions(e) {
if (!enabledElement) { if (!enabledElement) {
return; return;
} }
var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId);
var series = cornerstoneTools.metaData.get('series', enabledElement.image.imageId);
var timepoint = Timepoints.findOne({timepointName: study.date}); var imageId = enabledElement.image.imageId;
var study = cornerstoneTools.metaData.get('study', imageId);
var series = cornerstoneTools.metaData.get('series', imageId);
var timepoint = Timepoints.findOne({timepointName: study.studyDate});
if (!timepoint) { if (!timepoint) {
return; return;
} }
@ -41,7 +43,7 @@ function updateLesions(e) {
// TODO: Bring series in correct imageViewport // TODO: Bring series in correct imageViewport
if (timepointObject.seriesInstanceUid !== series.instanceUid) { if (timepointObject.seriesInstanceUid !== series.seriesInstanceUid) {
console.log("not in same series"); console.log("not in same series");
var newSeriesData = { var newSeriesData = {
seriesInstanceUid: timepointObject.seriesInstanceUid, seriesInstanceUid: timepointObject.seriesInstanceUid,

6
Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
View File

@ -4,8 +4,10 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
// Get the current element's timepointID from the study date metadata // Get the current element's timepointID from the study date metadata
var element = eventData.element; var element = eventData.element;
var enabledElement = cornerstone.getEnabledElement(element); var enabledElement = cornerstone.getEnabledElement(element);
var study = cornerstoneTools.metaData.get('study', enabledElement.image.imageId); var imageId = enabledElement.image.imageId;
var timepoint = Timepoints.findOne({timepointName: study.date});
var study = cornerstoneTools.metaData.get('study', imageId);
var timepoint = Timepoints.findOne({timepointName: study.studyDate});
if (!timepoint) { if (!timepoint) {
return; return;
} }

4
Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -264,8 +264,6 @@ function loadSeriesIntoViewport(data) {
// This is used to update the value of the "active viewport", when the user interacts // This is used to update the value of the "active viewport", when the user interacts
// with a new viewport element // with a new viewport element
function sendActivationTrigger(e, eventData) { function sendActivationTrigger(e, eventData) {
log.info('imageViewerViewport sendActivationTrigger');
// Check if the current active viewport in the Meteor Session // Check if the current active viewport in the Meteor Session
// Is the same as the viewport in which the activation event was fired. // Is the same as the viewport in which the activation event was fired.
// If it was, no changes are necessary, so stop here. // If it was, no changes are necessary, so stop here.
@ -275,6 +273,8 @@ function loadSeriesIntoViewport(data) {
return; return;
} }
log.info('imageViewerViewport sendActivationTrigger');
// Otherwise, trigger an 'ActivateViewport' event to be handled by the Template event // Otherwise, trigger an 'ActivateViewport' event to be handled by the Template event
// handler // handler
eventData.viewportIndex = viewportIndex; eventData.viewportIndex = viewportIndex;

2
Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js
View File

@ -172,7 +172,7 @@ Template.viewportOverlay.helpers({
// Get study data // Get study data
var study = cornerstoneTools.metaData.get('study', this.imageId); var study = cornerstoneTools.metaData.get('study', this.imageId);
if (study.instanceUid === viewportStudies.fetch()[0].studyInstanceUid) { if (study.studyInstanceUid === viewportStudies.fetch()[0].studyInstanceUid) {
return 'Prior'; return 'Prior';
} }
} }

17
Packages/viewerbase/lib/metaDataProvider.js
View File

@ -22,17 +22,18 @@ addMetaData = function(imageId, data) {
var metaData = {}; var metaData = {};
metaData.study = { metaData.study = {
instanceUid: studyMetaData.studyInstanceUid, patientId: studyMetaData.patientId,
date: studyMetaData.studyDate, studyInstanceUid: studyMetaData.studyInstanceUid,
time: studyMetaData.studyTime, studyDate: studyMetaData.studyDate,
description: studyMetaData.studyDescription studyTime: studyMetaData.studyTime,
studyDescription: studyMetaData.studyDescription
}; };
metaData.series = { metaData.series = {
description: seriesMetaData.seriesDescription, seriesDescription: seriesMetaData.seriesDescription,
number: seriesMetaData.seriesNumber, seriesNumber: seriesMetaData.seriesNumber,
modality: seriesMetaData.modality, modality: seriesMetaData.modality,
instanceUid: seriesMetaData.seriesInstanceUid, seriesInstanceUid: seriesMetaData.seriesInstanceUid,
numImages: numImages numImages: numImages
}; };
@ -42,7 +43,7 @@ addMetaData = function(imageId, data) {
photometricInterpretation: instanceMetaData.photometricInterpretation, photometricInterpretation: instanceMetaData.photometricInterpretation,
sopInstanceUid: instanceMetaData.sopInstanceUid, sopInstanceUid: instanceMetaData.sopInstanceUid,
sopClassUid: instanceMetaData.sopClassUid, sopClassUid: instanceMetaData.sopClassUid,
number: instanceMetaData.instanceNumber, instanceNumber: instanceMetaData.instanceNumber,
index: imageIndex index: imageIndex
}; };

2
Packages/viewerbase/log.js
View File

@ -1,3 +1,3 @@
// Create package logger using loglevel // Create package logger using loglevel
// https://atmospherejs.com/spacejamio/loglevel // https://atmospherejs.com/spacejamio/loglevel
log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'info'); log = loglevel.createPackageLogger('viewerbase', defaultLevel = 'warn');