light9 Changeset - 24664f7ae65e

Changeset - 24664f7ae65e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 20 months ago 2023-06-04 00:52:14
drewp@bigasterisk.com

eval faders more tolerant of incomplete data

1 file changed with 7 insertions and 4 deletions:

light9/effect/sequencer/eval_faders.py

0 comments (0 inline, 0 general)

light9/effect/sequencer/eval_faders.py

➞

Show inline comments

@@ @@ -39,50 +39,53 @@ class FaderEval: @@
     """peer to Sequencer, but this one takes the current :Fader settings -> sendToCollector
     """
     def __init__(self, graph: SyncedGraph, lib: EffectFunctionLibrary):
         self.graph = graph
         self.lib = lib
         self.faders: List[Fader] = []
         self.grandMaster = 1.0
         self.graph.addHandler(self._compile)
         self.graph.addHandler(self._compileGm)
         self.lastLoopSucceeded = False
     @COMPILE.time()
     def _compile(self) -> None:
         """rebuild our data from the graph"""
         self.faders = []
         for fader in self.graph.subjects(RDF.type, L9['Fader']):
             try:
                 self.faders.append(self._compileFader(fader))
             except ValueError:
                 pass
         # this could go in a second, smaller addHandler call to avoid rebuilding Fader objs constantly
         for f in self.faders:
             f.value = None
             try:
                 setting = typedValue(Node, self.graph, f.uri, L9['setting'])
             except ValueError:
                 f.value = None
             else:
                 continue
             try:
                 f.value = typedValue(float, self.graph, setting, L9['value'])
             except ValueError:
                 continue
     def _compileFader(self, fader: URIRef) -> Fader:
         effect = typedValue(EffectUri, self.graph, fader, L9['effect'])
         setting = typedValue(Node, self.graph, fader, L9['setting'])
         setAttr = typedValue(EffectAttr, self.graph, setting, L9['effectAttr'])
-        return (Fader(self.graph, self.lib, cast(URIRef, fader), effect, setAttr))
         return Fader(self.graph, self.lib, cast(URIRef, fader), effect, setAttr)
     def _compileGm(self):
         try:
             self.grandMaster = typedValue(float, self.graph,
                                           L9.grandMaster,
                                           L9.value)
             print('got gm', self.grandMaster)
         except ValueError:
             return
     @COMPUTE_ALL_FADERS.time()
     def computeOutput(self) -> DeviceSettings:

0 comments (0 inline, 0 general)