Final adjustments on overlay

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

@@ -5,6 +5,7 @@ import { Session } from 'meteor/session';
 import { $ } from 'meteor/jquery';
 // OHIF Modules
 import { OHIF } from 'meteor/ohif:core';
+import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
 // Local Modules
 import { StackManager } from '../../../lib/StackManager';
 import { setActiveViewport } from '../../../lib/setActiveViewport';
@@ -348,8 +349,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
         };
 
         // Attach the onNewImage callback to the CornerstoneNewImage event
-        $element.off('CornerstoneNewImage', onNewImage);
-        $element.on('CornerstoneNewImage', onNewImage);
+        $element.one('CornerstoneNewImage', onNewImage);
 
         // Set a random value for the Session variable in order to trigger an overlay update
         Session.set('CornerstoneNewImage' + viewportIndex, Math.random());

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

@@ -7,6 +7,17 @@ import { viewportOverlayUtils } from '../../../lib/viewportOverlayUtils';
 import { getElementIfNotEmpty } from '../../../lib/getElementIfNotEmpty';
 import { getStackDataIfNotEmpty } from '../../../lib/getStackDataIfNotEmpty';
 
+Template.viewportOverlay.onCreated(() => {
+    const instance = Template.instance();
+
+    instance.getImageIndex = () => {
+        const stack = getStackDataIfNotEmpty(instance.data.viewportIndex);
+        if (!stack || stack.currentImageIdIndex === undefined) return;
+
+        return stack.currentImageIdIndex;
+    };
+});
+
 Template.viewportOverlay.helpers({
     wwwc() {
         Session.get('CornerstoneImageRendered' + this.viewportIndex);
@@ -217,12 +228,8 @@ Template.viewportOverlay.helpers({
     imageIndex() {
         Session.get('CornerstoneNewImage' + this.viewportIndex);
 
-        const stack = getStackDataIfNotEmpty(this.viewportIndex);
-        if (!stack || stack.currentImageIdIndex === undefined) {
-            return;
-        }
-
-        return stack.currentImageIdIndex + 1;
+        const imageIndex = Template.instance().getImageIndex();
+        return _.isUndefined(imageIndex) ? 0 : imageIndex + 1;
     },
 
     numImages() {