Mercurial > code > home > repos > light9
changeset 359:bd8a89743226
KC optimizations, hw sliders now follow the active row
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Wed, 13 Jun 2007 06:58:09 +0000 |
| parents | 5ee1de9ddc9d |
| children | 415c206f7534 |
| files | bcf2000.py bin/keyboardcomposer light9/Submaster.py |
| diffstat | 3 files changed, 47 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/bcf2000.py Wed Jun 13 06:55:47 2007 +0000 +++ b/bcf2000.py Wed Jun 13 06:58:09 2007 +0000 @@ -37,7 +37,7 @@ self.lastValue = {} # control name : value self.packet = "" loop = LoopingCall(self.poll) - loop.start(.02) + loop.start(.01) def poll(self): try: @@ -54,15 +54,6 @@ self.packet = "" self.packetReceived(p) - return - - while 1: - packet = self.dev.read(3) - while len(packet) < 3: - if len(packet) == 0: - self.reopen() - packet += self.dev.read(3 - len(packet)) - def packetReceived(self, packet): b0, which, value = [ord(b) for b in packet] if b0 != 0xb0:
--- a/bin/keyboardcomposer Wed Jun 13 06:55:47 2007 +0000 +++ b/bin/keyboardcomposer Wed Jun 13 06:58:09 2007 +0000 @@ -19,10 +19,9 @@ from bcf2000 import BCF2000 nudge_keys = { - 'up' : list('qwertyuiop'), - 'down' : list('asdfghjkl') + 'up' : list('qwertyui'), + 'down' : list('asdfghjk') } -nudge_keys['down'].append('semicolon') class SubScale(Scale, Fadable): def __init__(self, master, *args, **kw): @@ -86,7 +85,8 @@ self.slider_table = {} # this holds coords:sub Tk vars self.name_to_subtk.clear() # subname : SubmasterTk instance self.current_row = 0 - + + self.connect_to_hw() self.make_key_hints() self.draw_sliders() self.highlight_row(self.current_row) @@ -108,6 +108,7 @@ self.sub_name.pack(side=LEFT) self.stop_frequent_update_time = 0 + def connect_to_hw(self): try: self.sliders = Sliders(self.hw_slider_moved) except IOError: @@ -115,7 +116,7 @@ def valueOut(self, name, value): pass self.sliders = dummy() - print "no hw sliders found" + print "no hw sliders found" def make_key_hints(self): keyhintrow = Frame(self) @@ -170,6 +171,16 @@ self.highlight_row(self.current_row) row = self.rows[self.current_row] self.keyhints.pack_configure(before=row) + + + for col in range(8): + try: + subtk = self.slider_table[(self.current_row, col)] + except KeyError: + pass # unfilled bottom row has holes + self.send_to_hw(subtk.name, col + 1) + + def got_nudger(self, number, direction, full=0): subtk = self.slider_table[(self.current_row, number)] if direction == 'up': @@ -184,7 +195,11 @@ subtk.scale.decrease() def hw_slider_moved(self, col, value): - subtk = self.slider_table[(self.current_row, col)] + value = int(value * 100) / 100 + try: + subtk = self.slider_table[(self.current_row, col)] + except KeyError: + return # no slider assigned at that column subtk.scale.set(value) def draw_sliders(self): @@ -200,17 +215,31 @@ subtk = self.draw_sub_slider(row, col, sub.name, current_level) self.slider_table[(rowcount, col)] = subtk self.name_to_subtk[sub.name] = subtk - col += 1 - col %= 10 - def slider_changed(x, y, z, subtk=subtk, col=col, sub=sub): + def slider_changed(x, y, z, subtk=subtk, + col=col, sub=sub, rowcount=rowcount): subtk.scale.draw_indicator_colors() self.send_levels() - v = 127 * self.get_levels()[sub.name] - self.sliders.valueOut("slider%s" % (col), v) - + if rowcount == self.current_row: + self.send_to_hw(sub.name, col + 1) subtk.slider_var.trace('w', slider_changed) + + # initial position + self.send_to_hw(sub.name, col + 1) + col = (col + 1) % 8 + + def send_to_hw(self, subName, hwNum): + v = round(127 * self.slider_vars[subName].get()) + chan = "slider%s" % hwNum + + # workaround for some rounding issue, where we receive one + # value and then decide to send back a value that's one step + # lower + if abs(v - self.sliders.lastValue.get(chan, 0)) <= 1: + return + self.sliders.valueOut(chan, v) + def make_row(self): row = Frame(self, bd=2, bg='black') row.pack(expand=1, fill=BOTH) @@ -219,7 +248,7 @@ return row def draw_sub_slider(self, row, col, name, current_level): subtk = SubmasterTk(row, name, current_level) - subtk.place(relx=col * 0.1, rely=0, relwidth=0.1, relheight=1) + subtk.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1) self.setup_key_nudgers(subtk.scale) self.slider_vars[name] = subtk.slider_var @@ -289,15 +318,10 @@ BCF2000.__init__(self) self.cb = cb def valueIn(self, name, value): - print "in", name, value if name.startswith("slider"): self.cb(int(name[6:]) - 1, value / 127) if __name__ == "__main__": - - #prof.watchPoint("/usr/lib/python2.4/site-packages/rdflib-2.3.3-py2.4-linux-i686.egg/rdflib/syntax/parsers/n3p/n3p.py", 67) - - parser = OptionParser() parser.add_option('--nonpersistent', action="store_true", help="don't load or save levels") @@ -333,5 +357,6 @@ tksupport.install(root,ms=10) +# prof.watchPoint("/usr/lib/python2.4/site-packages/rdflib-2.3.3-py2.4-linux-i686.egg/rdflib/Graph.py", 615) prof.run(reactor.run, profile=False)
--- a/light9/Submaster.py Wed Jun 13 06:55:47 2007 +0000 +++ b/light9/Submaster.py Wed Jun 13 06:58:09 2007 +0000 @@ -236,7 +236,9 @@ return [s.name for s in self.get_all_subs()] def get_sub_by_name(self, name): "Makes a new sub if there isn't one." - return self.submasters.get(name, Submaster(name)) + if name in self.submasters: + return self.submasters[name] + return Submaster(name) __getitem__ = get_sub_by_name def fullsub(*chans):