From df95db6d155985e0a5e9a9963827c134a9516961 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Wed, 27 May 2020 22:20:40 -0400
Subject: [PATCH] Add referenceStudyUID to measurement schema

---
 .../measurementServiceMappingsFactory.js      |  3 ++
 .../MeasurementService/MeasurementService.js  | 51 +------------------
 2 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.js b/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.js
index f2715eb39..f279eaec0 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.js
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.js
@@ -65,6 +65,7 @@ const measurementServiceMappingsFactory = measurementService => {
       SOPInstanceUID,
       FrameOfReferenceUID,
       SeriesInstanceUID,
+      StudyInstanceUID,
     } = _getAttributes(element);
 
     const points = [];
@@ -75,6 +76,7 @@ const measurementServiceMappingsFactory = measurementService => {
       SOPInstanceUID: SOPInstanceUID,
       FrameOfReferenceUID,
       referenceSeriesUID: SeriesInstanceUID,
+      referenceStudyUID: StudyInstanceUID,
       label: measurementData.text,
       description: measurementData.description,
       unit: measurementData.unit,
@@ -96,6 +98,7 @@ const measurementServiceMappingsFactory = measurementService => {
       SOPInstanceUID: instance.SOPInstanceUID,
       FrameOfReferenceUID: instance.FrameOfReferenceUID,
       SeriesInstanceUID: instance.SeriesInstanceUID,
+      StudyInstanceUID: instance.StudyInstanceUID,
     };
   };
 
diff --git a/platform/core/src/services/MeasurementService/MeasurementService.js b/platform/core/src/services/MeasurementService/MeasurementService.js
index 9028758a6..336d964e9 100644
--- a/platform/core/src/services/MeasurementService/MeasurementService.js
+++ b/platform/core/src/services/MeasurementService/MeasurementService.js
@@ -33,6 +33,7 @@ const MEASUREMENT_SCHEMA_KEYS = [
   'id',
   'SOPInstanceUID',
   'FrameOfReferenceUID',
+  'referenceStudyUID',
   'referenceSeriesUID',
   'label',
   'description',
@@ -263,7 +264,6 @@ class MeasurementService {
     const sourceInfo = this._getSourceInfo(source);
 
     if (!definition) {
-      console.log('TEST');
       log.warn('No source definition provided. Exiting early.');
       return;
     }
@@ -338,33 +338,6 @@ class MeasurementService {
     return newMeasurement.id;
   }
 
-  /**
-   * Subscribe to measurement updates.
-   *
-   * @param {string} eventName The name of the event
-   * @param {Function} callback Events callback
-   * @return {Object} Observable object with actions
-  //  */
-  // subscribe(eventName, callback) {
-  //   if (this._isValidEvent(eventName)) {
-  //     const listenerId = guid();
-  //     const subscription = { id: listenerId, callback };
-
-  //     console.info(`Subscribing to '${eventName}'.`);
-  //     if (Array.isArray(this.listeners[eventName])) {
-  //       this.listeners[eventName].push(subscription);
-  //     } else {
-  //       this.listeners[eventName] = [subscription];
-  //     }
-
-  //     return {
-  //       unsubscribe: () => this._unsubscribe(eventName, listenerId),
-  //     };
-  //   } else {
-  //     throw new Error(`Event ${eventName} not supported.`);
-  //   }
-  // }
-
   _getMappingByMeasurementSource(measurementId, definition) {
     const measurement = this.getMeasurement(measurementId);
     if (this._isValidSource(measurement.source)) {
@@ -449,28 +422,6 @@ class MeasurementService {
     }
   }
 
-  /**
-   * Unsubscribe to measurement updates.
-   *
-   * @param {string} eventName The name of the event
-  //  * @param {string} listenerId The listeners id
-  //  * @return void
-  //  */
-  // _unsubscribe(eventName, listenerId) {
-  //   if (!this.listeners[eventName]) {
-  //     return;
-  //   }
-
-  //   const listeners = this.listeners[eventName];
-  //   if (Array.isArray(listeners)) {
-  //     this.listeners[eventName] = listeners.filter(
-  //       ({ id }) => id !== listenerId
-  //     );
-  //   } else {
-  //     this.listeners[eventName] = undefined;
-  //   }
-  // }
-
   /**
    * Check if a given measurement data is valid.
    *