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.

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

Remove shot from "select markers" drop down when shot is removed #61

Merged

Conversation

carterturn
Copy link
Contributor

The pull request attempts to resolve issue #44 by removing shots from the "select markers" drop down when the shot is removed from runviewer.
It successfully avoids issues with shots being loaded, deleted, and loaded again.
However, this PR does change the behavior of runviewer in that previously loaded shots are no longer visible (greyed out) in the "select markers" drop down. In my opinion, the new behavior is acceptable, and---since the entries for deleted shots are greyed out---it should not impact workflows.
The case of loading the same shot twice, the removing one or both also seems to be handled correctly.

@dihm
Copy link
Contributor

dihm commented Feb 9, 2024

Confirmed this fixes the issue. Agreed that there is no worry about changing workflow or anything. Merging.

@dihm
Copy link
Contributor

dihm commented Feb 9, 2024

Thanks for the Fix!

@dihm dihm merged commit 9ce5bea into labscript-suite:master Feb 9, 2024
1 check passed
dihm added a commit that referenced this pull request Feb 9, 2024
commit 0b698cea7230e63913dc174f7d290b2251241bad
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Feb 9 10:22:53 2024 -0500

    Merge pull request #64 from dihm/update_release_workflow

    Version bump gh actions to update node.js to 20

commit 332228533d61b80613748dbaab8a1e3a0d109e72
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Feb 9 08:02:55 2024 -0500

    Merge pull request #61 from carterturn/carterturn-dropdown-cleaning

    Remove shot from "select markers" drop down when shot is removed

commit 5dd5c5dd943b0acecac624709b6b79a0b42409b0
Author: David Meyer <dihm@users.noreply.github.com>
Date:   Fri Feb 9 07:45:40 2024 -0500

    Merge pull request #63 from dihm/setuptools_scm_fix

    Ensure `release-branch-semver` is used.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants