light9 Changeset - abf812ca5eba

Changeset - abf812ca5eba

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 20 months ago 2023-05-27 22:45:44
drewp@bigasterisk.com

faders have a settings node before their value now

2 files changed with 15 insertions and 17 deletions:

light9/effect/sequencer/eval_faders.py

light9/fade/Light9FadeUi.ts

0 comments (0 inline, 0 general)

light9/effect/sequencer/eval_faders.py

➞

Show inline comments

@@ @@ -29,64 +29,58 @@ class Fader: @@
         self.ee = effecteval.EffectEval2(self.graph, self.effect)
 class FaderEval:
     """peer to Sequencer, but this one takes the current :Fader settings -> sendToCollector
     """
     def __init__(self,
                  graph: SyncedGraph,
                  ):
         self.graph = graph
         self.faders: List[Fader] = []
         # self.simpleOutputs = SimpleOutputs(self.graph)
         log.info('fader adds handler')
         self.graph.addHandler(self._compile)
         self.lastLoopSucceeded = False
         # self.codeWatcher = CodeWatcher(onChange=self.onCodeChange)
         # have caller do this
         #asyncio.create_task(self.startUpdating())
     # async def startUpdating(self):
     #     await self.graph.addAsyncHandler(self.update)
     #     log.info('startupdating task done')
     def onCodeChange(self):
         log.debug('seq.onCodeChange')
         self.graph.addHandler(self._compile)
         #self.updateLoop()
     @metrics('compile_graph_fader').time()
     def _compile(self) -> None:
         """rebuild our data from the graph"""
         self.faders = []
         for fader in self.graph.subjects(RDF.type, L9['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'])
             self.faders.append(Fader(self.graph, cast(URIRef, fader), effect, setAttr))
         # this could go in a second, smaller addHandler call to avoid rebuilding Fader objs constantly
         for f in self.faders:
             f.value = typedValue(float, self.graph, f.uri, L9['value'])
             setting = typedValue(Node, self.graph, f.uri, L9['setting'])
             f.value = typedValue(float, self.graph, setting, L9['value'])
     def computeOutput(self) -> DeviceSettings:
-        notesSettings:List[DeviceSettings] = []
+        faderEffectOutputs: List[DeviceSettings] = []
         now = UnixTime(time.time())
         for f in self.faders:
             if f.value is None:
                 raise TypeError('f.value should be set by now')
             effectSettings = EffectSettings(self.graph, [(f.effect, f.setEffectAttr, f.value)])
             notesSettings.append(f.ee.compute(effectSettings))
             if f.value < .001:
                 continue
             faderEffectOutputs.append(f.ee.compute(effectSettings))
             # ee = effecteval.EffectEval(self.graph, f.effectClass, self.simpleOutputs)
             # deviceSettings, report = ee.outputFromEffect(
             #     effectSettings,
             #     songTime=now, # probably wrong
             #     noteTime=now, # wrong
             #     )
             # log.info(f'  𝅘𝅥𝅮  {uriTail(f.uri)}: {effectSettings=} -> {deviceSettings=}')
             # if deviceSettings:
             #     notesSettings.append(deviceSettings)
-        return DeviceSettings.merge(self.graph, notesSettings)
+        return DeviceSettings.merge(self.graph, faderEffectOutputs)

light9/fade/Light9FadeUi.ts

➞

Show inline comments

@@ @@ -134,40 +134,44 @@ export class Light9Fader extends LitElem @@
         this.effectAttr = null;
+      }
+    }
+  }
   private compileValue(graph: SyncedGraph) {
     const U = graph.U();
     if (!graph.contains(this.uri, U("rdf:type"), U(":Fader"))) {
       // not loaded yet
       // console.timeEnd(`valueSync ${this.uri.value}`)
       return;
+    }
     this.value = graph.floatValue(this.uri, graph.Uri(":value"));
     const st = graph.uriValue(this.uri, U(":setting"));
     this.value = graph.floatValue(st, graph.Uri(":value"));
+  }
   onSliderInput(ev: CustomEvent) {
     if (this.graph === undefined) {
       return;
+    }
     const U = this.graph.U();
     const prev = this.value;
     const v: number = (ev.target as any).valueAsNumber;
     this.value = parseFloat(v.toPrecision(3)); // rewrite pls
     if (this.value == prev) {
       return;
+    }
     meter.tick();
     this.graph.patchObject(this.uri, this.graph.Uri(":value"), this.graph.LiteralRoundedFloat(this.value), this.ctx);
     if (!this.setting) {
       throw new Error("can't make new settings yet");
+    }
     this.graph.patchObject(this.setting, this.graph.Uri(":value"), this.graph.LiteralRoundedFloat(this.value), this.ctx);
+  }
   onEffectChange(ev: CustomEvent) {
     if (this.graph === undefined) {
       return;
+    }
     const { newValue } = ev.detail;
     this.graph.patchObject(this.uri, this.graph.Uri(":effect"), newValue, this.ctx);
+  }
   onEffectAttrChange(ev: CustomEvent) {
     if (this.graph === undefined) {

0 comments (0 inline, 0 general)