Adding stackImagePositionOffsetSynchronizer.js to Viewerbase namespace and instanciating it in the Viewers

Packages/ohif-hanging-protocols/client/protocolEngine.js

@@ -4,7 +4,6 @@ import { _ } from 'meteor/underscore';
 // OHIF Modules
 import { OHIF } from 'meteor/ohif:core';
 import 'meteor/ohif:viewerbase';
-import 'meteor/ohif:metadata';
 
 // Define a global variable that will be used to refer to the Protocol Engine
 // It must be populated by HP.setEngine when the Viewer is initialized and a ProtocolEngine

Packages/ohif-hanging-protocols/package.js

@@ -19,7 +19,6 @@ Package.onUse(function(api) {
     api.use('validatejs');
 
     // Our custom packages
-    api.use('ohif:metadata');
     api.use('ohif:viewerbase');
 
     api.addAssets('assets/dots.svg', 'client');

Packages/ohif-viewerbase/client/index.js

@@ -5,7 +5,6 @@ import { Viewerbase } from '../namespace';
  */
 
 import './collections';
-import './lib/stackImagePositionOffsetSynchronizer.js';
 import './lib/debugReactivity';
 
 /**
@@ -208,3 +207,7 @@ Viewerbase.TypeSafeCollection = TypeSafeCollection;
 // OHIFError
 import { OHIFError } from './lib/classes/OHIFError';
 Viewerbase.OHIFError = OHIFError;
+
+// StackImagePositionOffsetSynchronizer
+import { StackImagePositionOffsetSynchronizer } from './lib/classes/StackImagePositionOffsetSynchronizer';
+Viewerbase.StackImagePositionOffsetSynchronizer = StackImagePositionOffsetSynchronizer;

Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js

@@ -1,9 +1,9 @@
 import { OHIF } from 'meteor/ohif:core';
 import { Session } from 'meteor/session';
 import { $ } from 'meteor/jquery';
-import { toolManager } from './toolManager';
+import { toolManager } from '../toolManager';
 
-class StackImagePositionOffsetSynchronizer {
+export class StackImagePositionOffsetSynchronizer {
   constructor() {
     this.active = false;
     this.syncedViewports = [];
@@ -208,6 +208,4 @@ class StackImagePositionOffsetSynchronizer {
         OHIF.log.info(`StackImagePositionOffsetSynchronizer getViewportImageNormal: ${errorMessage}`);
       }
   }
-}
-
-OHIF.viewer.stackImagePositionOffsetSynchronizer = new StackImagePositionOffsetSynchronizer();
+};

Packages/ohif-viewerbase/client/lib/helpers/isDisplaySetActive.js

@@ -1,7 +1,6 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 import { $ } from 'meteor/jquery';
-import { viewportUtils } from '../viewportUtils';
 
 import { OHIF } from 'meteor/ohif:core';
 import 'meteor/ohif:viewerbase';
@@ -32,12 +31,6 @@ Template.registerHelper('isDisplaySetActive', (displaySetInstanceUid, viewportIn
         // (Note, viewportData may have more entries!)
         const currentNumberOfViewports = OHIF.viewerbase.layoutManager.getNumberOfViewports();
 
-        // Get active viewport element
-        const activeViewport = viewportUtils.getActiveViewportElement();
-
-        // Get viewports elements
-        const viewportsElement = $('.imageViewerViewport');
-
         // Loop through the viewport data up until the currently displayed
         // number of viewports
         const viewportData = OHIF.viewerbase.layoutManager.viewportData;
@@ -45,7 +38,7 @@ Template.registerHelper('isDisplaySetActive', (displaySetInstanceUid, viewportIn
             const data = viewportData[i];
 
             // If the display set is displayed in this viewport and is active, stop here
-            if (data && data.displaySetInstanceUid === displaySetInstanceUid && viewportsElement.get(data.viewportIndex) === activeViewport) {
+            if (data && data.displaySetInstanceUid === displaySetInstanceUid) {
                 result = true;
                 break;
             }

Packages/ohif-viewerbase/client/lib/viewportUtils.js

@@ -124,6 +124,10 @@ const clearTools = () => {
 const linkStackScroll = () => {
     const synchronizer = OHIF.viewer.stackImagePositionOffsetSynchronizer;
 
+    if(!synchronizer) {
+        return;
+    }
+
     if(synchronizer.isActive()) {
         synchronizer.deactivate();
     } else {