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

Modified the downsampling logic to be per dataset rather than global #336

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

ANeaves
Copy link
Contributor

@ANeaves ANeaves commented Mar 1, 2024

Fixes #333

Created to complete the above tagged issue. The frame counter used to select which frames to pass on to the live view socket now counts per Dataset, so if multiple datasets have been selected to be forwarded, it will count them individually.

Copy link
Collaborator

@GDYendell GDYendell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just a few comments.

cpp/frameProcessor/src/LiveViewPlugin.cpp Outdated Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Outdated Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Outdated Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Outdated Show resolved Hide resolved
cpp/frameProcessor/src/LiveViewPlugin.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@GDYendell GDYendell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Being picky I would suggest a rebase to "fixup" (squash without the commit message) the review changes into the first commit, but not a blocker.

Happy to merge this @timcnicholls ?

@timcnicholls
Copy link
Contributor

Thanks @GDYendell yes I'm happy to merge it. @ANeaves would you like me to do the rebase?

@ANeaves
Copy link
Contributor Author

ANeaves commented Mar 19, 2024

Thanks @GDYendell, yes please @timcnicholls if you've time to do the rebase that'd be a great help

@timcnicholls timcnicholls merged commit 357e4c7 into master Mar 19, 2024
15 checks passed
@timcnicholls timcnicholls deleted the live-view-configured-dataset branch March 19, 2024 09:33
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.

Make it possible for the LiveViewPlugin to publish the Nth frame of every configured dataset
3 participants