Changed naming in study and series metadata for consistency

Packages/lesiontracker/compatibility/nonTargetTool.js

@@ -83,10 +83,15 @@
     }
 
     function createNewMeasurement(mouseEventData) {
+        var imageId = mouseEventData.image.imageId;
 
-        // Get seriesInstanceUId & studyInstanceUId
-        var seriesInstanceUid = cornerstoneTools.metaData.get('series', mouseEventData.image.imageId).instanceUid;
-        var studyInstanceUid = cornerstoneTools.metaData.get('study', mouseEventData.image.imageId).instanceUid;
+        // Get studyInstanceUid
+        var study = cornerstoneTools.metaData.get('study', imageId);
+        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
         var measurementData = {

Packages/lesiontracker/components/lesionLocationDialog/lesionLocationDialog.js

@@ -12,7 +12,7 @@ function getLesionLocationCallback(measurementData, eventData, doneCallback) {
     var element = eventData.element;
     var enabledElement = cornerstone.getEnabledElement(element);
     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) {
         return;
     }

Packages/lesiontracker/components/lesionTable/lesionTable.js

@@ -28,10 +28,12 @@ function updateLesions(e) {
         if (!enabledElement) {
             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) {
             return;
         }
@@ -41,7 +43,7 @@ function updateLesions(e) {
 
         // TODO: Bring series in correct imageViewport
 
-        if (timepointObject.seriesInstanceUid !== series.instanceUid) {
+        if (timepointObject.seriesInstanceUid !== series.seriesInstanceUid) {
             console.log("not in same series");
             var newSeriesData  = {
                 seriesInstanceUid: timepointObject.seriesInstanceUid,

Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js

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