From 1c3f3cfcf6be4449dacea77c92959a60eee1cf43 Mon Sep 17 00:00:00 2001 From: diego0020 Date: Wed, 5 Jun 2019 09:11:13 -0500 Subject: [PATCH 1/6] initial prototype --- docker/Nginx-Orthanc/docker-compose.yml | 17 +++-------------- docs/latest/essentials/data-source.md | 8 ++++++-- package.json | 1 + public/config/docker_nginx-orthanc.js | 8 ++++---- src/utils/initWebWorkers.js | 11 +++++++---- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/docker/Nginx-Orthanc/docker-compose.yml b/docker/Nginx-Orthanc/docker-compose.yml index 26e797514..62cf8df25 100644 --- a/docker/Nginx-Orthanc/docker-compose.yml +++ b/docker/Nginx-Orthanc/docker-compose.yml @@ -1,17 +1,6 @@ version: '3.5' services: - proxy: - image: nginx:1.15-alpine - ports: - - 8899:80 - volumes: - - ./config/nginx.conf:/etc/nginx/nginx.conf:ro - restart: unless-stopped - - # LINK: https://hub.docker.com/r/jodogne/orthanc-plugins/ - # TODO: Update to use Postgres - # https://github.com/mrts/docker-postgresql-multiple-databases orthanc: image: jodogne/orthanc-plugins:1.5.6 hostname: orthanc @@ -20,7 +9,7 @@ services: - ./config/orthanc.json:/etc/orthanc/orthanc.json:ro # Persist data - ./volumes/orthanc-db/:/var/lib/orthanc/db/ - # ports: - # - '4242:4242' # DICOM - # - '8042:8042' # Web + ports: + - '4242:4242' # DICOM + - '8042:8042' # Web restart: unless-stopped diff --git a/docs/latest/essentials/data-source.md b/docs/latest/essentials/data-source.md index 7d828e8a0..5a6fdbc8f 100644 --- a/docs/latest/essentials/data-source.md +++ b/docs/latest/essentials/data-source.md @@ -29,11 +29,15 @@ For our purposes, we will be using `Orthanc`, but you can see a list of - Docker - [Docker for Mac](https://docs.docker.com/docker-for-mac/) - - [Docker for Windows](https://docs.docker.com/docker-for-windows/) + - [Docker for Windows (recommended)](https://docs.docker.com/docker-for-windows/) + - [Docker Toolbox for Windows](https://docs.docker.com/toolbox/toolbox_install_windows/) _Not sure if you have `docker` installed already? Try running `docker --version` in command prompt or terminal_ +If you are using Docker Toolbox you need to change the _proxy_ parameter in +_package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip throws. + ### Running Orthanc _Start Orthanc:_ @@ -112,7 +116,7 @@ window.config = { }, ], }, -} +}; ``` To learn more about how you can configure the OHIF Viewer, check out our diff --git a/package.json b/package.json index 5fa923387..2cdf9ddb4 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "node": ">=8", "npm": ">=5" }, + "proxy": "http://localhost:8042", "scripts": { "cm": "npx git-cz", "dev": "yarn run preBuild && cross-env PORT=5000 react-scripts start", diff --git a/public/config/docker_nginx-orthanc.js b/public/config/docker_nginx-orthanc.js index b184c5a9d..b200b4b9f 100644 --- a/public/config/docker_nginx-orthanc.js +++ b/public/config/docker_nginx-orthanc.js @@ -5,9 +5,9 @@ window.config = { dicomWeb: [ { name: 'Orthanc', - wadoUriRoot: 'http://localhost:8899/wado', - qidoRoot: 'http://localhost:8899/dicom-web', - wadoRoot: 'http://localhost:8899/dicom-web', + wadoUriRoot: '/wado', + qidoRoot: '/dicom-web', + wadoRoot: '/dicom-web', qidoSupportsIncludeField: false, imageRendering: 'wadors', thumbnailRendering: 'wadors', @@ -17,4 +17,4 @@ window.config = { }, ], }, -} +}; diff --git a/src/utils/initWebWorkers.js b/src/utils/initWebWorkers.js index 462d065da..b7e04ad63 100644 --- a/src/utils/initWebWorkers.js +++ b/src/utils/initWebWorkers.js @@ -6,18 +6,21 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'; * @param {String} webWorkScriptsPath */ export default function(baseDirectory, webWorkScriptsPath) { - const scriptsPath = `${window.location.protocol}//${ + let scriptsPath = `${window.location.protocol}//${ window.location.host - }${baseDirectory}/${webWorkScriptsPath}`; + }${baseDirectory}`; + if (webWorkScriptsPath) { + scriptsPath += `/${webWorkScriptsPath}/`; + } const config = { maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1), startWebWorkersOnDemand: true, - webWorkerPath: `${scriptsPath}/cornerstoneWADOImageLoaderWebWorker.min.js`, + webWorkerPath: `${scriptsPath}cornerstoneWADOImageLoaderWebWorker.min.js`, taskConfiguration: { decodeTask: { loadCodecsOnStartup: true, initializeCodecsOnStartup: false, - codecsPath: `${scriptsPath}/cornerstoneWADOImageLoaderCodecs.min.js`, + codecsPath: `${scriptsPath}cornerstoneWADOImageLoaderCodecs.min.js`, usePDFJS: false, strict: false, }, From f47ce6e629caf7c5eb20570aa02e7378aae67320 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Mon, 17 Jun 2019 14:35:39 +0200 Subject: [PATCH 2/6] feat(@ohif/extension-vtk): Add visible crosshair lines to MPR mode re #562 --- package.json | 2 +- yarn.lock | 168 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 159 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7ebf89ad2..e0b0e0ed0 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@babel/runtime": "^7.4.5", "@ohif/extension-cornerstone": "0.0.36", "@ohif/extension-dicom-microscopy": "0.0.6", - "@ohif/extension-vtk": "0.0.5", + "@ohif/extension-vtk": "0.0.6", "@ohif/i18n": "0.0.4", "classnames": "^2.2.6", "cornerstone-core": "^2.2.8", diff --git a/yarn.lock b/yarn.lock index 1d2c703aa..b0b92cfd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1454,14 +1454,15 @@ classnames "^2.2.6" dicom-microscopy-viewer "^0.4.3" -"@ohif/extension-vtk@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@ohif/extension-vtk/-/extension-vtk-0.0.5.tgz#91e096cf57516a4f1808708de8d0406f7b9f547a" - integrity sha512-klUbYuM8SH138exWCNcv6CSiN5NVZCg0qMEJfdMFsXdb6knqVoaUiVGPxmgxVKIhX6+/VIrILheEDArtcfGvJw== +"@ohif/extension-vtk@0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@ohif/extension-vtk/-/extension-vtk-0.0.6.tgz#a4100963d87f268190ecac7784ff131bd4350b20" + integrity sha512-IwXIpAQEOSRbPNXW0B6XfBMrp3k3LvdD/uyrOeEjI35hVjABf/9aGwqMk9wiw672AN26w/eZ04uXeKjRBsLzsQ== dependencies: "@babel/runtime" "^7.4.5" "@ohif/i18n" "0.0.4" - react-vtkjs-viewport "0.0.8" + react-vtkjs-viewport "0.0.9" + vtk.js "^8.9.1" "@ohif/i18n@0.0.4", "@ohif/i18n@^0.0.4": version "0.0.4" @@ -2724,6 +2725,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= +base64-js@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" + integrity sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw== + base64-js@^1.0.2: version "1.3.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" @@ -2804,6 +2810,11 @@ bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== +blueimp-md5@2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d" + integrity sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ== + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -3245,6 +3256,15 @@ capture-stack-trace@^1.0.0: resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== +cardboard-vr-display@^1.0.15: + version "1.0.16" + resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.16.tgz#f91e2798e8fb70a348599638c6742c72dfeadabc" + integrity sha512-GFBWPMH/ixy4Ji014BAO1ryddGHphtJlA8gUR6UdKsOpPjUQukCKpgsx2XIJ5oBlqXnDQOcLVRqBWyuvTI32jQ== + dependencies: + gl-preserve-state "^1.0.0" + nosleep.js "^0.7.0" + webvr-polyfill-dpdb "^1.0.11" + cardinal@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" @@ -3638,6 +3658,11 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.6.tgz#3cd3d8adc725ab473843db338bcdfd4a7bb087bf" integrity sha512-f20oA7jsrrmERTS70r3tmRSxR8IJV2MTN7qe6hzgX+3ARfXrdMJFvGWvWQK0xpcBurg9j9eO2MiqzZ8Y+/UPCA== +commander@2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" + integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== + commander@2.17.x: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" @@ -3934,6 +3959,11 @@ core-js@^2.4.0, core-js@^2.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A== +core-js@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" + integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU= + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -5020,6 +5050,11 @@ es6-promise@^4.0.3: resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f" integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q== +es6-promise@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" + integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y= + es6-promisify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" @@ -6132,6 +6167,16 @@ git-log-parser@^1.2.0: through2 "~2.0.0" traverse "~0.6.6" +gl-matrix@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.0.0.tgz#888301ac7650e148c3865370e13ec66d08a8381f" + integrity sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA== + +gl-preserve-state@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198" + integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q== + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -6826,6 +6871,11 @@ ignore@^5.0.6, ignore@^5.1.1: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558" integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ== +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + immer@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" @@ -8243,6 +8293,17 @@ jsx-ast-utils@^2.1.0: dependencies: array-includes "^3.0.3" +jszip@3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.4.tgz#fc323fe41bb1730348d20dd022aa4d8b57cbbcf9" + integrity sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA== + dependencies: + core-js "~2.3.0" + es6-promise "~3.0.2" + lie "~3.1.0" + pako "~1.0.2" + readable-stream "~2.0.6" + killable@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -8483,6 +8544,13 @@ libnpx@^10.2.0: y18n "^4.0.0" yargs "^11.0.0" +lie@~3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= + dependencies: + immediate "~3.0.5" + lint-staged@^8.2.1: version "8.2.1" resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz#752fcf222d9d28f323a3b80f1e668f3654ff221f" @@ -9758,6 +9826,11 @@ normalize-url@^4.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee" integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ== +nosleep.js@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289" + integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok= + npm-audit-report@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz#303bc78cd9e4c226415076a4f7e528c89fc77018" @@ -10508,7 +10581,12 @@ pacote@^8.1.6: unique-filename "^1.1.0" which "^1.3.0" -pako@~1.0.5: +pako@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" + integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== + +pako@~1.0.2, pako@~1.0.5: version "1.0.10" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== @@ -11681,6 +11759,11 @@ process-es6@^0.11.2: resolved "https://registry.yarnpkg.com/process-es6/-/process-es6-0.11.6.tgz#c6bb389f9a951f82bd4eb169600105bd2ff9c778" integrity sha1-xrs4n5qVH4K9TrFpYAEFvS/5x3g= +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -12345,10 +12428,10 @@ react-viewerbase@0.9.0: react-i18next "^10.11.0" react-with-direction "1.3.0" -react-vtkjs-viewport@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.0.8.tgz#194bd96c3f66f7f5fe4c757e0621fb5b0b43907e" - integrity sha512-L7RMr0z+C7CixW6+Wal3AAJiO1je5GlVLEKOpzMtayB5gECcrOD5AC+1/s5C/1okNVJG9BW4W9UZBoHRM6dRpw== +react-vtkjs-viewport@0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.0.9.tgz#da79aa66f52dcd731bcc5abd2587cbb120a25331" + integrity sha512-VwRCY2DPxWMhix4v3PAtdENp3U1p+Z9nKf1Ch5+KWRKF6fWeA+B2glYKMYNpPnP4bULzVz9iwV+Zeojt3gEibA== dependencies: moment "^2.24.0" @@ -12548,6 +12631,18 @@ readable-stream@~1.0.26, readable-stream@~1.0.26-4: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" @@ -13276,6 +13371,11 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +seedrandom@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" + integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -13520,6 +13620,15 @@ shelljs@0.7.6: interpret "^1.0.0" rechoir "^0.6.2" +shelljs@0.7.8: + version "0.7.8" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" + integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM= + dependencies: + glob "^7.0.0" + interpret "^1.0.0" + rechoir "^0.6.2" + shellwords@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" @@ -15105,6 +15214,23 @@ void-elements@^2.0.1: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= +vtk.js@^8.9.1: + version "8.9.1" + resolved "https://registry.yarnpkg.com/vtk.js/-/vtk.js-8.9.1.tgz#db49e869fbf61e4d6ca71a8a61f9092bc5fa39f7" + integrity sha512-sxQ/kFXQTVp2bzRhnSwOXlODWL0vlBkZ3X+SKW+G3ZmGDmncFGkjS5yXhTJFLBp2LVvYnqQiA8z4AeE6XrhkSg== + dependencies: + base64-js "1.2.1" + blueimp-md5 "2.10.0" + commander "2.11.0" + gl-matrix "3.0.0" + jszip "3.1.4" + pako "1.0.6" + seedrandom "2.4.3" + shelljs "0.7.8" + webvr-polyfill "0.10.8" + webworker-promise "0.4.2" + xmlbuilder "9.0.7" + w3c-hr-time@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" @@ -15282,6 +15408,23 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== +webvr-polyfill-dpdb@^1.0.11: + version "1.0.16" + resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.16.tgz#7f2cf88460c002a5f10ff69b2bf3a5663e0ad9dd" + integrity sha512-FCciTtPhwkYYHGL0K67G8k7ZnNVqnEx3u4NVHLJ0+Ya6f2VTZUl/GJpaEo1Id2pBP/2l0RYZ3IGZE4Pe8fRalg== + +webvr-polyfill@0.10.8: + version "0.10.8" + resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.8.tgz#64f8896a4d07375347217284a66b943c93da3dc9" + integrity sha512-Oa89Hb0+NRRgQXxnMxnPgT/1UYItPJfpnwmn7RFmPtGpxcWBXpwXZ0zR0RkfoB77ahlJZ+No+5QejLfOA4CJ8Q== + dependencies: + cardboard-vr-display "^1.0.15" + +webworker-promise@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/webworker-promise/-/webworker-promise-0.4.2.tgz#aeb92684a3a5a05e95ddaeccf8482254c6cf5dc0" + integrity sha512-/se9zS6MpRhyodk+C7YcBZq5mY1apJvKys6Tb6t2NDDeRMGgRuuyYjox38PssylFyPodjPEab/S0WuA20CFu7g== + whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" @@ -15594,6 +15737,11 @@ xml@^1.0.1: resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU= +xmlbuilder@9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + xmlchars@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf" From 2f4961c0780ddc14f2a89718fe977948d615a5ac Mon Sep 17 00:00:00 2001 From: dannyrb Date: Tue, 18 Jun 2019 23:26:27 -0400 Subject: [PATCH 3/6] Note regarding docker toolbox and react-proxy --- docs/latest/essentials/data-source.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/latest/essentials/data-source.md b/docs/latest/essentials/data-source.md index 5a6fdbc8f..2ba6c1283 100644 --- a/docs/latest/essentials/data-source.md +++ b/docs/latest/essentials/data-source.md @@ -35,8 +35,10 @@ For our purposes, we will be using `Orthanc`, but you can see a list of _Not sure if you have `docker` installed already? Try running `docker --version` in command prompt or terminal_ -If you are using Docker Toolbox you need to change the _proxy_ parameter in -_package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip throws. +> If you are using `Docker Toolbox` you need to change the _proxy_ parameter in +> _package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip +> throws. This is the value [`react-scripts`][react-proxy]] uses to proxy +> requests ### Running Orthanc @@ -146,6 +148,7 @@ _Feel free to make a Pull Request if you want to add to this list._ [dicom-web]: https://en.wikipedia.org/wiki/DICOMweb [storescu]: http://support.dcmtk.org/docs/storescu.html [cra-start]: https://github.com/facebook/create-react-app#npm-start-or-yarn-start +[react-proxy]: https://facebook.github.io/create-react-app/docs/proxying-api-requests-in-development#configuring-the-proxy-manually [dcm4chee]: https://github.com/dcm4che/dcm4chee-arc-light [dcm4chee-docker]: https://github.com/dcm4che/dcm4chee-arc-light/wiki/Running-on-Docker From 03501eddb084d1ede53a1d4679d12f98aa423b6c Mon Sep 17 00:00:00 2001 From: dannyrb Date: Tue, 18 Jun 2019 23:33:02 -0400 Subject: [PATCH 4/6] fix typo --- docs/latest/essentials/data-source.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/latest/essentials/data-source.md b/docs/latest/essentials/data-source.md index 2ba6c1283..c47f794d5 100644 --- a/docs/latest/essentials/data-source.md +++ b/docs/latest/essentials/data-source.md @@ -37,7 +37,7 @@ in command prompt or terminal_ > If you are using `Docker Toolbox` you need to change the _proxy_ parameter in > _package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip -> throws. This is the value [`react-scripts`][react-proxy]] uses to proxy +> throws. This is the value [`react-scripts`][react-proxy] uses to proxy > requests ### Running Orthanc From d9dd127539908967e24a8f91585fff2d53e3f9e2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" Date: Wed, 19 Jun 2019 03:35:17 +0000 Subject: [PATCH 5/6] docs: update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 149f16790..1c77efc31 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ [![CircleCI][circleci-image]][circleci-url] [![codecov][codecov-image]][codecov-url] -[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors) [![code style: prettier][prettier-image]][prettier-url] [![semantic-release][semantic-image]][semantic-url] @@ -190,7 +190,7 @@ Thanks goes to these wonderful people -
Erik Ziegler
Erik Ziegler
💻		Evren Ozkan
Evren Ozkan
💻		Gustavo André Lelis
Gustavo André Lelis
💻		Danny Brown
Danny Brown
💻		allcontributors[bot]
allcontributors[bot]
📖		Esref Durna
Esref Durna
💬
+
Erik Ziegler
Erik Ziegler
💻		Evren Ozkan
Evren Ozkan
💻		Gustavo André Lelis
Gustavo André Lelis
💻		Danny Brown
Danny Brown
💻		allcontributors[bot]
allcontributors[bot]
📖		Esref Durna
Esref Durna
💬		diego0020
diego0020
💻
From baa28bdf419923ab253b6987f1e4a97ca99f9fbe Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" Date: Wed, 19 Jun 2019 03:35:18 +0000 Subject: [PATCH 6/6] docs: update .all-contributorsrc --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index cdb7fcad8..fbb92652b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -58,6 +58,15 @@ "contributions": [ "question" ] + }, + { + "login": "diego0020", + "name": "diego0020", + "avatar_url": "https://avatars3.githubusercontent.com/u/7297450?v=4", + "profile": "https://github.com/diego0020", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7,