# HG changeset patch # User drewp@bigasterisk.com # Date 2023-05-30 02:36:24 # Node ID f31df46edfddd2abbeba3d07f2b8b66908bdf14e # Parent e462853f1ef69af4d3911856b8b5d27803b0b8c1 reformat diff --git a/light9/effect/effecteval.py b/light9/effect/effecteval.py --- a/light9/effect/effecteval.py +++ b/light9/effect/effecteval.py @@ -76,7 +76,7 @@ class EffectEval2: graph: SyncedGraph uri: EffectUri - effectFunction: Optional[URIRef]=None + effectFunction: Optional[URIRef] = None def __post_init__(self): self.graph.addHandler(self._compile) @@ -86,34 +86,36 @@ class EffectEval2: if not self.graph.contains((self.uri, RDF.type, L9['Effect'])): raise ValueError(f'{self.uri} not an :Effect') - self.function = effect_scale + self.function = effect_scale devs = [] for s in self.graph.objects(self.uri, L9['setting']): - d = typedValue(DeviceUri, self.graph, s, L9['device']) - da = typedValue(DeviceAttr, self.graph, s, L9['deviceAttr']) + d = typedValue(DeviceUri, self.graph, s, L9['device']) + da = typedValue(DeviceAttr, self.graph, s, L9['deviceAttr']) v = typedValue(VTUnion, self.graph, s, L9['value']) devs.append((d, da, v)) self.devs = DeviceSettings(self.graph, devs) - def compute(self, inputs:EffectSettings) -> DeviceSettings: + def compute(self, inputs: EffectSettings) -> DeviceSettings: - s=0 - for e,ea,v in inputs.asList(): + s = 0 + for e, ea, v in inputs.asList(): if not isinstance(v, float): raise TypeError - if ea==L9['strength']: + if ea == L9['strength']: s = v - return effect_scale(s,self.devs ) + return effect_scale(s, self.devs) return self.function(inputs) + def effect_scale(strength: float, devs: DeviceSettings) -> DeviceSettings: out = [] - for d,da,v in devs.asList(): + for d, da, v in devs.asList(): out.append((d, da, scale(v, strength))) return DeviceSettings(devs.graph, out) + @dataclass class EffectEval: """