Skip to content

Commit

Permalink
[add-description]:Example Change 88 to the default service
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengdechang2 committed Nov 29, 2022
1 parent 1aea480 commit a441b8a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
10 changes: 7 additions & 3 deletions platform/core/src/DICOMWeb/getAuthorizationHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ import user from '../user';
* @param {string|function} [server.requestOptions.auth]
* @returns {Object} { Authorization }
*/
export default function getAuthorizationHeader({ requestOptions } = {}) {
console.log('requestOptions: ', requestOptions);
export default function getAuthorizationHeader({ requestOptions } = {
requestOptions: {
auth: 'orthanc:orthanc',
}
}) {


const headers = {};

Expand All @@ -42,7 +46,7 @@ export default function getAuthorizationHeader({ requestOptions } = {}) {
// headers['Access-Control-Allow-Methods'] = 'PUT,GET,POST,DELETE,OPTIONS'
// headers['Access-Control-Allow-Credentials'] = true
// headers['Access-Control-Max-Age'] = '86400'
console.log('headers: ', headers);

return headers;


Expand Down
4 changes: 2 additions & 2 deletions platform/core/src/studies/services/qido/studies.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function resultDataToStudies(resultData) {
function Studies(server, filter) {
const { staticWado } = server;
let replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('serve')))
console.log('JSON.stringify(replaceStr): ', JSON.stringify(replaceStr), JSON.stringify(replaceStr) == "{}");

if (JSON.stringify(replaceStr.serve) == "{}") {
replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('defaultServe')))
}
Expand All @@ -138,7 +138,7 @@ function Studies(server, filter) {
server = { ...server, ...serve }

}
console.log('DICOMWeb.getAuthorizationHeader(server): ', DICOMWeb.getAuthorizationHeader(server));

const config = {
...server,
url: server.qidoRoot,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ export default class RetrieveMetadataLoader {
async execLoad() {
await this.configLoad();
const preLoadData = await this.preLoad();
console.log('preLoadData: ', preLoadData);

const loadData = await this.load(preLoadData);
console.log('loadData: ', loadData);

const postLoadData = await this.posLoad(loadData);
console.log('postLoadData: ', postLoadData);


return postLoadData;
}
Expand Down
6 changes: 3 additions & 3 deletions platform/viewer/public/config/docker_nginx-orthanc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ window.config = {
// wadoUriRoot: '/10.10.99.88:8042/wado',
// qidoRoot: '/10.10.99.88:8042/dicom-web',
// wadoRoot: '/10.10.99.88:8042/dicom-web',
wadoUriRoot: 'http://10.10.99.208:8042/wado',
qidoRoot: 'http://10.10.99.208:8042/dicom-web',
wadoRoot: 'http://10.10.99.208:8042/dicom-web',
wadoUriRoot: 'http://10.10.99.88:8042/wado',
qidoRoot: 'http://10.10.99.88:8042/dicom-web',
wadoRoot: 'http://10.10.99.88:8042/dicom-web',
qidoSupportsIncludeField: false,
imageRendering: 'wadors',
thumbnailRendering: 'wadors',
Expand Down

0 comments on commit a441b8a

Please sign in to comment.