diff --git a/Packages-react/extensions/ohif-cornerstone-extension/package.json b/Packages-react/extensions/ohif-cornerstone-extension/package.json index e2a581623..325bc352d 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.23", + "version": "0.0.25", "description": "OHIF extension for Cornerstone", "author": "OHIF", "license": "MIT", @@ -23,7 +23,7 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "^3.1.0", "cornerstone-wado-image-loader": "^2.2.3", - "dcmjs": "^0.3.3", + "dcmjs": "^0.3.7", "dicom-parser": "^1.8.3", "hammerjs": "^2.0.8", "ohif-core": "^0.3.5", diff --git a/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js b/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js index cb15e9653..c6de26091 100644 --- a/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js +++ b/Packages-react/extensions/ohif-cornerstone-extension/src/handleSegmentationStorage.js @@ -50,10 +50,10 @@ function getCornerstoneStack(studies, studyInstanceUid, displaySetInstanceUid) { } function parseSeg(arrayBuffer, imageIds) { - return dcmjs.adapters.Cornerstone.Segmentation.readToolState( + return dcmjs.adapters.Cornerstone.Segmentation.generateToolState( imageIds, arrayBuffer, - //firstImagePlane + cornerstone.metaData ); } @@ -118,9 +118,6 @@ async function handleSegmentationStorage( const referenceDisplaySet = displaySets[0]; const imageIds = referenceDisplaySet.images.map(image => image.getImageId()); - - //const firstImagePlane = cornerstone.metadata.get('imagePlane', imageIds[0]); - const results = parseSeg(arrayBuffer, imageIds); if (!results) { diff --git a/Packages-react/ohif-viewer/package.json b/Packages-react/ohif-viewer/package.json index e636e1f09..d00288ebe 100644 --- a/Packages-react/ohif-viewer/package.json +++ b/Packages-react/ohif-viewer/package.json @@ -100,14 +100,14 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "^3.2.4", "cornerstone-wado-image-loader": "^2.2.3", - "dcmjs": "^0.3.6", + "dcmjs": "^0.3.7", "dicom-parser": "^1.8.3", "dicomweb-client": "^0.4.2", "hammerjs": "^2.0.8", "lodash.isequal": "^4.5.0", "moment": "^2.24.0", "ohif-core": "^0.3.5", - "ohif-cornerstone-extension": "^0.0.20", + "ohif-cornerstone-extension": "^0.0.25", "ohif-dicom-html-extension": "^0.0.2", "ohif-dicom-microscopy-extension": "^0.0.5", "ohif-dicom-pdf-extension": "^0.0.6", diff --git a/Packages-react/ohif-viewer/src/sha.js b/Packages-react/ohif-viewer/src/sha.js index 6e9653e07..a82b8f1dd 100644 --- a/Packages-react/ohif-viewer/src/sha.js +++ b/Packages-react/ohif-viewer/src/sha.js @@ -1 +1 @@ -export default 'ec51cb7a6cac63c42e38e6f141951cdd6962dda3'; +export default 'c31e21fe1863b2ebe570f321b9b2425f5ff86d33'; diff --git a/Packages-react/ohif-viewer/yarn.lock b/Packages-react/ohif-viewer/yarn.lock index 64a475177..27da0b04d 100644 --- a/Packages-react/ohif-viewer/yarn.lock +++ b/Packages-react/ohif-viewer/yarn.lock @@ -3386,14 +3386,15 @@ 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.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.3.6.tgz#d07d02299afb136fbbd6c9fc8370509aa01361f8" - integrity sha512-169vTK+dbdcmyggDv3G5hIDYwITvxhPA8seK6VwSiWnqyVks+FP4MB/TAdHkFxSkKXumi6wn0Ugr1xoXre9IHQ== +dcmjs@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.3.7.tgz#2179aecf3e6c93e3b292d2ac54e6c85ebb68ceb8" + integrity sha512-68+T5+0HpIENAgFjbD3fTGlTp4sR81hHChx/BzWMKrTwHXsEnKO2WGvBmpwPPKpezZWlYwkOrCaXRSwy9yJN0Q== dependencies: "@babel/polyfill" "^7.2.5" "@babel/runtime" "^7.3.1" loglevelnext "^3.0.0" + ndarray "^1.0.18" debug@*, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0: version "4.1.1" @@ -5899,6 +5900,11 @@ invert-kv@^2.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== +iota-array@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087" + integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc= + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -8155,6 +8161,14 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +ndarray@^1.0.18: + version "1.0.18" + resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793" + integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M= + dependencies: + iota-array "^1.0.0" + is-buffer "^1.0.2" + needle@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" @@ -8816,15 +8830,15 @@ ohif-core@^0.3.5: lodash.merge "^4.6.1" validate.js "^0.12.0" -ohif-cornerstone-extension@^0.0.20: - version "0.0.20" - resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.20.tgz#831da61160338ba30b09d6454876d3d7b318445b" - integrity sha512-m/qmBFcV3vJ6+ma0UHXHqMN0Nz1Zw9I47T6zgnvz7ZwxJ3h8aQfUjVPGtRcuB2snna4c4NmEHaxoEGRR0bFdIg== +ohif-cornerstone-extension@^0.0.25: + version "0.0.25" + resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.25.tgz#33da4c4d84ef9c7e395b3b5ec68eda217288af65" + integrity sha512-3uoclL5F2nqxrVivxcy0t/a4DJ8YaXnDjLYvQI1+fKt+mgoDJZ6I+tZ9XbRUQmgu1fEoAB8PLJeXmLTUV2zXFQ== dependencies: "@babel/runtime" "^7.2.0" classnames "^2.2.6" lodash.throttle "^4.1.1" - react-cornerstone-viewport "^0.1.20" + react-cornerstone-viewport "^0.1.23" ohif-dicom-html-extension@^0.0.2: version "0.0.2" @@ -10584,10 +10598,10 @@ react-bootstrap-modal@^4.2.0: react-overlays "^0.8.0" react-transition-group "^2.0.0" -react-cornerstone-viewport@^0.1.20: - version "0.1.20" - resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.20.tgz#90e369a48e3f47dd5da69d42f0c8ee7e87e81543" - integrity sha512-SbaSjCAVFpQoUUXZ6d5F5QwKrP66zRJ4mN7JXPGyiL6+/m0jGkaBVci6pftkth66Lu5HRlCZUS8nh0plONPUtA== +react-cornerstone-viewport@^0.1.23: + version "0.1.23" + resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.23.tgz#4f065c4d1a5e721a45b819d1b7e94489af69b5c1" + integrity sha512-uukvBIrtvExY0oOo6d/79CZRrALtU2Pq8NBovYVvD02Hg40yYtGYLZ2AnbjbQEtsf0LjpLhcfT/QU6ZOB2v8rw== dependencies: lodash.debounce "^4.0.8" moment "^2.23.0"