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

Fix incorrect frame duration in last frame in animation mode #43660

Merged
merged 3 commits into from
Jun 14, 2021

Conversation

nyalldawson
Copy link
Collaborator

The final frame must always have the same duration as other frames,
even if this means we go past the end of the animation range. Also
avoid showing a "zero length" frame at the end of the animation
if the frame duration fits exactly into the overall animation
range.

Fixes #40777

The final frame must always have the same duration as other frames,
even if this means we go past the end of the animation range. Also
avoid showing a "zero length" frame at the end of the animation
if the frame duration fits exactly into the overall animation
range.

Fixes qgis#40777
@nyalldawson nyalldawson added Temporal Temporal filtering or animation backport queued_ltr_backports Queued Backports labels Jun 10, 2021
@github-actions github-actions bot added this to the 3.20.0 milestone Jun 10, 2021
increments, instead of a confusing "zero length" range

Fixes qgis#40868
Copy link
Contributor

@nirvn nirvn left a comment

Choose a reason for hiding this comment

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

The additional test logic looks sound to me.

@nyalldawson nyalldawson merged commit 5f5a3a7 into qgis:master Jun 14, 2021
@nyalldawson nyalldawson deleted the fix_40777 branch June 14, 2021 03:08
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-43660-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0221122ceb18265d6596716b74a60196f6d91389,fb90f1b09e6fa48f6896cd53b65544efc253e280,d0328c25aa765234248a6dc53bc30f9de56b5b18
# Push it to GitHub
git push --set-upstream origin backport-43660-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-43660-to-queued_ltr_backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports Temporal Temporal filtering or animation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Temporal Controller ends with a Frame with Step size == zero
3 participants