Skip to content

Commit 071cea6

Browse files
fantixpaulineribeyreharaprasadjrnerella92m0nhawk
committed
changes to support Gen3 and MIDRC environment
Co-authored-by: Fantix King <[email protected]> Co-authored-by: Pauline Ribeyre <[email protected]> Co-authored-by: Hara Prasad <[email protected]> Co-authored-by: rnerella92 <[email protected]> Co-authored-by: Andrew Prokhorenkov <[email protected]> Co-authored-by: cmlsn <[email protected]>
1 parent 238a30c commit 071cea6

File tree

11 files changed

+57
-29
lines changed

11 files changed

+57
-29
lines changed

‎Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ RUN yarn install --verbose
4646

4747
ENV PATH /usr/src/app/node_modules/.bin:$PATH
4848
ENV QUICK_BUILD true
49+
ENV PUBLIC_URL /dicom-viewer/
4950
# ENV GENERATE_SOURCEMAP=false
5051
# ENV REACT_APP_CONFIG=config/default.js
5152

‎extensions/cornerstone/src/toolbarModule.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ const definitions = [
215215
commandName: 'setToolActive',
216216
commandOptions: { toolName: 'Bidirectional' },
217217
},
218-
{
218+
/*{
219219
id: 'Download',
220220
label: 'Download',
221221
icon: 'create-screen-capture',
@@ -225,7 +225,7 @@ const definitions = [
225225
behavior: TOOLBAR_BUTTON_BEHAVIORS.DOWNLOAD_SCREEN_SHOT,
226226
togglable: true,
227227
},
228-
},
228+
},*/
229229
],
230230
},
231231
{

‎platform/viewer/public/assets/browserconfig.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<browserconfig>
33
<msapplication>
44
<tile>
5-
<square70x70logo src="/assets/mstile-70x70.png"/>
6-
<square150x150logo src="/assets/mstile-150x150.png"/>
7-
<wide310x150logo src="/assets/mstile-310x150.png"/>
8-
<square310x310logo src="/assets/mstile-310x310.png"/>
5+
<square70x70logo src="/dicom-viewer/assets/mstile-70x70.png"/>
6+
<square150x150logo src="/dicom-viewer/assets/mstile-150x150.png"/>
7+
<wide310x150logo src="/dicom-viewer/assets/mstile-310x150.png"/>
8+
<square310x310logo src="/dicom-viewer/assets/mstile-310x310.png"/>
99
<TileColor>#fff</TileColor>
1010
</tile>
1111
</msapplication>

‎platform/viewer/public/assets/favicon.ico

-28.3 KB
Binary file not shown.

‎platform/viewer/public/assets/manifest.webapp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "OHIF Viewer",
44
"description": "OHIF Viewer",
55
"icons": {
6-
"60": "/assets/firefox_app_60x60.png",
7-
"128": "/assets/firefox_app_128x128.png",
8-
"512": "/assets/firefox_app_512x512.png"
6+
"60": "/dicom-viewer/assets/firefox_app_60x60.png",
7+
"128": "/dicom-viewer/assets/firefox_app_128x128.png",
8+
"512": "/dicom-viewer/assets/firefox_app_512x512.png"
99
},
1010
"developer": {
1111
"name": "OHIF Contributors",

‎platform/viewer/public/assets/midrc-logo.png

70.7 KB
Loading

‎platform/viewer/public/assets/yandex-browser-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "2.2.1",
33
"api_version": 1,
44
"layout": {
5-
"logo": "/assets/yandex-browser-50x50.png",
5+
"logo": "/dicom-viewer/assets/yandex-browser-50x50.png",
66
"color": "#fff",
77
"show_title": true
88
}

‎platform/viewer/public/config/default.js

+30-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
window.config = {
22
// default: '/'
3-
routerBasename: '/',
3+
routerBasename: '/dicom-viewer/',
44
extensions: [],
5-
showStudyList: true,
5+
showStudyList: false,
66
filterQueryParam: false,
7-
disableServersCache: false,
7+
disableServersCache: true,
88
studyPrefetcher: {
99
enabled: true,
1010
order: 'closest',
@@ -15,21 +15,44 @@ window.config = {
1515
displayProgress: true,
1616
includeActiveDisplaySet: true,
1717
},
18+
disableMeasurementPanel: false,
1819
servers: {
1920
dicomWeb: [
2021
{
21-
name: 'DCM4CHEE',
22-
wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado',
23-
qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
24-
wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
22+
name: 'dicom-web',
23+
wadoUriRoot: '/dicom-server/wado',
24+
qidoRoot: '/dicom-server/dicom-web',
25+
wadoRoot: '/dicom-server/dicom-web',
2526
qidoSupportsIncludeField: true,
2627
imageRendering: 'wadors',
2728
thumbnailRendering: 'wadors',
2829
enableStudyLazyLoad: true,
30+
StudiesMetadata: 'MainDicomTags',
31+
SeriesMetadata: "Full",
2932
supportsFuzzyMatching: true,
33+
3034
},
3135
],
3236
},
37+
// update the logo to the MIDRC logo
38+
whiteLabeling: {
39+
createLogoComponentFn: function (React) {
40+
return React.createElement('a', {
41+
target: '_self',
42+
rel: 'noopener noreferrer',
43+
className: 'header-brand',
44+
href: 'https://data.midrc.org',
45+
style: {
46+
display: 'block',
47+
textIndent: '-9999px',
48+
background: 'url(../assets/midrc-logo.png)',
49+
backgroundSize: 'contain',
50+
backgroundRepeat: 'no-repeat',
51+
width: '200px',
52+
},
53+
});
54+
},
55+
},
3356

3457
// Extensions should be able to suggest default values for these?
3558
// Or we can require that these be explicitly set

‎platform/viewer/public/manifest.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,47 @@
77
"orientation": "any",
88
"icons": [
99
{
10-
"src": "/assets/android-chrome-36x36.png",
10+
"src": "/dicom-viewer/assets/android-chrome-36x36.png",
1111
"sizes": "36x36",
1212
"type": "image/png"
1313
},
1414
{
15-
"src": "/assets/android-chrome-48x48.png",
15+
"src": "/dicom-viewer/assets/android-chrome-48x48.png",
1616
"sizes": "48x48",
1717
"type": "image/png"
1818
},
1919
{
20-
"src": "/assets/android-chrome-72x72.png",
20+
"src": "/dicom-viewer/assets/android-chrome-72x72.png",
2121
"sizes": "72x72",
2222
"type": "image/png"
2323
},
2424
{
25-
"src": "/assets/android-chrome-96x96.png",
25+
"src": "/dicom-viewer/assets/android-chrome-96x96.png",
2626
"sizes": "96x96",
2727
"type": "image/png"
2828
},
2929
{
30-
"src": "/assets/android-chrome-144x144.png",
30+
"src": "/dicom-viewer/assets/android-chrome-144x144.png",
3131
"sizes": "144x144",
3232
"type": "image/png"
3333
},
3434
{
35-
"src": "/assets/android-chrome-192x192.png",
35+
"src": "/dicom-viewer/assets/android-chrome-192x192.png",
3636
"sizes": "192x192",
3737
"type": "image/png"
3838
},
3939
{
40-
"src": "/assets/android-chrome-256x256.png",
40+
"src": "/dicom-viewer/assets/android-chrome-256x256.png",
4141
"sizes": "256x256",
4242
"type": "image/png"
4343
},
4444
{
45-
"src": "/assets/android-chrome-384x384.png",
45+
"src": "/dicom-viewer/assets/android-chrome-384x384.png",
4646
"sizes": "384x384",
4747
"type": "image/png"
4848
},
4949
{
50-
"src": "/assets/android-chrome-512x512.png",
50+
"src": "/dicom-viewer/assets/android-chrome-512x512.png",
5151
"sizes": "512x512",
5252
"type": "image/png"
5353
}

‎platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,14 @@ function ViewerRetrieveStudyData({
416416

417417
if (error) {
418418
const content = JSON.stringify(error);
419-
if (content.includes('404') || content.includes('NOT_FOUND')) {
419+
if (error.status == 404 || content.includes('404') || content.includes('NOT_FOUND')) {
420420
return <NotFound />;
421421
}
422422

423+
if (error.status == 403) {
424+
return <NotFound message="You do not have access to this data" />;
425+
}
426+
423427
return <NotFound message="Failed to retrieve study data" />;
424428
}
425429

‎platform/viewer/src/service-worker.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//
88

99
// Embedded version
10-
importScripts('/third_party/workbox/workbox-v5.1.4/workbox-sw.js');
10+
importScripts('/dicom-viewer/third_party/workbox/workbox-v5.1.4/workbox-sw.js');
1111

1212
workbox.setConfig({
13-
modulePathPrefix: '/third_party/workbox/workbox-v5.1.4/',
13+
modulePathPrefix: '/dicom-viewer/third_party/workbox/workbox-v5.1.4/',
1414
});
1515

1616
// Internet version

0 commit comments

Comments
 (0)