# HG changeset patch
# User drewp@bigasterisk.com
# Date 1402799019 0
# Node ID 65f0179a9254e03f3177bc29d3dc28e121e7715a
# Parent 9973d4623928781cf68ebbcbf300717c97e81b77
subcomposer has a web ui with buttons for toggling lights
Ignore-this: f8cf76c46d81eec86c8945a61f6a594d
diff -r 9973d4623928 -r 65f0179a9254 bin/subcomposer
--- a/bin/subcomposer Sun Jun 15 02:21:24 2014 +0000
+++ b/bin/subcomposer Sun Jun 15 02:23:39 2014 +0000
@@ -39,6 +39,7 @@
from light9.rdfdb.patch import Patch
from light9.observable import Observable
from light9.editchoice import EditChoice, Local
+from light9.subcomposer import subcomposerweb
class Subcomposer(tk.Frame):
@@ -235,8 +236,11 @@
if not opts.no_geometry:
toplevelat("subcomposer - %s" % opts.session, root, graph, session)
+
sc = Subcomposer(root, graph, session)
sc.pack()
+
+ subcomposerweb.init(graph, session, sc.currentSub)
tk.Label(root,text="Bindings: B1 adjust level; B2 set full; B3 instant bump",
font="Helvetica -12 italic",anchor='w').pack(side='top',fill='x')
diff -r 9973d4623928 -r 65f0179a9254 light9/networking.py
--- a/light9/networking.py Sun Jun 15 02:21:24 2014 +0000
+++ b/light9/networking.py Sun Jun 15 02:23:39 2014 +0000
@@ -44,5 +44,6 @@
effectEval = ServiceAddress(L9['effectEval'])
picamserve = ServiceAddress(L9['picamserve'])
rdfdb = ServiceAddress(L9['rdfdb'])
+subComposer = ServiceAddress(L9['subComposer'])
patchReceiverUpdateHost = ServiceAddress(L9['patchReceiverUpdateHost'])
diff -r 9973d4623928 -r 65f0179a9254 light9/subcomposer/__init__.py
diff -r 9973d4623928 -r 65f0179a9254 light9/subcomposer/index.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/light9/subcomposer/index.html Sun Jun 15 02:23:39 2014 +0000
@@ -0,0 +1,42 @@
+
+
+
+ subcomposer
+
+
+
+
+ Toggle channel in current sub
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 9973d4623928 -r 65f0179a9254 light9/subcomposer/subcomposerweb.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/light9/subcomposer/subcomposerweb.py Sun Jun 15 02:23:39 2014 +0000
@@ -0,0 +1,29 @@
+import logging
+import cyclone.web, cyclone.websocket, cyclone.httpclient
+from lib.cycloneerr import PrettyErrorHandler
+from light9 import networking
+from rdflib import URIRef, Literal
+from twisted.internet import reactor
+log = logging.getLogger('web')
+
+def init(graph, session, currentSub):
+ SFH = cyclone.web.StaticFileHandler
+ app = cyclone.web.Application(handlers=[
+ (r'/()', SFH,
+ {'path': 'light9/subcomposer', 'default_filename': 'index.html'}),
+ (r'/static/(.*)', SFH, {'path': 'static/'}),
+ (r'/toggle', Toggle),
+ ], debug=True, graph=graph, currentSub=currentSub)
+ reactor.listenTCP(networking.subComposer.port, app)
+ log.info("listening on %s" % networking.subComposer.port)
+
+class Toggle(PrettyErrorHandler, cyclone.web.RequestHandler):
+ def post(self):
+ chan = URIRef(self.get_argument('chan'))
+ log.info("toggle %r", chan)
+ sub = self.settings.currentSub()
+
+ chanKey = Literal(chan.rsplit('/', 1)[1])
+ old = sub.get_levels().get(chanKey, 0)
+
+ sub.editLevel(chan, 0 if old else 1)