Merge remote-tracking branch 'origin/master' into feat/exampleProtocols

OHIF · Apr 22, 2024 · 23d9cff · 23d9cff
2 parents e47e469 + f0ed3fd
commit 23d9cff
Show file tree

Hide file tree

Showing 77 changed files with 994 additions and 360 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+
+### Features
+
+* **tmtv-mode:** Add Brush tools and move SUV peak calculation to web worker ([#4053](https://github.com/OHIF/Viewers/issues/4053)) ([8192e34](https://github.com/OHIF/Viewers/commit/8192e348eca993fec331d4963efe88f9a730eceb))
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 

diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-d250d04580883446fcb8d748b2a97c5c198922af
+8192e348eca993fec331d4963efe88f9a730eceb
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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 **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.86",
+  "version": "3.8.0-beta.87",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.86",
-    "@ohif/extension-cornerstone": "3.8.0-beta.86",
-    "@ohif/extension-default": "3.8.0-beta.86",
-    "@ohif/i18n": "3.8.0-beta.86",
+    "@ohif/core": "3.8.0-beta.87",
+    "@ohif/extension-cornerstone": "3.8.0-beta.87",
+    "@ohif/extension-default": "3.8.0-beta.87",
+    "@ohif/i18n": "3.8.0-beta.87",
     "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,17 @@
 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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+
+### Features
+
+* **tmtv-mode:** Add Brush tools and move SUV peak calculation to web worker ([#4053](https://github.com/OHIF/Viewers/issues/4053)) ([8192e34](https://github.com/OHIF/Viewers/commit/8192e348eca993fec331d4963efe88f9a730eceb))
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 

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.86",
+  "version": "3.8.0-beta.87",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.86",
-    "@ohif/extension-cornerstone": "3.8.0-beta.86",
-    "@ohif/extension-default": "3.8.0-beta.86",
-    "@ohif/i18n": "3.8.0-beta.86",
+    "@ohif/core": "3.8.0-beta.87",
+    "@ohif/extension-cornerstone": "3.8.0-beta.87",
+    "@ohif/extension-default": "3.8.0-beta.87",
+    "@ohif/i18n": "3.8.0-beta.87",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.9",
-    "@cornerstonejs/core": "^1.70.9",
+    "@cornerstonejs/adapters": "^1.70.10",
+    "@cornerstonejs/core": "^1.70.10",
     "@kitware/vtk.js": "30.3.3",
     "react-color": "^2.19.3"
   }

diff --git a/extensions/cornerstone-dicom-sr/CHANGELOG.md b/extensions/cornerstone-dicom-sr/CHANGELOG.md
@@ -3,6 +3,17 @@
 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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+
+### Features
+
+* **tmtv-mode:** Add Brush tools and move SUV peak calculation to web worker ([#4053](https://github.com/OHIF/Viewers/issues/4053)) ([8192e34](https://github.com/OHIF/Viewers/commit/8192e348eca993fec331d4963efe88f9a730eceb))
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 

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.86",
+  "version": "3.8.0-beta.87",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.86",
-    "@ohif/extension-cornerstone": "3.8.0-beta.86",
-    "@ohif/extension-measurement-tracking": "3.8.0-beta.86",
-    "@ohif/ui": "3.8.0-beta.86",
+    "@ohif/core": "3.8.0-beta.87",
+    "@ohif/extension-cornerstone": "3.8.0-beta.87",
+    "@ohif/extension-measurement-tracking": "3.8.0-beta.87",
+    "@ohif/ui": "3.8.0-beta.87",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.9",
-    "@cornerstonejs/core": "^1.70.9",
-    "@cornerstonejs/tools": "^1.70.9",
+    "@cornerstonejs/adapters": "^1.70.10",
+    "@cornerstonejs/core": "^1.70.10",
+    "@cornerstonejs/tools": "^1.70.10",
     "classnames": "^2.3.2"
   }
 }
diff --git a/extensions/cornerstone-dynamic-volume/CHANGELOG.md b/extensions/cornerstone-dynamic-volume/CHANGELOG.md
@@ -3,6 +3,17 @@
 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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+
+### Features
+
+* **tmtv-mode:** Add Brush tools and move SUV peak calculation to web worker ([#4053](https://github.com/OHIF/Viewers/issues/4053)) ([8192e34](https://github.com/OHIF/Viewers/commit/8192e348eca993fec331d4963efe88f9a730eceb))
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 

diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dynamic-volume",
-  "version": "3.8.0-beta.86",
+  "version": "3.8.0-beta.87",
   "description": "OHIF extension for 4D volumes data",
   "author": "OHIF",
   "license": "MIT",
@@ -29,11 +29,11 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.86",
-    "@ohif/extension-cornerstone": "3.8.0-beta.86",
-    "@ohif/extension-default": "3.8.0-beta.86",
-    "@ohif/i18n": "3.8.0-beta.86",
-    "@ohif/ui": "3.8.0-beta.86",
+    "@ohif/core": "3.8.0-beta.87",
+    "@ohif/extension-cornerstone": "3.8.0-beta.87",
+    "@ohif/extension-default": "3.8.0-beta.87",
+    "@ohif/i18n": "3.8.0-beta.87",
+    "@ohif/ui": "3.8.0-beta.87",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/core": "^1.70.9",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.70.9",
-    "@cornerstonejs/tools": "^1.70.9",
+    "@cornerstonejs/core": "^1.70.10",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.70.10",
+    "@cornerstonejs/tools": "^1.70.10",
     "classnames": "^2.3.2"
   }
 }
diff --git a/extensions/cornerstone-dynamic-volume/src/getPanelModule.tsx b/extensions/cornerstone-dynamic-volume/src/getPanelModule.tsx
@@ -43,21 +43,21 @@ function getPanelModule({ commandsManager, extensionManager, servicesManager })
   return [
     {
       name: 'dynamic-volume',
-      iconName: 'group-layers',
+      iconName: 'tab-4d',
       iconLabel: '4D Workflow',
       label: '4D Workflow',
       component: wrappedDynamicDataPanel,
     },
     {
       name: 'dynamic-toolbox',
-      iconName: 'group-layers',
+      iconName: 'tab-4d',
       iconLabel: '4D Workflow',
       label: 'Dynamic Toolbox',
       component: wrappedDynamicToolbox,
     },
     {
       name: 'dynamic-export',
-      iconName: 'group-layers',
+      iconName: 'tab-4d',
       iconLabel: '4D Workflow',
       label: '4D Workflow',
       component: wrappedDynamicExport,

diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md
@@ -3,6 +3,17 @@
 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.87](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.86...v3.8.0-beta.87) (2024-04-19)
+
+
+### Features
+
+* **tmtv-mode:** Add Brush tools and move SUV peak calculation to web worker ([#4053](https://github.com/OHIF/Viewers/issues/4053)) ([8192e34](https://github.com/OHIF/Viewers/commit/8192e348eca993fec331d4963efe88f9a730eceb))
+
+
+
+
+
 # [3.8.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.85...v3.8.0-beta.86) (2024-04-19)
 
 

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.86",
+  "version": "3.8.0-beta.87",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -38,10 +38,10 @@
     "@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.70.9",
+    "@cornerstonejs/dicom-image-loader": "^1.70.10",
     "@icr/polyseg-wasm": "^0.4.0",
-    "@ohif/core": "3.8.0-beta.86",
-    "@ohif/ui": "3.8.0-beta.86",
+    "@ohif/core": "3.8.0-beta.87",
+    "@ohif/ui": "3.8.0-beta.87",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.9",
-    "@cornerstonejs/core": "^1.70.9",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.70.9",
-    "@cornerstonejs/tools": "^1.70.9",
+    "@cornerstonejs/adapters": "^1.70.10",
+    "@cornerstonejs/core": "^1.70.10",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.70.10",
+    "@cornerstonejs/tools": "^1.70.10",
     "@icr/polyseg-wasm": "^0.4.0",
     "@kitware/vtk.js": "30.3.3",
     "html2canvas": "^1.4.1",

diff --git a/extensions/cornerstone/src/commandsModule.ts b/extensions/cornerstone/src/commandsModule.ts
@@ -346,9 +346,9 @@ function commandsModule({
         }
       }
     },
-    setToolActiveToolbar: ({ value, itemId, toolGroupIds = [] }) => {
+    setToolActiveToolbar: ({ value, itemId, toolName, toolGroupIds = [] }) => {
       // Sometimes it is passed as value (tools with options), sometimes as itemId (toolbar buttons)
-      const toolName = itemId || value;
+      toolName = toolName || itemId || value;
 
       toolGroupIds = toolGroupIds.length ? toolGroupIds : toolGroupService.getToolGroupIds();
 

diff --git a/extensions/cornerstone/src/components/ViewportWindowLevel/getViewportVolumeHistogram.ts b/extensions/cornerstone/src/components/ViewportWindowLevel/getViewportVolumeHistogram.ts
@@ -2,10 +2,12 @@ import { getWebWorkerManager } from '@cornerstonejs/core';
 
 const workerManager = getWebWorkerManager();
 
-const options = {
-  // maxWorkerInstances: 1,
-  // overwrite: false
-  autoTerminationOnIdle: 1000,
+const WorkerOptions = {
+  maxWorkerInstances: 1,
+  autoTerminateOnIdle: {
+    enabled: true,
+    idleTimeThreshold: 1000,
+  },
 };
 
 // Register the task
@@ -15,9 +17,9 @@ const workerFn = () => {
   });
 };
 
-workerManager.registerWorker('histogram-worker', workerFn, options);
-
 const getViewportVolumeHistogram = async (viewport, volume, options?) => {
+  workerManager.registerWorker('histogram-worker', workerFn, WorkerOptions);
+
   if (!volume?.loadStatus.loaded) {
     return undefined;
   }

diff --git a/extensions/cornerstone/src/init.tsx b/extensions/cornerstone/src/init.tsx
@@ -279,19 +279,18 @@ export default async function init({
   eventTarget.addEventListener(EVENTS.ELEMENT_DISABLED, elementDisabledHandler.bind(null));
   colormaps.forEach(registerColormap);
 
-  // Create a debounced function that shows the notification
-  const debouncedShowNotification = debounce(detail => {
-    uiNotificationService.show({
-      title: detail.type,
-      message: detail.message,
-      type: 'error',
-    });
-  }, 300);
-
   // Event listener
-  eventTarget.addEventListener(EVENTS.ERROR_EVENT, ({ detail }) => {
-    debouncedShowNotification(detail);
-  });
+  eventTarget.addEventListenerDebounced(
+    EVENTS.ERROR_EVENT,
+    ({ detail }) => {
+      uiNotificationService.show({
+        title: detail.type,
+        message: detail.message,
+        type: 'error',
+      });
+    },
+    1000
+  );
 }
 
 function CPUModal() {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d250d04580883446fcb8d748b2a97c5c198922af
		8192e348eca993fec331d4963efe88f9a730eceb