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

Fix chord visualization #37

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

Fix chord visualization #37

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
14 changes: 7 additions & 7 deletions freetar/ug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def get_chords(s: SongDetail) -> SongDetail:
found = False
for fret, fingers in variants_temp.items():
try:
if not found and fingers.index(1) >= 0:
if not found and (1 in fingers):
found = True
except ValueError:
...
Expand All @@ -158,16 +158,16 @@ def get_chords(s: SongDetail) -> SongDetail:

if not len(variants):
continue
if (6 - len(variants)) >= min(variants.keys()):
for fret in range(1, min(variants.keys())):
variants[fret] = [0] * 6
while len(variants) < 6:
variants[max(variants) + 1] = [0] * 6

variant_strings_pressed = [*variants.values()]
variant_strings_pressed = [sum(x) for x in zip(*variant_strings_pressed)]
unstrummed_strings = [int(not bool(y)) for y in variant_strings_pressed]
variants = {k: variants[k] for k in sorted(variants.keys())}

fingering_for_variant = []
for finger, x in zip(chord_variant["fingers"][::-1], unstrummed_strings):
fingering_for_variant.append("x" if x else finger)
for finger, fret in zip(chord_variant["fingers"][::-1], chord_variant["frets"][::-1]):
fingering_for_variant.append("x" if fret == -1 else finger)
fingering_for_variant = fingering_for_variant

if chord not in chords:
Expand Down