Merge pull request #173 from OHIF/master

Update to OHIF v4.12.49
ImagingDataCommons · Jan 10, 2023 · 9344bee · 9344bee
2 parents 1278c6f + 5d9e4c9
commit 9344bee
Show file tree

Hide file tree

Showing 20 changed files with 134 additions and 44 deletions.
diff --git 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.12.16](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [2.12.15](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-09-20)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "2.12.15",
+  "version": "2.12.16",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "cornerstone-math": "^0.1.9",
     "cornerstone-tools": "^6.0.6",
     "cornerstone-wado-image-loader": "^4.2.1",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "dicom-parser": "^1.8.11",
     "hammerjs": "^2.0.8",
     "prop-types": "^15.6.2",

diff --git 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.24](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [1.3.23](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-09-01)
 
 **Note:** Version bump only for package @ohif/extension-dicom-html

diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-html",
-  "version": "1.3.23",
+  "version": "1.3.24",
   "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.24.10",
+    "dcmjs": "0.29.3",
     "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
@@ -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.7.14](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 ## [0.7.13](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-09-01)
 
 **Note:** Version bump only for package @ohif/extension-dicom-rt

diff --git a/extensions/dicom-rt/package.json b/extensions/dicom-rt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-rt",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "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.6.1",
     "cornerstone-tools": "^6.0.6",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "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
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.7.20](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2023-01-10)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.19](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.18](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 ## [0.7.17](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-12)
 
 

diff --git a/extensions/dicom-segmentation/package.json b/extensions/dicom-segmentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.7.17",
+  "version": "0.7.20",
   "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.6.1",
     "cornerstone-tools": "^6.0.6",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"

diff --git a/extensions/dicom-segmentation/src/components/SegmentItem/SegmentItem.css b/extensions/dicom-segmentation/src/components/SegmentItem/SegmentItem.css
@@ -62,15 +62,16 @@
 }
 
 .dcmseg-segment-item .segment-label span {
-  overflow-wrap: normal;
-  white-space: nowrap;
+  overflow-wrap: break-word;
+  white-space: normal;
   overflow: hidden;
   max-width: calc(100% - 40px); /* calc(100% - 50px); 20px = eye icon */
   text-overflow: ellipsis;
 }
 
 .dcmseg-segment-item .segment-label .eye-icon {
   cursor: pointer;
+  min-width: 20px;
   color: var(--active-color);
 }
 

diff --git a/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js b/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js
@@ -630,25 +630,17 @@ const SegmentationPanel = ({
 
   const onVisibilityChangeHandler = isVisible => {
     let segmentsHidden = [];
+    const labelmap3D = getActiveLabelMaps3D();
+
     state.segmentNumbers.forEach(segmentNumber => {
       if (isVTK()) {
         onSegmentVisibilityChange(segmentNumber, isVisible);
       }
 
-      /** Get all labelmaps with this segmentNumber (overlapping segments) */
-      const { labelmaps3D } = getBrushStackState();
-      const possibleLabelMaps3D = labelmaps3D.filter(({ labelmaps2D }) => {
-        return labelmaps2D.some(({ segmentsOnLabelmap }) =>
-          segmentsOnLabelmap.includes(segmentNumber)
-        );
-      });
-
-      possibleLabelMaps3D.forEach(labelmap3D => {
-        labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
-        segmentsHidden = [
-          ...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
-        ];
-      });
+      labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
+      segmentsHidden = [
+        ...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
+      ];
     });
 
     setState(state => ({ ...state, segmentsHidden }));

diff --git 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.25](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## [0.2.24](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-09-01)
 
 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser

diff --git 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.24",
+  "version": "0.2.25",
   "description": "OHIF extension for checking DICOM headers.",
   "author": "OHIF",
   "license": "MIT",
@@ -28,7 +28,7 @@
   },
   "peerDependencies": {
     "@ohif/core": "^2.6.0",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "react": "^16.8.6"
   },
   "dependencies": {

diff --git a/extensions/vtk/CHANGELOG.md b/extensions/vtk/CHANGELOG.md
@@ -43,6 +43,14 @@ All notable changes to this project will be documented in this file. See
 
 
 
+## [1.12.41](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.12.40](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-12)
 
 **Note:** Version bump only for package @ohif/extension-vtk

diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.12.40",
+  "version": "1.12.41",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "cornerstone-core": "^2.6.1",
     "cornerstone-tools": "^6.0.6",
     "cornerstone-wado-image-loader": "^4.2.1",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "dicom-parser": "^1.8.11",
     "i18next": "^17.0.3",
     "i18next-browser-languagedetector": "^3.0.1",
@@ -53,7 +53,7 @@
     "react-vtkjs-viewport": "^0.14.5"
   },
   "devDependencies": {
-    "@ohif/core": "^2.16.34",
+    "@ohif/core": "^2.16.35",
     "@ohif/ui": "^1.10.10",
     "cornerstone-tools": "^6.0.6",
     "cornerstone-wado-image-loader": "^4.2.1",

diff --git a/platform/core/CHANGELOG.md b/platform/core/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.16.35](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
 ## [2.16.34](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-12)
 
 

diff --git a/platform/core/package.json b/platform/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/core",
-  "version": "2.16.34",
+  "version": "2.16.35",
   "description": "Generic business logic for web-based medical imaging applications",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "ajv": "^6.10.0",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "dicomweb-client": "^0.8.3",
     "immer": "9.0.12",
     "isomorphic-base64": "^1.0.2",

diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.12.49](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2023-01-10)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.48](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.47](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [4.12.46](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-12-12)
 
 

diff --git a/platform/viewer/package.json b/platform/viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/viewer",
-  "version": "4.12.46",
+  "version": "4.12.49",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -47,16 +47,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.16.34",
-    "@ohif/extension-cornerstone": "^2.12.15",
+    "@ohif/core": "^2.16.35",
+    "@ohif/extension-cornerstone": "^2.12.16",
     "@ohif/extension-debugging": "^0.3.3",
-    "@ohif/extension-dicom-html": "^1.3.23",
+    "@ohif/extension-dicom-html": "^1.3.24",
     "@ohif/extension-dicom-microscopy": "^0.52.0",
     "@ohif/extension-dicom-pdf": "^1.1.2",
-    "@ohif/extension-dicom-rt": "^0.7.13",
-    "@ohif/extension-dicom-segmentation": "^0.7.17",
+    "@ohif/extension-dicom-rt": "^0.7.14",
+    "@ohif/extension-dicom-segmentation": "^0.7.20",
     "@ohif/extension-lesion-tracker": "^0.2.2",
-    "@ohif/extension-vtk": "^1.12.40",
+    "@ohif/extension-vtk": "^1.12.41",
     "@ohif/i18n": "^0.53.0",
     "@ohif/ui": "^1.10.10",
     "@tanem/react-nprogress": "^1.1.25",
@@ -66,7 +66,7 @@
     "cornerstone-math": "^0.1.9",
     "cornerstone-tools": "^6.0.6",
     "cornerstone-wado-image-loader": "^4.2.1",
-    "dcmjs": "0.24.10",
+    "dcmjs": "0.29.3",
     "dicom-parser": "^1.8.11",
     "dicomweb-client": "^0.8.3",
     "hammerjs": "^2.0.8",

diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-3.7
+3.8
diff --git a/yarn.lock b/yarn.lock
@@ -5637,16 +5637,17 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-dcmjs@0.24.10:
-  version "0.24.10"
-  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.24.10.tgz#048a12a1905175763274545c17bb38b506cdfd00"
-  integrity sha512-kugEdBqwwTx7lqUxm4jdklkMJiQ8pZ0aqMw9WkszkDU5lDWHyq2kbRccACtcwqygC7j1d36w8uG/vNLMejeMBg==
+dcmjs@0.29.3:
+  version "0.29.3"
+  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.3.tgz#e672ed079bd5371406e022361c60d7794af40d7b"
+  integrity sha512-aLAkrpejrFAatzU84ID9s01+oUFBzIP3gSkgyr2OcDfOphW7ms/JUDUdH24Y6361NaMovEo4gJ3bRrzsBmI8cA==
   dependencies:
     "@babel/runtime-corejs2" "^7.17.8"
     gl-matrix "^3.1.0"
     lodash.clonedeep "^4.5.0"
     loglevelnext "^3.0.1"
     ndarray "^1.0.19"
+    pako "^2.0.4"
 
 [email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"