TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add checks for study metadata in rt and seg panels + bump dcmjs to fix circular references issues naturalizing datasets (#2588)

Browse Source 
Co-authored-by: Davide Punzo <punzodavide@hotmail.it>
This commit is contained in:
Igor Octaviano 2021-10-26 05:19:12 -03:00 committed by GitHub
parent 729272a985
commit 03a34a75a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cornerstone/package.json
View File

@ -36,7 +36,7 @@
"cornerstone-math": "^0.1.9", "cornerstone-math": "^0.1.9",
"cornerstone-tools": "^6.0.0", "cornerstone-tools": "^6.0.0",
"cornerstone-wado-image-loader": "^4.0.3", "cornerstone-wado-image-loader": "^4.0.3",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

2
extensions/dicom-html/package.json
View File

@ -29,7 +29,7 @@
}, },
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.8.6", "react": "^16.8.6",
"react-dom": "^16.8.6" "react-dom": "^16.8.6"

2
extensions/dicom-html/src/DicomHtmlViewport.js
View File

@ -217,7 +217,7 @@ class DicomHtmlViewport extends Component {
}; };
componentDidMount() { componentDidMount() {
const dataSet = this.setContentFromByteArray(this.props.byteArray); this.setContentFromByteArray(this.props.byteArray);
} }
setContentFromByteArray(byteArray) { setContentFromByteArray(byteArray) {

2
extensions/dicom-rt/package.json
View File

@ -31,7 +31,7 @@
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"cornerstone-core": "^2.5.0", "cornerstone-core": "^2.5.0",
"cornerstone-tools": "^6.0.0", "cornerstone-tools": "^6.0.0",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"gl-matrix": "^3.3.0", "gl-matrix": "^3.3.0",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.8.6", "react": "^16.8.6",

11
extensions/dicom-rt/src/index.js
View File

@ -91,17 +91,12 @@ export default {
} }
if (activeViewport) { if (activeViewport) {
const study = studies.find(
s => s.StudyInstanceUID === activeViewport.StudyInstanceUID
);
const ds = study.displaySets.find(
ds =>
ds.displaySetInstanceUID ===
activeViewport.displaySetInstanceUID
);
const studyMetadata = studyMetadataManager.get( const studyMetadata = studyMetadataManager.get(
activeViewport.StudyInstanceUID activeViewport.StudyInstanceUID
); );
if (!studyMetadata) {
return;
}
const referencedDisplaySets = studyMetadata.getDerivedDatasets({ const referencedDisplaySets = studyMetadata.getDerivedDatasets({
referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID, referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID,
Modality: 'RTSTRUCT', Modality: 'RTSTRUCT',

2
extensions/dicom-segmentation/package.json
View File

@ -31,7 +31,7 @@
"@ohif/core": "^0.50.0", "@ohif/core": "^0.50.0",
"cornerstone-core": "^2.5.0", "cornerstone-core": "^2.5.0",
"cornerstone-tools": "^6.0.0", "cornerstone-tools": "^6.0.0",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.8.6", "react": "^16.8.6",
"react-dom": "^16.8.6" "react-dom": "^16.8.6"

3
extensions/dicom-segmentation/src/index.js
View File

@ -143,6 +143,9 @@ export default {
const studyMetadata = studyMetadataManager.get( const studyMetadata = studyMetadataManager.get(
activeViewport.StudyInstanceUID activeViewport.StudyInstanceUID
); );
if (!studyMetadata) {
return;
}
const referencedDS = studyMetadata.getDerivedDatasets({ const referencedDS = studyMetadata.getDerivedDatasets({
referencedSeriesInstanceUID: referencedSeriesInstanceUID:
activeViewport.SeriesInstanceUID, activeViewport.SeriesInstanceUID,

2
extensions/dicom-tag-browser/package.json
View File

@ -28,7 +28,7 @@
}, },
"peerDependencies": { "peerDependencies": {
"@ohif/core": "^2.6.0", "@ohif/core": "^2.6.0",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"react": "^16.8.6" "react": "^16.8.6"
}, },
"dependencies": { "dependencies": {

2
extensions/vtk/package.json
View File

@ -35,7 +35,7 @@
"cornerstone-core": "^2.5.0", "cornerstone-core": "^2.5.0",
"cornerstone-tools": "^6.0.0", "cornerstone-tools": "^6.0.0",
"cornerstone-wado-image-loader": "^4.0.3", "cornerstone-wado-image-loader": "^4.0.3",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"i18next": "^17.0.3", "i18next": "^17.0.3",
"i18next-browser-languagedetector": "^3.0.1", "i18next-browser-languagedetector": "^3.0.1",

2
platform/core/package.json
View File

@ -39,7 +39,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.5.5", "@babel/runtime": "^7.5.5",
"ajv": "^6.10.0", "ajv": "^6.10.0",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"dicomweb-client": "^0.8.1", "dicomweb-client": "^0.8.1",
"immer": "6.0.2", "immer": "6.0.2",
"isomorphic-base64": "^1.0.2", "isomorphic-base64": "^1.0.2",

2
platform/ui/src/contextProviders/SnackbarProvider.js
View File

@ -41,7 +41,7 @@ const SnackbarProvider = ({ children, service }) => {
LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler); LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler);
return () => { return () => {
LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler); LogManager.unsubscribe(LogManager.EVENTS.OnLog, onLogHandler);
}; };
}, [show]); }, [show]);

2
platform/viewer/package.json
View File

@ -66,7 +66,7 @@
"cornerstone-math": "^0.1.9", "cornerstone-math": "^0.1.9",
"cornerstone-tools": "^6.0.0", "cornerstone-tools": "^6.0.0",
"cornerstone-wado-image-loader": "^4.0.3", "cornerstone-wado-image-loader": "^4.0.3",
"dcmjs": "0.18.9", "dcmjs": "0.18.10",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"dicomweb-client": "^0.8.1", "dicomweb-client": "^0.8.1",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",

8
yarn.lock
View File

@ -6647,10 +6647,10 @@ dateformat@^3.0.0:
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
dcmjs@0.18.9: dcmjs@0.18.10:
version "0.18.9" version "0.18.10"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.9.tgz#0e18fcff975aaae8ca01a96e781fa75c29ec97f3" resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.10.tgz#9e293a20dc359c7eba6c81b6afaf5a52fa841288"
integrity sha512-aTu4fUo3TSgohJC+U509qdXL1per09XvlYdQva0BGtIZMr/iR5n8h/ojpcDTRJoVtSuaj331KJj1yCj8FMMK4Q== integrity sha512-GLW1KJmzs+1ye8WA29wDy+cOHa4dYv2Q5XPQuX33X4bK5AqzS+56IzuCH+WkQXnvALZZDBFgbPztOVdUwnN4uw==
dependencies: dependencies:
"@babel/polyfill" "^7.8.3" "@babel/polyfill" "^7.8.3"
"@babel/runtime" "^7.8.4" "@babel/runtime" "^7.8.4"