# HG changeset patch # User Drew Perttula # Date 2018-06-04 07:05:42 # Node ID 299d49de85a85609af43f8f93fcd8f4b9a92e7d9 # Parent b680d6f50a93deb0a3a0302fe2f74c902dfab3fe effectSequencer info display Ignore-this: 88d2b52511206f38b90b2658bc63ec9c diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -460,12 +460,12 @@ class KeyboardComposer(tk.Frame, SubClie strength = _graph.value(setting, L9['level']) if strength: now = time.time() - outputSettings.append( - self.effectEval[effect].outputFromEffect( - [(L9['strength'], strength)], - songTime=now, - # should be counting from when you bumped up from 0 - noteTime=now)) + out, report = self.effectEval[effect].outputFromEffect( + [(L9['strength'], strength)], + songTime=now, + # should be counting from when you bumped up from 0 + noteTime=now) + outputSettings.append(out) return DeviceSettings.fromList(_graph, outputSettings) diff --git a/light9/effect/effecteval.py b/light9/effect/effecteval.py --- a/light9/effect/effecteval.py +++ b/light9/effect/effecteval.py @@ -51,8 +51,9 @@ class EffectEval(object): strength = float(effectSettings[L9['strength']]) if strength <= 0: - return DeviceSettings(self.graph, []) + return DeviceSettings(self.graph, []), {'zero': True} + report = {} out = {} # (dev, attr): value out.update(self.simpleOutputs.values( @@ -63,12 +64,12 @@ class EffectEval(object): try: func = globals()[tail] except KeyError: - pass + report['error'] = 'effect code not found for %s' % self.effect else: out.update(func(effectSettings, strength, songTime, noteTime)) outList = [(d, a, v) for (d, a), v in out.iteritems()] - return DeviceSettings(self.graph, outList) + return DeviceSettings(self.graph, outList), report def effect_Curtain(effectSettings, strength, songTime, noteTime): diff --git a/light9/effect/sequencer.html b/light9/effect/sequencer.html --- a/light9/effect/sequencer.html +++ b/light9/effect/sequencer.html @@ -13,155 +13,127 @@ - - +