Interface overhaul #28

C-Achard · 2022-08-15T14:40:31Z

API & UI overhauls

TODO :

Maybe :

Make some widget elements that are opened on user action (mainly cropping) singletons to avoid issues with opening/closing

Note : check that correct layer types apply to all utils especially.

deprecated-napari-hub-preview-bot · 2022-08-15T14:51:47Z

Preview page for your plugin is ready here:
https://preview.napari-hub.org/AdaptiveMotorControlLab/CellSeg3d/28
Updated: 2022-10-02T09:04:07.530381

codecov-commenter · 2022-08-15T15:54:55Z

Codecov Report

Merging #28 (2ebdc5d) into main (30c3e4d) will increase coverage by 17.61%.
The diff coverage is 63.17%.

@@             Coverage Diff             @@
##             main      #28       +/-   ##
===========================================
+ Coverage   37.59%   55.21%   +17.61%     
===========================================
  Files          38       44        +6     
  Lines        3511     4211      +700     
===========================================
+ Hits         1320     2325     +1005     
+ Misses       2191     1886      -305

Impacted Files	Coverage Δ
...ri_cellseg3d/code_models/models/model_SwinUNetR.py	`54.54% <ø> (ø)`
...ari_cellseg3d/code_models/models/model_TRAILMAP.py	`0.00% <ø> (ø)`
napari_cellseg3d/code_models/models/model_VNet.py	`42.85% <ø> (ø)`
...ellseg3d/code_models/models/unet/buildingblocks.py	`22.50% <ø> (ø)`
napari_cellseg3d/code_plugins/plugin_metrics.py	`0.00% <0.00%> (ø)`
napari_cellseg3d/dev_scripts/drafts.py	`0.00% <ø> (ø)`
napari_cellseg3d/dev_scripts/weight_conversion.py	`0.00% <0.00%> (ø)`
napari_cellseg3d/plugins.py	`0.00% <0.00%> (ø)`
napari_cellseg3d/code_models/model_workers.py	`24.55% <23.64%> (ø)`
napari_cellseg3d/code_plugins/plugin_crop.py	`34.61% <34.61%> (ø)`
... and 28 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

MMathisLab · 2023-03-01T15:37:38Z

looking forward to reviewing! It's a big one (with some conflicts, so maybe rebase to main first?) Also good to have Tim test the user experience?

C-Achard · 2023-03-01T15:55:41Z

looking forward to reviewing! It's a big one (with some conflicts, so maybe rebase to main first?) Also good to have Tim test the user experience?

@MMathisLab I will fix the conflicts when merging, I've already included most of the changes from main manually. I'll ask Tim as well, thank you!

MMathisLab · 2023-03-01T16:05:24Z

but can you please rebase before I review it? see basecamp :D

- GroupedWidgets replaces make_group - ContainerWidget replaces make_container

- Removed make_container, make_checkbox, now uses provided UI classes

- Prepared ModelConfig for model info - Prepared InferenceConfig - docstring update

- GroupedWidgets replaces make_group - ContainerWidget replaces make_container

Fixed type errro

Fix argument name error

Fix argument errors

lint

- Added label for model input size - Added warning when folder loading fails

- Replaced all large argument lists with dataclasses for clarity and robustness

Fix type

- QtWarningMsg removed for PyQt6 - Restored write() method in Log for download progress

jeylau · 2023-03-27T21:29:09Z

napari_cellseg3d/interface.py

+    # head = msg.split(": ")[0]
+    # if type == QtWarningMsg and head == "QWindowsWindow::setGeometry":
+    #     logger.warning(
+    #         f"Qt resize error : {msg}\nhas been handled by attempting to resize the window"
+    #     )
+    #     try:
+    #         if widget.parent() is not None:
+    #             state = int(widget.parent().parent().windowState())
+    #             if state == 0:  # normal state
+    #                 widget.parent().parent().adjustSize()
+    #                 logger.debug("Non-max. size adjust attempt")
+    #                 logger.debug(f"{widget.parent().parent()}")
+    #             elif state == 2:  # maximized state
+    #                 widget.parent().parent().showNormal()
+    #                 widget.parent().parent().showMaximized()
+    #                 logger.debug("Maximized size adjust attempt")
+    #     except RuntimeError:
+    #         pass


This code wasn't functional?

It's not broken per se, but I've had two issues with it :

Inconsistency (it sometimes fails to do its job, maybe I missed a window status case, though usually it's when napari is maximized)

Causes ImportError when using PyQt6 as backend (this was the reason for commenting, it hindered testing of the plugin on other computers)

I could spend some time fixing it, but those resize errors seem to mainly occur on 4K screens (PyQt5's support of it is not perfect) and less so on more typical resolutions. I can check again on a 1080 screen

(Note to self : Maybe it'd be worth checking if it goes to the except block)

C-Achard added enhancement New feature or request UI Related to the UI labels Aug 15, 2022

C-Achard self-assigned this Aug 15, 2022

C-Achard mentioned this pull request Aug 19, 2022

v0.0.1rc4 #29

Merged

C-Achard mentioned this pull request Sep 2, 2022

Documentation status #15

Open

33 tasks

C-Achard mentioned this pull request Oct 31, 2022

CVE-2007-4559 Patch #31

Merged

C-Achard closed this Mar 1, 2023

C-Achard reopened this Mar 1, 2023

C-Achard marked this pull request as ready for review March 1, 2023 15:19

C-Achard requested a review from MMathisLab March 1, 2023 15:19

C-Achard added 15 commits March 1, 2023 18:38

Fix rebase conflicts

06540a9

UI improvements

25664ba

- GroupedWidgets replaces make_group - ContainerWidget replaces make_container

Refactor UI funcs

27b51d2

- Removed make_container, make_checkbox, now uses provided UI classes

Started dataclass conversion for params

249267c

- Prepared ModelConfig for model info - Prepared InferenceConfig - docstring update

Rebase + lint

b829a3d

Fix rebase conflicts

7047182

UI improvements

5d9d957

- GroupedWidgets replaces make_group - ContainerWidget replaces make_container

Keep dict for model info

6f24316

Update model_workers.py

afe4f09

Fixed type errro

Fixed incorrect calls to ContainerWidget

400b21e

Update plugin_model_inference.py

6a1e98c

Fix argument name error

Update plugin_model_inference.py

09244ea

Fix argument errors

🎨

fd0af48

lint

Model input label + warn for empty/wrong folder

5bf1dbe

- Added label for model input size - Added warning when folder loading fails

Started refactoring config

6a255c8

- Replaced all large argument lists with dataclasses for clarity and robustness

C-Achard added 21 commits March 3, 2023 11:24

Update test_and_deploy.yml

f23c578

Update test_and_deploy.yml

f493531

Update test_plugin_inference.py

a0bc9e4

Fix type

Updated weight download test

34a5025

Update test_weight_download.py

5e27e50

Disable weight download test

816bb48

Updated actions version

e2295a1

Test other action for testing

76feee2

Disabled longer tests

42c8f94

Try longer tests on Windows

b235e9e

Disable macos

92cfb5c

Disabled longer tests

809de64

Try training short test

96a5783

Test yield

93748d7

Disabled worker tests

93e2654

Improving testing

fba44fd

Updated training test with small model

87c1c71

Disabled worker tests

114ae0b

Update setup.cfg

fc6e413

Disable resize handler, re-enabled write in Log

2ebdc5d

- QtWarningMsg removed for PyQt6 - Restored write() method in Log for download progress

black

6e10946

C-Achard added the documentation Improvements or additions to documentation label Mar 15, 2023

C-Achard changed the title ~~[WIP] Cy/interface overhaul~~ Cy/interface overhaul Mar 15, 2023

C-Achard changed the title ~~Cy/interface overhaul~~ Interface overhaul Mar 15, 2023

C-Achard mentioned this pull request Mar 15, 2023

Voronoi-Otsu labeling + instance segmentation code overhaul #34

Merged

C-Achard requested a review from jeylau March 27, 2023 09:00

jeylau reviewed Mar 27, 2023

View reviewed changes

jeylau approved these changes Mar 28, 2023

View reviewed changes

C-Achard merged commit cdc09de into main Mar 29, 2023

C-Achard deleted the cy/interface-overhaul branch December 5, 2023 14:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Interface overhaul #28

Interface overhaul #28

Uh oh!

C-Achard commented Aug 15, 2022 •

edited

Loading

Uh oh!

deprecated-napari-hub-preview-bot bot commented Aug 15, 2022 •

edited

Loading

Uh oh!

codecov-commenter commented Aug 15, 2022 •

edited

Loading

Uh oh!

MMathisLab commented Mar 1, 2023

Uh oh!

C-Achard commented Mar 1, 2023 •

edited

Loading

Uh oh!

MMathisLab commented Mar 1, 2023

Uh oh!

jeylau Mar 27, 2023

Uh oh!

C-Achard Mar 28, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Interface overhaul #28

Interface overhaul #28

Uh oh!

Conversation

C-Achard commented Aug 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deprecated-napari-hub-preview-bot bot commented Aug 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Aug 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MMathisLab commented Mar 1, 2023

Uh oh!

C-Achard commented Mar 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MMathisLab commented Mar 1, 2023

Uh oh!

jeylau Mar 27, 2023

Choose a reason for hiding this comment

Uh oh!

C-Achard Mar 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

C-Achard commented Aug 15, 2022 •

edited

Loading

deprecated-napari-hub-preview-bot bot commented Aug 15, 2022 •

edited

Loading

codecov-commenter commented Aug 15, 2022 •

edited

Loading

C-Achard commented Mar 1, 2023 •

edited

Loading

C-Achard Mar 28, 2023 •

edited

Loading