Merged LesionTracker and OHIF Viewer, refactored out common components

Packages/viewerbase/server/lib/namespace.js

@@ -0,0 +1,3 @@
+Services = {};
+Services.QIDO = {};
+Services.WADO = {};

Packages/viewerbase/server/methods/getStudyMetadata.js

@@ -0,0 +1,10 @@
+Meteor.methods({
+  'GetStudyMetadata' : function(studyInstanceUid) {
+    console.log('GetStudyMetadata(%s)', studyInstanceUid);
+
+    var server = Meteor.settings.dicomWeb.endpoints[0];
+
+    //return Services.QIDO.Instances(server, studyInstanceUid);
+    return Services.WADO.RetrieveMetadata(server, studyInstanceUid);
+  }
+});

Packages/viewerbase/server/methods/worklistSearch.js

@@ -0,0 +1,6 @@
+Meteor.methods({
+  'WorklistSearch' : function(filter) {
+    var server = Meteor.settings.dicomWeb.endpoints[0];
+    return Services.QIDO.Studies(server, filter);
+  }
+});

Packages/viewerbase/server/seed.js

@@ -0,0 +1,18 @@
+var users = [
+  {
+    email: 'admin@ohif.org',
+    //username: "admin",
+    password: "admin",
+    profile: {
+
+    }
+  }
+];
+
+Meteor.startup(function() {
+  users.forEach(function(user) {
+    if(!Meteor.users.findOne({username: user.username})) {
+      Accounts.createUser(user);
+    }
+  });
+});

Packages/viewerbase/server/services/qido/instances.js

@@ -0,0 +1,59 @@
+function buildUrl(server, studyInstanceUid) {
+
+  var url = server.qidoRoot + '/studies/' + studyInstanceUid + '/instances';
+
+  return url;
+}
+
+function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
+  var seriesMap = {};
+  var seriesList = [];
+  resultData.forEach(function(instance) {
+    var seriesInstanceUid = DICOMWeb.getString(instance['0020000E']);
+    var series = seriesMap[seriesInstanceUid];
+    if(!series) {
+      series = {
+        seriesInstanceUid : seriesInstanceUid,
+        seriesNumber : DICOMWeb.getString(instance['00200011']),
+        instances: []
+      };
+      seriesMap[seriesInstanceUid] = series;
+      seriesList.push(series);
+    }
+
+    // The uri for the dicomweb
+    // NOTE: DCM4CHEE seems to return the data zipped
+    // NOTE: Orthanc returns the data with multi-part mime which cornerstoneWADOImageLoader doesn't
+    //       know how to parse yet
+    //var uri = DICOMWeb.getString(instance['00081190']);
+    //uri = uri.replace('wado-rs', 'dicom-web');
+
+    // manually create a WADO-URI from the UID's
+    // NOTE: Haven't been able to get Orthanc's WADO-URI to work yet - maybe its not configured?
+    var sopInstanceUid = DICOMWeb.getString(instance['00080018']);
+    var uri = server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + "&contentType=application%2Fdicom";
+
+    series.instances.push({
+      sopClassUid: DICOMWeb.getString(instance['00080016']),
+      sopInstanceUid: sopInstanceUid,
+      uri: uri,
+      instanceNumber: DICOMWeb.getString(instance['00200013'])
+    });
+  });
+  return seriesList;
+}
+
+Services.QIDO.Instances = function(server, studyInstanceUid) {
+
+  var url = buildUrl(server, studyInstanceUid);
+
+  var result = DICOMWeb.getJSON(url, server.requestOptions);
+  
+  var study = {
+    wadoUriRoot: server.wadoUriRoot,
+    studyInstanceUid: studyInstanceUid,
+    seriesList: resultDataToStudyMetadata(server, studyInstanceUid, result.data)
+  };
+
+  return study;
+};

Packages/viewerbase/server/services/qido/studies.js

@@ -0,0 +1,38 @@
+function filterToQIDOURL(server, filter) {
+  var parameters = {
+    PatientName : filter.patientName,
+    PatientID: filter.patientId,
+    AccessionNumber : filter.accessionNumber,
+    limit : filter.limit || 20,
+    includefield : server.qidoSupportsIncludeField ? 'all' : undefined
+  };
+  var url = server.qidoRoot + '/studies?' + encodeQueryData(parameters);
+  return url;
+}
+
+function resultDataToStudies(resultData) {
+  var studies = [];
+  resultData.forEach(function(study) {
+    studies.push({
+      patientName: DICOMWeb.getName(study['00100010']),
+      patientId: DICOMWeb.getString(study['00100020']),
+      accessionNumber : DICOMWeb.getString(study['00080050']),
+      studyDate: DICOMWeb.getString(study['00080020']),
+      modalities: DICOMWeb.getString(study['00080061']),
+      studyDescription: DICOMWeb.getString(study['00081030']),
+      imageCount: DICOMWeb.getString(study['00201208']),
+      studyInstanceUid: DICOMWeb.getString(study['0020000D'])
+      //url : server.wadoRoot + '/studies/' + DICOMWeb.getString(study['0020000D']) + '/metadata'
+    });
+  });
+  return studies;
+}
+
+Services.QIDO.Studies = function(server, filter) {
+
+  var url = filterToQIDOURL(server, filter);
+
+  var result = DICOMWeb.getJSON(url, server.requestOptions);
+
+  return resultDataToStudies(result.data);
+};

Packages/viewerbase/server/services/wado/retrieveMetadata.js

@@ -0,0 +1,88 @@
+function buildUrl(server, studyInstanceUid) {
+
+  var url = server.wadoRoot + '/studies/' + studyInstanceUid + '/metadata';
+
+  return url;
+}
+
+function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
+  var seriesMap = {};
+  var seriesList = [];
+  resultData.forEach(function(instance) {
+    var seriesInstanceUid = DICOMWeb.getString(instance['0020000E']);
+    var series = seriesMap[seriesInstanceUid];
+    if(!series) {
+      series = {
+        seriesDescription: DICOMWeb.getString(instance['0008103E']),
+        modality: DICOMWeb.getString(instance['00080060']),
+        seriesInstanceUid : seriesInstanceUid,
+        seriesNumber : DICOMWeb.getNumber(instance['00200011']),
+        instances: []
+      };
+      seriesMap[seriesInstanceUid] = series;
+      seriesList.push(series);
+    }
+
+    var sopInstanceUid = DICOMWeb.getString(instance['00080018']);
+
+    var instanceSummary = {
+      // -----------
+      // TODO = Fix this
+      // This doesn't seem like the best place to put this, but otherwise we have no study info
+      patientName: DICOMWeb.getName(instance['00100010']),
+      patientId: DICOMWeb.getString(instance['00100020']),
+      accessionNumber : DICOMWeb.getString(instance['00080050']),
+      studyDate: DICOMWeb.getString(instance['00080020']),
+      modalities: DICOMWeb.getString(instance['00080061']),
+      studyDescription: DICOMWeb.getString(instance['00081030']),
+      imageCount: DICOMWeb.getString(instance['00201208']),
+      studyInstanceUid: DICOMWeb.getString(instance['0020000D']),
+      // -----------
+      imageType: DICOMWeb.getString(instance['00080008']),
+      sopClassUid: DICOMWeb.getString(instance['00080016']),
+      sopInstanceUid: sopInstanceUid,
+      instanceNumber: DICOMWeb.getNumber(instance['00200013']),
+      imagePositionPatient: DICOMWeb.getString(instance['00200032']),
+      imageOrientationPatient: DICOMWeb.getString(instance['00200037']),
+      frameOfReferenceUID: DICOMWeb.getString(instance['00200052']),
+      sliceLocation: DICOMWeb.getNumber(instance['00201041']),
+      samplesPerPixel: DICOMWeb.getNumber(instance['00280002']),
+      photometricInterpretation: DICOMWeb.getString(instance['00280004']),
+      rows: DICOMWeb.getNumber(instance['00280010']),
+      columns: DICOMWeb.getNumber(instance['00280011']),
+      pixelSpacing: DICOMWeb.getString(instance['00280030']),
+      bitsAllocated: DICOMWeb.getNumber(instance['00280100']),
+      bitsStored: DICOMWeb.getNumber(instance['00280101']),
+      highBit: DICOMWeb.getNumber(instance['00280102']),
+      pixelRepresentation: DICOMWeb.getNumber(instance['00280103']),
+      windowCenter: DICOMWeb.getString(instance['00281050']),
+      windowWidth: DICOMWeb.getString(instance['00281051']),
+      rescaleIntercept: DICOMWeb.getNumber(instance['00281052']),
+      rescaleSlope: DICOMWeb.getNumber(instance['00281053']),
+    };
+
+    if(server.imageRendering === 'wadouri') {
+      instanceSummary.wadouri = server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + "&contentType=application%2Fdicom";
+    } else {
+      instanceSummary.wadorsuri = server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
+    }
+
+    series.instances.push(instanceSummary);
+  });
+  return seriesList;
+}
+
+Services.WADO.RetrieveMetadata = function(server, studyInstanceUid) {
+
+  var url = buildUrl(server, studyInstanceUid);
+
+  var result = DICOMWeb.getJSON(url, server.requestOptions);
+
+  var study = {
+    wadoUriRoot: server.wadoUriRoot,
+    studyInstanceUid: studyInstanceUid,
+    seriesList: resultDataToStudyMetadata(server, studyInstanceUid, result.data)
+  };
+
+  return study;
+};