Merge branch 'master' into fix/wrong-aspect-ratio-load-sr

OHIF · Jul 18, 2023 · df9e8de · df9e8de
2 parents 805612f + 265c1fb
commit df9e8de
Show file tree

Hide file tree

Showing 33 changed files with 157 additions and 167 deletions.
diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-7d286a07f2141bf8b8b85ca9d9b5eb3c0d7fc996
+18156bb7b1cc24c47beadb0a6acd31db7fa076a3
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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/extension-cornerstone": "3.7.0-beta.32",
-    "@ohif/extension-default": "3.7.0-beta.32",
-    "@ohif/i18n": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/extension-cornerstone": "3.7.0-beta.33",
+    "@ohif/extension-default": "3.7.0-beta.33",
+    "@ohif/i18n": "3.7.0-beta.33",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/extension-cornerstone": "3.7.0-beta.32",
-    "@ohif/extension-default": "3.7.0-beta.32",
-    "@ohif/i18n": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/extension-cornerstone": "3.7.0-beta.33",
+    "@ohif/extension-default": "3.7.0-beta.33",
+    "@ohif/i18n": "3.7.0-beta.33",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "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.7.0-beta.32",
-    "@ohif/extension-cornerstone": "3.7.0-beta.32",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/extension-cornerstone": "3.7.0-beta.33",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
@@ -44,9 +44,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.4.1",
-    "@cornerstonejs/core": "^1.4.1",
-    "@cornerstonejs/tools": "^1.4.1",
+    "@cornerstonejs/adapters": "^1.4.4",
+    "@cornerstonejs/core": "^1.4.4",
+    "@cornerstonejs/tools": "^1.4.4",
     "classnames": "^2.3.2"
   }
 }
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
     "@cornerstonejs/dicom-image-loader": "^1.4.1",
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "^0.29.6",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -52,10 +52,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.4.1",
-    "@cornerstonejs/core": "^1.4.1",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.4.1",
-    "@cornerstonejs/tools": "^1.4.1",
+    "@cornerstonejs/adapters": "^1.4.4",
+    "@cornerstonejs/core": "^1.4.4",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.4.4",
+    "@cornerstonejs/tools": "^1.4.4",
     "@kitware/vtk.js": "27.3.1",
     "html2canvas": "^1.4.1",
     "lodash.debounce": "4.0.8",

diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts
@@ -1,6 +1,5 @@
 import SUPPORTED_TOOLS from './constants/supportedTools';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
-import getModalityUnit from './utils/getModalityUnit';
 import { utils } from '@ohif/core';
 
 const CircleROI = {
@@ -112,16 +111,15 @@ function getMappedAnnotations(annotation, DisplaySetService) {
     );
 
     const { SeriesNumber } = displaySet;
-    const { mean, stdDev, max, area, Modality } = targetStats;
-    const unit = getModalityUnit(Modality);
+    const { mean, stdDev, max, area, Modality, modalityUnit } = targetStats;
 
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,

diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts
@@ -1,6 +1,5 @@
 import SUPPORTED_TOOLS from './constants/supportedTools';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
-import getModalityUnit from './utils/getModalityUnit';
 import { utils } from '@ohif/core';
 
 const EllipticalROI = {
@@ -112,16 +111,15 @@ function getMappedAnnotations(annotation, displaySetService) {
     );
 
     const { SeriesNumber } = displaySet;
-    const { mean, stdDev, max, area, Modality } = targetStats;
-    const unit = getModalityUnit(Modality);
+    const { mean, stdDev, max, area, Modality, modalityUnit } = targetStats;
 
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,

diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts
@@ -1,6 +1,5 @@
 import SUPPORTED_TOOLS from './constants/supportedTools';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
-import getModalityUnit from './utils/getModalityUnit';
 import { utils } from '@ohif/core';
 
 const RectangleROI = {
@@ -106,16 +105,15 @@ function getMappedAnnotations(annotation, DisplaySetService) {
     );
 
     const { SeriesNumber } = displaySet;
-    const { mean, stdDev, max, area, Modality } = targetStats;
-    const unit = getModalityUnit(Modality);
+    const { mean, stdDev, max, area, Modality, modalityUnit } = targetStats;
 
     annotations.push({
       SeriesInstanceUID,
       SOPInstanceUID,
       SeriesNumber,
       frameNumber,
       Modality,
-      unit,
+      unit: modalityUnit,
       mean,
       stdDev,
       max,

diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/utils/getModalityUnit.js b/extensions/cornerstone/src/utils/measurementServiceMappings/utils/getModalityUnit.js
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/utils/index.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/utils/index.ts
@@ -4,11 +4,9 @@ import {
   setAnnotationSelected,
   getFirstAnnotationSelected,
 } from './selection';
-import getModalityUnit from './getModalityUnit';
 import getSOPInstanceAttributes from './getSOPInstanceAttributes';
 
 export {
-  getModalityUnit,
   getHandlesFromPoints,
   getSOPInstanceAttributes,
   isAnnotationSelected,

diff --git a/extensions/default/package.json b/extensions/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-default",
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "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.7.0-beta.32",
-    "@ohif/i18n": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/i18n": "3.7.0-beta.33",
     "dcmjs": "^0.29.5",
     "dicomweb-client": "^0.10.2",
     "prop-types": "^15.6.2",

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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "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.7.0-beta.32",
-    "@ohif/extension-default": "3.7.0-beta.32",
-    "@ohif/i18n": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/extension-default": "3.7.0-beta.33",
+    "@ohif/i18n": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "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.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

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.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "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.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-measurement-tracking",
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "Tracking features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -30,11 +30,11 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^1.4.1",
-    "@cornerstonejs/tools": "^1.4.1",
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@cornerstonejs/core": "^1.4.4",
+    "@cornerstonejs/tools": "^1.4.4",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "classnames": "^2.3.2",
     "dcmjs": "^0.29.5",
     "lodash.debounce": "^4.17.21",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/ui": "3.7.0-beta.33",
     "@xstate/react": "^0.8.1",
     "xstate": "^4.10.0"
   }

diff --git a/extensions/test-extension/package.json b/extensions/test-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-test",
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "OHIF extension used inside e2e testing",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "0.29.4",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/tmtv/package.json b/extensions/tmtv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-tmtv",
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "description": "OHIF extension for Total Metabolic Tumor Volume",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.32",
-    "@ohif/ui": "3.7.0-beta.32",
+    "@ohif/core": "3.7.0-beta.33",
+    "@ohif/ui": "3.7.0-beta.33",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.7.0-beta.32",
+  "version": "3.7.0-beta.33",
   "packages": ["extensions/*", "platform/*", "modes/*"],
   "npmClient": "yarn",
   "useWorkspaces": true