diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md index c01016776..db1f89fe2 100644 --- a/extensions/cornerstone/CHANGELOG.md +++ b/extensions/cornerstone/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.10.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.10.0...@ohif/extension-cornerstone@2.10.1) (2021-02-05) + +**Note:** Version bump only for package @ohif/extension-cornerstone + + + + + # [2.10.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.9.6...@ohif/extension-cornerstone@2.10.0) (2020-12-10) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 98e95a868..819534f40 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone", - "version": "2.10.0", + "version": "2.10.1", "description": "OHIF extension for Cornerstone", "author": "OHIF", "license": "MIT", @@ -36,7 +36,7 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "^4.20.1", "cornerstone-wado-image-loader": "^3.1.0", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "dicom-parser": "^1.8.3", "hammerjs": "^2.0.8", "prop-types": "^15.6.2", diff --git a/extensions/dicom-html/CHANGELOG.md b/extensions/dicom-html/CHANGELOG.md index 171ed36cd..d34b17cdb 100644 --- a/extensions/dicom-html/CHANGELOG.md +++ b/extensions/dicom-html/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.0...@ohif/extension-dicom-html@1.3.1) (2021-02-05) + +**Note:** Version bump only for package @ohif/extension-dicom-html + + + + + # [1.3.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.2.9...@ohif/extension-dicom-html@1.3.0) (2020-12-10) diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json index 2b7623f0c..b280e7563 100644 --- a/extensions/dicom-html/package.json +++ b/extensions/dicom-html/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-html", - "version": "1.3.0", + "version": "1.3.1", "description": "OHIF extension for rendering structured reports to HTML", "author": "OHIF", "license": "MIT", @@ -29,7 +29,7 @@ }, "peerDependencies": { "@ohif/core": "^0.50.0", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-rt/CHANGELOG.md b/extensions/dicom-rt/CHANGELOG.md index 44346ce62..98865a816 100644 --- a/extensions/dicom-rt/CHANGELOG.md +++ b/extensions/dicom-rt/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.6.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.6.3...@ohif/extension-dicom-rt@0.6.4) (2021-02-05) + +**Note:** Version bump only for package @ohif/extension-dicom-rt + + + + + ## [0.6.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.6.2...@ohif/extension-dicom-rt@0.6.3) (2021-01-21) **Note:** Version bump only for package @ohif/extension-dicom-rt diff --git a/extensions/dicom-rt/package.json b/extensions/dicom-rt/package.json index 7813e46dd..b21979fa6 100644 --- a/extensions/dicom-rt/package.json +++ b/extensions/dicom-rt/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-rt", - "version": "0.6.3", + "version": "0.6.4", "description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.", "author": "OHIF", "license": "MIT", @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.2.8", "cornerstone-tools": "^4.20.1", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "gl-matrix": "^3.3.0", "prop-types": "^15.6.2", "react": "^16.8.6", diff --git a/extensions/dicom-segmentation/CHANGELOG.md b/extensions/dicom-segmentation/CHANGELOG.md index b53e88db0..6a1efd607 100644 --- a/extensions/dicom-segmentation/CHANGELOG.md +++ b/extensions/dicom-segmentation/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.5.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.5.1...@ohif/extension-dicom-segmentation@0.5.2) (2021-02-05) + +**Note:** Version bump only for package @ohif/extension-dicom-segmentation + + + + + ## [0.5.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.5.0...@ohif/extension-dicom-segmentation@0.5.1) (2021-01-21) **Note:** Version bump only for package @ohif/extension-dicom-segmentation diff --git a/extensions/dicom-segmentation/package.json b/extensions/dicom-segmentation/package.json index 90b50e85a..da1a654bc 100644 --- a/extensions/dicom-segmentation/package.json +++ b/extensions/dicom-segmentation/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-segmentation", - "version": "0.5.1", + "version": "0.5.2", "description": "OHIF extension for viewing segmentations in the 2D MPR view", "author": "OHIF", "license": "MIT", @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.2.8", "cornerstone-tools": "^4.20.1", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-tag-browser/CHANGELOG.md b/extensions/dicom-tag-browser/CHANGELOG.md index c87b548b3..50e6e187b 100644 --- a/extensions/dicom-tag-browser/CHANGELOG.md +++ b/extensions/dicom-tag-browser/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.0...@ohif/extension-dicom-tag-browser@0.2.1) (2021-02-05) + +**Note:** Version bump only for package @ohif/extension-dicom-tag-browser + + + + + # [0.2.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.1.1...@ohif/extension-dicom-tag-browser@0.2.0) (2020-12-10) diff --git a/extensions/dicom-tag-browser/package.json b/extensions/dicom-tag-browser/package.json index def284031..c9398ed9d 100644 --- a/extensions/dicom-tag-browser/package.json +++ b/extensions/dicom-tag-browser/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-tag-browser", - "version": "0.2.0", + "version": "0.2.1", "description": "OHIF extension for checking DICOM headers.", "author": "OHIF", "license": "MIT", @@ -28,7 +28,7 @@ }, "peerDependencies": { "@ohif/core": "^2.6.0", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "react": "^16.8.6" }, "dependencies": { diff --git a/extensions/dicom-tag-browser/src/components/DicomTagBrowser.css b/extensions/dicom-tag-browser/src/components/DicomTagBrowser.css index ea2341b0a..26cb8414f 100644 --- a/extensions/dicom-tag-browser/src/components/DicomTagBrowser.css +++ b/extensions/dicom-tag-browser/src/components/DicomTagBrowser.css @@ -3,6 +3,11 @@ margin-left: auto; } +.dicom-tag-browser-table-wrapper { + height: 500px; + overflow-y: scroll; +} + .dicom-tag-browser-table tr { padding-left: 10px; padding-right: 10px; @@ -11,6 +16,20 @@ white-space: nowrap; } +.dicom-tag-browser-content { + overflow: hidden; + width: 100%; + padding-bottom: 50px; +} + +.dicom-tag-browser-instance-range .range { + height: 20px; +} + +.dicom-tag-browser-instance-range { + padding: 20px 0 20px 0; +} + .dicom-tag-browser-table td.dicom-tag-browser-table-center { text-align: center; } diff --git a/extensions/dicom-tag-browser/src/components/DicomTagBrowser.js b/extensions/dicom-tag-browser/src/components/DicomTagBrowser.js index 05f0670f8..8a358d308 100644 --- a/extensions/dicom-tag-browser/src/components/DicomTagBrowser.js +++ b/extensions/dicom-tag-browser/src/components/DicomTagBrowser.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; import { classes, cornerstone as OHIFCornerstone } from '@ohif/core'; +import { Range } from '@ohif/ui'; import dcmjs from 'dcmjs'; import DicomBrowserSelect from './DicomBrowserSelect'; import moment from 'moment'; @@ -99,26 +100,35 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => { let instanceSelectList = null; if (isImageStack) { - const selectedInstanceValue = instanceList[activeInstance]; - instanceSelectList = ( - +
+

Instance Number: {value}

} + onChange={({ target }) => { + const instanceIndex = parseInt(target.value); + setActiveInstance(instanceIndex); + }} + /> +
); } return ( -
+
{instanceSelectList} - +
+ +
); }; @@ -127,30 +137,28 @@ function DicomTagTable({ tags, meta }) { const rows = getFormattedRowsFromTags(tags, meta); return ( -
- - - - - - - - - {rows.map((row, index) => { - const className = row.className ? row.className : null; +
TagValue RepresentationKeywordValue
+ + + + + + + + {rows.map((row, index) => { + const className = row.className ? row.className : null; - return ( - - - - - - - ); - })} - -
TagValue RepresentationKeywordValue
{row[0]}{row[1]}{row[2]}{row[3]}
-
+ return ( + + {row[0]} + {row[1]} + {row[2]} + {row[3]} + + ); + })} + + ); } @@ -183,12 +191,16 @@ function getFormattedRowsFromTags(tags, meta) { } else { if (tagInfo.vr === 'xs') { try { - const dataset = metadataProvider.getStudyDataset(meta.StudyInstanceUID); + const dataset = metadataProvider.getStudyDataset( + meta.StudyInstanceUID + ); const tag = dcmjs.data.Tag.fromPString(tagInfo.tag).toCleanString(); const originalTagInfo = dataset[tag]; tagInfo.vr = originalTagInfo.vr; } catch (error) { - console.error(`Failed to parse value representation for tag '${tagInfo.keyword}'`); + console.error( + `Failed to parse value representation for tag '${tagInfo.keyword}'` + ); } } diff --git a/extensions/dicom-tag-browser/src/getCommandsModule.js b/extensions/dicom-tag-browser/src/getCommandsModule.js index 0fec35e79..eb45e011d 100644 --- a/extensions/dicom-tag-browser/src/getCommandsModule.js +++ b/extensions/dicom-tag-browser/src/getCommandsModule.js @@ -21,7 +21,7 @@ export default function getCommandsModule(servicesManager) { const { UIModalService } = servicesManager.services; - const WrappedDicomTagBrowser = function () { + const WrappedDicomTagBrowser = function() { return ( { shouldCloseOnEsc, fullscreen, closeButton, - showScrollbar + showScrollbar, + noScroll, } = options; return ( {ModalContent && ( {this.props.showPercentage && {`${this.state.value}%`}} - {this.props.showValue && {this.state.value}} + {this.props.showValue && ( + + {this.props.valueRenderer + ? this.props.valueRenderer(this.state.value) + : this.state.value} + + )} ); } @@ -40,6 +46,7 @@ Range.propTypes = { max: PropTypes.number.isRequired, step: PropTypes.number, id: PropTypes.string, + valueRenderer: PropTypes.func, onChange: PropTypes.func, showPercentage: PropTypes.bool, showValue: PropTypes.bool, diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md index 4fca22f34..ff262b1d5 100644 --- a/platform/viewer/CHANGELOG.md +++ b/platform/viewer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.8.8](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.8.7...@ohif/viewer@4.8.8) (2021-02-05) + +**Note:** Version bump only for package @ohif/viewer + + + + + ## [4.8.7](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.8.6...@ohif/viewer@4.8.7) (2021-01-28) diff --git a/platform/viewer/package.json b/platform/viewer/package.json index db79ff802..87f8c0988 100644 --- a/platform/viewer/package.json +++ b/platform/viewer/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/viewer", - "version": "4.8.7", + "version": "4.8.8", "description": "OHIF Viewer", "author": "OHIF Contributors", "license": "MIT", @@ -49,16 +49,16 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "@ohif/core": "^2.12.1", - "@ohif/extension-cornerstone": "^2.10.0", + "@ohif/core": "^2.12.2", + "@ohif/extension-cornerstone": "^2.10.1", "@ohif/extension-debugging": "^0.1.6", - "@ohif/extension-dicom-html": "^1.3.0", + "@ohif/extension-dicom-html": "^1.3.1", "@ohif/extension-dicom-microscopy": "^0.51.4", "@ohif/extension-dicom-pdf": "^1.0.6", - "@ohif/extension-dicom-rt": "^0.6.3", - "@ohif/extension-dicom-segmentation": "^0.5.1", + "@ohif/extension-dicom-rt": "^0.6.4", + "@ohif/extension-dicom-segmentation": "^0.5.2", "@ohif/extension-lesion-tracker": "^0.2.1", - "@ohif/extension-vtk": "^1.10.2", + "@ohif/extension-vtk": "^1.10.3", "@ohif/i18n": "^0.53.0", "@ohif/ui": "^1.8.1", "@tanem/react-nprogress": "^1.1.25", @@ -68,7 +68,7 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "^4.20.1", "cornerstone-wado-image-loader": "^3.1.0", - "dcmjs": "0.17.0", + "dcmjs": "0.17.2", "dicom-parser": "^1.8.3", "dicomweb-client": "^0.4.4", "hammerjs": "^2.0.8", diff --git a/yarn.lock b/yarn.lock index b260f856a..b74d343c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6619,10 +6619,10 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dcmjs@0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.17.0.tgz#dbfd6db3efd2936f9bead9c902b7db396f64e9f5" - integrity sha512-7JnNqNWXqjGyspLRwKM4nn+TU/+w3iMl9boU4eHrr831M4crMWWIiSQDejpOnfDT9+opqyeaYcNkiekr7p6TFg== +dcmjs@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.17.2.tgz#81d6e696119c25afbd26967a6250a32c25f06535" + integrity sha512-wM9AUWt9vM2S+owI/4UjoBCSV9Mfi/m5rykHH5WTDZVxQZUrL/ehOC/l7d7gkcMaOSD0C0r9X56Nn/562Jt1/Q== dependencies: "@babel/polyfill" "^7.8.3" "@babel/runtime" "^7.8.4"