From cb32c299e2a422893843ff835f996ac4efa9ad70 Mon Sep 17 00:00:00 2001
From: Gustavo Lelis <galelis@gmail.com>
Date: Fri, 8 Feb 2019 17:03:11 -0200
Subject: [PATCH] feat(measurementTable): Adding convert measurements into
 table data function into our reducer

---
 .../ConnectedMeasurementTable.js              | 23 +++++++++++++++----
 .../src/connectedComponents/Viewer.js         |  9 +++++---
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Packages-react/ohif-viewer/src/connectedComponents/ConnectedMeasurementTable.js b/Packages-react/ohif-viewer/src/connectedComponents/ConnectedMeasurementTable.js
index ed7c410ba..1e850c69a 100644
--- a/Packages-react/ohif-viewer/src/connectedComponents/ConnectedMeasurementTable.js
+++ b/Packages-react/ohif-viewer/src/connectedComponents/ConnectedMeasurementTable.js
@@ -19,16 +19,29 @@ function convertMeasurementsToTableData(measurements) {
   const tableData = [
     {
       groupName: 'Measurements',
-      measurements: []
+      measurements: [],
+      measurements1: measurements
     }
   ];
 
-  if (!measurements || !measurements.length) {
-    return tableData;
+  if (measurements && measurements.allTools) {
+    measurements.allTools.forEach(measurement => {
+      const tableMeasurement = {
+        label: '...',
+        hasWarnings: false,
+        warningTitle: '',
+        isSplitLesion: false,
+        warningList: [],
+        data: [
+          {
+            displayText: '...'
+          }
+        ]
+      };
+      tableData[0].measurements.push(tableMeasurement);
+    });
   }
 
-  // TODO: Add measurements into tableData
-
   return tableData;
 }
 
diff --git a/Packages-react/ohif-viewer/src/connectedComponents/Viewer.js b/Packages-react/ohif-viewer/src/connectedComponents/Viewer.js
index 4ecab201c..7314e7ec8 100644
--- a/Packages-react/ohif-viewer/src/connectedComponents/Viewer.js
+++ b/Packages-react/ohif-viewer/src/connectedComponents/Viewer.js
@@ -52,6 +52,7 @@ OHIF.viewer.functionList = {
 class Viewer extends Component {
   static propTypes = {
     studies: PropTypes.array,
+    studyInstanceUids: PropTypes.array,
     onTimepointsUpdated: PropTypes.func,
     onMeasurementsUpdated: PropTypes.func
   };
@@ -158,10 +159,12 @@ class Viewer extends Component {
   componentDidMount() {
     const { studies } = this.props;
     const { TimepointApi, MeasurementApi } = OHIF.measurements;
+    const currentTimepointId = 'TimepointId';
 
-    const timepointApi = new TimepointApi('TimepointId', {
+    const timepointApi = new TimepointApi(currentTimepointId, {
       onTimepointsUpdated: this.onTimepointsUpdated
     });
+
     const measurementApi = new MeasurementApi(timepointApi, {
       onMeasurementsUpdated: this.onMeasurementsUpdated
     });
@@ -170,8 +173,8 @@ class Viewer extends Component {
     timepointApi.retrieveTimepoints({ patientId });
 
     // TODO: Retrieve measurements and sync them with tool data
-    // measurementApi.retrieveMeasurements(patientId, [currentTimepointId]);
-    // measurementApi.syncMeasurementsAndToolData();
+    measurementApi.retrieveMeasurements(patientId, [currentTimepointId]);
+    //measurementApi.syncMeasurementsAndToolData();
   }
 
   render() {