Mercurial > code > home > repos > light9

changeset 945:85ccda959170

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KC seems to refresh on new subs now, though it redraws way too many times Ignore-this: 581be0258df1d2fe1bdcc3b957f6fcb2
author drewp@bigasterisk.com
date Thu, 13 Jun 2013 05:56:57 +0000
parents 3b3cc5f98a03
children 7e991dba05f4
files bin/keyboardcomposer light9/Submaster.py
diffstat 2 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/bin/keyboardcomposer	Thu Jun 13 02:21:37 2013 +0000
+++ b/bin/keyboardcomposer	Thu Jun 13 05:56:57 2013 +0000
@@ -204,14 +204,6 @@
 
         self.stop_frequent_update_time = 0
 
-    def onNewSub(self, sub):
-        log.info("new %s", sub)
-        self.graph.addHandler(self.draw_sliders)
-
-    def onLostSub(self, subUri):
-        log.info("lost %s", subUri)
-        self.graph.addHandler(self.draw_sliders)
-
     def draw_sliders(self):
         for r in self.rows:
             r.destroy()
@@ -223,6 +215,9 @@
 
         self.tk_focusFollowsMouse()
 
+        self.submasters.findSubs() # trigger graph load, but we read
+                                   # from get_all_subs, below
+        
         rowcount = -1
         col = 0
         last_group = None
@@ -234,8 +229,6 @@
                              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")
         log.info("withgroups %s", withgroups)
 
         for group, order, sub in withgroups:
--- a/light9/Submaster.py	Thu Jun 13 02:21:37 2013 +0000
+++ b/light9/Submaster.py	Thu Jun 13 05:56:57 2013 +0000
@@ -281,7 +281,7 @@
 
     return maxes
 
-class Submasters:
+class Submasters(object):
     "Collection o' Submaster objects"
     def __init__(self, graph):
         self.submasters = {} # uri : Submaster