Creating ohif:metadata package with metadata classes and adding it to the viewers

OHIFViewer/.meteor/packages

@@ -13,6 +13,7 @@ ohif:study-list
 ohif:dicom-services
 ohif:hanging-protocols
 # ohif:user-management
+ohif:metadata
 
 twbs:bootstrap
 http@1.2.10

OHIFViewer/.meteor/versions

@@ -20,10 +20,6 @@ caching-compiler@1.1.9
 caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
-clinical:router@2.0.17
-clinical:router-location@2.0.14
-clinical:router-middleware-stack@2.0.13
-clinical:router-url@2.0.15
 coffeescript@1.11.1_4
 ddp@1.2.5
 ddp-client@1.3.2
@@ -81,6 +77,7 @@ ohif:design@0.0.1
 ohif:dicom-services@0.0.1
 ohif:hanging-protocols@0.0.1
 ohif:log@0.0.1
+ohif:metadata@0.0.1
 ohif:study-list@0.0.1
 ohif:viewerbase@0.0.1
 ohif:wadoproxy@0.0.1

OHIFViewer/client/components/toolbarSection/toolbarSection.js

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

OHIFViewer/client/components/viewer/viewer.js

@@ -1,5 +1,6 @@
 import { OHIF } from 'meteor/ohif:core';
-import { Viewerbase } from 'meteor/ohif:viewerbase';
+import 'meteor/ohif:viewerbase';
+import 'meteor/ohif:metadata';
 
 OHIF.viewer = OHIF.viewer || {};
 OHIF.viewer.defaultTool = 'wwwc';
@@ -54,6 +55,8 @@ Template.viewer.onCreated(() => {
     instance.data.studies.forEach(study => {
         study.selected = true;
         study.displaySets = Viewerbase.createStacks(study);
+        // const studyMetadata = new OHIF.metadata.StudyMetadata(study);
+        // study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
         ViewerStudies.insert(study);
         ViewerData[contentId].studyInstanceUids.push(study.studyInstanceUid);
     });