From 73bb4de1406382a52478de4e2fa435b838c5fa6e Mon Sep 17 00:00:00 2001
From: "James A. Petts" <jamesapetts@gmail.com>
Date: Wed, 17 Jun 2020 08:25:10 +0100
Subject: [PATCH] SR viewport to cornerstone viewport consistency updates.

---
 .../dicom-sr/src/OHIFCornerstoneSRViewport.js       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
index b20e4c6ff..c7892e4aa 100644
--- a/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
+++ b/extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js
@@ -34,7 +34,7 @@ function OHIFCornerstoneSRViewport({
   const [activeDisplaySetData, setActiveDisplaySetData] = useState({});
   const [element, setElement] = useState(null);
 
-  const { viewports } = viewportGrid;
+  const { viewports, activeViewportIndex } = viewportGrid;
 
   const onElementEnabled = evt => {
     const eventData = evt.detail;
@@ -161,6 +161,10 @@ function OHIFCornerstoneSRViewport({
     element,
   ]);
 
+  const firstViewportIndexWithMatchingDisplaySetUid = viewports.findIndex(
+    vp => vp.displaySetInstanceUID === displaySet.displaySetInstanceUID
+  );
+
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
 
@@ -235,8 +239,10 @@ function OHIFCornerstoneSRViewport({
     <>
       <ViewportActionBar
         onSeriesChange={onMeasurementChange}
+        showPatientInfo={viewportIndex === activeViewportIndex}
+        showNavArrows={viewportIndex === activeViewportIndex}
         studyData={{
-          label: `${measurementSelected + 1}`,
+          label: _viewportLabels[firstViewportIndexWithMatchingDisplaySetUid],
           isTracked: false,
           isLocked: false,
           studyDate: StudyDate,
@@ -264,12 +270,15 @@ function OHIFCornerstoneSRViewport({
         isStackPrefetchEnabled={true} // todo
         isPlaying={false}
         frameRate={24}
+        isOverlayVisible={false}
       />
       {childrenWithProps}
     </>
   );
 }
 
+const _viewportLabels = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I'];
+
 OHIFCornerstoneSRViewport.propTypes = {
   displaySet: PropTypes.object.isRequired,
   viewportIndex: PropTypes.number.isRequired,