Multiple panes qt6 by mmalczak · Pull Request #2721 · m-labs/artiq

mmalczak · 2025-04-16T16:53:27Z

ARTIQ Pull Request

Description of Changes

Add multiple experiment workspaces.
Add possibility to rename workspace tab. Add tooltip informing about that possibility. Ensure unique tab names.
Opening experiment opens related workspace.
The workspace state is save.
Handle migration of experiments from previous version to the version with multiple workspaces.

Related Issue

Type of Changes

	Type
✓	✨ New feature

Steps (Choose relevant, delete irrelevant before submitting)

All Pull Requests

Use correct spelling and grammar.
Check the copyright situation of your changes and sign off your patches (git commit --signoff, see copyright).

Code Changes

Run flake8 to check code style (follow PEP-8 style). flake8 has issues with parsing Migen/gateware code, ignore as necessary.
Test your changes or have someone test them. Mention what was tested and how.
Add and check docstrings and comments
Check, test, and update the unittests in /artiq/test/ or gateware simulations in /artiq/gateware/test

Git Logistics

Split your contribution into logically separate changes (git rebase --interactive). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.
[ x] Write short & meaningful commit messages. Review each commit for messages (git show). Format:
```
topic: description. < 50 characters total.

Longer description. < 70 characters per line
```

Licensing

See copyright & licensing for more info.
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited and are licensed under LGPLv3+.

marmeladapk · 2025-04-16T20:14:19Z

This is what it looks like in release-8 that we're using internally in Warsaw. Option to hide scheduler settings will be in a future PR. Also we're working on docking applets inside these workspaces.

Here's the original PR where I tested this for some edge cases, when reviewing you can redo those scenarios if you want.
elhep#10

SimonRenblad · 2025-04-17T03:42:21Z

+                tab_widget = self.main_window.centralWidget()
+                mdi_area_name = experiment_mdi[expurl]
+                mdi_area = self.main_window.get_mdi_area_by_name(mdi_area_name)
+                tab_widget.setCurrentWidget(mdi_area)


Seems odd to have to switch between tabs for each experiment. Would it be challenging to store the state of each experiment window in their corresponding MdiArea and restore the state of each MdiArea sequentially?

ok, I save and restore mdi areas and respective experiments as stored in the centralWidget. There is not need to add any additional monotonically increasing index nor depend on unique names anymore.

SimonRenblad · 2025-04-17T05:13:37Z

Can we make the tabs movable?

SimonRenblad · 2025-04-17T05:20:49Z

+        index = self.tabAt(event.pos())
+        if index != -1:
+            current_name = self.tabText(index)
+            new_name, ok = QtWidgets.QInputDialog.getText(


I am aware that QTabBar does not come with built in editing of the tab text (which is a shame). I do still think that an input dialog is overkill here. Spawning a QLineEdit and positioning it over the tab text seems more user friendly, see for example https://stackoverflow.com/q/8707457

I did it and pushed the changes.
Please check it, as I am not convinced if it is a better solution.

If I were to choose, I would go with the input dialog.

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

… ExperimentManager #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

…#4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

…mdi_area_by_name which becomes redundant now #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

… state #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

…ng input dialog to change the tab name #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

…s and move it to artiq/dashboard/experiment_tabs.py #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

sbourdeauducq requested review from SimonRenblad and dnadlinger April 16, 2025 16:56

sbourdeauducq mentioned this pull request Apr 16, 2025

Multiple panes #2722

Closed

7 tasks

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/dashboard/experiments.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Apr 17, 2025

View reviewed changes

SimonRenblad mentioned this pull request Apr 17, 2025

Fold experiments qt6 #2724

Open

8 tasks

mmalczak added 11 commits June 4, 2025 21:12

Add multiple MDI areas #4

fb6bde2

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Add double-click action to change the name of the MDI area #4

c50d664

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Restore the state of the MainWindow before restoring the state of the…

6f43ea9

… ExperimentManager #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Avoid tab-names duplication #4

0cd673b

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Handle the case of missing mda_area on fresh dashboard #4

53418d9

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Replace New Workspace button with plus sign #4

f099bc5

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Add tab tooltip - double click to rename #4

cc7caca

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Improve assignment of unique tab titles #4

be4f61b

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Force geomettry refresh on minimized windows on tab-change #4

f3fb5bc

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Keep focus on the last focused subwindow, instead of the minimized one …

e4ca691

…#4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Keep the state of maximized windows, add comments #4

f450339

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

mmalczak added 3 commits June 4, 2025 21:12

Support migration from release-8 to the version with multiple panes #4

a7873ad

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Linter changes #4

7602217

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Adjust for PyQt6 #4

3869ce2

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

mmalczak force-pushed the multiple_panes_qt6 branch from 7032c2e to 3869ce2 Compare June 4, 2025 19:13

mmalczak added 3 commits June 4, 2025 21:41

Do not accommodate state migration between releases #4

4a4ffb5

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Remove unnecessary 'isinstance' checks #4

b4a372f

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Remove duplicated code #4

aa71de0

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

SimonRenblad reviewed Jun 6, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

SimonRenblad reviewed Jun 6, 2025

View reviewed changes

Comment thread artiq/frontend/artiq_dashboard.py Outdated

mmalczak added 8 commits June 6, 2025 23:48

PyQt6 adjustments #4

24e51e3

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Save mdi area state using indexes from the centralWidget. Remove get_…

59fc695

…mdi_area_by_name which becomes redundant now #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Do not enforce unique tab names #4

fbf8ec3

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Hide the close button when there is only one workspace left #4

8951907

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Rename the first Workspace instead of deleteing it when restoring the…

5354921

… state #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Spawn a QLineEdit and positioning it over the tab text instead of usi…

a2dfde1

…ng input dialog to change the tab name #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Remove docstrings or replace it with standard comments #4

507ed75

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Move EditableMdiTabBar to artiq/gui/tools.py #4

cc16f7e

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

mmalczak requested a review from SimonRenblad June 8, 2025 14:51

mmalczak force-pushed the multiple_panes_qt6 branch from 60b20f0 to 24ba2a7 Compare June 14, 2025 22:16

mmalczak added 2 commits June 15, 2025 00:22

Encapsulate the 'multiple panes' logic in MultipleTabsManagement clas…

deb8f4d

…s and move it to artiq/dashboard/experiment_tabs.py #4 Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

Make the tabs movable #4

bf3ed36

Signed-off-by: Miłosz Malczak <milosz.malczak@gmail.com>

mmalczak force-pushed the multiple_panes_qt6 branch from 24ba2a7 to bf3ed36 Compare June 14, 2025 22:22

mmalczak requested a review from marmeladapk June 16, 2025 20:48

Uh oh!

Conversation

mmalczak commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ARTIQ Pull Request

Description of Changes

Related Issue

Type of Changes

Steps (Choose relevant, delete irrelevant before submitting)

All Pull Requests

Code Changes

Git Logistics

Licensing

Uh oh!

marmeladapk commented Apr 16, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SimonRenblad Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

mmalczak Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SimonRenblad commented Apr 17, 2025

Uh oh!

SimonRenblad Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

mmalczak Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mmalczak commented Apr 16, 2025 •

edited

Loading