Adding Metadata classes to Lesion Tracker (WIP) and some fixed;

LesionTracker/client/components/toolbarSection/toolbarSection.js

@@ -9,11 +9,11 @@ Template.toolbarSection.helpers({
         Session.get('LayoutManagerUpdated');
 
         // Stops here if layout manager is not defined yet
-        if (!window.layoutManager) {
+        if (!Viewerbase.layoutManager) {
             return;
         }
 
-        return window.layoutManager.viewportData.length > 1;
+        return Viewerbase.layoutManager.viewportData.length > 1;
     },
 
     leftSidebarToggleButtonData() {
@@ -217,7 +217,7 @@ Template.toolbarSection.events({
     'click #toggleTarget'(event, instance) {
         const $target = $(event.currentTarget);
         if (!$target.hasClass('active') && $target.hasClass('expanded')) {
-            toolManager.setActiveTool('bidirectional');
+            Viewerbase.toolManager.setActiveTool('bidirectional');
         }
     },
 

LesionTracker/client/components/viewer/viewer.js

@@ -1,12 +1,11 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 import { ReactiveDict } from 'meteor/reactive-dict';
-import { OHIF } from 'meteor/ohif:core';
-import 'meteor/ohif:viewerbase';
 import { _ } from 'meteor/underscore';
 
-// @TODO: Figure out what to change so we don't have this duplicate import (export createStacks?)
-import { Viewerbase } from 'meteor/ohif:viewerbase';
+import { OHIF } from 'meteor/ohif:core';
+import 'meteor/ohif:viewerbase';
+import 'meteor/ohif:metadata';
 
 Session.set('ViewerMainReady', false);
 Session.set('TimepointsReady', false);
@@ -70,7 +69,8 @@ Template.viewer.onCreated(() => {
 
     instance.data.studies.forEach(study => {
         study.selected = true;
-        study.displaySets = OHIF.viewerbase.createStacks(study);
+        const studyMetadata = new OHIF.metadata.StudyMetadata(study);
+        study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         OHIF.viewer.Studies.insert(study);
     });