OHIF-190 - Rehydrate PR (#1835)

* WIP rehydration.

* WIP OHIF-190 rehydrate.

* Remove debugger statements.

* Merge in and fix after OHIF-197 and OHIF-198

* Remove console.log

* Fix typo

* fix length tracking bug

* Respond to reviewer comments.

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "2.7.3",
+  "version": "3.0.0",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",

extensions/cornerstone/src/init.js

@@ -246,10 +246,12 @@ const _connectToolsToMeasurementService = measurementService => {
 
     function addMeasurement(csToolsEvent) {
       console.log('CSTOOLS::addOrUpdate', csToolsEvent, csToolsEvent.detail);
+
       try {
         const evtDetail = csToolsEvent.detail;
         const { toolName, toolType, measurementData } = evtDetail;
         const csToolName = toolName || measurementData.toolType || toolType;
+
         const measurementId = addOrUpdate(csToolName, evtDetail);
 
         if (measurementId) {

extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.js

@@ -30,7 +30,7 @@ const ArrowAnnotate = {
     points.push(measurementData.handles);
 
     return {
-      id: measurementData._measurementServiceId,
+      id: measurementData.id,
       SOPInstanceUID: SOPInstanceUID,
       FrameOfReferenceUID,
       referenceSeriesUID: SeriesInstanceUID,

extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.js

@@ -31,7 +31,7 @@ const Bidirectional = {
     const shortAxis = [handles.perpendicularStart, handles.perpendicularEnd];
 
     return {
-      id: measurementData._measurementServiceId,
+      id: measurementData.id,
       SOPInstanceUID: SOPInstanceUID,
       FrameOfReferenceUID,
       referenceSeriesUID: SeriesInstanceUID,

extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalRoi.js

@@ -53,7 +53,7 @@ const EllipticalRoi = {
     }
 
     return {
-      id: measurementData._measurementServiceId,
+      id: measurementData.id,
       SOPInstanceUID: SOPInstanceUID,
       FrameOfReferenceUID,
       referenceSeriesUID: SeriesInstanceUID,

extensions/cornerstone/src/utils/measurementServiceMappings/Length.js

@@ -26,7 +26,7 @@ const Length = {
         text: label,
         description,
         handles: getHandlesFromPoints(points),
-        _measurementServiceId: id,
+        id,
       },
     };
   },
@@ -57,11 +57,8 @@ const Length = {
       StudyInstanceUID,
     } = getSOPInstanceAttributes(element);
 
-    const points = [];
-    points.push(measurementData.handles);
-
     return {
-      id: measurementData._measurementServiceId,
+      id: measurementData.id,
       SOPInstanceUID: SOPInstanceUID,
       FrameOfReferenceUID,
       referenceSeriesUID: SeriesInstanceUID,