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.

Sign up for GitHub

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

Jump to bottom

Undo/redo, dask compatibility #17

Merged
merged 64 commits into from
May 15, 2022
Merged

Undo/redo, dask compatibility #17

merged 64 commits into from
May 15, 2022

Conversation

haesleinhuepf
Copy link
Owner

  • Undo/redo GUI by @Cryaaa
  • Dask 4D array compatibility

Cryaaa and others added 30 commits March 9, 2022 10:49
@Cryaaa
making saving work
32b7676
@Cryaaa
making progress on deleting layers and widgets
b0afcca
@Cryaaa
progress
813c549
@Cryaaa
continuing work on saving single states
5def4d0
@Cryaaa
Merge branch 'haesleinhuepf:main' into workflow-undo-functionality
8a8feef
@Cryaaa
debugging
3025547
@Cryaaa
Update Saving a workflow state and reloading it after deleting layers…
7468585 
… and widgets.ipynb
@Cryaaa
making progress on debugging undo
12168da
@Cryaaa
reverted some changes that didn't make sense
f15136b
@Cryaaa
first test implementation of undo
4fd3064
@Cryaaa
slight change to freezing (makes more sense this way)
46f2d3f
@haesleinhuepf
enable pre-selecting operation and setting auto-call
d43aade
@haesleinhuepf
utility functions for finding functions and categories
1094bf6
@haesleinhuepf
build GUI with operation-selection
62a97c5
@Cryaaa
testing notebooks created and small typo
8d6b69e
@Cryaaa
implemented a function that retrieves the right op name when no opera…
0f86d7b 
…tion is specified beforehand

also update testing notebooks and add test workflows.
@Cryaaa
Update testing loading with new gui.ipynb
902b859
@Cryaaa
trying to get new method to work without relying on try except
7d90d66
@Cryaaa
testing notebooks modified
b0a5d61
@Cryaaa
adding prints for debugging
22cfd43
@Cryaaa
fixing bugs (hopefully finally for kwargs situation
ab791ed
@Cryaaa
small comments and formatting changes
597bf8e
@Cryaaa
notin much
4d72ac6
@Cryaaa
working (so far)
c2c5643
@Cryaaa
commenting out prints for now
1a64c2c
@Cryaaa
SO CLOSE TO FINISHED!
a3b79bc
@Cryaaa
adjusting button size to keep widgets more similar
11d8e0b
@Cryaaa
Merge branch 'operation_select_after_workflow_loading' into workflow-…
2f90cf1 
…undo-functionality
@Cryaaa
trying to make undo work
7fbcd64
@Cryaaa
cleaning up the code and fixing some todo's
b6a8f38
Cryaaa and others added 21 commits April 28, 2022 10:29
@Cryaaa
removing notebooks not needed anymore
e94a4ec
@Cryaaa
only reloading when needed and changing otherwise
13c2c03
@Cryaaa
notebook changes
3ccbcaf
@Cryaaa
Update Undo and Redo category widgets - testing functionality.ipynb
bf3caec
@Cryaaa
removing old stuff
2f7649d
@Cryaaa
fixed a bug when changing algorithms
6edb661
@Cryaaa
Merge branch 'main' into workflow-undo-functionality
f46a281
@Cryaaa
removing the button size and adding a default button size parameter t…
450d2c2 
…hat is importable
@Cryaaa
making things work again after merging main into here
86e7f69
@Cryaaa
testing undo with 4d data
5a11dde
@Cryaaa
testing some new stuff
343d1b0
@Cryaaa
revert changes to category widget
0f7a74f 
The problems arise because of 4D handling
@Cryaaa
removing prints
f723c1f
@haesleinhuepf
Merge pull request #12 from Cryaaa/workflow-undo-functionality
106d13c 
Workflow undo functionality
@haesleinhuepf
split into separate undo and redo buttons
da30c35
@haesleinhuepf
removed obsolete code that co-exists in napari-time-slicer
acd8188
@haesleinhuepf
pass viewer to clesperanto functions
9de8d46
@haesleinhuepf
delayed layer updates, prevent undo/redo 4D
cf89e7d
@haesleinhuepf
minor dask related bug fixes
77e3ed6
@haesleinhuepf
immediately refresh layers
2f8a7d6
@haesleinhuepf
prevent unnecessary again-and-again computing of results
fd9bbca
@haesleinhuepf
Copy link
Owner Author

haesleinhuepf commented May 15, 2022 •
edited
Loading

Codecov Report

Merging #17 (e0f0652) into main (2f0d159) will decrease coverage by 1.61%.
The diff coverage is 4.93%.

@@            Coverage Diff             @@
##             main      #17      +/-   ##
==========================================
- Coverage   30.15%   28.54%   -1.62%     
==========================================
  Files          12       13       +1     
  Lines         892     1023     +131     
==========================================
+ Hits          269      292      +23     
- Misses        623      731     +108
Impacted Files Coverage Δ
napari_assistant/_undo_redo.py 0.00% <0.00%> (ø)
napari_assistant/_workflow_io_utility.py 0.00% <0.00%> (ø)
napari_assistant/_gui/_category_widget.py 14.23% <5.26%> (-0.86%) ⬇️
napari_assistant/_gui/_Assistant.py 33.07% <9.80%> (-5.03%) ⬇️
napari_assistant/_categories.py 60.10% <17.64%> (+3.71%) ⬆️

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 2f0d159...e0f0652. Read the comment docs.

@haesleinhuepf haesleinhuepf merged commit 06ab5bd into main May 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@haesleinhuepf @Cryaaa