Merge recOrder into waveorder
#183
Merged
Conversation
This file contains hidden or 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
Bump napari-hub-preview-action version to fix CI
) * unpin recorder version * Revert "unpin recorder version" This reverts commit 838e9a1bb49ac5256c876cbad12c12d48da102c7. * add waveorder co-dev guide & fix markdown syntax * fix markdown syntax * bump napari-hub-preview-action version to fix CI * add waveorder co-dev guide & fix markdown syntax * Revert "Merge branch 'waveorder-co-dev' of https://github.com/mehta-lab/recOrder into waveorder-co-dev" This reverts commit 3e09466c4b94828da557c8fe0d25a7eb69f0db0d, reversing changes made to b399c36cae7cdbb1bf0c4bbc08d2888fe4237a87. Co-authored-by: Talon Chandler <talonchandler@gmail.com>
* Pol offset checkbox * apply +90 degree offset when box is checked * remove debug message Co-authored-by: Ziwen Liu <67518483+ziw-liu@users.noreply.github.com>
Import `qtpy` instead of `PyQt5` in autogenerated `gui.py`
…into recon-scripts
* store .npz files in correct place * reduce clutter from local testing * fix qlipp example bug * clean pti tests
* ignore waveorder/_version.py * update recOrder README figure * updates plugin logo
* update main README, README per method to summarize hardware * move `/examples` to `/docs/examples` * `/examples/documentation` -> `/examples/deprecated` * update link * remove [examples] installation * fix tests * cleaning up `/docs` * fix .toml typo * clean development-guide.md * fix typo * update `recorder` -> `waveorder` throughout docs --------- Co-authored-by: Talon Chandler <talonchandler@gmail.com>
Collaborator
Author
|
The major TODOs are complete, and branch is nearly ready to merge. I successfully installed and calibrated on falcon, and I ran successful GUI and CLI reconstructions on bruno. @mattersoflight feel free to make additional README edits on this branch directly. |
ziw-liu
reviewed
Mar 26, 2025
ziw-liu
reviewed
Mar 26, 2025
Member
|
@talonchandler I finally got around to finalizing the README. I like the current structure (overview, summary of methods with illustrations and references, links to examples).
This branch can be merged after this. |
ziw-liu
reviewed
Apr 2, 2025
Co-authored-by: Ziwen Liu <67518483+ziw-liu@users.noreply.github.com>
Collaborator
Author
|
Ready to merge IMO. Re-requesting review from @ziw-liu. Thanks all! |
ziw-liu
reviewed
Apr 2, 2025
ziw-liu
approved these changes
Apr 2, 2025
Contributor
ziw-liu
left a comment
ziw-liu
left a comment
There was a problem hiding this comment.
Thanks! @talonchandler do you want to bump the current head of main as v2.2.1 (we have a v2.2.1b0) before merging?
Collaborator
Author
|
Good idea! Just bumped and released |
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.
This PR merges
recOrderintowaveorder.TODO before this branch merges into
main:recOrder's commit history intowaveorderrecOrderWIP herenow merged)recOrdertowaveorderrecOrdertowaveorder(all remaining PRs are stale and/or very small)TODO after this branch merges into
main:iohub,pydantic, andmicromanagerare getting stale #197, and test.waveorderrecOrderrepository as archived, and point towaveorder, see this recOrder draft PR