From b76317885211627e91377146f6a28ce06d461da5 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Tue, 12 Feb 2019 18:19:09 +0100 Subject: [PATCH] Update ohif-cornerstone-extension with latest react-cornerstone-viewport --- .../ohif-cornerstone-extension/package.json | 13 +++++++------ .../rollup.config.js | 2 ++ .../src/handleSegmentationStorage.js | 1 - Packages-react/ohif-viewer/src/App.css | 19 ------------------- 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 Packages-react/ohif-viewer/src/App.css diff --git a/Packages-react/extensions/ohif-cornerstone-extension/package.json b/Packages-react/extensions/ohif-cornerstone-extension/package.json index a5daa92b3..18ef26ff0 100644 --- a/Packages-react/extensions/ohif-cornerstone-extension/package.json +++ b/Packages-react/extensions/ohif-cornerstone-extension/package.json @@ -1,6 +1,6 @@ { "name": "ohif-cornerstone-extension", - "version": "0.0.14", + "version": "0.0.15", "description": "OHIF extension for Cornerstone", "author": "OHIF", "license": "MIT", @@ -20,18 +20,19 @@ }, "peerDependencies": { "cornerstone-core": "^2.2.8", - "cornerstone-wado-image-loader": "^2.2.3", - "cornerstone-tools": "3.0.4", "cornerstone-math": "^0.1.8", + "cornerstone-tools": "^3.1.0", + "cornerstone-wado-image-loader": "^2.2.3", "dcmjs": "^0.3.3", "dicom-parser": "^1.8.3", "hammerjs": "^2.0.8", + "ohif-core": "^0.2.7", "prop-types": "^15.6.2", "react": "^15.0.0 || ^16.0.0", "react-dom": "^15.0.0 || ^16.0.0", "react-redux": "^6.0.0", - "redux": "^4.0.1", - "ohif-core": "^0.2.7" + "react-resize-detector": "^3.4.0", + "redux": "^4.0.1" }, "devDependencies": { "@babel/core": "^7.2.2", @@ -89,6 +90,6 @@ "@babel/runtime": "^7.2.0", "classnames": "^2.2.6", "lodash.throttle": "^4.1.1", - "react-cornerstone-viewport": "^0.1.12" + "react-cornerstone-viewport": "^0.1.13" } } diff --git a/Packages-react/extensions/ohif-cornerstone-extension/rollup.config.js b/Packages-react/extensions/ohif-cornerstone-extension/rollup.config.js index 029786fbc..4333cb6f5 100644 --- a/Packages-react/extensions/ohif-cornerstone-extension/rollup.config.js +++ b/Packages-react/extensions/ohif-cornerstone-extension/rollup.config.js @@ -12,6 +12,8 @@ const globals = { 'react': 'React', 'react-dom': 'ReactDOM', 'react-redux': 'ReactRedux', + 'react-resize-detector': 'ReactResizeDetector', + 'prop-types': 'PropTypes', 'cornerstone-core': 'cornerstone', 'cornerstone-wado-image-loader': 'cornerstoneWADOImageLoader', 'cornerstone-math': 'cornerstoneMath', diff --git a/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js b/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js index 2cda97e09..cb15e9653 100644 --- a/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js +++ b/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js @@ -118,7 +118,6 @@ async function handleSegmentationStorage( const referenceDisplaySet = displaySets[0]; const imageIds = referenceDisplaySet.images.map(image => image.getImageId()); - //debugger; //const firstImagePlane = cornerstone.metadata.get('imagePlane', imageIds[0]); diff --git a/Packages-react/ohif-viewer/src/App.css b/Packages-react/ohif-viewer/src/App.css deleted file mode 100644 index 25ef88265..000000000 --- a/Packages-react/ohif-viewer/src/App.css +++ /dev/null @@ -1,19 +0,0 @@ -html, -body, -#root { - background-color: black; - height: 100%; - width: 100%; - margin: 0; - overflow: hidden; -} - -body { - box-sizing: border-box; - margin: 0; - padding: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - font-family: Roboto, OpenSans, HelveticaNeue-Light, Helvetica Neue Light, - Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; -}