diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.babelrc b/Packages-react/extensions/ohif-dicom-microscopy-extension/.babelrc similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.babelrc rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.babelrc diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.editorconfig b/Packages-react/extensions/ohif-dicom-microscopy-extension/.editorconfig similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.editorconfig rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.editorconfig diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.eslintrc b/Packages-react/extensions/ohif-dicom-microscopy-extension/.eslintrc similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.eslintrc rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.eslintrc diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.gitignore b/Packages-react/extensions/ohif-dicom-microscopy-extension/.gitignore similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.gitignore rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.gitignore diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.prettierrc b/Packages-react/extensions/ohif-dicom-microscopy-extension/.prettierrc similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.prettierrc rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.prettierrc diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/.travis.yml b/Packages-react/extensions/ohif-dicom-microscopy-extension/.travis.yml similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/.travis.yml rename to Packages-react/extensions/ohif-dicom-microscopy-extension/.travis.yml diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/LICENSE b/Packages-react/extensions/ohif-dicom-microscopy-extension/LICENSE similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/LICENSE rename to Packages-react/extensions/ohif-dicom-microscopy-extension/LICENSE diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/package.json b/Packages-react/extensions/ohif-dicom-microscopy-extension/package.json similarity index 90% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/package.json rename to Packages-react/extensions/ohif-dicom-microscopy-extension/package.json index 4fc209bd1..c86fe3f6e 100644 --- a/Packages-react/extensions/OHIFDicomMicroscopyExtension/package.json +++ b/Packages-react/extensions/ohif-dicom-microscopy-extension/package.json @@ -1,6 +1,6 @@ { "name": "ohif-dicom-microscopy-extension", - "version": "0.0.3", + "version": "0.0.4", "description": "OHIF extension for Dicom Microscopy", "author": "OHIF", "license": "MIT", @@ -28,7 +28,6 @@ "@babel/plugin-transform-runtime": "^7.2.0", "@babel/preset-env": "^7.2.3", "@babel/preset-react": "^7.0.0", - "@svgr/rollup": "^4.1.0", "babel-eslint": "^9.0.0", "cross-env": "^5.2.0", "eslint": "5.6.0", @@ -39,11 +38,9 @@ "gh-pages": "^2.0.1", "husky": "^1.3.1", "lint-staged": "^8.1.0", - "lodash.clonedeep": "^4.5.0", "prettier": "^1.15.3", "react": "^16.6.3", "react-dom": "^16.6.3", - "react-scripts": "^2.1.2", "rollup": "^0.68.2", "rollup-plugin-babel": "^4.2.0", "rollup-plugin-commonjs": "^9.2.0", @@ -80,9 +77,6 @@ "@babel/runtime": "^7.2.0", "classnames": "^2.2.6", "dicom-microscopy-viewer": "^0.2.0", - "dicomweb-client": "^0.4.1", - "lodash.isequal": "^4.5.0", - "ohif-core": "^0.2.3", - "prop-types": "^15.6.2" + "ohif-core": "^0.2.4" } } diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/rollup.config.js b/Packages-react/extensions/ohif-dicom-microscopy-extension/rollup.config.js similarity index 92% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/rollup.config.js rename to Packages-react/extensions/ohif-dicom-microscopy-extension/rollup.config.js index 4c4ee8d59..af54d3861 100644 --- a/Packages-react/extensions/OHIFDicomMicroscopyExtension/rollup.config.js +++ b/Packages-react/extensions/ohif-dicom-microscopy-extension/rollup.config.js @@ -4,7 +4,6 @@ import external from 'rollup-plugin-peer-deps-external' import postcss from 'rollup-plugin-postcss' import resolve from 'rollup-plugin-node-resolve' import url from 'rollup-plugin-url' -import svgr from '@svgr/rollup' import pkg from './package.json' // Deal with https://github.com/rollup/rollup-plugin-commonjs/issues/297 import builtins from 'rollup-plugin-node-builtins'; @@ -15,7 +14,7 @@ export default { { file: pkg.main, format: 'umd', - name: 'ohif-dicom-pdf-extension', + name: 'ohif-dicom-microscopy-extension', sourcemap: true, exports: 'named', globals: { @@ -52,6 +51,5 @@ export default { ] } }) - ], - external: ['hammerjs'] + ] } diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/DicomMicroscopySopClassHandler.js b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopySopClassHandler.js similarity index 78% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/src/DicomMicroscopySopClassHandler.js rename to Packages-react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopySopClassHandler.js index d4105d9dc..cbcab71c1 100644 --- a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/DicomMicroscopySopClassHandler.js +++ b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopySopClassHandler.js @@ -1,15 +1,13 @@ import OHIF from 'ohif-core'; -const { plugins, utils } = OHIF; -const { PLUGIN_TYPES } = plugins; +const { utils } = OHIF; const SOP_CLASS_UIDS = { VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.77.1.6' }; -const DicomMicrscopySopClassHandler = { +const DicomMicroscopySopClassHandler = { id: 'DicomMicroscopySopClassHandlerPlugin', - type: PLUGIN_TYPES.SOP_CLASS_HANDLER, sopClassUids: [SOP_CLASS_UIDS.VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE], getDisplaySetFromSeries(series, study, dicomWebClient) { const instance = series.getFirstInstance(); @@ -27,4 +25,4 @@ const DicomMicrscopySopClassHandler = { } }; -export default DicomMicrscopySopClassHandler; +export default DicomMicroscopySopClassHandler; diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/DicomMicroscopyViewport.js b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopyViewport.js similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/src/DicomMicroscopyViewport.js rename to Packages-react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopyViewport.js diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/OHIFDicomMicroscopyExtension.js b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js similarity index 100% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/src/OHIFDicomMicroscopyExtension.js rename to Packages-react/extensions/ohif-dicom-microscopy-extension/src/OHIFDicomMicroscopyExtension.js diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/index.js b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/index.js similarity index 74% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/src/index.js rename to Packages-react/extensions/ohif-dicom-microscopy-extension/src/index.js index c33786b35..46f2fbafb 100644 --- a/Packages-react/extensions/OHIFDicomMicroscopyExtension/src/index.js +++ b/Packages-react/extensions/ohif-dicom-microscopy-extension/src/index.js @@ -1,7 +1,5 @@ import OHIFDicomMicroscopyExtension from './OHIFDicomMicroscopyExtension.js'; -export { - OHIFDicomMicroscopyExtension -}; +export { OHIFDicomMicroscopyExtension }; export default OHIFDicomMicroscopyExtension; diff --git a/Packages-react/extensions/OHIFDicomMicroscopyExtension/yarn.lock b/Packages-react/extensions/ohif-dicom-microscopy-extension/yarn.lock similarity index 99% rename from Packages-react/extensions/OHIFDicomMicroscopyExtension/yarn.lock rename to Packages-react/extensions/ohif-dicom-microscopy-extension/yarn.lock index 225b41a47..73fc8c445 100644 --- a/Packages-react/extensions/OHIFDicomMicroscopyExtension/yarn.lock +++ b/Packages-react/extensions/ohif-dicom-microscopy-extension/yarn.lock @@ -6996,10 +6996,10 @@ octal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b" -ohif-core@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.2.1.tgz#6f3b3aed29b9c709b8abe2a6f0155a1fa09f81af" - integrity sha512-X3/Jcw7EkgSqmaO2zIu19Wc5nJKcoS3AmgwbV0f7LHLQUkvJvVAtljslcBUMKgiaYFc/fJcTmr16oApsGJyGvA== +ohif-core@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.2.3.tgz#2eea4806f44dd98740afe4fec6fb2a038c496197" + integrity sha512-wBfZOxmRhrkDPFlmoADzxeuNlGiZGa2azbFkpUosxW+8yciuwmOvh21e0bd3uwAkotinrItWihnRR9gz8bG2DA== dependencies: "@babel/runtime" "^7.2.0" cornerstone-core "^2.2.8" diff --git a/Packages-react/ohif-core b/Packages-react/ohif-core index 8850a092a..37df733aa 160000 --- a/Packages-react/ohif-core +++ b/Packages-react/ohif-core @@ -1 +1 @@ -Subproject commit 8850a092a0b860bc9d423fcc49512567251fc47b +Subproject commit 37df733aaae0f8fafd13315e4cd95b0697115cca diff --git a/Packages-react/ohif-viewer/package.json b/Packages-react/ohif-viewer/package.json index 122ec5faf..8b5238170 100644 --- a/Packages-react/ohif-viewer/package.json +++ b/Packages-react/ohif-viewer/package.json @@ -101,7 +101,6 @@ "cornerstone-wado-image-loader": "^2.2.3", "dcmjs": "^0.3.2", "dicom-parser": "^1.8.3", - "dicomweb-client": "^0.4.1", "hammerjs": "^2.0.8", "lodash.isequal": "^4.5.0", "ohif-core": "^0.2.3", diff --git a/Packages-react/ohif-viewer/rollup.config.js b/Packages-react/ohif-viewer/rollup.config.js index e7efe3550..0338e9b18 100644 --- a/Packages-react/ohif-viewer/rollup.config.js +++ b/Packages-react/ohif-viewer/rollup.config.js @@ -62,8 +62,8 @@ export default { 'node_modules/redux-oidc/dist/redux-oidc.js': [ 'reducer', 'CallbackComponent', 'loadUser', 'OidcProvider', 'createUserManager' ], - 'node_modules/dicomweb-client/build/dicomweb-client.js': [ - 'api' + 'node_modules/cornerstoneTools/dist/cornerstoneTools.min.js': [ + 'cornerstoneTools' ] } }), diff --git a/Packages-react/ohif-viewer/src/sha.js b/Packages-react/ohif-viewer/src/sha.js index 33e0198f2..1c7adcb45 100644 --- a/Packages-react/ohif-viewer/src/sha.js +++ b/Packages-react/ohif-viewer/src/sha.js @@ -1 +1 @@ -export default 'f06e629c2f2256576e7de5bda48124b3a808ab9b'; +export default 'bf8f737fecdc34e46f973b438fe7139347b4c890';