From e957968494e82d544ebbc731fe7e2e5397cf79d9 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Sun, 13 Nov 2016 14:54:01 +0100
Subject: [PATCH] Add Timepoint name to viewport overlay

---
 .../client/components/viewer/viewer.js        |  3 +
 .../longitudinalViewportOverlay.html          | 90 ++++++++++++++-----
 .../longitudinalViewportOverlay.js            | 13 ++-
 3 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 49d0e9c46..12cd0da6d 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -66,6 +66,9 @@ Template.viewer.onCreated(() => {
 
     instance.data.timepointApi = new OHIF.measurements.TimepointApi(instance.data.currentTimepointId);
 
+    // TODO: Find a better way to pass this to the ViewportOverlay
+    OHIF.viewer.timepointApi = instance.data.timepointApi;
+
     const patientId = instance.data.studies[0].patientId;
     const filter = {
         patientId
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
index 361b5a47a..0d772c81d 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
@@ -1,26 +1,74 @@
 <template name="longitudinalViewportOverlay">
     <div class="imageViewerViewportOverlay noselect {{#if gt numImages 1}}controlsVisible{{/if}}">
-        <div class="topleft dicomTag">
-            <div>{{formatPN patientName}}</div>
-            <div>{{patientId}}</div>
-            <div class='timepointName'>{{timepointName}}</div>
-        </div>
-        <div class="topright dicomTag">
-            <div>{{studyDescription}}</div>
-            <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
-        </div>
-        <div class="bottomright dicomTag">
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
-            <div>{{compression}}</div>
-            <div>{{wwwc}}</div>
-        </div>
-        <div class="bottomleft dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
-            <div>{{frameRate}}</div>
-            <div>{{imageDimensions}}</div>
-            <div>{{seriesDescription}}</div>
-        </div>
+        {{#unless tagDisplaySpecified}}
+            <div class="topleft dicomTag">
+                <div>{{formatPN patientName}}</div>
+                <div>{{patientId}}</div>
+                <div class='timepointName'>{{timepointName}}</div>
+            </div>
+            <div class="topright dicomTag">
+                <div>{{studyDescription}}</div>
+                <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
+            </div>
+            <div class="bottomright dicomTag">
+                <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
+                <div class="compressionIndicator">{{compression}}</div>
+                <div>{{wwwc}}</div>
+            </div>
+            <div class="bottomleft dicomTag">
+                <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+                <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
+                <div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div>
+                <div>{{imageDimensions}}</div>
+                <div>
+                    <span>{{#if location}}Loc: {{formatNumberPrecision location 2}} mm{{/if}}</span>
+                    <span>{{#if thickness}}Thick: {{formatNumberPrecision thickness 2}} mm{{/if}}</span>
+                    <span>{{#if spacingBetweenSlices}}Spacing: {{formatNumberPrecision spacingBetweenSlices 2}} mm{{/if}}</span>
+                </div>
+                <div>{{seriesDescription}}</div>
+            </div>
+        {{/unless}}
+
+        {{#if tagDisplayRightOnly}}
+            <div class="topright dicomTag">
+                <div>{{formatPN patientName}}</div>
+                <div>{{patientId}}</div>
+                <div class='timepointName'>{{timepointName}}</div>
+                <div>{{studyDescription}}</div>
+                <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
+            </div>
+            <div class="bottomright dicomTag">
+                <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+                <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
+                <div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div>
+                <div>{{imageDimensions}}</div>
+                <div>{{seriesDescription}}</div>
+                <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
+                <div class="compressionIndicator">{{compression}}</div>
+                <div>{{wwwc}}</div>
+            </div>
+        {{/if}}
+
+        {{#if tagDisplayLeftOnly}}
+            <div class="topleft dicomTag">
+                <div>{{formatPN patientName}}</div>
+                <div>{{patientId}}</div>
+                <div class='timepointName'>{{timepointName}}</div>
+                <div>{{studyDescription}}</div>
+                <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
+            </div>
+            <div class="bottomleft dicomTag">
+                <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+                <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
+                <div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div>
+                <div>{{imageDimensions}}</div>
+                <div>{{seriesDescription}}</div>
+                <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
+                <div class="compressionIndicator">{{compression}}</div>
+                <div>{{wwwc}}</div>
+            </div>
+        {{/if}}
+
         {{#if gt numImages 1}}
             {{>imageControls imageIndex=imageIndex numImages=numImages}}
         {{/if}}
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
index 281478086..43d264c88 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
@@ -8,17 +8,22 @@ Template.longitudinalViewportOverlay.replaces(defaultTemplate);
 // HTML of this template is replaced with that of longitudinalViewportOverlay
 Template[defaultTemplate].helpers({
     timepointName: function() {
-        var data = this;
-        const timepointApi = Template.instance().timepointApi;
+        const instance = Template.instance();
+        const studyInstanceUid = instance.data.studyInstanceUid;
+
+        // TODO: Find a better way to obtain the timepointApi from the viewer.js template
+        const timepointApi = OHIF.viewer.timepointApi;
         if (!timepointApi) {
         	return;
         }
 
-        const timepoint = timepointApi.study(data.studyInstanceUid);
-        if (!timepoint) {
+        const timepoints = timepointApi.study(studyInstanceUid);
+        if (!timepoints || !timepoints.length) {
             return;
         }
 
+        const timepoint = timepoints[0];
+
         return timepointApi.name(timepoint);
     }
 });
\ No newline at end of file