Changeset - ce8b66e68cd5
[Not reviewed]
default
0 3 0
drewp@bigasterisk.com - 3 years ago 2022-05-31 07:12:51
drewp@bigasterisk.com
type fixes
3 files changed with 9 insertions and 8 deletions:
0 comments (0 inline, 0 general)
light9/effect/sequencer/sequencer.py
Show inline comments
 
@@ -21,7 +21,7 @@ from light9.effect.settings import Devic
 
from light9.effect.simple_outputs import SimpleOutputs
 
from light9.namespaces import L9, RDF
 
from light9.newtypes import DeviceUri, DeviceAttr, NoteUri, Curve, Song
 
from rdfdb.syncedgraph import SyncedGraph
 
from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 
from light9.metrics import metrics
 

	
 
import imp
 
@@ -102,7 +102,7 @@ class Note(object):
 
        }
 
        effectSettings: Dict[DeviceAttr, Union[float, str]] = dict(
 
            (DeviceAttr(da), v) for da, v in self.baseEffectSettings.items())
 
        effectSettings[L9['strength']] = self.evalCurve(t)
 
        effectSettings[cast(DeviceAttr, L9['strength'])] = self.evalCurve(t)
 

	
 
        def prettyFormat(x: Union[float, str]):
 
            if isinstance(x, float):
 
@@ -112,7 +112,7 @@ class Note(object):
 
        report['effectSettings'] = dict(
 
            (str(k), prettyFormat(v))
 
            for k, v in sorted(effectSettings.items()))
 
        report['nonZero'] = cast(float, effectSettings[L9['strength']]) > 0
 
        report['nonZero'] = cast(float, effectSettings[cast(DeviceAttr, L9['strength'])]) > 0
 
        out, evalReport = self.effectEval.outputFromEffect(
 
            list(effectSettings.items()),
 
            songTime=t,
 
@@ -189,7 +189,7 @@ class Sequencer(object):
 
        self.notes[song] = []
 
        for note in self.graph.objects(song, L9['note']):
 
            try:
 
                n = Note(self.graph, NoteUri(note), effecteval,
 
                n = Note(self.graph, NoteUri(cast(NoteUri, note)), effecteval,
 
                         self.simpleOutputs)
 
            except Exception:
 
                log.warn(f"failed to build Note {note} - skipping")
light9/effect/sequencer/service.py
Show inline comments
 
@@ -2,15 +2,16 @@
 
plays back effect notes from the timeline
 
"""
 

	
 
from run_local import log
 
import functools
 
from light9.run_local import log
 
from twisted.internet import reactor
 
from light9.metrics import metrics, metricsRoute
 
from rdfdb.syncedgraph import SyncedGraph
 
from rdfdb.syncedgraph.syncedgraph import SyncedGraph
 
from light9 import networking, showconfig
 
import optparse, sys, logging
 
import cyclone.web
 
from rdflib import URIRef
 
from light9.effect.sequencer.sequencer import Sequencer, Updates
 
from light9.effect.sequencer.sequencer import Sequencer
 
from light9.collector.collector_client import sendToCollector
 

	
 
from light9 import clientsession
light9/effect/sequencer/web/vite.config.ts
Show inline comments
 
@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
 

	
 
const servicePort = 8213;
 
export default defineConfig({
 
  base: "/effectSeequencer/",
 
  base: "/effectSequencer/",
 
  root: "./light9/effect/sequencer/web",
 
  publicDir: "../web",
 
  server: {
0 comments (0 inline, 0 general)