ARC dev branch #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g issue. I've just hacked in a missing attribute to all of the GroupLayer children - they need to have a Node mixin to behave properly
…t SEG-faults or index errors when moving groups within groups, particularly empty group into empty group.
…ayers view. Still seg-fault bug when nesting two empty group layers
* Edit file name to be specific to our use case * Rename single test
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4 +/- ##
==========================================
- Coverage 93.87% 89.66% -4.21%
==========================================
Files 2 8 +6
Lines 49 484 +435
==========================================
+ Hits 46 434 +388
- Misses 3 50 +47 ☔ View full report in Codecov by Sentry. |
* Add workflow step to run tests on head of napari * Add optional dependency on napari-latest which fetches napari from the git repo directly * Create an optional install that uses HEAD of napari, add it to list of tests * Add note that napari-latest install is available to README * Update README.md Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com> --------- Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com>
* Add conftest.py for shared fixtures and do a quick model check for our QtGroupLayerModel * Typehints don't carry through fixtures
* allow renaming of groups and layers * keep prefix for group layers and update setRoot * remove unused tree_model * add initial tests for renaming * add test for editing state on double click * move tests into test_group_layer_widget
* Ensure GroupLayer subclasses from our own subclass of Node * Define ambiguously inherited attributes (IE ensure I don't break KM's tests) * Actually use the nested structure fixture so ruff doesn't get angry * Reorganise the test suite fixture layout since it's starting to get bloated * Basic tests to check is_group and strict typing * Self-review * Allow _check_if_already_tracking to be optionally recursive. Write test for method. * Update src/napari_experimental/group_layer.py Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> * Dammit linter --------- Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>
* add group layer controls * fix controls for latest changes to group layer * remove syncing of selection * add tests for group layer controls * fix TypeError * expand docstrings * react to sub-groups
* Allow group_layer to return a flat index * Enforce layer order updates through the GroupLayer events * Rework how items are added to GroupLayers to make things more explicit * Remove unused function * Docstring Tidy (#27) * Some docstrings for _widget * Docstrings for GroupLayerNode class * docstrings for group_layer_qt * Docstrings for group_layer.py * Add attributes and methods to classes where necessary * Missed a rename * Add tests for widget activity * Test for layer deletion sync * Ruff for 3.9 disagrees with 3.11 * strict keyword not in Py3.9
* Allow group_layer to return a flat index * Enforce layer order updates through the GroupLayer events * Rework how items are added to GroupLayers to make things more explicit * Remove unused function * Docstring Tidy (#27) * Some docstrings for _widget * Docstrings for GroupLayerNode class * docstrings for group_layer_qt * Docstrings for group_layer.py * Add attributes and methods to classes where necessary * Missed a rename * Write method that fixes the min failing example * Hey look, a docstring! * Remove double-counting of positions after destination * Test revise index method, remove redundant variable passed * Maybe this is correct if I have a flat index sort a priori * Fix ordering issue and allow for Groups to be assigned a flatindex * Add 2nd test to check moving items out of different subgroups still tracks order correctly * Remove un-necessary variable * Remove commented-out experimental code * Apply suggestions from @K-Meech code review
* MDLint + alessandrofelder -> brainglobe in README * Create implementation deatils section * Group and Node subclassing explanations * Notes on indexing conventions * Update README.md Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com> --------- Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>
* add group layer delegate * rename group layer delegate * add context for right click menu * working minimal right click menu * fix syncing of selection * update docstrings and remove unused functions * fix double click edit * simplify right click actions and context to fix tests * update docstrings * Force widget in tests to have a parent (#35) * Allows toggling visibility of group layers (#30) * toggle visiblity for group layers * add tests for visiblity * update docstrings * fix failing tests * remove logger and thumbnail role * fix view controls when switching from group to layer --------- Co-authored-by: Will Graham <32364977+willGraham01@users.noreply.github.com>
|
@alessandrofelder I've opened #37 which fixes the issue with the automatic merge (it's an empty change because one commit was cherry-picked from Once that's in, this PR will be merge-able into |
* Fix seg-faults and broken drag-and-drop via overwriting index method * Switch to unique ID trackers over reimplementing method. Allows safe overwride of __eq__ and __hash__ * Remove one bug from the README broken features section --------- Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com>
* Basic Sphinx build and docs structure * Workflow to publish docs on pushes to main * Separate sphinx requirements from package requirements * Add building the docs section * Reorganise group_layers docs * Docs API for Groups & Nodes, some source docstring updates for text rendering * Placeholder for widget docs * Write widget docs page * Add note on hashing things * expand docs for group layers, delegates and context menu (#40) --------- Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>
alessandrofelder
approved these changes
Jul 10, 2024
There was a problem hiding this comment.
Big thanks to @willGraham01 and @K-Meech for excellent work on this 🎉
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before submitting a pull request (PR), please read the contributing guide.
Please fill out as much of this template as you can, but if you have any problems or questions, just leave a comment and we will help out :)
Description
What is this PR
Why is this PR needed?
Intended to remain as a draft for quick comparison between ARC development and the current state of
main. It also means that any test workflows added tomainwill automatically be run on this branch too.Recommended to break convention here and just merge this PR rather than squash and merge. The commit history is already modular thanks to the ways of working that were adopted during the development period, though a squash merge would also be acceptable if we want to view this PR as providing an "alpha" version of the plugin.
What does this PR do?
Implements group layers! For more details, one should review the README and the commit log (and then head to the relevant PRs). However, key features include:
Note that some development features, notably the
tests/blobs.pyscript andenter_debugmethods for the main widget are still present.References
#1
How has this PR been tested?
A testing framework has been built up and included in the development work, and so comes in with this PR.
Is this a breaking change?
No
Does this PR require an update to the documentation?
Yes, though again this is provided along with the new method.
We should probably write documentation as part of this.
Checklist: