From 1e898fd5c8e8d39c85166dccac19dcd3f81fa1db Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 30 Jan 2019 16:21:38 +0000 Subject: [PATCH] Update ohif-core, fix rollup usage with dicomweb-client and dicom-microscopy-viewer --- Packages-react/ohif-core | 2 +- Packages-react/ohif-viewer/package.json | 7 ++++--- Packages-react/ohif-viewer/rollup.config.js | 6 ++++++ .../DicomMicroscopySopClassHandlerPlugin.js | 4 ---- .../DicomMicroscopyViewport.js | 3 --- Packages-react/ohif-viewer/yarn.lock | 18 +++++++++++++----- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Packages-react/ohif-core b/Packages-react/ohif-core index 7ab55fe8f..ec14190cc 160000 --- a/Packages-react/ohif-core +++ b/Packages-react/ohif-core @@ -1 +1 @@ -Subproject commit 7ab55fe8f5778def698282d9e6381835897c392d +Subproject commit ec14190ccc8e4fe5033cc232fccaaba1c858d097 diff --git a/Packages-react/ohif-viewer/package.json b/Packages-react/ohif-viewer/package.json index 5156a27eb..a35e5d155 100644 --- a/Packages-react/ohif-viewer/package.json +++ b/Packages-react/ohif-viewer/package.json @@ -55,6 +55,8 @@ "lint-staged": "^8.1.0", "lodash.clonedeep": "^4.5.0", "prettier": "^1.15.3", + "react": "^16.7.0", + "react-dom": "^16.7.0", "react-scripts": "^2.1.2", "rollup": "^0.68.2", "rollup-plugin-babel": "^4.2.0", @@ -97,20 +99,19 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "3.0.0-b.1512", "cornerstone-wado-image-loader": "^2.2.3", + "dcmjs": "^0.3.0", "dicom-microscopy-viewer": "^0.2.0", "dicom-parser": "^1.8.3", "dicomweb-client": "^0.4.1", "hammerjs": "^2.0.8", "lodash.isequal": "^4.5.0", - "ohif-core": "^0.1.7", + "ohif-core": "^0.1.9", "oidc-client": "^1.6.1", "prop-types": "^15.6.2", - "react": "^16.7.0", "react-bootstrap-modal": "^4.2.0", "react-cornerstone-viewport": "^0.1.8", "react-dnd": "^7.0.2", "react-dnd-html5-backend": "^7.0.2", - "react-dom": "^16.7.0", "react-redux": "^6.0.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", diff --git a/Packages-react/ohif-viewer/rollup.config.js b/Packages-react/ohif-viewer/rollup.config.js index f3972e7e0..b0bdae69a 100644 --- a/Packages-react/ohif-viewer/rollup.config.js +++ b/Packages-react/ohif-viewer/rollup.config.js @@ -61,6 +61,12 @@ export default { 'node_modules/react-is/index.js': ['isValidElementType'], 'node_modules/redux-oidc/dist/redux-oidc.js': [ 'reducer', 'CallbackComponent', 'loadUser', 'OidcProvider', 'createUserManager' + ], + 'node_modules/dicom-microscopy-viewer/build/dicom-microscopy-viewer.js': [ + 'api' + ], + 'node_modules/dicomweb-client/build/dicomweb-client.js': [ + 'api' ] } }), diff --git a/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopySopClassHandlerPlugin.js b/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopySopClassHandlerPlugin.js index 5f5bdda51..01ac9b4c3 100644 --- a/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopySopClassHandlerPlugin.js +++ b/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopySopClassHandlerPlugin.js @@ -16,11 +16,7 @@ const DicomMicrscopySopClassHandlerPlugin = { sopClassUids: [SOP_CLASS_UIDS.VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE], getDisplaySetFromSeries(series, study) { const instance = series.getFirstInstance(); - const headers = OHIF.DICOMWeb.getAuthorizationHeader(); - console.warn(headers); - - debugger; const dicomWebClient = new dwc({ url: study.getData().wadoRoot, diff --git a/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopyViewport.js b/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopyViewport.js index 709b18906..8fc5cd771 100644 --- a/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopyViewport.js +++ b/Packages-react/ohif-viewer/src/connectedComponents/DicomMicroscopyPlugin/DicomMicroscopyViewport.js @@ -49,7 +49,6 @@ class DicomMicroscopyViewport extends Component { return Promise.all(promises); }) .then(metadata => { - console.warn(metadata); metadata = metadata.filter(m => m); const viewer = new microscopyViewer({ @@ -57,8 +56,6 @@ class DicomMicroscopyViewport extends Component { metadata }); - debugger; - viewer.render({ container }); }); } diff --git a/Packages-react/ohif-viewer/yarn.lock b/Packages-react/ohif-viewer/yarn.lock index e2e916f58..2be1b13a6 100644 --- a/Packages-react/ohif-viewer/yarn.lock +++ b/Packages-react/ohif-viewer/yarn.lock @@ -1856,7 +1856,7 @@ babel-plugin-transform-react-remove-prop-types@0.4.20: resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.20.tgz#688bdea1e27ea0023775dea817fa2d3f8df8802b" integrity sha512-bWQ8e7LsgdFpyHU/RabjDAjVhL7KLAJXEt0nb0LANFje8YAGA8RlZv88a72aCswOxELWULkYuJqfFoKgs58Tng== -babel-polyfill@>=6.9.1: +babel-polyfill@>=6.9.1, babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= @@ -3397,6 +3397,14 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= +dcmjs@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.3.0.tgz#d065a65b3df14d6028542760de6143f0acdc2ed0" + integrity sha512-k6La/q+ROPjoAPQCWIWd49XUGUzolLG6qJhEMdSAhYEa4WP6CLyjIgL1Ul2NqM7Vxyd74ydHi537AWxOtdSxmA== + dependencies: + babel-polyfill "^6.26.0" + babel-runtime "^6.26.0" + debug@*, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" @@ -8201,10 +8209,10 @@ octal@^1.0.0: resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b" integrity sha1-Y+cWKmjvvrniE1iNWOmJ0eXEUws= -ohif-core@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.1.8.tgz#af0ff273e9ad3096d5d98187191a336e08e72f93" - integrity sha512-e5fIKDHOfVaYkrkKFjyqhad/vP7D2ynn2q77mNFMAX49Lo5y/WgXiXytJTeaXNJzksnzTQquOxA93XAh8viuWg== +ohif-core@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.1.9.tgz#66cc3243d45a56b3dfd9f352b96b2b77f0df43eb" + integrity sha512-ghW1IMhTYAcIkD1Ft2N88bqbApskH8Hbutp9b+mKVEQofSKVkN/Osu1KkvEx6PTSSbp0BcY9iSVF+/9wj6Z5wA== dependencies: "@babel/runtime" "^7.2.0" dicomweb-client "^0.4.1"