From b5f94412fac28b864ae38df97b72a9aed24d6495 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Fri, 6 Nov 2015 12:36:38 +0100
Subject: [PATCH] Made tabs open before study loads. Added study loading
 indicator

---
 LesionTracker/client/components/viewer.html   |  2 +-
 LesionTracker/client/components/viewer.styl   |  2 +-
 .../cornerstone/client/hangingProtocol.js     |  5 +++
 .../basic/loadingText/loadingText.styl        |  1 +
 .../components/tabContent/tabContent.html     |  1 +
 .../components/tabContent/tabContent.styl     |  4 +++
 .../components/tabTitle/tabTitle.styl         |  5 ++-
 Packages/worklist/components/worklist.js      | 32 +++++++++----------
 .../components/worklistStudy/worklistStudy.js |  2 +-
 Packages/worklist/package.js                  |  1 +
 10 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 Packages/worklist/components/tabContent/tabContent.styl

diff --git a/LesionTracker/client/components/viewer.html b/LesionTracker/client/components/viewer.html
index 64b20c9ca..387867aad 100644
--- a/LesionTracker/client/components/viewer.html
+++ b/LesionTracker/client/components/viewer.html
@@ -1,5 +1,5 @@
 <template name="viewer">
-    <div id="viewer" class="viewer">
+    <div id="viewer">
         {{ >lesionDialog }}
         {{ >hidingPanel }}
         <div id="viewportAndLesionTable">
diff --git a/LesionTracker/client/components/viewer.styl b/LesionTracker/client/components/viewer.styl
index 106bd5a6d..da96bc85e 100644
--- a/LesionTracker/client/components/viewer.styl
+++ b/LesionTracker/client/components/viewer.styl
@@ -1,4 +1,4 @@
-.viewer
+#viewer
   width: 100%
   height: 100%
   margin: 0
diff --git a/Packages/cornerstone/client/hangingProtocol.js b/Packages/cornerstone/client/hangingProtocol.js
index 565ea5971..0e90aa5c8 100644
--- a/Packages/cornerstone/client/hangingProtocol.js
+++ b/Packages/cornerstone/client/hangingProtocol.js
@@ -5,6 +5,11 @@ function defaultHangingProtocol(inputData) {
     var viewportRows = inputData.viewportRows;
     var viewportColumns = inputData.viewportColumns;
 
+    if (!studies.length) {
+        log.warn("No studies provided to Hanging Protocol");
+        return;
+    }
+
     // This is the most basic hanging protocol.
     var stacks = [];
     studies.forEach(function(study) {
diff --git a/Packages/viewerbase/components/basic/loadingText/loadingText.styl b/Packages/viewerbase/components/basic/loadingText/loadingText.styl
index 8a3ac7468..62728d08b 100644
--- a/Packages/viewerbase/components/basic/loadingText/loadingText.styl
+++ b/Packages/viewerbase/components/basic/loadingText/loadingText.styl
@@ -1,4 +1,5 @@
 .loadingTextDiv
   margin: 30px
+
   h5
     text-align: center
\ No newline at end of file
diff --git a/Packages/worklist/components/tabContent/tabContent.html b/Packages/worklist/components/tabContent/tabContent.html
index efe106f26..390d5f74a 100644
--- a/Packages/worklist/components/tabContent/tabContent.html
+++ b/Packages/worklist/components/tabContent/tabContent.html
@@ -1,4 +1,5 @@
 <template name="tabContent">
     <div role="tabpanel" class="tab-pane {{active}}" id="{{contentid}}">
+        {{ >loadingText }}
     </div>
 </template>
\ No newline at end of file
diff --git a/Packages/worklist/components/tabContent/tabContent.styl b/Packages/worklist/components/tabContent/tabContent.styl
new file mode 100644
index 000000000..f7820215b
--- /dev/null
+++ b/Packages/worklist/components/tabContent/tabContent.styl
@@ -0,0 +1,4 @@
+.tab-pane
+  .loadingTextDiv
+    h5
+      color: #777
\ No newline at end of file
diff --git a/Packages/worklist/components/tabTitle/tabTitle.styl b/Packages/worklist/components/tabTitle/tabTitle.styl
index 0519ecba6..1c9b8bbbb 100644
--- a/Packages/worklist/components/tabTitle/tabTitle.styl
+++ b/Packages/worklist/components/tabTitle/tabTitle.styl
@@ -1 +1,4 @@
- 
\ No newline at end of file
+.tabTitle
+  button.close    
+    // Prevent blue glow around button in Chrome
+    outline: none 
\ No newline at end of file
diff --git a/Packages/worklist/components/worklist.js b/Packages/worklist/components/worklist.js
index f1aa85be0..edf1de51e 100644
--- a/Packages/worklist/components/worklist.js
+++ b/Packages/worklist/components/worklist.js
@@ -54,6 +54,8 @@ switchToTab = function(contentId) {
 
         Session.set('studies', data.studies);
 
+        // Remove the loading text template that is inside by default
+        container.innerHTML = "";
         UI.renderWithData(Template.viewer, data, container);
         var imageViewer = $("#viewer");
         if (imageViewer) {
@@ -67,24 +69,20 @@ switchToTab = function(contentId) {
 };
 
 
-openNewTab = function(studyInstanceUid) {
-    getStudyMetadata(studyInstanceUid, function(study) {
-        var title = study.seriesList[0].instances[0].patientName;
-        var contentid = generateUUID();
+openNewTab = function(studyInstanceUid, title) {
+    var contentid = generateUUID();
+    var data = {
+        title: title,
+        contentid: contentid,
+    };
+    tabs.insert(data);
 
-        var data = {
-            title: title,
-            contentid: contentid,
-        };
-        tabs.insert(data);
-
-        ViewerData[contentid] = {
-            title: title,
-            contentid: contentid,
-            studyInstanceUid: studyInstanceUid
-        };
-        switchToTab(contentid);
-    });
+    ViewerData[contentid] = {
+        title: title,
+        contentid: contentid,
+        studyInstanceUid: studyInstanceUid
+    };
+    switchToTab(contentid);
 };
 
 Template.worklist.onRendered(function() {
diff --git a/Packages/worklist/components/worklistStudy/worklistStudy.js b/Packages/worklist/components/worklistStudy/worklistStudy.js
index f02950b9b..4fe739c32 100644
--- a/Packages/worklist/components/worklistStudy/worklistStudy.js
+++ b/Packages/worklist/components/worklistStudy/worklistStudy.js
@@ -1,5 +1,5 @@
 Template.worklistStudy.events({
     'click': function () {
-        openNewTab(this.studyInstanceUid);
+        openNewTab(this.studyInstanceUid, this.patientName);
     }
 });
\ No newline at end of file
diff --git a/Packages/worklist/package.js b/Packages/worklist/package.js
index eda018dee..c97c87180 100644
--- a/Packages/worklist/package.js
+++ b/Packages/worklist/package.js
@@ -29,6 +29,7 @@ Package.onUse(function (api) {
     api.addFiles('components/tabTitle/tabTitle.styl', 'client');
 
     api.addFiles('components/tabContent/tabContent.html', 'client');
+    api.addFiles('components/tabContent/tabContent.styl', 'client');
 
     api.addFiles('components/worklistStudy/worklistStudy.html', 'client');
     api.addFiles('components/worklistStudy/worklistStudy.js', 'client');