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

POC: GUI layout for recOrder v1.0.0 #442

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft

POC: GUI layout for recOrder v1.0.0 #442

wants to merge 57 commits into from

Commits on Sep 28, 2023

  1. draft new main widget layout

    @ziw-liu
    ziw-liu committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    f84063d View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. remove redundant slider

    @ziw-liu
    ziw-liu committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    b515d86 View commit details
    Browse the repository at this point in the history

  2. hack: semi-automated config magicgui

    @ziw-liu
    ziw-liu committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    954d12c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. replace typing.List with the builtin generic

    @ziw-liu
    ziw-liu committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    c95533b View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. potential fix for python 3.9 

    where `typing.Union` does not have the `__name__` atrribute
    @ziw-liu
    ziw-liu committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    9165057 View commit details
    Browse the repository at this point in the history

  2. watch zarr poc

    @ziw-liu
    ziw-liu committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    eecbd6c View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. test watching when writing larger images

    @ziw-liu
    ziw-liu committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f5ed6d5 View commit details
    Browse the repository at this point in the history

  2. Dynamic layout of reconstruction wizard (#448) 

    * simplify types

* first-pass dropdown menus

* dynamic modes

* simplify RECONSTRUCTION_TYPES

* debugging script launches new widget

* contain dynamic UI elements

---------

Co-authored-by: Ziwen Liu <[email protected]>
    @talonchandler @ziw-liu
    talonchandler and ziw-liu committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    0dbf946 View commit details
    Browse the repository at this point in the history

  3. generate example settings with revised model

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    dd0f030 View commit details
    Browse the repository at this point in the history

  4. skip reconstruction_settings during GUI generation

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    4f8e24f View commit details
    Browse the repository at this point in the history

  5. fix settings tests

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    5ce8f82 View commit details
    Browse the repository at this point in the history

  6. fix roundtrip io tests

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    194be02 View commit details
    Browse the repository at this point in the history

  7. update comput-tf tests and logic

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    278c274 View commit details
    Browse the repository at this point in the history

  8. update compute-tf tests

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    a0759ce View commit details
    Browse the repository at this point in the history

  9. update reconstruction

    @talonchandler
    talonchandler committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    8490c96 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. final tests passing

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    2842834 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #449 from mehta-lab/revise-settings 

    Revise settings for magic-gui compatibility
    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    ef3a4d1 View commit details
    Browse the repository at this point in the history

  3. unused import

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    8c19e15 View commit details
    Browse the repository at this point in the history

  4. first steps towards reconstruction button

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    1f8c52a View commit details
    Browse the repository at this point in the history

  5. minimally working GUI -> CLI

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    d16b34f View commit details
    Browse the repository at this point in the history

  6. display results in viewer

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    6f6c6ae View commit details
    Browse the repository at this point in the history

  7. annotate types

    @ziw-liu
    ziw-liu committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    2cb8093 View commit details
    Browse the repository at this point in the history

  8. save output to a new file path

    @ziw-liu
    ziw-liu committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    0f915a3 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #450 from mehta-lab/reconstruct-button 

    Minimally working reconstruct button
    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    f739cc7 View commit details
    Browse the repository at this point in the history

  10. add in-progress cb

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    483de87 View commit details
    Browse the repository at this point in the history

  11. tmp inputs

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    0c6c045 View commit details
    Browse the repository at this point in the history

  12. basic listener

    @talonchandler
    talonchandler committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    8124d1e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. checkpoint create-then-fill strategy

    @talonchandler
    talonchandler committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    cbe5b25 View commit details
    Browse the repository at this point in the history

  2. assume finite time points

    @talonchandler
    talonchandler committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ffb6c0b View commit details
    Browse the repository at this point in the history

  3. setup reconstruction queue

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    723957d View commit details
    Browse the repository at this point in the history

  4. put tasks in the queue

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    b82e69c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into listen-to-zarr

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2d038ff View commit details
    Browse the repository at this point in the history

  6. fix the queue

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    3cf7b92 View commit details
    Browse the repository at this point in the history

  7. T and Z sweep acquisition script

    @talonchandler
    talonchandler committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2a0ba12 View commit details
    Browse the repository at this point in the history

  8. integrate with the demo writer

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    025d3f1 View commit details
    Browse the repository at this point in the history

  9. qt slot for callback

    @ziw-liu
    ziw-liu committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    4976c37 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #451 from mehta-lab/listen-to-zarr 

    First-pass listen to zarr, reconstruct, and fill napari layers
    @talonchandler
    talonchandler committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    3fd1017 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Merge branch 'v1-gui-layout' into acquire-z-stack

    @talonchandler
    talonchandler committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    81882ac View commit details
    Browse the repository at this point in the history

  2. move the viewing flag forward

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    c76b8d0 View commit details
    Browse the repository at this point in the history

  3. slow down and acquire from camera

    @talonchandler
    talonchandler committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    a57d2e9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'v1-gui-layout' into acquire-z-stack

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    abac294 View commit details
    Browse the repository at this point in the history

  5. quit worker after finished

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    2fcfa86 View commit details
    Browse the repository at this point in the history

  6. in-progress testing

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    1f55613 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'acquire-z-stack' of https://github.com/mehta-lab/recOrder… 

    … into acquire-z-stack
    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    b3b3c16 View commit details
    Browse the repository at this point in the history

  8. add pyqtslot

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    feb628e View commit details
    Browse the repository at this point in the history

  9. create array before acquisition

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    30b02b1 View commit details
    Browse the repository at this point in the history

  10. fix bug

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    5241569 View commit details
    Browse the repository at this point in the history

  11. fix shape

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    96c575e View commit details
    Browse the repository at this point in the history

  12. xy bug

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    4bc51ab View commit details
    Browse the repository at this point in the history

  13. typo fix

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    8eba361 View commit details
    Browse the repository at this point in the history

  14. put into queue in a separate thread

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    4f3cb53 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/acquire-z-stack' into acquire-z-… 

    …stack
    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    984da22 View commit details
    Browse the repository at this point in the history

  16. attempt to quit worker thread upon close

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    f4eab25 View commit details
    Browse the repository at this point in the history

  17. quit first

    @ziw-liu
    ziw-liu committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    629ddc4 View commit details
    Browse the repository at this point in the history

  18. changes during final push to demo

    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    89686ca View commit details
    Browse the repository at this point in the history

  19. Merge branch 'acquire-z-stack' of https://github.com/mehta-lab/recOrder… 

    … into acquire-z-stack
    @edyoshikun
    edyoshikun committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    28b13b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Merge pull request #453 from mehta-lab/acquire-z-stack 

    Pycromanager T and Z sweep acquisition script
    @talonchandler
    talonchandler committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    160d413 View commit details
    Browse the repository at this point in the history