Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add superqt QCollapsibles to the gui #107

Merged
merged 82 commits into from
Feb 28, 2022

Conversation

fdrgsp
Copy link
Contributor

@fdrgsp fdrgsp commented Feb 25, 2022

Liked to PR #90 and issue #106.

This PR should be merged after #90.

This PR adds superqt QCollapsibles to the gui.

Compared to #90, I removed the camera bit depth and binning controls since I figured that we can set it through the property browser and we will be able to control it through the group and preset table (once ready).

I also added the shutter widget in the gui (since I want to open a PR to implement shutters control).

720p_coll.mov

@codecov
Copy link

codecov bot commented Feb 25, 2022

Codecov Report

Merging #107 (bbf4b0c) into main (c977b2a) will increase coverage by 0.39%.
The diff coverage is 90.43%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #107      +/-   ##
==========================================
+ Coverage   74.37%   74.77%   +0.39%     
==========================================
  Files          17       19       +2     
  Lines        1686     1748      +62     
==========================================
+ Hits         1254     1307      +53     
- Misses        432      441       +9     
Impacted Files Coverage Δ
micromanager_gui/_gui_objects/_xyz_stages.py 88.09% <ø> (-0.28%) ⬇️
micromanager_gui/multid_widget.py 77.38% <28.57%> (-1.12%) ⬇️
...nager_gui/_gui_objects/_property_browser_widget.py 73.68% <73.68%> (ø)
micromanager_gui/main_window.py 68.02% <75.86%> (-0.10%) ⬇️
micromanager_gui/_gui_objects/_shutters_widget.py 81.48% <81.48%> (ø)
micromanager_gui/_gui_objects/_camera_widget.py 90.19% <100.00%> (-3.05%) ⬇️
...romanager_gui/_gui_objects/_illumination_widget.py 73.68% <100.00%> (-6.32%) ⬇️
...nager_gui/_gui_objects/_mm_configuration_widget.py 83.33% <100.00%> (+1.19%) ⬆️
micromanager_gui/_gui_objects/_mm_widget.py 100.00% <100.00%> (ø)
micromanager_gui/_gui_objects/_objective_widget.py 78.26% <100.00%> (-1.74%) ⬇️
... and 1 more

Continue to review full report at Codecov.

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

@tlambert03
Copy link
Member

looks great. I think we should now remove the group boxes around each of the Objectives, shutters, and camera ROI. let's get #90 in though so you don't need to worry about conflicts, then we'll come back to this

@tlambert03
Copy link
Member

@fdrgsp ... I tried to merge main into this, but it has become a big merge mess now. this is one reason I tried to emphasize that the qcollapsible should come after we merged #90 :). Because this PR was branched off of that PR, we pretty much couldn't do anything to that one without screwing up this one. If it were me, I'd probably just create a new branch from main, and redo whatever you had done here. But I'll leave it up to you. try to get the diff back down to as small of a change as needed to implement what you wanted to do here

@fdrgsp
Copy link
Contributor Author

fdrgsp commented Feb 28, 2022

@tlambert03 Sure, no problem! I'll let you know when it is fixed 👍🏻 Thanks!

@fdrgsp
Copy link
Contributor Author

fdrgsp commented Feb 28, 2022

@tlambert03 I think this is now ready! Let's wait for the tests (locally they all pass) and then you can probably merge.

@tlambert03
Copy link
Member

does ~1,100 added and 995 lines removed sound right for this? Why is this such a big change to add a qcollapsible?

@fdrgsp
Copy link
Contributor Author

fdrgsp commented Feb 28, 2022

does ~1,100 added and 995 lines removed sound right for this? Why is this such a big change to add a qcollapsible?

I think this is just because all the single widgets are a different the before.

@tlambert03
Copy link
Member

ok thanks. I like the new layout, and tests are passing, so I'm going to merge. But will follow up with some stylistic refactors and simplifications, and will ping you

@tlambert03 tlambert03 merged commit 1f441d9 into pymmcore-plus:main Feb 28, 2022
@fdrgsp fdrgsp deleted the QCollapsibles_x2 branch May 27, 2024 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants