light9 Changeset - cad8207933d7

Changeset - cad8207933d7

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 12 years ago 2013-06-08 08:21:24
drewp@bigasterisk.com

KC fix logging, startup after graph sync, display uri tails when there's no label
Ignore-this: 55d0cac2cd05d07ac6e7691b25b6b117

2 files changed with 26 insertions and 19 deletions:

bin/keyboardcomposer

light9/Submaster.py

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

 #!bin/python
 from __future__ import division, nested_scopes
 from run_local import log
 import cgi, os, sys, time, subprocess, logging, random
 from optparse import OptionParser
 import webcolors, colorsys
 from louie import dispatcher
 from twisted.internet import reactor, tksupport
 from twisted.web import xmlrpc, server, resource
 from rdflib import URIRef, Literal, RDF
 from Tix import *
 import Tix as tk
 import pickle
 import run_local
 from light9.Fadable import Fadable
 from light9.Submaster import Submasters, sub_maxes
 from light9.subclient import SubClient
 from light9 import dmxclient, showconfig, networking, prof
 from light9.uihelpers import toplevelat, bindkeys
 from light9.namespaces import L9
@@ @@ -139,13 +139,15 @@ class SubmasterBox(Frame): @@
                 try:
                     self.slider_var.set(graph.value(setting, L9['level']))
                 finally:
                     self.pauseTrace = False
     def updateName(self):
         self.namelabel.config(text=self.sub.graph.label(self.sub.uri))
         def shortUri(u):
             return '.../' + u.split('/')[-1]
         self.namelabel.config(text=self.sub.graph.label(self.sub.uri) or shortUri(self.sub.uri))
     def launch_subcomposer(self, *args):
         subprocess.Popen(["bin/subcomposer", "--no-geometry", self.name])
 class KeyboardComposer(Frame, SubClient):
     def __init__(self, root, graph, session,
@@ @@ -229,14 +231,14 @@ class KeyboardComposer(Frame, SubClient) @@
         # probably haven't been called back with the graph data yet
         withgroups = sorted((self.graph.value(sub.uri, L9['group']),
                              self.graph.value(sub.uri, L9['order']),
                              sub)
             for sub in self.submasters.get_all_subs())
         dispatcher.connect(self.onNewSub, "new submaster")
         dispatcher.connect(self.onLostSub, "lost submaster")
         #dispatcher.connect(self.onNewSub, "new submaster")
         #dispatcher.connect(self.onLostSub, "lost submaster")
         log.info("withgroups %s", withgroups)
         for group, order, sub in withgroups:
             group = self.graph.value(sub.uri, L9['group'])
             if col == 0 or group != last_group:
@@ @@ -517,43 +519,46 @@ class Sliders(BCF2000): @@
             else:
                 return
             kc.change_row(kc.current_row + diff)
             self.valueOut(name, 0)
 def launch(opts, root, graph, session):
     tl = toplevelat("Keyboard Composer - %s" % opts.session,
                     existingtoplevel=root, graph=graph, session=session)
     kc = KeyboardComposer(tl, graph, session,
                           hw_sliders=not opts.no_sliders)
     kc.pack(fill=BOTH, expand=1)
     for helpline in ["Bindings: B3 mute; C-l edit levels in subcomposer"]:
         tk.Label(root,text=helpline, font="Helvetica -12 italic",
                  anchor='w').pack(side='top',fill='x')
 if __name__ == "__main__":
     parser = OptionParser()
     parser.add_option('--no-sliders', action='store_true',
                       help="don't attach to hardware sliders")
     clientsession.add_option(parser)
     parser.add_option('-v', action='store_true', help="log info level")
     opts, args = parser.parse_args()
     logging.basicConfig(level=logging.INFO if opts.v else logging.WARN)
     log = logging.getLogger('keyboardcomposer')
     log.setLevel(logging.INFO if opts.v else logging.WARN)
     graph = SyncedGraph("keyboardcomposer")
     # i think this also needs delayed start (like subcomposer has), to have a valid graph
     # before setting any stuff from the ui
     root = Tk()
     initTkdnd(root.tk, 'tkdnd/trunk/')
     session = clientsession.getUri('keyboardcomposer', opts)
     tl = toplevelat("Keyboard Composer - %s" % opts.session,
                     existingtoplevel=root, graph=graph, session=session)
     kc = KeyboardComposer(tl, graph, session,
                           hw_sliders=not opts.no_sliders)
     kc.pack(fill=BOTH, expand=1)
     for helpline in ["Bindings: B3 mute; C-l edit levels in subcomposer"]:
         tk.Label(root,text=helpline, font="Helvetica -12 italic",
                  anchor='w').pack(side='top',fill='x')
     graph.initiallySynced.addCallback(
         lambda _: launch(opts, root, graph, session))
     if 0: # needs fixing, or maybe it's obsolete because other progs can just patch the rdf graph
         import twisted.internet
         try:
             reactor.listenTCP(networking.keyboardComposer.port,
                               server.Site(LevelServerHttp(kc.name_to_subbox)))

light9/Submaster.py

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ class Submaster(object): @@
         self.temporary = True
         if not self.temporary:
             # obsolete
             dispatcher.connect(log.error, 'reload all subs')
         log.debug("%s initial levels %s", self.name, self.levels)
+        #log.debug("%s initial levels %s", self.name, self.levels)
     def _editedLevels(self):
         pass
     def set_level(self, channelname, level, save=True):
         self.levels[resolve_name(channelname)] = level
@@ @@ -268,26 +268,28 @@ def combine_subdict(subdict, name=None, @@
     return maxes
 class Submasters:
     "Collection o' Submaster objects"
     def __init__(self, graph):
         self.submasters = {}
+        self.submasters = {} # uri : Submaster
         self.graph = graph
         graph.addHandler(self.findSubs)
     def findSubs(self):
         current = set()
         for s in self.graph.subjects(RDF.type, L9['Submaster']):
             if self.graph.contains((s, RDF.type, L9['LocalSubmaster'])):
                 continue
             log.info("found sub %s", s)
             if s not in self.submasters:
                 sub = self.submasters[s] = PersistentSubmaster(self.graph, s)
                 dispatcher.send("new submaster", sub=sub)
-                current.add(s)
             current.add(s)
         for s in set(self.submasters.keys()) - current:
             del self.submasters[s]
             dispatcher.send("lost submaster", subUri=s)
         log.info("findSubs finished %s", self.submasters)
     def get_all_subs(self):

0 comments (0 inline, 0 general)