BuboBubo/ziffers-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Raphaël Forment
2023-02-05 16:20:51 +01:00
parent 79a336887c
commit 4d74186df8
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ziffers/scale.py
View File

@ -1533,31 +1533,20 @@ def get_scale(name: str) -> list:
def note_from_pc( def note_from_pc(
root: int | str, root: int | str,
pitch_class: int, pitch_class: int,
intervals: str | list[int|float], intervals: str | list[int | float],
cents: bool = False, cents: bool = False,
octave: int = 0, octave: int = 0,
modifier: int = 0) -> int: modifier: int = 0) -> int:
"""Resolve a pitch class into a note from a scale""" """Resolve a pitch class into a note from a scale"""
if isinstance(root, str): # Initialization
root = note_to_midi(root) root = note_to_midi(root) if isinstance(root, str) else root
intervals = get_scale(intervals) if isinstance(
intervals, str) else intervals
intervals = list(map(lambda x: x / 100), intervals) if cents else intervals
if isinstance(intervals, str): # Computing the result
intervals = get_scale(intervals) interval_sum = sum(intervals[0:pitch_class % len(intervals)])
if cents:
intervals = list(map(lambda x: x / 100), intervals)
interval_sum = sum(intervals[0:pitch_class])
note = (root + interval_sum if pitch_class >= 0 else root - interval_sum) note = (root + interval_sum if pitch_class >= 0 else root - interval_sum)
return note + octave*sum(intervals) + modifier return note + octave*sum(intervals) + modifier
if __name__ == "__main__":
print(get_scale("Godatic"))
# Taking the fifth from the chromatic scale
user_scale = get_scale("chromatic")
note = note_from_pc(60, -7, user_scale)
print(f"Note: {note} from {user_scale}")