From 6f6fea973d918c1359ebdc399308b45f0982bdee Mon Sep 17 00:00:00 2001
From: "James A. Petts" <jamesapetts@gmail.com>
Date: Wed, 10 Jun 2020 13:33:56 +0100
Subject: [PATCH] WIP

---
 .../dicom-sr/src/OHIFCornerstoneSRViewport.js | 54 ++++++++++++-------
 .../dicom-sr/src/getSopClassHandlerModule.js  |  2 -
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
index 2a1c80254..ef3630f67 100644
--- a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
+++ b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
@@ -51,8 +51,6 @@ function OHIFCornerstoneSRViewport({
   useEffect(() => {
     const numMeasurements = displaySet.measurements.length;
 
-    console.log(`MEASUREMENT COUNT: ${numMeasurements}`);
-
     setMeasurementCount(numMeasurements);
   }, [
     dataSource,
@@ -78,16 +76,15 @@ function OHIFCornerstoneSRViewport({
       );
     }
 
-    console.log(measurementSelected);
-
-    _getViewportData(
+    _getViewportAndActiveDisplaySetData(
       dataSource,
       displaySet,
       measurementSelected,
       DisplaySetService,
       element
-    ).then(viewportData => {
+    ).then(({ viewportData, activeDisplaySetData }) => {
       setViewportData({ ...viewportData });
+      setActiveDisplaySetData({ ...activeDisplaySetData });
     });
   };
 
@@ -129,13 +126,7 @@ function OHIFCornerstoneSRViewport({
     });
   }
 
-  const {
-    Modality,
-    SeriesDate,
-    SeriesDescription,
-    SeriesInstanceUID,
-    SeriesNumber,
-  } = displaySet;
+  const { Modality } = displaySet;
 
   // TODO -> Get this from the associated stack.
 
@@ -145,8 +136,14 @@ function OHIFCornerstoneSRViewport({
     PatientSex,
     PatientAge,
     SliceThickness,
+    StudyDate,
+    SeriesDescription,
+    SeriesInstanceUID,
+    SeriesNumber,
   } = activeDisplaySetData;
 
+  debugger;
+
   const onMeasurementChange = direction => {
     let newMeausrementSelected = measurementSelected;
 
@@ -165,7 +162,7 @@ function OHIFCornerstoneSRViewport({
     }
 
     if (newMeausrementSelected === measurementSelected) {
-      updateViewport();
+      // TODO -> Jump to image in this case.
     }
 
     setMeasurementSelected(newMeausrementSelected);
@@ -178,10 +175,10 @@ function OHIFCornerstoneSRViewport({
       <ViewportActionBar
         onSeriesChange={onMeasurementChange}
         studyData={{
-          label: '',
+          label: `${measurementSelected + 1}`,
           isTracked: false,
           isLocked: false,
-          studyDate: SeriesDate, // TODO: This is series date. Is that ok?
+          studyDate: StudyDate,
           currentSeries: SeriesNumber,
           seriesDescription: SeriesDescription,
           modality: Modality,
@@ -265,7 +262,7 @@ function _getCornerstoneStack(
   return stack;
 }
 
-async function _getViewportData(
+async function _getViewportAndActiveDisplaySetData(
   dataSource,
   displaySet,
   measurementSelected,
@@ -290,7 +287,28 @@ async function _getViewportData(
     stack,
   };
 
-  return viewportData;
+  const { displaySetInstanceUID } = measurement;
+
+  const referencedDisplaySet = DisplaySetService.getDisplaySetByUID(
+    displaySetInstanceUID
+  );
+
+  const image0 = referencedDisplaySet.images[0];
+  const activeDisplaySetData = {
+    PatientID: image0.PatientID,
+    PatientName: image0.PatientName,
+    PatientSex: image0.PatientSex,
+    PatientAge: image0.PatientAge,
+    SliceThickness: image0.SliceThickness,
+    StudyDate: image0.StudyDate,
+    SeriesDescription: image0.SeriesDescription,
+    SeriesInstanceUID: image0.SeriesInstanceUID,
+    SeriesNumber: image0.SeriesNumber,
+  };
+
+  debugger;
+
+  return { viewportData, activeDisplaySetData };
 }
 
 export default OHIFCornerstoneSRViewport;
diff --git a/extensions/dicom-sr/src/getSopClassHandlerModule.js b/extensions/dicom-sr/src/getSopClassHandlerModule.js
index 561fdba6a..7d5d51c25 100644
--- a/extensions/dicom-sr/src/getSopClassHandlerModule.js
+++ b/extensions/dicom-sr/src/getSopClassHandlerModule.js
@@ -81,8 +81,6 @@ function _getDisplaySetsFromSeries(
     sopClassUids,
   };
 
-  console.log(DisplaySetService);
-
   // Check currently added displaySets and add measurements if the sources exist.
   DisplaySetService.activeDisplaySets.forEach(activeDisplaySet => {
     _checkIfCanAddMeasurementsToDisplaySet(