Merge branch 'master' of github.com:OHIF/Viewers into viewport-ready-…

…event
OHIF · Nov 7, 2023 · 12b6866 · 12b6866
2 parents 2b44f9f + 1a68c06
commit 12b6866
Show file tree

Hide file tree

Showing 70 changed files with 608 additions and 191 deletions.
diff --git a/CHANGELOG.md b/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package ohif-monorepo-root
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 

diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-b23eeff93745769e67e60c33d75293d6242c5ec9
+ee67bcc0f55450ccddaa543389180f505e121af5
diff --git a/extensions/cornerstone-dicom-rt/CHANGELOG.md b/extensions/cornerstone-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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt

diff --git a/extensions/cornerstone-dicom-rt/package.json b/extensions/cornerstone-dicom-rt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/extension-cornerstone": "3.8.0-beta.9",
-    "@ohif/extension-default": "3.8.0-beta.9",
-    "@ohif/i18n": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/extension-cornerstone": "3.8.0-beta.10",
+    "@ohif/extension-default": "3.8.0-beta.10",
+    "@ohif/i18n": "3.8.0-beta.10",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/extensions/cornerstone-dicom-seg/CHANGELOG.md b/extensions/cornerstone-dicom-seg/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg

diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/extension-cornerstone": "3.8.0-beta.9",
-    "@ohif/extension-default": "3.8.0-beta.9",
-    "@ohif/i18n": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/extension-cornerstone": "3.8.0-beta.10",
+    "@ohif/extension-default": "3.8.0-beta.10",
+    "@ohif/i18n": "3.8.0-beta.10",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.20.3",
-    "@cornerstonejs/tools": "^1.20.3",
+    "@cornerstonejs/adapters": "^1.27.3",
+    "@cornerstonejs/tools": "^1.27.3",
     "@kitware/vtk.js": "27.3.1",
     "react-color": "^2.19.3"
   }

diff --git a/extensions/cornerstone-dicom-sr/CHANGELOG.md b/extensions/cornerstone-dicom-sr/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr

diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -32,10 +32,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/extension-cornerstone": "3.8.0-beta.9",
-    "@ohif/extension-measurement-tracking": "3.8.0-beta.9",
-    "@ohif/ui": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/extension-cornerstone": "3.8.0-beta.10",
+    "@ohif/extension-measurement-tracking": "3.8.0-beta.10",
+    "@ohif/ui": "3.8.0-beta.10",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
@@ -44,9 +44,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.20.3",
-    "@cornerstonejs/core": "^1.20.3",
-    "@cornerstonejs/tools": "^1.20.3",
+    "@cornerstonejs/adapters": "^1.27.3",
+    "@cornerstonejs/core": "^1.27.3",
+    "@cornerstonejs/tools": "^1.27.3",
     "classnames": "^2.3.2"
   }
 }
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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **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": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
-    "@cornerstonejs/dicom-image-loader": "^1.20.3",
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/ui": "3.8.0-beta.9",
+    "@cornerstonejs/dicom-image-loader": "^1.27.3",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/ui": "3.8.0-beta.10",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -52,10 +52,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.20.3",
-    "@cornerstonejs/core": "^1.20.3",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.20.3",
-    "@cornerstonejs/tools": "^1.20.3",
+    "@cornerstonejs/adapters": "^1.27.3",
+    "@cornerstonejs/core": "^1.27.3",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.27.3",
+    "@cornerstonejs/tools": "^1.27.3",
     "@kitware/vtk.js": "27.3.1",
     "html2canvas": "^1.4.1",
     "lodash.debounce": "4.0.8",

diff --git a/extensions/cornerstone/src/init.tsx b/extensions/cornerstone/src/init.tsx
@@ -59,8 +59,8 @@ export default async function init({
 
   await cs3DInit({
     rendering: {
-      preferSizeOverAccuracy: Boolean(appConfig.use16BitDataType),
-      useNorm16Texture: Boolean(appConfig.use16BitDataType),
+      preferSizeOverAccuracy: Boolean(appConfig.preferSizeOverAccuracy),
+      useNorm16Texture: Boolean(appConfig.useNorm16Texture),
     },
   });
 

diff --git a/extensions/cornerstone/src/initWADOImageLoader.js b/extensions/cornerstone/src/initWADOImageLoader.js
@@ -49,7 +49,8 @@ export default function initWADOImageLoader(
       // Until the default is set to true (which is the case for cornerstone3D),
       // we should set this flag to false.
       convertFloatPixelDataToInt: false,
-      use16BitDataType: Boolean(appConfig.use16BitDataType),
+      use16BitDataType:
+        Boolean(appConfig.useNorm16Texture) || Boolean(appConfig.preferSizeOverAccuracy),
     },
     beforeSend: function (xhr) {
       //TODO should be removed in the future and request emitted by DicomWebDataSource

diff --git a/extensions/default/CHANGELOG.md b/extensions/default/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 

diff --git a/extensions/default/package.json b/extensions/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-default",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "Common/default features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/i18n": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/i18n": "3.8.0-beta.10",
     "dcmjs": "^0.29.12",
     "dicomweb-client": "^0.10.2",
     "prop-types": "^15.6.2",

diff --git a/extensions/default/src/init.ts b/extensions/default/src/init.ts
@@ -51,10 +51,16 @@ export default function init({ servicesManager, configuration = {} }): void {
 const handlePETImageMetadata = ({ SeriesInstanceUID, StudyInstanceUID }) => {
   const { instances } = DicomMetadataStore.getSeries(StudyInstanceUID, SeriesInstanceUID);
 
+  if (!instances?.length) {
+    return;
+  }
+
   const modality = instances[0].Modality;
-  if (modality !== 'PT') {
+
+  if (!modality || modality !== 'PT') {
     return;
   }
+
   const imageIds = instances.map(instance => instance.imageId);
   const instanceMetadataArray = [];
   imageIds.forEach(imageId => {

diff --git a/extensions/dicom-microscopy/CHANGELOG.md b/extensions/dicom-microscopy/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-dicom-microscopy

diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-microscopy",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "OHIF extension for DICOM microscopy",
   "author": "Bill Wallace, md-prog",
   "license": "MIT",
@@ -28,10 +28,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/extension-default": "3.8.0-beta.9",
-    "@ohif/i18n": "3.8.0-beta.9",
-    "@ohif/ui": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/extension-default": "3.8.0-beta.10",
+    "@ohif/i18n": "3.8.0-beta.10",
+    "@ohif/ui": "3.8.0-beta.10",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/extensions/dicom-pdf/CHANGELOG.md b/extensions/dicom-pdf/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-dicom-pdf

diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-pdf",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "OHIF extension for PDF display",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/ui": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/ui": "3.8.0-beta.10",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/dicom-video/CHANGELOG.md b/extensions/dicom-video/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.
 
+# [3.8.0-beta.10](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.9...v3.8.0-beta.10) (2023-11-03)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
 # [3.8.0-beta.9](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.8...v3.8.0-beta.9) (2023-11-02)
 
 **Note:** Version bump only for package @ohif/extension-dicom-video

diff --git a/extensions/dicom-video/package.json b/extensions/dicom-video/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-video",
-  "version": "3.8.0-beta.9",
+  "version": "3.8.0-beta.10",
   "description": "OHIF extension for video display",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.9",
-    "@ohif/ui": "3.8.0-beta.9",
+    "@ohif/core": "3.8.0-beta.10",
+    "@ohif/ui": "3.8.0-beta.10",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b23eeff93745769e67e60c33d75293d6242c5ec9
		ee67bcc0f55450ccddaa543389180f505e121af5