[WIP] feat: Multi monitor launch page #3872

wayfarer3130 · 2023-12-30T14:48:48Z

Context

Users should be able to launch OHIF in a multi-monitor mode. This change adds a worklist on the initial launch page, and automatically launches additional windows when a study is viewed. This may need to be moved to a custom mode/extension design, but right now is just a WIP.

Changes & Results

Testing

Checklist

PR

[] My Pull Request title is descriptive, accurate and follows the
semantic-release format and guidelines.

Code

[] My code has been well-documented (function documentation, inline comments,
etc.)

Public Documentation Updates

[] The documentation page has been updated as necessary for any public API
additions or removals.

Tested Environment

[] OS:
[] Node version:
[] Browser:

netlify · 2023-12-30T14:48:53Z

✅ Deploy Preview for ohif-dev ready!

Name	Link
🔨 Latest commit	`cccb0bf`
🔍 Latest deploy log	https://app.netlify.com/sites/ohif-dev/deploys/66547e63c02f8e00075bd0a0
😎 Deploy Preview	https://deploy-preview-3872--ohif-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

netlify · 2023-12-30T14:48:53Z

✅ Deploy Preview for ohif-platform-docs ready!

Name	Link
🔨 Latest commit	`cccb0bf`
🔍 Latest deploy log	https://app.netlify.com/sites/ohif-platform-docs/deploys/66547e63404d690008995138
😎 Deploy Preview	https://deploy-preview-3872--ohif-platform-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

platform/core/src/services/CustomizationService/CustomizationService.ts

+      return newValue;
+    }
+
+    return mergeWith(oldValue || {}, newValue, mergeCustomizer.bind(null, mergeType));


codecov · 2023-12-30T14:54:06Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8a335bd) 46.23% compared to head (f6e144a) 44.44%.
Report is 230 commits behind head on master.

❗ Current head f6e144a differs from pull request most recent head e7f8352. Consider uploading reports for the commit e7f8352 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3872      +/-   ##
==========================================
- Coverage   46.23%   44.44%   -1.80%     
==========================================
  Files          78       80       +2     
  Lines        1276     1332      +56     
  Branches      312      327      +15     
==========================================
+ Hits          590      592       +2     
- Misses        548      587      +39     
- Partials      138      153      +15

Files	Coverage Δ
platform/app/src/index.js	`0.00% <ø> (ø)`
platform/app/src/routes/WorkList/filtersMeta.js	`0.00% <ø> (ø)`
platform/core/src/log.js	`14.28% <ø> (-85.72%)`	⬇️
...ervices/DicomMetadataStore/createSeriesMetadata.js	`0.00% <ø> (ø)`
...services/DicomMetadataStore/createStudyMetadata.js	`0.00% <ø> (ø)`
platform/core/src/utils/addAccessors.js	`9.09% <ø> (ø)`
platform/core/src/utils/downloadCSVReport.js	`0.00% <ø> (ø)`
platform/core/src/utils/formatDate.js	`0.00% <ø> (ø)`
platform/core/src/utils/index.js	`100.00% <ø> (ø)`
...form/core/src/utils/isDisplaySetReconstructable.js	`5.00% <ø> (+0.18%)`	⬆️
... and 1 more

... and 1 file with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1678593...e7f8352. Read the comment docs.

sedghi · 2024-01-11T14:14:03Z

extensions/measurement-tracking/package.json

@@ -37,7 +37,7 @@
    "@ohif/ui": "3.8.0-beta.36",
    "classnames": "^2.3.2",
    "dcmjs": "^0.29.12",
-    "lodash.debounce": "^4.17.21",
+    "lodash.debounce": "^4.0.8",


Why we are going back? it doesn't have any effect actually because of ^

sedghi · 2024-01-11T14:15:54Z

extensions/multimonitor/src/getCommandsModule.ts

@@ -0,0 +1,31 @@
+import { ServicesManager, CommandsManager, ExtensionManager } from '@ohif/core';
+
+import applyMultiMonitor from './MultiMonitor';


I'm not a fan of applyMultiMonitor import from a folder called MultiMonitor which only has a index.tsx

sedghi · 2024-01-11T14:16:13Z

extensions/multimonitor/src/MultiMonitor/index.tsx

+  }
+}
+
+export default MultiMonitor;


I don't think you need tsx for this file, ts would do the job

sedghi · 2024-01-11T14:16:34Z

extensions/multimonitor/src/MultiMonitor/index.tsx

@@ -0,0 +1,28 @@
+function MultiMonitor() {
+  const { href } = window.location;
+  console.log('multiMonitor', href);


remove log please

sedghi · 2024-01-11T14:17:25Z

extensions/multimonitor/src/MultiMonitor/index.tsx

+  if (screenDetailsPromise) {
+    screenDetailsPromise.then(screenDetails => {
+      const { screens } = screenDetails;
+      const baseURL = href.replace('/multimonitor', '/basic-test');
+      console.log('Hello multi-monitor', ...screens);
+      const newScreen = screens.find(screen => screen.isPrimary === true);
+      const width = Math.floor(newScreen.availWidth / 2) - 2;
+      const height = newScreen.availHeight;
+      const window1 = window.open(
+        `${baseURL}&hangingProtocolId=@ohif/hpMultiMonitor2&screen=0-0.5`,
+        'ohifScreen1',
+        `screenX=${width + 1},top=0,width=${width},height=${height}`
+      );
+      console.log('Opened', window1);
+      window.window1 = window1;
+      window.moveTo(0, 0);
+    });
+  } else {
+    console.log('Not multi monitor', screenDetailsPromise);
+  }


I prefer

if (!screenDetailsPromise) { console.log('Not multi monitor', screenDetailsPromise); return } screenDetailsPromise.then(screenDetails => { const { screens } = screenDetails; const baseURL = href.replace('/multimonitor', '/basic-test'); console.log('Hello multi-monitor', ...screens); const newScreen = screens.find(screen => screen.isPrimary === true); const width = Math.floor(newScreen.availWidth / 2) - 2; const height = newScreen.availHeight; const window1 = window.open( `${baseURL}&hangingProtocolId=@ohif/hpMultiMonitor2&screen=0-0.5`, 'ohifScreen1', `screenX=${width + 1},top=0,width=${width},height=${height}` ); console.log('Opened', window1); window.window1 = window1; window.moveTo(0, 0); });

Less indentation, more readable IMO

sedghi · 2024-01-11T14:17:59Z

extensions/multimonitor/src/MultiMonitor/index.tsx

@@ -0,0 +1,28 @@
+function MultiMonitor() {


documentation please

sedghi

Thanks!
I tried it, it opens a second window on my other monitor only half (right half) and shows blank at the moment.

cypress · 2024-01-25T00:53:18Z

Passing run #3726 ↗︎

0	44	0	0	0

Details:

Basic changes to layout to add studyData information.
Project: Viewers	Commit: `f6e144ac03`
Status: Passed	Duration: 06:24 💡
Started: Jan 25, 2024 1:55 PM	Ended: Jan 25, 2024 2:01 PM

Review all test suite changes for PR #3872 ↗︎

wayfarer3130 · 2024-05-27T19:03:19Z

Redoing this in a cleaner fashion.

wayfarer3130 added 2 commits December 29, 2023 10:18

feat: Add customization merge, append or replace functionality

9463730

feat: Add search page display multi-monitor setup

d3f1dd1

github-advanced-security bot found potential problems Dec 30, 2023

View reviewed changes

wayfarer3130 added 3 commits January 4, 2024 15:58

feat: Basic multi-monitor mode

6d79762

Multi monitor Works in Progress notes

94b1ec4

speelingg

e05f833

sedghi reviewed Jan 11, 2024

View reviewed changes

extensions/multimonitor/src/MultiMonitor/index.tsx

@@ -0,0 +1,28 @@

function MultiMonitor() {

Copy link

Member

sedghi Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

documentation please

sedghi reviewed Jan 11, 2024

View reviewed changes

wayfarer3130 added 2 commits January 19, 2024 17:08

Update multi-monitor

177ffd9

Merge remote-tracking branch 'ohif/master' into feat/multi-monitor

478c87f

wayfarer3130 added 4 commits January 24, 2024 20:37

Add pages to start displaying study info and priors list

3c0c8cb

Basic changes to layout to add studyData information.

f6e144a

Improved multi-monitor display

e7f8352

Merge remote-tracking branch 'origin/master' into feat/multi-monitor

cccb0bf

wayfarer3130 closed this May 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] feat: Multi monitor launch page #3872

[WIP] feat: Multi monitor launch page #3872

wayfarer3130 commented Dec 30, 2023

netlify bot commented Dec 30, 2023 •

edited

netlify bot commented Dec 30, 2023 •

edited

codecov bot commented Dec 30, 2023 •

edited

sedghi Jan 11, 2024

sedghi Jan 11, 2024

sedghi Jan 11, 2024

sedghi Jan 11, 2024

sedghi Jan 11, 2024

sedghi Jan 11, 2024

sedghi left a comment

cypress bot commented Jan 25, 2024 •

edited

wayfarer3130 commented May 27, 2024

		@@ -0,0 +1,31 @@
		import { ServicesManager, CommandsManager, ExtensionManager } from '@ohif/core';

		import applyMultiMonitor from './MultiMonitor';

[WIP] feat: Multi monitor launch page #3872

[WIP] feat: Multi monitor launch page #3872

Conversation

wayfarer3130 commented Dec 30, 2023

Context

Changes & Results

Testing

Checklist

PR

Code

Public Documentation Updates

Tested Environment

netlify bot commented Dec 30, 2023 • edited

✅ Deploy Preview for ohif-dev ready!

netlify bot commented Dec 30, 2023 • edited

✅ Deploy Preview for ohif-platform-docs ready!

codecov bot commented Dec 30, 2023 • edited

Codecov Report

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi Jan 11, 2024

Choose a reason for hiding this comment

sedghi left a comment

Choose a reason for hiding this comment

cypress bot commented Jan 25, 2024 • edited

Passing run #3726 ↗︎

Review all test suite changes for PR #3872 ↗︎

wayfarer3130 commented May 27, 2024

netlify bot commented Dec 30, 2023 •

edited

netlify bot commented Dec 30, 2023 •

edited

codecov bot commented Dec 30, 2023 •

edited

cypress bot commented Jan 25, 2024 •

edited