light9 Changeset - 546e01adad37

Changeset - 546e01adad37

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

David McClosky - 18 years ago 2007-06-15 21:23:53
dmcc@bigasterisk.com

keyboardcomposer: better bumping, save row, bug fixen
redo pickle format to save row (WARNING: you'll need to delete saved levels file)
bumping: force lights to be off
set slider levels on start up

1 file changed with 18 insertions and 9 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -71,17 +71,18 @@ class KeyboardComposer(Frame, SubClient) @@
                  hw_sliders=False):
         Frame.__init__(self, root, bg='black')
         SubClient.__init__(self)
         self.submasters = submasters
         self.name_to_subtk = {}
         self.current_sub_levels = {}
         self.current_row = 0
         if current_sub_levels is not None:
             self.current_sub_levels = current_sub_levels
         else:
             try:
                 self.current_sub_levels = \
+                self.current_sub_levels, self.current_row = \
                     pickle.load(file('.keyboardcomposer.savedlevels'))
             except IOError:
                 pass
         self.connect_to_hw(hw_sliders)
         self.draw_ui()
@@ @@ -89,17 +90,16 @@ class KeyboardComposer(Frame, SubClient) @@
     def draw_ui(self):
         self.rows = [] # this holds Tk Frames for each row
         self.slider_vars = {} # this holds subname:sub Tk vars
         self.slider_table = {} # this holds coords:sub Tk vars
         self.name_to_subtk.clear() # subname : SubmasterTk instance
         self.current_row = 0
         self.make_key_hints()
         self.draw_sliders()
-        self.highlight_row(self.current_row)
+        self.change_row(self.current_row)
         self.rows[self.current_row].focus()
         self.buttonframe = Frame(self, bg='black')
         self.buttonframe.pack(side=BOTTOM)
         self.alltozerobutton = Button(self.buttonframe, text="All to Zero",
             command=self.alltozero, bg='black', fg='white')
@@ @@ -157,20 +157,22 @@ class KeyboardComposer(Frame, SubClient) @@
         # Row changing:
         # Page dn, C-n, and ] do down
         # Page up, C-p, and ' do up
         for key in '<Prior> <Next> <Control-n> <Control-p> ' \
                    '<Key-bracketright> <Key-apostrophe>'.split():
-            tkobject.bind(key, self.change_row)
+            tkobject.bind(key, self.change_row_cb)
-    def change_row(self, event):
+    def change_row_cb(self, event):
         diff = 1
         if event.keysym in ('Prior', 'p', 'bracketright'):
             diff = -1
         self.change_row(self.current_row + diff)
     def change_row(self, row):
         old_row = self.current_row
-        self.current_row += diff
+        self.current_row = row
         self.current_row = max(0, self.current_row)
         self.current_row = min(len(self.rows) - 1, self.current_row)
         self.unhighlight_row(old_row)
         self.highlight_row(self.current_row)
         row = self.rows[self.current_row]
         self.keyhints.pack_configure(before=row)
@@ @@ -293,30 +295,32 @@ class KeyboardComposer(Frame, SubClient) @@
         sub = self.get_levels_as_sub()
         sub.name = subname
         sub.temporary = 0
         sub.save()
     def save(self):
-        pickle.dump(self.get_levels(),
+        pickle.dump((self.get_levels(), self.current_row),
                     file('.keyboardcomposer.savedlevels', 'w'))
     def send_frequent_updates(self):
         """called when we get a fade -- send events as quickly as possible"""
         if time.time() <= self.stop_frequent_update_time:
             self.send_levels()
             self.after(10, self.send_frequent_updates)
     def refresh(self):
         self.save()
         self.submasters = Submasters()
         self.current_sub_levels = \
+        self.current_sub_levels, self.current_row = \
             pickle.load(file('.keyboardcomposer.savedlevels'))
         for r in self.rows:
             r.destroy()
         self.keyhints.destroy()
         self.buttonframe.destroy()
         self.draw_ui()
         # possibly paranoia (but possibly not)
         self.change_row(self.current_row)
     def alltozero(self):
         for name, subtk in self.name_to_subtk.items():
             if subtk.scale.scale_var.get() != 0:
                 subtk.scale.fade(value=0.0, length=0)
@@ @@ -340,13 +344,18 @@ class Sliders(BCF2000): @@
     def valueIn(self, name, value):
         kc = self.kc
         if name.startswith("slider"):
             kc.hw_slider_moved(int(name[6:]) - 1, value / 127)
         elif name.startswith("button-lower"):
             col = int(name[12:]) - 1
             tkslider = kc.slider_table[(kc.current_row, col)]
             self.valueOut(name, 0)
             try:
                 tkslider = kc.slider_table[(kc.current_row, col)]
             except KeyError:
                 return
             slider_var = tkslider.slider_var
             if slider_var.get() == 1:
                 slider_var.set(0)
             else:
                 slider_var.set(1)

0 comments (0 inline, 0 general)