Skip to content

Use floor to avoid non-integer keys #2

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

Open
abrock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use floor to avoid non-integer keys #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions make_arq.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import json
import subprocess
import stat
import math

try:
from _makearq import get_frame_data as _get_frame_data
Expand Down Expand Up @@ -127,9 +128,10 @@ def get_frames(framenames):
}
def key(t):
sn = t[1]['MakerNotes:SequenceNumber'] - 1
print("sn: {0}".format(sn))
s = 1 + (sn) % 4
i = seq2idx[s]
g = seq2idx[1 + sn / 4]
g = seq2idx[1 + math.floor(sn / 4)]
return (g, i)
frames.sort(key=key)
w, h = frames[0][1]['EXIF:ImageWidth'], frames[0][1]['EXIF:ImageHeight']
Expand Down Expand Up @@ -215,8 +217,4 @@ def main():


if __name__ == '__main__':
try:
main()
except Exception as e:
print('ERROR: %s' % str(e))
exit(-1)
main()