From 553eb9e24eea0a539a2dc5f1a9bc7094ce2f1bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= <eloisalgado@gmail.com>
Date: Fri, 4 Nov 2016 15:28:30 -0200
Subject: [PATCH] OHIF-126: OHIF-126: Show float values rounded to 2 decimal
 places on pet study for the fields (Location, Thickness, Spacing Between
 Slices, Frame Rate)

---
 .../imageViewerViewport/imageViewerViewport.js       |  2 +-
 .../viewer/viewportOverlay/viewportOverlay.html      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index 121bd6033..765c2de54 100644
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -501,7 +501,7 @@ Template.imageViewerViewport.onDestroyed(function() {
 
     // When a viewport element is being destroyed
     var element = this.find('.imageViewerViewport');
-    if (!element) {
+    if (!element || !$(element).find('canvas').length) {
         return;
     }
 
diff --git a/Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html b/Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html
index 125d59a0f..816eb084a 100644
--- a/Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html
+++ b/Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html
@@ -18,12 +18,12 @@
             <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}}{{frameRate}} FPS{{/if}}</div>
+                <div>{{#if frameRate}}{{formatNumberPrecision frameRate 2}} FPS{{/if}}</div>
                 <div>{{imageDimensions}}</div>
                 <div>
-                    <span>{{#if location}}Loc: {{location}} mm{{/if}}</span>
-                    <span>{{#if thickness}}Thick: {{thickness}} mm{{/if}}</span>
-                    <span>{{#if spacingBetweenSlices}}Spacing: {{spacingBetweenSlices}} mm{{/if}}</span>
+                    <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>
@@ -40,7 +40,7 @@
             <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}}{{frameRate}} FPS{{/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>
@@ -60,7 +60,7 @@
             <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}}{{frameRate}} FPS{{/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>