Final adjustments to routing behaviors

LesionTracker/client/components/viewer/viewer.html

@@ -1,15 +1,17 @@
 <template name="viewer">
-    {{#if and Template.subscriptionsReady dataSourcesReady}}
-        <div class="viewerDialogs">
+    <div class="viewerDialogs">
+        {{#if and Template.subscriptionsReady dataSourcesReady}}
             {{>confirmDeleteDialog}}
             {{>measurementTableHUD (clone this)}}
             {{>cineDialog}}
-        </div>
-        <div id="viewer">
+        {{/if}}
+    </div>
+    <div id="viewer">
+        {{#if and Template.subscriptionsReady dataSourcesReady}}
             {{>toolbarSection (clone this)}}
             {{>viewerSection (clone this)}}
-        </div>
-    {{else}}
-        {{>loadingText}}
-    {{/if}}
+        {{else}}
+            {{>loadingText}}
+        {{/if}}
+    </div>
 </template>

LesionTracker/client/components/viewer/viewer.js

@@ -36,7 +36,8 @@ Template.viewer.onCreated(() => {
     const instance = Template.instance();
 
     const { TimepointApi, MeasurementApi, ConformanceCriteria } = OHIF.measurements;
-    const currentTimepointId = instance.data.currentTimepointId;
+
+    const currentTimepointId = OHIF.viewer.data.currentTimepointId;
     const timepointApi = new TimepointApi(currentTimepointId);
     const measurementApi = new MeasurementApi(timepointApi);
     const conformanceCriteria = new ConformanceCriteria(measurementApi, timepointApi);
@@ -88,6 +89,9 @@ Template.viewer.onCreated(() => {
         OHIF.viewer.data.loadedSeriesData = {};
     }
 
+    // Store the viewer data in session for further user
+    Session.setPersistent('ViewerData', OHIF.viewer.data);
+
     Session.set('activeViewport', OHIF.viewer.data.activeViewport || false);
 
     // Set lesion tool buttons as disabled if pixel spacing is not available for active element
@@ -156,13 +160,8 @@ Template.viewer.onCreated(() => {
         measurementApi.priorTimepointId = prior.timepointId;
     }
 
-    if (instance.data.currentTimepointId) {
-        //  Enable Lesion Tracker Tools if the opened study is associated
-        OHIF.lesiontracker.toggleLesionTrackerToolsButtons(true);
-    } else {
-        //  Disable Lesion Tracker Tools if the opened study is not associated
-        OHIF.lesiontracker.toggleLesionTrackerToolsButtons(false);
-    }
+    //  Enable/Disable Lesion Tracker Tools if the opened study is associated or not
+    OHIF.lesiontracker.toggleLesionTrackerToolsButtons(!!currentTimepointId);
 
     let firstMeasurementActivated = false;
     instance.autorun(() => {
@@ -311,7 +310,7 @@ const initHangingProtocol = () => {
         const layoutManager = OHIF.viewerbase.layoutManager;
 
         // Instantiate StudyMetadataSource: necessary for Hanging Protocol to get study metadata
-        const studyMetadataSource = new StudyList.classes.OHIFStudyMetadataSource();
+        const studyMetadataSource = new OHIF.studylist.classes.OHIFStudyMetadataSource();
 
         // Creates Protocol Engine object with required arguments
         const ProtocolEngine = new HP.ProtocolEngine(layoutManager, studyMetadataList, [], studyMetadataSource);