Most JS files, all helpers and simple reconciliations

Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js

@@ -1,5 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
 import { OHIF } from 'meteor/ohif:core';
-import { unloadHandlers } from '../../../lib/unloadHandlers.js';
+// Local Modules
+import { toolManager } from '../../../lib/toolManager';
+import { unloadHandlers } from '../../../lib/unloadHandlers';
+import { hotkeyUtils } from '../../../lib/hotkeyUtils';
+import { ResizeViewportManager } from '../../../lib/classes/ResizeViewportManager';
+import { LayoutManager } from '../../../lib/classes/LayoutManager';
+
+Meteor.startup(() => {
+    // Create the synchronizer used to update reference lines
+    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
+
+    window.ResizeViewportManager = window.ResizeViewportManager || new ResizeViewportManager();
+});
 
 Template.viewerMain.onCreated(() => {
     // Attach the Window resize listener
@@ -8,23 +23,22 @@ Template.viewerMain.onCreated(() => {
     // and change it to jQuery._data(window, 'events')['resize']. 
     // Otherwise this function will be probably overrided.
     // See cineDialog instance.setResizeHandler function
-    window.addEventListener('resize', handleResize);
+    window.addEventListener('resize', window.ResizeViewportManager.handleResize.bind(window.ResizeViewportManager));
 
     // Add beforeUnload event handler to check for unsaved changes
     window.addEventListener('beforeunload', unloadHandlers.beforeUnload);
-
-    // Create the synchronizer used to update reference lines
-    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
 });
 
 Template.viewerMain.onRendered(() => {
     const instance = Template.instance();
 
-    HP.ProtocolStore.onReady(() => {
+    instance.subscribe('hangingprotocols', () => {
         const { studies, currentTimepointId, measurementApi, timepointIds } = instance.data;
         const parentElement = instance.$('#layoutManagerTarget').get(0);
-        window.layoutManager = new LayoutManager(parentElement, studies);
 
+        OHIF.viewerbase.layoutManager = new LayoutManager(parentElement, studies);
+
+        OHIF.viewerbase.layoutManager.updateViewports();
         // Default actions for Associated Studies
         if(currentTimepointId) {
             // Follow-up studies: same as the first measurement in the table
@@ -73,18 +87,22 @@ Template.viewerMain.onRendered(() => {
             }
 
             // Toggle Measurement Table 
-            instance.data.state.set('rightSidebar', 'measurements');
+            if(instance.data.state) {
+                instance.data.state.set('rightSidebar', 'measurements');
+            }
         }
         // Hide as default for single study
         else {
-            instance.data.state.set('rightSidebar', null);
+            if(instance.data.state) {
+                instance.data.state.set('rightSidebar', null);
+            }
         }
 
-        ProtocolEngine = new HP.ProtocolEngine(window.layoutManager, studies);
-        HP.setEngine(ProtocolEngine);
+        // ProtocolEngine = new HP.ProtocolEngine(OHIF.viewerbase.layoutManager, studies);
+        // HP.setEngine(ProtocolEngine);
 
         // Enable hotkeys
-        enableHotkeys();
+        hotkeyUtils.enableHotkeys();
 
         Session.set('ViewerMainReady', Random.id());
     });
@@ -94,7 +112,7 @@ Template.viewerMain.onDestroyed(() => {
     OHIF.log.info('viewerMain onDestroyed');
 
     // Remove the Window resize listener
-    window.removeEventListener('resize', handleResize);
+    window.removeEventListener('resize', window.ResizeViewportManager.handleResize.bind(window.ResizeViewportManager));
 
     // Remove beforeUnload event handler...
     window.removeEventListener('beforeunload', unloadHandlers.beforeUnload);
@@ -102,6 +120,6 @@ Template.viewerMain.onDestroyed(() => {
     // Destroy the synchronizer used to update reference lines
     OHIF.viewer.updateImageSynchronizer.destroy();
 
-    delete window.layoutManager;
+    delete OHIF.viewerbase.layoutManager;
     delete ProtocolEngine;
 });