af4b8b45f5
* Adding a better error handling for DICOMWeb getJson method * Adding a better error handling for DICOMWeb getBulkData method * Fixinf some typos. Using console.error to log errors * Better error handling for DIMSE connections * Using meteor error in StudyListSearch to better display same error in the client * Using Meteor.Error for a better pattern. Added an error message in the study list. created connection error types to DICOMWeb connection errors * Changing error types for server connection. Added better errors for DIMSE server on sockets * Improving viewer response to error being throw when not finding server to display studies * OHIF-168: adding catches clauses for retrieveStudyMetada method * OHIF-168: fixing typo in DIMSE.js * OHIF-168: setting the session variable to false when starting a new studylist search * OHIF-168: Using OHIF.log instead of console * OHIF-168: removing parsing into string for OHIF.log in Connection.js * OHIF-168: improving error message visibility in study viewer
95 lines
3.3 KiB
JavaScript
95 lines
3.3 KiB
JavaScript
import { OHIF } from 'meteor/ohif:core';
|
|
|
|
/**
|
|
* Creates a QIDO URL given the server settings and a study instance UID
|
|
* @param server
|
|
* @param studyInstanceUid
|
|
* @returns {string} URL to be used for QIDO calls
|
|
*/
|
|
function buildUrl(server, studyInstanceUid) {
|
|
return server.qidoRoot + '/studies/' + studyInstanceUid + '/instances';
|
|
}
|
|
|
|
/**
|
|
* Parses data returned from a QIDO search and transforms it into
|
|
* an array of series that are present in the study
|
|
*
|
|
* @param server The DICOM server
|
|
* @param studyInstanceUid
|
|
* @param resultData
|
|
* @returns {Array} Series List
|
|
*/
|
|
function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
|
|
var seriesMap = {};
|
|
var seriesList = [];
|
|
|
|
resultData.forEach(function(instance) {
|
|
// Use seriesMap to cache series data
|
|
// If the series instance UID has already been used to
|
|
// process series data, continue using that series
|
|
var seriesInstanceUid = DICOMWeb.getString(instance['0020000E']);
|
|
var series = seriesMap[seriesInstanceUid];
|
|
|
|
// If no series data exists in the seriesMap cache variable,
|
|
// process any available series data
|
|
if (!series) {
|
|
series = {
|
|
seriesInstanceUid: seriesInstanceUid,
|
|
seriesNumber: DICOMWeb.getString(instance['00200011']),
|
|
instances: []
|
|
};
|
|
|
|
// Save this data in the seriesMap cache variable
|
|
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 UIDs
|
|
// 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';
|
|
|
|
// Add this instance to the current series
|
|
series.instances.push({
|
|
sopClassUid: DICOMWeb.getString(instance['00080016']),
|
|
sopInstanceUid: sopInstanceUid,
|
|
uri: uri,
|
|
instanceNumber: DICOMWeb.getString(instance['00200013'])
|
|
});
|
|
});
|
|
return seriesList;
|
|
}
|
|
|
|
/**
|
|
* Retrieve a set of instances using a QIDO call
|
|
* @param server
|
|
* @param studyInstanceUid
|
|
* @throws ECONNREFUSED
|
|
* @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
|
|
*/
|
|
Services.QIDO.Instances = function(server, studyInstanceUid) {
|
|
var url = buildUrl(server, studyInstanceUid);
|
|
|
|
try {
|
|
var result = DICOMWeb.getJSON(url, server.requestOptions);
|
|
|
|
return {
|
|
wadoUriRoot: server.wadoUriRoot,
|
|
studyInstanceUid: studyInstanceUid,
|
|
seriesList: resultDataToStudyMetadata(server, studyInstanceUid, result.data)
|
|
};
|
|
} catch (error) {
|
|
OHIF.log.trace();
|
|
|
|
throw error;
|
|
}
|
|
|
|
};
|