TrizTech/ohif-viewer
17
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CornerstoneWADOImageLoader to 0.9.0, tried to get DIMSE + WADO-URI working

Browse Source
This commit is contained in:
Erik Ziegler committed 2016-02-09 13:19:11 +01:00
1 parent da5e752097
commit 8297171f4a
9 files changed
+103 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/viewerbase/server/methods/getStudyMetadata.js
+8 -5
View File
@@ -10,10 +10,13 @@ Meteor.methods({
throw 'No properly configured server was available over DICOMWeb';
}
// Get the server data. This is user-defined in the
// config.json files used to run the Meteor server
var server = Meteor.settings.dicomWeb.endpoints[0];
return Services.WADO.RetrieveMetadata(server, studyInstanceUid);
if (Meteor.settings.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
// Get the server data. This is user-defined in the
// config.json files used to run the Meteor server
var server = Meteor.settings.dicomWeb.endpoints[0];
return Services.WADO.RetrieveMetadata(server, studyInstanceUid);
} else if (Meteor.settings.dimse && Meteor.settings.defaultServiceType === 'dimse') {
return Services.DIMSE.RetrieveMetadata(studyInstanceUid);
}
}
});
Packages/viewerbase/server/services/dimse/instances.js
+1 -1
View File
@@ -37,7 +37,7 @@ function resultDataToStudyMetadata(resultData) {
var serverRoot = host + ':' + port;
log.info('INSTANCE');
log.info(instance);
//log.info(instance);
var sopInstanceUid = instance[0x00080018];
var uri = serverRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
Packages/viewerbase/server/services/dimse/retrieveMetadata.js
+8 -9
View File
@@ -26,6 +26,7 @@ function getSourceImageInstanceUid(instance) {
* @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
*/
function resultDataToStudyMetadata(studyInstanceUid, resultData) {
console.log('resultDataToStudyMetadata');
var seriesMap = {};
var seriesList = [];
@@ -69,7 +70,8 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
var sopInstanceUid = instance[0x00080018];
log.info('instance');
log.info(instance);
//console.log('instance');
//console.log(instance);
var instanceSummary = {
imageType: instance[0x00080008],
sopClassUid: instance[0x00080016],
@@ -99,12 +101,9 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
frameRate: parseFloat(instance[0x00181063])
};
var host = Meteor.settings.dimse.host,
port = Meteor.settings.dimse.port;
var serverRoot = host + ':' + port;
instanceSummary.wadorsuri = serverRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
// Retrieve the actual data over WADO-URI
var server = Meteor.settings.dicomWeb.endpoints[0];
instanceSummary.wadouri = server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + "&contentType=application%2Fdicom";
series.instances.push(instanceSummary);
});
@@ -156,7 +155,7 @@ Services.DIMSE.RetrieveMetadata = function(studyInstanceUid) {
study.studyInstanceUid = studyInstanceUid;
console.log(study);
console.log(study.seriesList[0].instances[0]);
//console.log(study);
//console.log(study.seriesList[0].instances[0]);
return study;
};