PWV-3: Creating ohif:log package and partially refactoring ohif:measurements

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

@@ -12,11 +12,11 @@ var allCornerstoneEvents = 'CornerstoneToolsMouseDown CornerstoneToolsMouseDownA
  * @param data {object} Object containing the study, series, and viewport element to be used
  */
 function loadDisplaySetIntoViewport(data, templateData) {
-    log.info('imageViewerViewport loadDisplaySetIntoViewport');
+    OHIF.log.info('imageViewerViewport loadDisplaySetIntoViewport');
 
     // Make sure we have all the data required to render the series
     if (!data.study || !data.displaySet || !data.element) {
-        log.warn('loadDisplaySetIntoViewport: No Study, Display Set, or Element provided');
+        OHIF.log.warn('loadDisplaySetIntoViewport: No Study, Display Set, or Element provided');
         return;
     }
 
@@ -66,7 +66,7 @@ function loadDisplaySetIntoViewport(data, templateData) {
 
         var numFrames = image.numFrames;
         if (numFrames > 1) {
-            log.info('Multiframe image detected');
+            OHIF.log.info('Multiframe image detected');
             for (var i = 0; i < numFrames; i++) {
                 metaData.frame = i;
                 imageId = getImageId(image, i);
@@ -136,7 +136,7 @@ function loadDisplaySetIntoViewport(data, templateData) {
         try {
             enabledElement = cornerstone.getEnabledElement(element);
         } catch (error) {
-            log.warn('Viewport destroyed before loaded image could be displayed');
+            OHIF.log.warn('Viewport destroyed before loaded image could be displayed');
             return;
         }
 
@@ -239,10 +239,10 @@ function loadDisplaySetIntoViewport(data, templateData) {
         // Define a function to run whenever the Cornerstone viewport is rendered
         // (e.g. following a change of window or zoom)
         function onImageRendered(e, eventData) {
-            log.info('imageViewerViewport onImageRendered');
+            OHIF.log.info('imageViewerViewport onImageRendered');
 
             if (!layoutManager.viewportData[viewportIndex]) {
-                log.warn("onImageRendered: LayoutManager has no viewport data for this viewport index?: " + viewportIndex);
+                OHIF.log.warn("onImageRendered: LayoutManager has no viewport data for this viewport index?: " + viewportIndex);
             }
 
             // Use Session to trigger reactive updates in the viewportOverlay helper functions
@@ -267,7 +267,7 @@ function loadDisplaySetIntoViewport(data, templateData) {
         // Define a function to run whenever the Cornerstone viewport changes images
         // (e.g. during scrolling)
         function onNewImage(e, eventData) {
-            log.info('imageViewerViewport onNewImage');
+            OHIF.log.info('imageViewerViewport onNewImage');
 
             // Update the metaData for missing fields
             updateMetaData(eventData.enabledElement.image);
@@ -323,7 +323,7 @@ function loadDisplaySetIntoViewport(data, templateData) {
                 return;
             }
 
-            log.info('imageViewerViewport sendActivationTrigger');
+            OHIF.log.info('imageViewerViewport sendActivationTrigger');
 
             // Otherwise, trigger an 'ActivateViewport' event to be handled by the Template event
             // handler
@@ -448,7 +448,7 @@ Meteor.startup(function() {
 
 Template.imageViewerViewport.onRendered(function() {
     var templateData = Template.currentData();
-    log.info('imageViewerViewport onRendered');
+    OHIF.log.info('imageViewerViewport onRendered');
 
     // When the imageViewerViewport template is rendered
     var element = this.find('.imageViewerViewport');
@@ -493,7 +493,7 @@ Template.imageViewerViewport.onRendered(function() {
 });
 
 Template.imageViewerViewport.onDestroyed(function() {
-    log.info('imageViewerViewport onDestroyed');
+    OHIF.log.info('imageViewerViewport onDestroyed');
 
     // When a viewport element is being destroyed
     var element = this.find('.imageViewerViewport');
@@ -509,7 +509,7 @@ Template.imageViewerViewport.onDestroyed(function() {
             cornerstoneTools.stopClip(element);
         }
     } catch (error) {
-        log.warn(error);
+        OHIF.log.warn(error);
     }
 
     // Disable the viewport element with Cornerstone
@@ -520,7 +520,7 @@ Template.imageViewerViewport.onDestroyed(function() {
 
 Template.imageViewerViewport.events({
     'ActivateViewport .imageViewerViewport'(event) {
-        log.info('imageViewerViewport ActivateViewport');
+        OHIF.log.info('imageViewerViewport ActivateViewport');
         setActiveViewport(event.currentTarget);
     },
 

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

@@ -29,10 +29,10 @@ Template.toolbarSectionButton.events({
         const activeTool = toolManager.getActiveTool();
         if (tool === activeTool) {
             const defaultTool = toolManager.getDefaultTool();
-            log.info('Setting active tool to: ' + defaultTool);
+            OHIF.log.info('Setting active tool to: ' + defaultTool);
             toolManager.setActiveTool(defaultTool, elements);
         } else {
-            log.info('Setting active tool to: ' + tool);
+            OHIF.log.info('Setting active tool to: ' + tool);
             toolManager.setActiveTool(tool, elements);
         }
     },

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

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 Template.viewerMain.onCreated(() => {
     // Attach the Window resize listener
     // Don't use jQuery here. "window.onresize" will always be null
@@ -28,8 +30,8 @@ Template.viewerMain.onRendered(() => {
 });
 
 Template.viewerMain.onDestroyed(() => {
-    log.info('viewerMain onDestroyed');
-    
+    OHIF.log.info('viewerMain onDestroyed');
+
     // Remove the Window resize listener
     window.removeEventListener('resize', handleResize);