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

LT-67 Adding peeers to DIMSE servers structure

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-04-21 18:43:01 -03:00 committed by Erik Ziegler
parent b33ce54188
commit fd5e7dd2f4
6 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LesionTracker/defaultSettings.js
View File

@ -26,10 +26,12 @@ Meteor.startup(function() {
}], }],
dimse: [{ dimse: [{
name: "ORTHANC_DIMSE", name: "ORTHANC_DIMSE",
host: 'localhost', peers: [{
port: 4242, host: 'localhost',
aeTitle: 'ORTHANC', port: 4242,
default: true aeTitle: 'ORTHANC',
default: true
}]
}] }]
}, },
"defaultServiceType": 'dicomWeb', "defaultServiceType": 'dicomWeb',

8
OHIFViewer/defaultSettings.js
View File

@ -26,9 +26,11 @@ Meteor.startup(function() {
}], }],
dimse: [{ dimse: [{
name: "ORTHANC_DIMSE", name: "ORTHANC_DIMSE",
host: 'localhost', peers: [{
port: 4242, host: 'localhost',
hostAE: 'ORTHANC' port: 4242,
hostAE: 'ORTHANC'
}]
}] }]
}, },
defaultServiceType: 'dicomWeb', defaultServiceType: 'dicomWeb',

2
Packages/worklist/server/services/dimse/instances.js
View File

@ -31,6 +31,8 @@ function resultDataToStudyMetadata(resultData) {
seriesList.push(series); seriesList.push(series);
} }
// TODO: Check which peer it should point to | brunoalvesdefaria
var server = Meteor.settings.servers.dimse[0].peers[0];
var host = Meteor.settings.servers.dimse.host, var host = Meteor.settings.servers.dimse.host,
port = Meteor.settings.servers.dimse.port; port = Meteor.settings.servers.dimse.port;

8
config/dockerDCM4CHE.json
View File

@ -19,9 +19,11 @@
"dimse": [ "dimse": [
{ {
"name": "DCM4CHE_DIMSE", "name": "DCM4CHE_DIMSE",
"host": "192.168.99.100", "peers": [{
"port": 11112, "host": "192.168.99.100",
"hostAE": "DCM4CHE" "port": 11112,
"hostAE": "DCM4CHE"
}]
} }
] ]
}, },

8
config/localhostOrthanc.json
View File

@ -20,9 +20,11 @@
"dimse": [ "dimse": [
{ {
"name": "ORTHANC_DIMSE", "name": "ORTHANC_DIMSE",
"host": "localhost", "peers": [{
"port": 4242, "host": "localhost",
"hostAE": "ORTHANC" "port": 4242,
"hostAE": "ORTHANC"
}]
} }
] ]
}, },

26
config/orthancDIMSE.json
View File

@ -19,17 +19,21 @@
], ],
"dimse": [{ "dimse": [{
"name": "ORTHANC_DIMSE", "name": "ORTHANC_DIMSE",
"host": "localhost", "peers": [
"port": 4242, {
"aeTitle": "ORTHANC", "host": "localhost",
"default": true "port": 4242,
},{ "aeTitle": "ORTHANC",
"name": "OHIFDCM_DIMSE", "default": true
"host": "0.0.0.0", },
"port": 11112, {
"aeTitle": "OHIFDCM", "host": "0.0.0.0",
"default": true, "port": 11112,
"server": true "aeTitle": "OHIFDCM",
"default": true,
"server": true
}
]
}] }]
}, },
"defaultServiceType": "dimse" "defaultServiceType": "dimse"