From ca28f5dbce377a939aaf78a7eb924f629894477e Mon Sep 17 00:00:00 2001
From: Emanuel Oliveira <emfolg@gmail.com>
Date: Wed, 26 Oct 2016 00:03:30 -0200
Subject: [PATCH] OHIF-15 Added two rendering options for cine dialog.

---
 .../toolbarSection/toolbarSection.js          | 58 +++++++------
 .../viewer/cineDialog/cineDialog.html         |  2 +-
 .../viewer/cineDialog/cineDialog.js           |  5 ++
 .../viewer/cineDialog/cineDialog.styl         | 86 ++++++++++++++++---
 Packages/worklist/both/schema.js              |  4 +-
 5 files changed, 112 insertions(+), 43 deletions(-)

diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.js b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
index aef4b5e84..9593a6a91 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.js
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
@@ -92,35 +92,39 @@ Template.toolbarSection.helpers({
             iconClasses: 'fa fa-undo'
         });
 
-        buttonData.push({
-            id: 'previousDisplaySet',
-            title: 'Previous',
-            classes: 'imageViewerCommand',
-            buttonTemplateName: 'displaySetNavigation',
-            isNext: false
-        });
+        if (!OHIF.uiSettings.multiframeEnhancementsEnabled) {
 
-        buttonData.push({
-            id: 'nextDisplaySet',
-            title: 'Next',
-            classes: 'imageViewerCommand',
-            buttonTemplateName: 'displaySetNavigation',
-            isNext: true
-        });
+            buttonData.push({
+                id: 'previousDisplaySet',
+                title: 'Previous',
+                classes: 'imageViewerCommand',
+                buttonTemplateName: 'displaySetNavigation',
+                isNext: false
+            });
 
-        buttonData.push({
-            id: 'toggleCinePlay',
-            title: 'Toggle CINE Play',
-            classes: 'imageViewerCommand',
-            buttonTemplateName: 'playClipButton'
-        });
+            buttonData.push({
+                id: 'nextDisplaySet',
+                title: 'Next',
+                classes: 'imageViewerCommand',
+                buttonTemplateName: 'displaySetNavigation',
+                isNext: true
+            });
 
-        buttonData.push({
-            id: 'toggleCineDialog',
-            title: 'CINE',
-            classes: 'imageViewerCommand',
-            iconClasses: 'fa fa-youtube-play'
-        });
+            buttonData.push({
+                id: 'toggleCinePlay',
+                title: 'Toggle CINE Play',
+                classes: 'imageViewerCommand',
+                buttonTemplateName: 'playClipButton'
+            });
+
+            buttonData.push({
+                id: 'toggleCineDialog',
+                title: 'CINE',
+                classes: 'imageViewerCommand',
+                iconClasses: 'fa fa-youtube-play'
+            });
+
+        }
 
         buttonData.push({
             id: 'layout',
@@ -221,7 +225,7 @@ Template.toolbarSection.onRendered(function() {
 
     instance.$('#layout').dropdown();
 
-    if (OHIF.uiSettings.showCineDialogOnRendered) {
+    if (OHIF.uiSettings.multiframeEnhancementsEnabled) {
         toggleCineDialog();
     }
 
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
index 7cb5acb85..a3233bbd5 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
@@ -1,5 +1,5 @@
 <template name="cineDialog">
-    {{#form id='cineDialog' class='dialog-animated noselect' schema=instance.schema api=instance.api}}
+    {{#form id='cineDialog' class=(getClassNames 'dialog-animated noselect') schema=instance.schema api=instance.api}}
         {{>inputHidden key='intervalId'}}
         <div class="cine-navigation">
             <div class="btn-group">
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
index 0cbea9a3e..b7c6a1f9f 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
@@ -142,5 +142,10 @@ Template.cineDialog.helpers({
     displaySetDisabled(isNext) {
         Session.get('LayoutManagerUpdated');
         return !OHIF.viewer.canMoveDisplaySets(isNext) ? 'disabled' : '';
+    },
+
+    getClassNames(baseCls) {
+        return baseCls + ' ' + (OHIF.uiSettings.multiframeEnhancementsEnabled ? 'single' : 'double') + '-row-style'
     }
+
 });
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
index da4acec35..462cbc6a4 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
@@ -4,19 +4,10 @@
   theme('border', '2px solid $uiBorderColor', 0.95)
   theme('background', '$uiGrayDarkest', 0.95)
   theme('color', '$textSecondaryColor')
-  border-radius: 8px
-  bottom: 3px
-  box-sizing: border-box
-  height: 80px
-  left: 50%
-  overflow: hidden
-  padding: 10px
   position: absolute
-  right: 3px
-  top: 2%
-  width: 300px
+  border-radius: 8px
   z-index: 1000
-  transform(translateX(-50%) translateY(-50%))
+  overflow: hidden
 
   h5
     font-size: 20px
@@ -36,6 +27,13 @@
     &:active, &.active
       theme('color', '$activeColor')
 
+#cineDialog.double-row-style
+  box-sizing: border-box
+  width: 300px
+  height: 80px
+  padding: 10px
+  top: 2%
+  left: 35%
 
   .cine-navigation
     position: absolute
@@ -63,6 +61,68 @@
       float: right
       padding: 5px 10px 0 0
 
-    .loop-section
-      padding-right: 12px
 
+#cineDialog.single-row-style
+  box-sizing: content-box
+  width: 425px
+  height: 45px
+  padding: 4px 8px
+  top: 2%
+  left: 35%
+
+  .cine-navigation
+    position: relative
+    float: right
+    overflow: hidden
+
+    .btn
+      padding: 0 2px
+      margin: 0 0 0 2px
+      border: 0 none
+      &:first-of-type
+        margin-left: 0
+
+      i
+        font-size: 38px
+        line-height: 45px
+
+  .cine-controls
+    position: relative
+    float: left
+    overflow: hidden
+    .btn
+      font-size: 22px
+      line-height: 45px
+      min-width: 28px
+      padding: 0 0px
+      margin: 0 4px
+      border: 0 none
+
+  .cine-options
+    display: block
+    position: relative
+    width: 150px
+    float: left
+    overflow: hidden
+    padding: 0
+    margin: 0 0 0 10px
+
+    .fps-section
+      display: block
+      float: left
+      width: 80px
+      input[type="range"]
+        line-height: 45px
+        height: 45px
+        background-color: transparent
+        border: 0 none
+        outline: 0 none
+
+    #fps
+      display: block
+      width: 68px
+      float: left
+      padding: 0
+      margin: 0 0 0 2px
+      text-align: center
+      line-height: 45px
diff --git a/Packages/worklist/both/schema.js b/Packages/worklist/both/schema.js
index b8d68f5d8..c59ef702c 100644
--- a/Packages/worklist/both/schema.js
+++ b/Packages/worklist/both/schema.js
@@ -149,9 +149,9 @@ export const UISettings = new SimpleSchema({
         label: 'The UP/DOWN display set navigation buttons will iterate over all the viewports at once?',
         defaultValue: false
     },
-    showCineDialogOnRendered: {
+    multiframeEnhancementsEnabled: {
         type: Boolean,
-        label: 'The Cine dialog will be displayed by default',
+        label: 'Enable cine dialog enhancements for multiframe images.',
         defaultValue: false
     }
 });