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

Changed check for default opts

Browse Source
This commit is contained in:
Miika Alonen
2023-02-12 01:38:27 +02:00
parent e08c172f68
commit 666aec3767
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ziffers/classes.py
View File

@ -107,8 +107,7 @@ class Pitch(Event):
self.update_note()
def update_note(self):
"""Update note if Key, Scale and Pitch-class is present
"""
"""Update note if Key, Scale and Pitch-class is present"""
if (
(self.key is not None)
and (self.scale is not None)
@ -268,7 +267,7 @@ class Sequence(Meta):
options = self.__update_options(current, options)
else:
if set(("key", "scale")) <= options.keys():
if isinstance(current,Cyclic):
if isinstance(current, Cyclic):
current = current.get_value()
if isinstance(current, (Pitch, RandomPitch, RandomInteger)):
current = self.__update_pitch(current, options)
@ -420,16 +419,18 @@ class Ziffers(Sequence):
# pylint: disable=locally-disabled, dangerous-default-value
def init_opts(self, options=None):
"""Evaluate the Ziffers tree using the options"""
if options is None or len(options)<=0:
self.options = DEFAULT_OPTIONS
else:
self.options.update(DEFAULT_OPTIONS)
if options:
self.options.update(options)
else:
self.options = DEFAULT_OPTIONS
self.iterator = iter(self.evaluate_tree(self.options))
def re_eval(self, options=None):
"""Re-evaluate the iterator"""
if options is not None:
self.options.update(DEFAULT_OPTIONS)
if options:
self.options.update(options)
self.iterator = iter(self.evaluate_tree(self.options))
@ -619,9 +620,7 @@ class ListOperation(Sequence):
else:
result = [
Pitch(
pitch_class=operation(
x.get_value(), right_value.get_value()
),
pitch_class=operation(x.get_value(), right_value.get_value()),
kwargs=options,
)
for x in result