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

Packages/ohif-study-list/server/methods/getStudyMetadata.js

@@ -1,10 +1,12 @@
+import { OHIF } from 'meteor/ohif:core';
+
 Meteor.methods({
     /**
      * Retrieves Study metadata given a Study Instance UID
      * This Meteor method is available from both the client and the server
      */
     GetStudyMetadata: function(studyInstanceUid) {
-        log.info('GetStudyMetadata(%s)', studyInstanceUid);
+        OHIF.log.info('GetStudyMetadata(%s)', studyInstanceUid);
 
         // Get the server data. This is user-defined in the config.json files or through servers
         // configuration modal

Packages/ohif-study-list/server/services/dimse/retrieveMetadata.js

@@ -1,4 +1,20 @@
-import { parseFloatArray } from '../../lib/parseFloatArray';
+import { OHIF } from 'meteor/ohif:core';
+import { parseFloatArray } from 'meteor/ohif:study-list/server/lib/parseFloatArray';
+
+/**
+ * Returns the value of the element (e.g. '00280009')
+ *
+ * @param element - The group/element of the element (e.g. '00280009')
+ * @param defaultValue - The default value to return if the element does not exist
+ * @returns {*}
+ */
+function getValue(element, defaultValue) {
+    if (!element || !element.value) {
+        return defaultValue;
+    }
+
+    return element.value;
+}
 
 /**
  * Parses the SourceImageSequence, if it exists, in order
@@ -18,21 +34,6 @@ function getSourceImageInstanceUid(instance) {
     }
 }
 
-/**
- * Returns the value of the element (e.g. '00280009')
- *
- * @param element - The group/element of the element (e.g. '00280009')
- * @param defaultValue - The default value to return if the element does not exist
- * @returns {*}
- */
-function getValue(element, defaultValue) {
-    if (!element || !element.value) {
-        return defaultValue;
-    }
-
-    return element.value;
-}
-
 /**
  * Parses result data from a DIMSE search into Study MetaData
  * Returns an object populated with study metadata, including the
@@ -43,7 +44,7 @@ function getValue(element, defaultValue) {
  * @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
  */
 function resultDataToStudyMetadata(studyInstanceUid, resultData) {
-    log.info('resultDataToStudyMetadata');
+    OHIF.log.info('resultDataToStudyMetadata');
     var seriesMap = {};
     var seriesList = [];
 
@@ -161,4 +162,4 @@ Services.DIMSE.RetrieveMetadata = function(studyInstanceUid) {
     }
 
     return resultDataToStudyMetadata(studyInstanceUid, results);
-};
+};

Packages/ohif-study-list/server/services/dimse/studies.js

@@ -1,59 +1,59 @@
-import { moment } from 'meteor/mrt:moment';
-
-/**
- * Parses resulting data from a QIDO call into a set of Study MetaData
- *
- * @param resultData
- * @returns {Array} An array of Study MetaData objects
- */
-function resultDataToStudies(resultData) {
-    var studies = [];
-
-    resultData.forEach(function(studyRaw) {
-        var study = studyRaw.toObject();
-        studies.push({
-            studyInstanceUid: study[0x0020000D],
-            // 00080005 = SpecificCharacterSet
-            studyDate: study[0x00080020],
-            studyTime: study[0x00080030],
-            accessionNumber: study[0x00080050],
-            referringPhysicianName: study[0x00080090],
-            // 00081190 = URL
-            patientName: study[0x00100010],
-            patientId: study[0x00100020],
-            patientBirthdate: study[0x00100030],
-            patientSex: study[0x00100040],
-            imageCount: study[0x00201208],
-            studyId: study[0x00200010],
-            studyDescription: study[0x00081030],
-            modalities: study[0x00080061]
-        });
-    });
-    return studies;
-}
-
-Services.DIMSE.Studies = function(filter) {
-    log.info('Services.DIMSE.Studies');
-
-    let filterStudyDate = '';
-    if (filter.studyDateFrom && filter.studyDateTo) {
-        const convertDate = date => moment(date, 'MM/DD/YYYY').format('YYYYMMDD');
-        const dateFrom = convertDate(filter.studyDateFrom);
-        const dateTo = convertDate(filter.studyDateTo);
-        filterStudyDate = `${dateFrom}-${dateTo}`;
-    }
-
-    var parameters = {
-        0x00100010: filter.patientName,
-        0x00100020: filter.patientId,
-        0x00080050: filter.accessionNumber,
-        0x00080020: filterStudyDate,
-        0x00081030: filter.studyDescription,
-        0x00100040: '',
-        0x00201208: '',
-        0x00080061: filter.modalitiesInStudy
-    };
-
-    var results = DIMSE.retrieveStudies(parameters);
-    return resultDataToStudies(results);
-};
+import { OHIF } from 'meteor/ohif:core';
+
+/**
+ * Parses resulting data from a QIDO call into a set of Study MetaData
+ *
+ * @param resultData
+ * @returns {Array} An array of Study MetaData objects
+ */
+function resultDataToStudies(resultData) {
+    var studies = [];
+
+    resultData.forEach(function(studyRaw) {
+        var study = studyRaw.toObject();
+        studies.push({
+            studyInstanceUid: study[0x0020000D],
+            // 00080005 = SpecificCharacterSet
+            studyDate: study[0x00080020],
+            studyTime: study[0x00080030],
+            accessionNumber: study[0x00080050],
+            referringPhysicianName: study[0x00080090],
+            // 00081190 = URL
+            patientName: study[0x00100010],
+            patientId: study[0x00100020],
+            patientBirthdate: study[0x00100030],
+            patientSex: study[0x00100040],
+            imageCount: study[0x00201208],
+            studyId: study[0x00200010],
+            studyDescription: study[0x00081030],
+            modalities: study[0x00080061]
+        });
+    });
+    return studies;
+}
+
+Services.DIMSE.Studies = function(filter) {
+    OHIF.log.info('Services.DIMSE.Studies');
+
+    let filterStudyDate = '';
+    if (filter.studyDateFrom && filter.studyDateTo) {
+        const convertDate = date => moment(date, 'MM/DD/YYYY').format('YYYYMMDD');
+        const dateFrom = convertDate(filter.studyDateFrom);
+        const dateTo = convertDate(filter.studyDateTo);
+        filterStudyDate = `${dateFrom}-${dateTo}`;
+    }
+
+    var parameters = {
+        0x00100010: filter.patientName,
+        0x00100020: filter.patientId,
+        0x00080050: filter.accessionNumber,
+        0x00080020: filterStudyDate,
+        0x00081030: filter.studyDescription,
+        0x00100040: '',
+        0x00201208: '',
+        0x00080061: filter.modalitiesInStudy
+    };
+
+    var results = DIMSE.retrieveStudies(parameters);
+    return resultDataToStudies(results);
+};