light9 Changeset - c0f7fc86f89b

Changeset - c0f7fc86f89b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 12 years ago 2013-06-15 06:09:57
drewp@bigasterisk.com

fix up hardware sliders in KC. big mess now
Ignore-this: 28956846058bf05ad44d9eeea2796c75

1 file changed with 23 insertions and 12 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -61,15 +61,16 @@ class SubScale(Scale, Fadable): @@
 class SubmasterBox(Frame):
     """
     this object owns the level of the submaster (the rdf graph is the
     real authority)
     """
     def __init__(self, master, sub, session):
+    def __init__(self, master, sub, session, col, row):
         self.sub = sub
         self.session = session
         self.col, self.row = col, row
         bg = sub.graph.value(sub.uri, L9.color, default='#000000')
         rgb = webcolors.hex_to_rgb(bg)
         hsv = colorsys.rgb_to_hsv(*[x/255 for x in rgb])
         darkBg = webcolors.rgb_to_hex(tuple([x * 255 for x in colorsys.hsv_to_rgb(
             hsv[0], hsv[1], .3)]))
         Frame.__init__(self, master, bd=1, relief='raised', bg=bg)
@@ @@ -93,29 +94,27 @@ class SubmasterBox(Frame): @@
         self._slider_var_trace = self.slider_var.trace('w', self.slider_changed)
         sub.graph.addHandler(self.updateLevelFromGraph)
         # initial position
-#        self.send_to_hw(sub.name, col + 1) # needs fix
+        # stil need? dispatcher.send("send_to_hw", sub=sub.uri, hwCol=col + 1)
     def cleanup(self):
         self.slider_var.trace_vdelete('w', self._slider_var_trace)
     def slider_changed(self, *args):
         self.scale.draw_indicator_colors()
         if self.pauseTrace:
             return
         self.updateGraphWithLevel(self.sub.uri, self.slider_var.get())
         # dispatcher.send("level changed") # in progress
         ###self.send_levels() # use dispatcher?
         # needs fixing: plan is to use dispatcher or a method call to tell a hardware-mapping object who changed, and then it can make io if that's a current hw slider
         #if rowcount == self.current_row:
         #    self.send_to_hw(sub.name, col + 1)
         dispatcher.send("send_to_hw", sub=self.sub.uri, hwCol=self.col + 1,
                         boxRow=self.row)
     def updateGraphWithLevel(self, uri, level):
         """in our per-session graph, we maintain SubSetting objects like this:
            ?session :subSetting [a :SubSetting; :sub ?s; :level ?l]
         """
@@ @@ -233,13 +232,13 @@ class KeyboardComposer(Frame, SubClient) @@
             if col == 0 or group != last_group:
                 row = self.make_row(group)
                 rowcount += 1
                 col = 0
             subbox = SubmasterBox(row, sub, self.session)
+            subbox = SubmasterBox(row, sub, self.session, col, rowcount)
             subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1)
             self.subbox[sub.uri] = self.slider_table[(rowcount, col)] = subbox
             self.setup_key_nudgers(subbox.scale)
             col = (col + 1) % 8
@@ @@ -259,12 +258,13 @@ class KeyboardComposer(Frame, SubClient) @@
             try:
                 self.sliders = Sliders(self)
             except IOError:
                 log.info("no hardware sliders")
                 self.sliders = DummySliders()
                 self.use_hw_sliders = False
             dispatcher.connect(self.send_to_hw, 'send_to_hw')
         else:
             self.sliders = DummySliders()
     def make_key_hints(self):
         keyhintrow = Frame(self)
@@ @@ -346,13 +346,14 @@ class KeyboardComposer(Frame, SubClient) @@
             except KeyError:
                 # unfilled bottom row has holes (plus rows with incomplete
                 # groups
                 self.sliders.valueOut("button-upper%d" % col, False)
                 self.sliders.valueOut("slider%d" % col, 0)
                 continue
             self.send_to_hw(subbox.name, col)
             self.send_to_hw(sub=subbox.sub.uri, hwCol=col,
                             boxRow=self.current_row)
     def got_nudger(self, number, direction, full=0):
         try:
             subbox = self.slider_table[(self.current_row, number)]
         except KeyError:
             return
@@ @@ -371,20 +372,30 @@ class KeyboardComposer(Frame, SubClient) @@
     def hw_slider_moved(self, col, value):
         value = int(value * 100) / 100
         try:
             subbox = self.slider_table[(self.current_row, col)]
         except KeyError:
             return # no slider assigned at that column
-        subbox.scale.set(value)
+        subbox.slider_var.set(value)
-    def send_to_hw(self, subUri, hwNum):
+    def send_to_hw(self, sub, hwCol, boxRow):
         if isinstance(self.sliders, DummySliders):
             return
         v = round(127 * self.slider_vars[subUri].get())
         chan = "slider%s" % hwNum
         assert isinstance(sub, URIRef), repr(subUri)
         if boxRow != self.current_row:
             return
         try:
             level = self.get_levels()[sub]
         except KeyError:
             log.warn("%r not in %r", sub, self.get_levels())
             raise
         v = round(127 * level)
         chan = "slider%s" % hwCol
         # workaround for some rounding issue, where we receive one
         # value and then decide to send back a value that's one step
         # lower.  -5 is a fallback for having no last value.  hopefully
         # we won't really see it
         if abs(v - self.sliders.lastValue.get(chan, -5)) <= 1:

0 comments (0 inline, 0 general)