Bug fix for when we have no applicable validation criteria, added default Meteor settings for OHIF Viewer
This commit is contained in:
parent
beaa56c0b3
commit
89782de15e
@ -25,6 +25,7 @@ ddp-server@1.2.2
|
|||||||
deps@1.0.9
|
deps@1.0.9
|
||||||
dicomweb@0.0.1
|
dicomweb@0.0.1
|
||||||
diff-sequence@1.0.1
|
diff-sequence@1.0.1
|
||||||
|
dimseservice@0.0.1
|
||||||
ecmascript@0.1.6
|
ecmascript@0.1.6
|
||||||
ecmascript-runtime@0.2.6
|
ecmascript-runtime@0.2.6
|
||||||
ejson@1.0.7
|
ejson@1.0.7
|
||||||
|
|||||||
30
OHIFViewer/defaultSettings.js
Normal file
30
OHIFViewer/defaultSettings.js
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
Meteor.startup(function() {
|
||||||
|
Meteor.settings = {
|
||||||
|
dicomWeb: {
|
||||||
|
endpoints: [{
|
||||||
|
name: 'Orthanc',
|
||||||
|
wadoUriRootNOTE: 'either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently',
|
||||||
|
wadoUriRoot: 'http://localhost:8043/wado',
|
||||||
|
qidoRoot: 'http://localhost:8042/dicom-web',
|
||||||
|
wadoRoot: 'http://localhost:8042/dicom-web',
|
||||||
|
qidoSupportsIncludeField: false,
|
||||||
|
imageRendering: 'wadouri',
|
||||||
|
requestOptions: {
|
||||||
|
auth: 'orthanc:orthanc',
|
||||||
|
logRequests: true,
|
||||||
|
logResponses: false,
|
||||||
|
logTiming: true
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
dimse: {
|
||||||
|
host: 'localhost',
|
||||||
|
port: 4242,
|
||||||
|
hostAE: 'ORTHANC'
|
||||||
|
},
|
||||||
|
defaultServiceType: 'dicomWeb'
|
||||||
|
//defaultServiceType: 'dimse'
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log('Using default OHIF Viewer settings with service: ' + Meteor.settings.defaultServiceType);
|
||||||
|
});
|
||||||
@ -293,6 +293,10 @@ function validateAll() {
|
|||||||
// - The acquisitionSliceThickness, for example, may be pulled from the image metadata
|
// - The acquisitionSliceThickness, for example, may be pulled from the image metadata
|
||||||
// - The organ in question, e.g. Chest X-ray, may determine the exact specifications for the current trial criteria
|
// - The organ in question, e.g. Chest X-ray, may determine the exact specifications for the current trial criteria
|
||||||
var currentConstraints = getTrialCriteriaConstraints(criteriaType, currentMeasurement.imageId);
|
var currentConstraints = getTrialCriteriaConstraints(criteriaType, currentMeasurement.imageId);
|
||||||
|
if (!currentConstraints) {
|
||||||
|
log.warn('No relevant contraints could be applied');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Run the single-measurement-specific conformance checks
|
// Run the single-measurement-specific conformance checks
|
||||||
// If any messages exist, add them to the array of messages
|
// If any messages exist, add them to the array of messages
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user