From c3dd2608b2e52b893472b2ef48f01ad6583f1b1c Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Wed, 27 May 2020 08:56:52 -0400
Subject: [PATCH] wire up some ActionBar data; default grid to 2x2

---
 extensions/default/src/getCommandsModule.js   |  4 +-
 .../src/getCommandsModule.js                  |  4 +-
 .../src/viewports/OHIFCornerstoneViewport.js  | 43 +++++++++++++------
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/extensions/default/src/getCommandsModule.js b/extensions/default/src/getCommandsModule.js
index 43cc760a4..d9091a789 100644
--- a/extensions/default/src/getCommandsModule.js
+++ b/extensions/default/src/getCommandsModule.js
@@ -50,8 +50,8 @@ function Test() {
   return <div
     onClick={() => {
       dispatch({ type: '', payload: {
-        numCols: 3,
-        numRows: 3,
+        numCols: 2,
+        numRows: 2,
         activeViewportIndex: 0,
         viewports: [],
       }})
diff --git a/extensions/measurement-tracking/src/getCommandsModule.js b/extensions/measurement-tracking/src/getCommandsModule.js
index 5a500b030..066a213a2 100644
--- a/extensions/measurement-tracking/src/getCommandsModule.js
+++ b/extensions/measurement-tracking/src/getCommandsModule.js
@@ -49,8 +49,8 @@ function Test() {
   return <div
     onClick={() => {
       dispatch({ type: '', payload: {
-        numCols: 3,
-        numRows: 3,
+        numCols: 2,
+        numRows: 2,
         activeViewportIndex: 0,
         viewports: [],
       }})
diff --git a/extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js
index cbb92a251..6a2705873 100644
--- a/extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js
+++ b/extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import cornerstone from 'cornerstone-core';
 import CornerstoneViewport from 'react-cornerstone-viewport';
-import OHIF from '@ohif/core';
+import OHIF, { DicomMetadataStore } from '@ohif/core';
 import { ViewportActionBar } from '@ohif/ui';
 import debounce from 'lodash.debounce';
 import throttle from 'lodash.throttle';
@@ -156,27 +156,42 @@ class OHIFCornerstoneViewport extends Component {
       });
     }
 
+    // We have...
+    // StudyInstanceUid, DisplaySetInstanceUid
+    // Use displaySetInstanceUid --> SeriesInstanceUid
+    // Get meta for series, map to actionBar
+    // const displaySet = DisplaySetService.getDisplaySetByUID(
+    //   dSet.displaySetInstanceUID
+    // );
+    // TODO: This display contains the meta for all instances.
+    // That can't be right...
+    console.log('DISPLAYSET', this.props.displaySet)
+    const seriesMeta = DicomMetadataStore.getSeries(this.props.displaySet.StudyInstanceUID, '');
+    console.log(seriesMeta);
+
+    const { Modality, SeriesDate, SeriesDescription, SeriesNumber } = this.props.displaySet;
+    const { PatientID, PatientName, PatientSex, PatientAge, SliceThickness,  } = this.props.displaySet.images[0];
+
     return (
       <>
         <ViewportActionBar
           onSeriesChange={direction => alert(`Series ${direction}`)}
           studyData={{
-            label: 'A',
+            label: '',
             isTracked: false,
             isLocked: false,
-            studyDate: '07-Sep-2011',
-            currentSeries: 1,
-            seriesDescription:
-              'Series description lorem ipsum dolor sit Series description lorem ipsum dolor sit Series description lorem ipsum dolor sit ',
-            modality: 'CT',
+            studyDate: SeriesDate, // TODO: This is series date. Is that ok?
+            currentSeries: SeriesNumber,
+            seriesDescription: SeriesDescription,
+            modality: Modality,
             patientInformation: {
-              patientName: 'Smith, Jane',
-              patientSex: 'F',
-              patientAge: '59',
-              MRN: '10000001',
-              thickness: '5.0mm',
-              spacing: '1.25mm',
-              scanner: 'Aquilion',
+              patientName: PatientName ? PatientName.Alphabetic || '' : '',
+              patientSex: PatientSex || '',
+              patientAge: PatientAge || '',
+              MRN: PatientID || '',
+              thickness: `${SliceThickness}mm`,
+              spacing: '',
+              scanner: '',
             },
           }}
         />