Merge branch 'master' into fusion_viewport

OHIF · Jun 29, 2023 · 5cbc6c5 · 5cbc6c5
2 parents 2ef60f4 + b4dbe56
commit 5cbc6c5
Show file tree

Hide file tree

Showing 34 changed files with 1,119 additions and 306 deletions.
diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-ef4f28690a813867db970bdcca13d76ec08fc8ce
+abe939bd2052239c35e5583e4fc8204e225a0e67
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.14",
+  "version": "3.7.0-beta.18",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/i18n": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/i18n": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/i18n": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/i18n": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

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.14",
+  "version": "3.7.0-beta.18",
   "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.2.4",
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "dcmjs": "^0.29.6",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/i18n": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/i18n": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/i18n": "3.7.0-beta.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/i18n": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "description": "Tracking features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -32,9 +32,9 @@
   "peerDependencies": {
     "@cornerstonejs/core": "^1.2.4",
     "@cornerstonejs/tools": "^1.2.4",
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+    "@ohif/ui": "3.7.0-beta.18",
     "@xstate/react": "^0.8.1",
     "xstate": "^4.10.0"
   }

diff --git a/...s/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx b/...s/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import { utils } from '@ohif/core';
 import {
@@ -31,6 +32,8 @@ function PanelStudyBrowserTracking({
     uiNotificationService,
   } = servicesManager.services;
 
+  const { t } = useTranslation('Common');
+
   // Normally you nest the components so the tree isn't so deep, and the data
   // doesn't have to have such an intense shape. This works well enough for now.
   // Tabs --> Studies --> DisplaySets --> Thumbnails
@@ -134,7 +137,7 @@ function PanelStudyBrowserTracking({
       const actuallyMappedStudies = mappedStudies.map(qidoStudy => {
         return {
           studyInstanceUid: qidoStudy.StudyInstanceUID,
-          date: formatDate(qidoStudy.StudyDate),
+          date: formatDate(qidoStudy.StudyDate) || t('NoStudyDate'),
           description: qidoStudy.StudyDescription,
           modalities: qidoStudy.ModalitiesInStudy,
           numInstances: qidoStudy.NumInstances,

diff --git a/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.tsx b/extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.tsx
@@ -22,7 +22,7 @@ function TrackedCornerstoneViewport(props) {
     viewportOptions,
   } = props;
 
-  const { t } = useTranslation('TrackedViewport');
+  const { t } = useTranslation('Common');
 
   const {
     measurementService,
@@ -54,6 +54,7 @@ function TrackedCornerstoneViewport(props) {
     PatientAge,
     SliceThickness,
     SpacingBetweenSlices,
+    StudyDate,
     ManufacturerModelName,
   } = displaySet.images[0];
 
@@ -194,7 +195,8 @@ function TrackedCornerstoneViewport(props) {
         getStatusComponent={() => _getStatusComponent(isTracked)}
         studyData={{
           label: viewportLabel,
-          studyDate: formatDate(SeriesDate), // TODO: This is series date. Is that ok?
+          studyDate:
+            formatDate(SeriesDate) || formatDate(StudyDate) || t('NoStudyDate'),
           currentSeries: SeriesNumber, // TODO - switch entire currentSeries to be UID based or actual position based
           seriesDescription: SeriesDescription,
           patientInformation: {

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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "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.14",
-    "@ohif/ui": "3.7.0-beta.14",
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/ui": "3.7.0-beta.18",
     "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.14",
+  "version": "3.7.0-beta.18",
   "packages": ["extensions/*", "platform/*", "modes/*"],
   "npmClient": "yarn",
   "useWorkspaces": true

diff --git a/modes/basic-dev-mode/package.json b/modes/basic-dev-mode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-basic-dev-mode",
-  "version": "3.7.0-beta.14",
+  "version": "3.7.0-beta.18",
   "description": "Basic OHIF Viewer Using Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -29,12 +29,12 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.14",
-    "@ohif/extension-dicom-video": "3.7.0-beta.14"
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.18",
+    "@ohif/extension-dicom-video": "3.7.0-beta.18"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13"

diff --git a/modes/basic-test-mode/package.json b/modes/basic-test-mode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-test",
-  "version": "3.7.0-beta.14",
+  "version": "3.7.0-beta.18",
   "description": "Basic mode for testing",
   "author": "OHIF",
   "license": "MIT",
@@ -32,14 +32,14 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.14",
-    "@ohif/extension-dicom-video": "3.7.0-beta.14",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.14",
-    "@ohif/extension-test": "3.7.0-beta.14"
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.18",
+    "@ohif/extension-dicom-video": "3.7.0-beta.18",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.18",
+    "@ohif/extension-test": "3.7.0-beta.18"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13"

diff --git a/modes/longitudinal/package.json b/modes/longitudinal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-longitudinal",
-  "version": "3.7.0-beta.14",
+  "version": "3.7.0-beta.18",
   "description": "Longitudinal Workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -32,15 +32,15 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-rt": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-seg": "3.7.0-beta.14",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.14",
-    "@ohif/extension-default": "3.7.0-beta.14",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.14",
-    "@ohif/extension-dicom-video": "3.7.0-beta.14",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.14"
+    "@ohif/core": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-rt": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-seg": "3.7.0-beta.18",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.18",
+    "@ohif/extension-default": "3.7.0-beta.18",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.18",
+    "@ohif/extension-dicom-video": "3.7.0-beta.18",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.18"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13"