light9 Changeset - d5858e9fa689

Changeset - d5858e9fa689

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

David McClosky - 20 years ago 2005-06-17 02:21:19
dmcc@bigasterisk.com

keyboardcomposer destroy fix and cleanups
- We were destroying KeyboardComposer a little too much. Fortunately,
we weren't passing the right number of arguments, so this was merely
an error.
- About the TODO comment removed: we don't need to use combine_dict
since Submaster logic will be changed entirely when we/if we move
to a SubServer world and keyboard composer will not be the wiser.

1 file changed with 3 insertions and 6 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

 #!/usr/bin/python
 from __future__ import division,nested_scopes
+from __future__ import division, nested_scopes
 import sys, time
 from twisted.internet import reactor,tksupport
+from twisted.internet import reactor, tksupport
 from twisted.web import xmlrpc, server
 from Tix import *
 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
 from light9.uihelpers import toplevelat
 nudge_keys = {
@@ @@ -196,25 +196,24 @@ class KeyboardComposer(Frame, SubClient) @@
         self.slider_vars[name] = subtk.slider_var
         return subtk
     def highlight_row(self, row):
         row = self.rows[row]
         row['bg'] = 'red'
     def unhighlight_row(self, row):
         row = self.rows[row]
         row['bg'] = 'black'
     def get_levels(self):
         return dict([(name, slidervar.get())
             for name, slidervar in self.slider_vars.items()])
     def get_levels_as_sub(self):
         # TODO this should be adapted to use Submaster.combine_subdict
         scaledsubs = [self.submasters.get_sub_by_name(sub) * level \
             for sub, level in self.get_levels().items()]
         maxes = sub_maxes(*scaledsubs)
         return maxes
     def save_current_stage(self, subname):
         print "saving current levels as", subname
         sub = self.get_levels_as_sub()
         sub.name = subname
         sub.temporary = 0
         sub.save()
@@ @@ -255,19 +254,17 @@ class LevelServer(xmlrpc.XMLRPC): @@
 if __name__ == "__main__":
     s = Submasters()
     root = Tk()
     tl = toplevelat("Keyboard Composer", existingtoplevel=root)
     kc = KeyboardComposer(tl, s)
     kc.pack(fill=BOTH, expand=1)
     ls = LevelServer(kc.name_to_subtk)
     reactor.listenTCP(8050, server.Site(ls))
     root.bind("<Destroy>",reactor.stop)
     root.protocol('WM_DELETE_WINDOW', reactor.stop)
     reactor.addSystemEventTrigger('after','shutdown',kc.save)
     reactor.addSystemEventTrigger('after', 'shutdown', kc.save)
     tksupport.install(root,ms=10)
     reactor.run()

0 comments (0 inline, 0 general)