-
Notifications
You must be signed in to change notification settings - Fork 7
Merge recOrder into waveorder
#183
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
Merged
Merged
Changes from all commits
Commits
Show all changes
1377 commits
Select commit
Hold shift + click to select a range
dccceed
Improve documentation
talonchandler fce4e62
Delete examples/__init__.py
talonchandler 87efe8d
TC + ZL script improvements
talonchandler bc88dd0
bump napari-hub-preview-action version to fix CI
ziw-liu 5c4e91a
Merge pull request #251 from mehta-lab/napari-hub-action-fix
talonchandler 0a8d610
Update development guide to install `waveorder` for co-development (#…
ziw-liu 71c4591
Remove unsupported calibration notebook
talonchandler 403aa61
Replace defunct notebooks with working scripts
talonchandler 869525e
Document script workflows
talonchandler 245014a
Remove unused import
talonchandler cd6d519
Improve documentation
talonchandler 5501ea6
Delete examples/__init__.py
talonchandler 7566ce5
TC + ZL script improvements
talonchandler e4105bb
Import qtpy in `gui.py`
talonchandler 1742c8a
Add documentation for changing the file in place
talonchandler fe847f1
90 degree orientation offset checkbox (#248)
talonchandler 4f154eb
Merge branch 'main' into PyQt5-to-qtpy
talonchandler 7af5af3
human-readable time stamp and open in napari
ziw-liu 81577ac
suppress markdown linter complaints
ziw-liu cc8d89c
add gnu sed hint
ziw-liu 5cf4af2
Fix typo
talonchandler 97fc4cf
Merge pull request #252 from mehta-lab/PyQt5-to-qtpy
talonchandler 9c35edd
Merge branch 'recon-scripts' of https://github.com/mehta-lab/recOrder…
talonchandler ef92a34
Remove hidden characters in plugin guide
talonchandler 5f6f0d0
Improve readability of timestamps
talonchandler 61615c6
Fix mismatched bold
talonchandler 5898a9a
🇺🇸 focussing -> focusing
talonchandler 8a61133
Improve create_preset_voltage.png
talonchandler 119c29a
Typo
talonchandler b947e93
Remove extra background info
talonchandler 814b486
Remove whitespace
talonchandler ecca6ff
Merge pull request #249 from mehta-lab/recon-scripts
talonchandler a805114
override initial tab to focus on calibration
ziw-liu 23f6edd
Merge pull request #256 from mehta-lab/init-tab-focus
talonchandler b86a42b
Rename acquisition buttons
talonchandler 1ddb9e4
Remove debugging print statement
talonchandler 1d4835e
Merge pull request #260 from mehta-lab/rename-acq-buttons
talonchandler c4b7ad5
Change background keyword argument
talonchandler eff8b7d
Merge pull request #261 from mehta-lab/suprress-bg-mode-print
talonchandler 09f1f26
Rename "90 Degree Offset"
talonchandler e988cff
Merge pull request #267 from mehta-lab/rename-pol-offset
talonchandler f84f09d
Move the most recent layer to the top of the layers list (#264)
ziw-liu 78b7bbb
use hsv colormap for background orientation layer
ziw-liu 2d7dfc7
draw overlay for both 2D and 3D
ziw-liu 867b5b7
generate overlay in a thread worker
ziw-liu 7806512
add notification for potential delay before update
ziw-liu c85e3e1
Merge pull request #269 from mehta-lab/bg-orientation-hsv
talonchandler 1d9c32f
Merge pull request #270 from mehta-lab/birefringence-3d-overlay
talonchandler 7f948bf
Average over z instead of slicing
talonchandler faf8ca1
Merge pull request #274 from mehta-lab/avg-3D-to-2D-ret-ori
talonchandler d91889a
Read illumination parameters from the loaded calibration instead of G…
ziw-liu 6afc049
add roi size check for cached reconstructor
ziw-liu a733902
add method to save gui state
ziw-liu 01c5380
beautify the method
ziw-liu 86f9a37
save gui state in bg and acq workers
ziw-liu 4d4857f
comment import behavior
ziw-liu 0be6260
Merge pull request #275 from mehta-lab/check-cached-recon-shape
talonchandler 3031672
save phase recon params and do not sort keys
ziw-liu 73f61cd
Add `in_focus_slice` argument
talonchandler 347e6fb
remove dependencies redundant with napari
ziw-liu e68aaab
remove unused dependency
ziw-liu d7d7a42
Call `enter_phase_denoiser` to create attributes
talonchandler 892acb3
Improve reconstruction scripts
talonchandler 5bcb4d6
Add README
talonchandler 40d92fb
Improve slurm docs
talonchandler df8ad0f
Merge pull request #284 from mehta-lab/select-in-focus-z
talonchandler 4af72d3
Example documentation improvements
talonchandler d834223
restore previous MDA settings after acquisition
ziw-liu 69c29b8
Populate if preset name contain any of a list of keywords
talonchandler 52e9b04
Better keywords; insensitive to case
talonchandler 57be9d1
Better comment
talonchandler d893c56
Typos
talonchandler 0238225
docs
talonchandler d21ddeb
Check for non-physical NA arguments
talonchandler 1793b2e
Merge pull request #288 from mehta-lab/check-NA
talonchandler f0f7791
Add "phase" and "ph" as keywords
talonchandler f5978a6
Merge pull request #287 from mehta-lab/bf-preset-keyword
talonchandler f1a42e1
Use simulated phantoms in demo scripts
talonchandler b02b231
Add fluorescence script
talonchandler d91ca67
Improve docs
talonchandler e7f7abf
Sweep regularizations script
talonchandler 7422a65
Add mult-modal-recon.py script
talonchandler 7a843a2
Cleaning up
talonchandler 37014da
Set NA defaults
talonchandler fda8c16
Merge pull request #283 from mehta-lab/dependency-maintenance
talonchandler 4d94480
Merge pull request #279 from mehta-lab/save-gui-state
talonchandler 50e131e
Match GUI's defaults
talonchandler f57e05a
Merge branch 'set_na_defaults' into improve-scripts
talonchandler 43649f1
Even to odd N_defocus for phantoms
talonchandler fd94bdc
Split `qlipp_compute` into `phantoms` and `reconstructions`
talonchandler 6b3bef8
Improved default behavior for `multi-modal-recon.py`
talonchandler 048cdf4
Fix imports after refactoring
talonchandler 6928feb
Merge pull request #291 from mehta-lab/set_na_defaults
talonchandler bbc02ea
Remove unused import
talonchandler 3b2a283
format faq section
ziw-liu 0d7e3d1
Hot fix finishing #291. Match defaults to GUI.
talonchandler 827e056
Merge branch 'main' into improve-scripts
talonchandler 82f6147
Fix import bug
talonchandler e28c831
Merge pull request #289 from mehta-lab/improve-scripts
talonchandler 00b0739
BF keep shutter open
talonchandler c740006
Merge pull request #292 from mehta-lab/bf-keep-shutter-open
talonchandler bdc3417
Merge pull request #286 from mehta-lab/restore-mda-after-acq
talonchandler 4e25aef
initial draft
talonchandler 790c7f1
Only disable "Phase From BF"
talonchandler 9bfce28
Fix typo
talonchandler 794eeb5
fix BF channel index
ieivanov fdaf8b4
Merge pull request #295 from mehta-lab/bugfix-examples
talonchandler d3b9886
Initial draft
606ddb2
Open select positions
783482f
Support channels and positions to layers
09bd32a
make resused elements class attributes
talonchandler bf28e86
Minor relabelling
b5f4a11
Change .convert to convert
cda3d2d
example save single zarr
7534ec0
Revert "example save single zarr"
talonchandler 5b8f52f
example to single zarr
talonchandler 355056d
Revert "Change .convert to convert"
talonchandler f718f93
Revert "Minor relabelling"
talonchandler 51ffe94
Revert "Support channels and positions to layers"
talonchandler 7ed9abf
Revert "Open select positions"
talonchandler ce48fc7
Revert "Initial draft"
talonchandler d213085
Better output channel names
talonchandler 22d9e1d
All scripts save to ./output/reconstructs_
talonchandler 8311532
Remove `msg` from MainWidget namespace
talonchandler fce1eb2
Remove unused import
talonchandler ea3e443
Use `cli.command` instead of `click.command`
talonchandler c62a294
Accidentally commented...might revert
talonchandler 4a41afe
Re-add bf_keywords to msg
talonchandler 23b1b43
Add channel_name text overlay to napari window
talonchandler 8b3e952
Merge pull request #294 from mehta-lab/no-bf-channel
talonchandler 655a764
pin numpy version (#301)
ziw-liu daea451
Change default color to green
2850c8d
Update overview figure
talonchandler d7c2088
Update docs
talonchandler 741befb
Remove DISPLAY AUTHORITY
talonchandler 308ad1c
Merge branch 'main' into cli-view
talonchandler 05246b0
Merge branch 'fix-tox-test' into cli-view
talonchandler 37cadc7
line break between two environment variables
ziw-liu fb44742
Merge pull request #302 from mehta-lab/fix-tox-test
talonchandler d6774a9
Merge branch 'main' into cli-view
talonchandler 7e10ae5
Merge pull request #297 from mehta-lab/cli-view
talonchandler 9ba69f3
swing-invariant extinction
talonchandler e0ea512
Docs first draft
talonchandler 59a3bab
Complete draft of docs
talonchandler 15d8bca
More docs
talonchandler 1b6f7a7
Formatting
talonchandler 009a9ad
Format 2
talonchandler d28c875
Better image sizes
talonchandler c65e4ce
Larger image
talonchandler 27a4f3f
Align center
talonchandler 28612e0
Add docstring and mention in other guides
talonchandler 7098de7
Typo
talonchandler d719272
Plugin guide typo
talonchandler ea878be
"Extinction" -> "Extinction Ratio" in GUI
talonchandler 1ff922a
White background on figs
talonchandler 107c497
Rewording edits
talonchandler 58c04be
Merge pull request #308 from mehta-lab/swing-invariant-extinction
talonchandler 55ede5f
Link to calibration guide
talonchandler 4ce4384
"S0" -> "BF - computed" in example script
talonchandler 0459cbf
Merge branch 'main' into example-to-single-zarr
talonchandler 0768f88
Merge pull request #310 from mehta-lab/fix-calib-docs
talonchandler 0a17504
Merge pull request #298 from mehta-lab/example-to-single-zarr
talonchandler d62bdf9
Update setup.cfg for macos_arm64 specific dependencies (#313)
mattersoflight d32bf46
Fix cli entry points
6d12fdd
Move imports into cli functions
b5e5e4e
black formatting
talonchandler a1451ee
Merge pull request #317 from mehta-lab/import-inside-cli-funcs
talonchandler 5d56b29
Updated Pycromanager to 0.24.1. (#307)
nicost 6742be9
remove transpose+copy (#322)
talonchandler c61c124
Depend on `iohub` (#331)
talonchandler fd74e3e
Multiprocessing script for reconstructing multiple positions and time…
talonchandler add3280
depend on iohub tagged release (#333)
talonchandler 78b510e
Add overlay option to `view` command (#336)
talonchandler 8c400d6
Turn live mode off when loading calibration (#335)
talonchandler 190443a
Write to single zarr store (#340)
talonchandler 1259d51
Install iohub from PyPI (#342)
ziw-liu 17033e8
Minor documentation updates for 0.3.0 (#344)
talonchandler 802cc62
pin README links (#345)
talonchandler 6b2b3cc
Test docking the plugin widget (#346)
ziw-liu cf7ded1
test on all PRs (#383)
talonchandler 96dca01
`0.4.0dev` merge to `main` (#375)
talonchandler 165d100
Bump dependencies and enable widget test (#391)
ziw-liu 276081f
0.4.0 installation documentation (#395)
talonchandler 858f3d4
Reconstruct a subset of time indices (#398)
talonchandler 1367a35
remove `recorder` view (#400)
talonchandler 7cf3b56
Pass scale metadata through `recorder reconstruct` (#399)
talonchandler 6dc571b
skip `QFileDialog.Options()` (#404)
talonchandler 038cc93
Standardize CLI (#402)
talonchandler e38e764
"Flip Orientation" and "Invert Phase Contrast" GUI checkboxes (#405)
talonchandler c40205c
CLI creates empty HCS zarr then fills it (#408)
talonchandler fbffe97
bump iohub (#414)
talonchandler 2843c6a
gui save to plate (#415)
talonchandler 7f57e33
Refactor apply_inverse_transfer_function file for multiprocessing (#411)
talonchandler f1fedef
Check for PyQt5 (#420)
talonchandler d017f6d
simplify dask graph before computing overlay (#423)
ziw-liu 9368932
Clean deprecated (#422)
talonchandler e17da56
Retardance reconstructions in nm (#413)
talonchandler 50cd8d9
`recOrder` data schema (#421)
talonchandler 828f266
Implement schema (#424)
talonchandler bbf3502
Redo overlay2 (#425)
talonchandler 8cf7037
Improved birefringence overlays (#426)
talonchandler e48b116
0.4.0 revised documentation (#428)
talonchandler 7f56ed0
"Orientation Legend" -> "Visualization" tab (#431)
talonchandler 2f5ae16
Background scaling, naming, and squeezing (#429)
talonchandler f2d5bb8
Sample contribution merge to main (#434)
talonchandler d644cc2
squeeze scale with image (#435)
talonchandler 8e7c728
0.4.0 release fixes (#436)
talonchandler 4363c7f
update links (#439)
talonchandler 0d61103
fix bug loading timepoints in apply_inverse_to_zyx_and_save (#441)
ieivanov ff996ba
remove the napari hub preview workflow (#446)
ziw-liu 7f33e5d
Update README and sample contribution (#440)
talonchandler 2aa080e
Direct link to README image (#447)
talonchandler 8f34a12
Append channels via CLI calls (#454)
talonchandler 5becc0c
test on python 3.11 (#455)
ziw-liu d31ad91
Optional GUI/PM dependencies (#456)
ziw-liu b9ccc93
Chunk transfer functions (#463)
talonchandler 57f611e
Pass metadata (#464)
talonchandler 0fa5af2
Collect and unify color overlays (#473)
talonchandler 3b216bb
pin ome-zarr (#475)
talonchandler a6d842a
Fix background-check bug (#469)
talonchandler 7687259
Default HSV colormap (#471)
talonchandler 9f0a37a
Bump Python, iohub, and waveorder (#478)
ziw-liu 6c70732
Parallelize reconstructions with `submitit` (#477)
talonchandler 6b34489
put test_store.zarr in `tmp_path` (#495)
talonchandler fcaa1f3
Update badges (#489)
talonchandler 29e804f
Buyer's guide (#486)
talonchandler e2eb24a
Standalone auto-generated reconstruction GUI (#487)
amitabhverma c4fed09
remove pyqt6 dependency and re-worked setup cfgs (#503)
amitabhverma 63b4be8
Merge remote-tracking branch 'recorder/main' into recorder-merge
talonchandler bce393f
Fix installation (#184)
talonchandler 2ada656
style
talonchandler 9293f1a
run action on all prs
talonchandler f98b4e7
ignore style changes
talonchandler f682c31
Fix non-example pytests (#186)
talonchandler 3e2abb8
Clean up examples and temp files (#187)
talonchandler b5a7a25
Remove recorder image references (#189)
talonchandler bfe8741
don't save recorder version
talonchandler 56fd046
Merging README (#188)
mattersoflight 6849375
clean "recOrder" from docs
talonchandler bd40f79
minor docs fix
talonchandler 7cb5453
update README: phase from defocus
mattersoflight c7090ca
add refs for fluorescence reconstruction
mattersoflight 4fab7d5
logo as top-level headline
talonchandler f5d9b7f
remove `setup.py`
talonchandler 10ac8d1
75%-size logo
talonchandler bb2e157
smaller
talonchandler 34938df
Add quotes to `pip install "waveorder[all]"`
talonchandler c2d4528
try again w/ <img> attributes
talonchandler f2852a5
even smaller
talonchandler 394e442
remove mention of confocal fluorescence reconstruction
talonchandler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| # .git-blame-ignore-revs | ||
| # created as described in: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view | ||
|
|
||
| # black-format files | ||
| 07517c3353c392106cabae003d589946ea25918a | ||
| 82f6df5ed34460374ce7c0fdca089d8caa570b9f | ||
| aa7050f973f36dc204ea495e105b5432223dc68d | ||
| a3dd7e5e9bc0bed404792e9b241f1639ade76f33 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --- | ||
| name: Bug report | ||
| about: Create a report to help us improve | ||
| title: "[BUG]" | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| **Summary and expected behavior** | ||
|
|
||
| **Code for reproduction (using python script or command line interface)** | ||
| ``` | ||
| # paste your code here | ||
|
|
||
| ``` | ||
|
|
||
| **Screenshots or steps for reproduction (using napari GUI)** | ||
|
|
||
| **Include relevant logs which are created next to the output dir, name of the dataset, yaml file(s) if encountering reconstruction errors.** | ||
|
|
||
| **Expected behavior** | ||
| A clear and concise description of what you expected to happen. | ||
|
|
||
| **Environment:** | ||
|
|
||
| Operating system: | ||
| Python version: | ||
| Python environment (command line, IDE, Jupyter notebook, etc): | ||
| Micro-Manager/pycromanager version: |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| name: Documentation | ||
| about: Help us improve documentation | ||
| title: "[DOC]" | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| **Suggested improvement** | ||
|
|
||
| **Optional: Pull request with better documentation** |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- | ||
| name: Feature request | ||
| about: Suggest an idea for this project | ||
| title: "[FEATURE]" | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| **Problem** | ||
|
|
||
| **Proposed solution** | ||
|
|
||
|
|
||
| **Alternatives you have considered, if any** | ||
|
|
||
| **Additional context** | ||
| Note relevant experimental conditions or datasets |
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
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: test | ||
|
|
||
| on: [push] | ||
|
|
||
| jobs: | ||
| test: | ||
| name: ${{ matrix.platform }} py${{ matrix.python-version }} | ||
| runs-on: ${{ matrix.platform }} | ||
| strategy: | ||
| matrix: | ||
| platform: [ubuntu-latest, windows-latest, macos-latest] | ||
| python-version: ["3.10", "3.11"] | ||
|
|
||
| steps: | ||
| - name: Checkout repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| # these libraries enable testing on Qt on linux | ||
| - uses: tlambert03/setup-qt-libs@v1 | ||
|
|
||
| # strategy borrowed from vispy for installing opengl libs on windows | ||
| - name: Install Windows OpenGL | ||
| if: runner.os == 'Windows' | ||
| run: | | ||
| git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git | ||
| powershell gl-ci-helpers/appveyor/install_opengl.ps1 | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| python -m pip install setuptools tox tox-gh-actions | ||
|
|
||
| # https://github.com/napari/cookiecutter-napari-plugin/commit/cb9a8c152b68473e8beabf44e7ab11fc46483b5d | ||
| - name: Test | ||
| uses: aganders3/headless-gui@v1 | ||
| with: | ||
| run: python -m tox | ||
|
|
||
| - name: Coverage | ||
| uses: codecov/codecov-action@v3 | ||
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
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.