Changed naming in study and series metadata for consistency

Packages/viewerbase/components/viewer/imageViewerViewport/imageViewerViewport.js

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

Packages/viewerbase/components/viewer/viewportOverlay/viewportOverlay.js

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

Packages/viewerbase/lib/metaDataProvider.js

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

Packages/viewerbase/log.js

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