Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…

…on-mode-initial
OHIF · Aug 8, 2023 · e0382aa · e0382aa
2 parents dbb9e4a + ec76ea2
commit e0382aa
Show file tree

Hide file tree

Showing 35 changed files with 185 additions and 119 deletions.
diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-72207e6c785269db70d8f717c06ab3b27b1d0dd9
+0493a0d587c99097de2f450e4e54e8c78805b3a8
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.41",
+  "version": "3.7.0-beta.42",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/i18n": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/i18n": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/i18n": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/i18n": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.9.3",
-    "@ohif/core": "3.7.0-beta.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/i18n": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/i18n": "3.7.0-beta.42",
     "dcmjs": "^0.29.5",
     "dicomweb-client": "^0.10.2",
     "prop-types": "^15.6.2",

diff --git a/extensions/default/src/ViewerLayout/index.tsx b/extensions/default/src/ViewerLayout/index.tsx
@@ -50,13 +50,16 @@ function ViewerLayout({
     //   dataSourceIdx === -1
     //     ? undefined
     //     : `datasources=${pathname.substring(dataSourceIdx + 1)}`;
-
+    
     // Todo: Handle parameters in a better way.
     const query = new URLSearchParams(window.location.search);
     const configUrl = query.get('configUrl');
 
+    const dataSourceName = pathname.substring(dataSourceIdx + 1);
+    const existingDataSource = extensionManager.getDataSources(dataSourceName);
+
     const searchQuery = new URLSearchParams();
-    if (dataSourceIdx !== -1) {
+    if (dataSourceIdx !== -1 && existingDataSource) {
       searchQuery.append('datasources', pathname.substring(dataSourceIdx + 1));
     }
 
@@ -66,7 +69,7 @@ function ViewerLayout({
 
     navigate({
       pathname: '/',
-      search: decodeURIComponent(searchQuery.toString()),
+      search: decodeURIComponent(searchQuery.toString())
     });
   };
 

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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/i18n": "3.7.0-beta.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/i18n": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "description": "Tracking features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -32,9 +32,9 @@
   "peerDependencies": {
     "@cornerstonejs/core": "^1.9.3",
     "@cornerstonejs/tools": "^1.9.3",
-    "@ohif/core": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+    "@ohif/ui": "3.7.0-beta.42",
     "@xstate/react": "^3.2.2",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/ui": "3.7.0-beta.41",
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/ui": "3.7.0-beta.42",
     "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.41",
-    "@ohif/extension-dicom-video": "3.7.0-beta.41"
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.42",
+    "@ohif/extension-dicom-video": "3.7.0-beta.42"
   },
   "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.41",
-    "@ohif/extension-dicom-video": "3.7.0-beta.41",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.41",
-    "@ohif/extension-test": "3.7.0-beta.41"
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.42",
+    "@ohif/extension-dicom-video": "3.7.0-beta.42",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.42",
+    "@ohif/extension-test": "3.7.0-beta.42"
   },
   "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.41",
+  "version": "3.7.0-beta.42",
   "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.41",
-    "@ohif/extension-cornerstone": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-rt": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-seg": "3.7.0-beta.41",
-    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.41",
-    "@ohif/extension-default": "3.7.0-beta.41",
-    "@ohif/extension-dicom-pdf": "3.7.0-beta.41",
-    "@ohif/extension-dicom-video": "3.7.0-beta.41",
-    "@ohif/extension-measurement-tracking": "3.7.0-beta.41"
+    "@ohif/core": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-rt": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-seg": "3.7.0-beta.42",
+    "@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.42",
+    "@ohif/extension-default": "3.7.0-beta.42",
+    "@ohif/extension-dicom-pdf": "3.7.0-beta.42",
+    "@ohif/extension-dicom-video": "3.7.0-beta.42",
+    "@ohif/extension-measurement-tracking": "3.7.0-beta.42"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13"

diff --git a/modes/longitudinal/src/index.js b/modes/longitudinal/src/index.js
@@ -63,7 +63,7 @@ const extensionDependencies = {
   '@ohif/extension-dicom-video': '^3.0.1',
 };
 
-function modeFactory() {
+function modeFactory({ modeConfiguration }) {
   let _activatePanelTriggersSubscriptions = [];
   return {
     // TODO: We're using this as a route segment
@@ -244,6 +244,7 @@ function modeFactory() {
       dicomRt.sopClassHandler,
     ],
     hotkeys: [...hotkeys.defaults.hotkeyBindings],
+    ...modeConfiguration,
   };
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		72207e6c785269db70d8f717c06ab3b27b1d0dd9
		0493a0d587c99097de2f450e4e54e8c78805b3a8