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

Packages/ohif-study-list/client/components/studylistResult/studylistResult.js

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 Session.setDefault('showLoadingText', true);
 
 Template.studylistResult.helpers({
@@ -149,7 +151,7 @@ function search() {
     Meteor.call('StudyListSearch', filter, (error, studies) => {
         console.log('StudyListSearch');
         if (error) {
-            log.warn(error);
+            OHIF.log.warn(error);
             return;
         }
 

Packages/ohif-study-list/client/components/studylistStudy/studylistStudy.js

@@ -1,9 +1,11 @@
+import { OHIF } from 'meteor/ohif:core';
+
 // Maybe we should use regular StudyList collection?
 StudyListSelectedStudies = new Meteor.Collection(null);
 StudyListSelectedStudies._debugName = 'StudyListSelectedStudies';
 
 function handleShiftClick(studyRow, data) {
-    //log.info('shiftKey');
+    //OHIF.log.info('shiftKey');
     var studyInstanceUid = studyRow.attr('studyInstanceUid');
 
     // Select all rows in between these two rows
@@ -60,7 +62,7 @@ function handleShiftClick(studyRow, data) {
 }
 
 function handleCtrlClick(studyRow, data) {
-    //log.info('ctrlKey');
+    //OHIF.log.info('ctrlKey');
     var studyInstanceUid = studyRow.attr('studyInstanceUid');
 
     if (studyRow.hasClass('active')) {
@@ -78,7 +80,7 @@ function handleCtrlClick(studyRow, data) {
         // Set this as the previously selected row, so the user can
         // use Shift to select from this point onwards
         StudyList.previouslySelected = studyRow;
-        log.info('StudyList PreviouslySelected set: ' + studyRow.index());
+        OHIF.log.info('StudyList PreviouslySelected set: ' + studyRow.index());
     }
 }
 
@@ -113,7 +115,7 @@ Template.studylistStudy.events({
             handleCtrlClick(studyRow, data);
         } else {
             // Select a single study
-            //log.info('Regular click');
+            //OHIF.log.info('Regular click');
 
             // Clear all selected studies
             StudyListSelectedStudies.remove({});
@@ -121,7 +123,7 @@ Template.studylistStudy.events({
 
             // Set the previous study to the currently clicked-on study
             StudyList.previouslySelected = studyRow;
-            //log.info('StudyList PreviouslySelected set: ' + studyRow.index());
+            //OHIF.log.info('StudyList PreviouslySelected set: ' + studyRow.index());
 
             // Set the current study as selected
             StudyListSelectedStudies.insert(data);
@@ -163,4 +165,4 @@ Template.studylistStudy.events({
         }
     }
 
-});
+});

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

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 /**
  * Retrieves metaData for multiple studies at once.
  *
@@ -50,9 +52,9 @@ getStudiesMetadata = function(studyInstanceUids, doneCallback, failCallback) {
             doneCallback(studies);
         }
     }).fail(function(error) {
-        log.warn(error);
+        OHIF.log.warn(error);
         if (failCallback && typeof failCallback === 'function') {
             failCallback(error);
         }
     });
-};
+};

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

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 // Define the StudyMetaData object. This is used as a cache
 // to store study meta data information to prevent unnecessary
 // calls to the server
@@ -20,7 +22,7 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
         doneCallback(study);
         return;
     }
-    
+
     console.time('getStudyMetadata');
 
     // If no study metadata is in the cache variable, we need to retrieve it from
@@ -42,7 +44,7 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
         }
 
         if (error) {
-            log.warn(error);
+            OHIF.log.warn(error);
             failCallback(error);
             return;
         }

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

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 /**
  * Imports selected studies from local into studylist
  * @param filesToImport Files located in the client machine to import
@@ -44,7 +46,7 @@ importStudies = function(filesToImport, importCallback) {
 
                 if (fileUploadStatus.numberOfFilesFailed > 0) {
                     //TODO: Some files failed to upload, so let user know
-                    log.info("Failed to upload " + fileUploadStatus.numberOfFilesFailed + " of " + numberOfFilesToUpload + " files");
+                    OHIF.log.info("Failed to upload " + fileUploadStatus.numberOfFilesFailed + " of " + numberOfFilesToUpload + " files");
                 }
             }
         };
@@ -128,4 +130,4 @@ function importStudiesInternal(studiesToImport, importCallback) {
         //  Import studies with study import status id to get callbacks
         Meteor.call("importStudies", studiesToImport, studyImportStatusId);
     });
-}
+}

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

@@ -1,3 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
 /**
  *  Switches to a new tab in the tabbed studylist container
  *  This function renders either the StudyList or the Viewer template with new data.
@@ -9,7 +11,7 @@ switchToTab = function(contentId) {
         return;
     }
 
-    log.info('Switching to tab: ' + contentId);
+    OHIF.log.info('Switching to tab: ' + contentId);
 
     $('.tabTitle').removeClass('active');
     $('.tabTitle a[data-target="#' + contentId + '"]').addClass('active');
@@ -78,7 +80,7 @@ switchToTab = function(contentId) {
 function viewStudiesInTab(contentId, studies) {
     // Tab closed while study data was being retrieved, stop here
     if (!ViewerData[contentId]) {
-        log.warn('Tab closed while study data was being retrieved');
+        OHIF.log.warn('Tab closed while study data was being retrieved');
         return;
     }