Fixes to make Viewer load

LesionTracker/package.json

@@ -9,7 +9,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "babel-runtime": "^6.18.0",
+    "babel-runtime": "^6.20.0",
     "bcrypt": "^0.8.7",
     "meteor-node-stubs": "^0.2.3"
   },

OHIFViewer/client/components/toolbarSection/toolbarSection.js

@@ -1,6 +1,7 @@
 import { OHIF } from 'meteor/ohif:core';
 import { Template } from 'meteor/templating';
 import { $ } from 'meteor/jquery';
+import { Viewerbase } from 'meteor/ohif:viewerbase';
 
 Template.toolbarSection.onCreated(() => {
     const instance = Template.instance();
@@ -181,7 +182,7 @@ Template.toolbarSection.helpers({
                 title: 'CINE',
                 classes: 'imageViewerCommand',
                 iconClasses: 'fa fa-youtube-play',
-                disableFunction: hasMultipleFrames
+                disableFunction: Viewerbase.viewportUtils.hasMultipleFrames
             });
         }
 
@@ -231,11 +232,11 @@ Template.toolbarSection.onRendered(function() {
     instance.$('#layout').dropdown();
 
     if (OHIF.uiSettings.displayEchoUltrasoundWorkflow) {
-        toggleCineDialog();
+        Viewerbase.viewportUtils.toggleCineDialog();
     }
 
     // Set disabled/enabled tool buttons that are set in toolManager
-    const states = toolManager.getToolDefaultStates();
+    const states = Viewerbase.toolManager.getToolDefaultStates();
     const disabledToolButtons = states.disabledToolButtons;
     const allToolbarButtons = $('#toolbar').find('button');
     if (disabledToolButtons && disabledToolButtons.length > 0) {

OHIFViewer/client/components/viewer/viewer.js

@@ -1,4 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
+import { Viewerbase } from 'meteor/ohif:viewerbase';
 
 OHIF.viewer = OHIF.viewer || {};
 OHIF.viewer.defaultTool = 'wwwc';
@@ -52,7 +53,7 @@ Template.viewer.onCreated(() => {
     ViewerData[contentId].studyInstanceUids = [];
     instance.data.studies.forEach(study => {
         study.selected = true;
-        study.displaySets = createStacks(study);
+        study.displaySets = Viewerbase.createStacks(study);
         ViewerStudies.insert(study);
         ViewerData[contentId].studyInstanceUids.push(study.studyInstanceUid);
     });

Packages/ohif-study-list/client/lib/getStudyMetadata.js

@@ -1,4 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
+import { Viewerbase } from 'meteor/ohif:viewerbase';
 
 // Define the StudyMetaData object. This is used as a cache
 // to store study meta data information to prevent unnecessary
@@ -55,7 +56,7 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
 
         // Once we have retrieved the data, we sort the series' by series
         // and instance number in ascending order
-        sortStudy(study);
+        Viewerbase.sortStudy(study);
 
         // Add additional metadata to our study from the studylist
         var studylistStudy = StudyListStudies.findOne({

Packages/ohif-study-list/client/lib/studylist.js

@@ -1,3 +1,5 @@
+import { Viewerbase } from 'meteor/ohif:viewerbase';
+
 StudyList = {
     functions: {},
     callbacks: {}
@@ -8,7 +10,7 @@ StudyList.callbacks.middleClickOnStudy = dblClickOnStudy;
 
 function dblClickOnStudy(data) {
     // Use the formatPN template helper to clean up the patient name
-    var title = formatPN(data.patientName);
+    var title = Viewerbase.helpers.formatPN(data.patientName);
     openNewTab(data.studyInstanceUid, title);
 }
 

Packages/ohif-user-management/client/active-entry/activeEntry.styl

@@ -1,4 +1,4 @@
-@import "{design}/app.styl"
+@import "{ohif:design}/app.styl"
 
 #entrySignIn.entryPage,
 #entrySignUp.entryPage,

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

@@ -274,6 +274,12 @@ Template.cineDialog.helpers({
 
     displaySetDisabled(isNext) {
         Session.get('LayoutManagerUpdated');
+
+        // @TODO: Investigate why this is running while OHIF.viewerbase.layoutManager is undefined
+        if (!OHIF.viewerbase.layoutManager) {
+            return;
+        }
+
         return !OHIF.viewerbase.layoutManager.canMoveDisplaySets(isNext) ? 'disabled' : '';
     },
 

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

@@ -22,6 +22,11 @@ Template.displaySetNavigation.events({
 Template.displaySetNavigation.helpers({
     disableButton(isNext) {
         Session.get('LayoutManagerUpdated');
+
+        if (!OHIF.viewerbase.layoutManager) {
+            return;
+        }
+
         return !OHIF.viewerbase.layoutManager.canMoveDisplaySets(isNext);
     }
 });

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

@@ -478,11 +478,11 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
  */
 const setDisplaySet = (data, displaySetInstanceUid, templateData) => {
     const study = data.study;
-    if (!study || !study.series) {
+    if (!study || !study.displaySets) {
         throw new OHIFError('Study does not exist or has no display sets');
     }
 
-    study.series.every(displaySet => {
+    study.displaySets.every(displaySet => {
         if (displaySet.displaySetInstanceUid === displaySetInstanceUid) {
             data.displaySet = displaySet;
             return false;

Packages/ohif-viewerbase/client/index.js

@@ -131,6 +131,11 @@ Viewerbase.sortingManager = sortingManager;
 import { crosshairsSynchronizers } from './lib/crosshairsSynchronizers';
 Viewerbase.crosshairsSynchronizers = crosshairsSynchronizers;
 
+// createStacks.*
+import { createStacks } from './lib/createStacks';
+Viewerbase.createStacks = createStacks;
+
+
 /**
  * Exported Singletons
  */

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

@@ -55,13 +55,11 @@ export class LayoutManager {
             // Keep the displayed display sets
             self.viewportData = oldViewportData;
             currentViewportIndex = oldViewportData.length;
-        } 
+        } else if (viewportsAmount <= oldViewportData.length) {
-        else if (viewportsAmount <= oldViewportData.length) {
             // Reduce the original displayed display sets
             self.viewportData = oldViewportData.slice(0, viewportsAmount);
             return;
-        } 
+        } else {
-        else {
             // Reset all display sets
             self.viewportData = [];
         }
@@ -69,7 +67,7 @@ export class LayoutManager {
         // Get all the display sets for the viewer studies
         let displaySets = [];
         this.studies.forEach(study => {
-            study.series.forEach(displaySet => {
+            study.displaySets.forEach(displaySet => {
                 displaySet.images.length && displaySets.push(displaySet);
             });
         });
@@ -82,8 +80,7 @@ export class LayoutManager {
             const beginIndex = sequenceMap.values().next().value[0].displaySetIndex + currentLength;
             const endIndex = beginIndex + (viewportsAmount - currentLength);
             appendix = displaySets.slice(beginIndex, endIndex);
-        } 
+        } else {
-        else {
             // Get available display sets from the first to the grid size
             appendix = displaySets.slice(0, viewportsAmount);
         }