annotate bin/keyboardcomposer @ 1860:5bcb950024af

reformat python Ignore-this: 7bbe37d199612c9c74ef2904c3f13553
author drewp@bigasterisk.com
date Wed, 22 May 2019 00:09:13 +0000
parents f066d6e874db
children 3c523c71da29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
721
8fddef28d7b9 KC deps
drewp@bigasterisk.com
parents: 676
diff changeset
1 #!bin/python
214
38c1ccfb6820 keyboardcomposer works
drewp@bigasterisk.com
parents: 205
diff changeset
2
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
3 from run_local import log
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
4 import cgi, time, logging
343
fe9dff7dbffd added C-l to launch subcomposer- in progress
Drew Perttula <drewp@bigasterisk.com>
parents: 287
diff changeset
5 from optparse import OptionParser
559
3f9162973d60 KC channel color support. use statements like sub:scoop :color "#ffaa77"
drewp@bigasterisk.com
parents: 520
diff changeset
6 import webcolors, colorsys
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
7 from louie import dispatcher
268
d5858e9fa689 keyboardcomposer destroy fix and cleanups
David McClosky <dmcc@bigasterisk.com>
parents: 264
diff changeset
8 from twisted.internet import reactor, tksupport
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
9 from twisted.web import resource
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
10 from rdflib import URIRef, Literal
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
11 import tkinter.tix as tk
214
38c1ccfb6820 keyboardcomposer works
drewp@bigasterisk.com
parents: 205
diff changeset
12
38c1ccfb6820 keyboardcomposer works
drewp@bigasterisk.com
parents: 205
diff changeset
13 from light9.Fadable import Fadable
260
7f9d0f04bb2d KeyboardComposer is now a SubClient
David McClosky <dmcc@bigasterisk.com>
parents: 253
diff changeset
14 from light9.subclient import SubClient
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
15 from light9 import showconfig, networking, prof
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
16 from light9.uihelpers import toplevelat
1654
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
17 from light9.namespaces import L9, RDF, RDFS
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
18 from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister
1698
f140153c087c bring back clientsession which doesn't belong in rdfdb
Drew Perttula <drewp@bigasterisk.com>
parents: 1692
diff changeset
19 from light9 import clientsession
1692
6fa4288da8a6 rdfdb is its own package now
drewp@bigasterisk.com
parents: 1665
diff changeset
20 from rdfdb.syncedgraph import SyncedGraph
1453
6906cacaa218 KC and SEQ share inotify code to reload effect code
drewp@bigasterisk.com
parents: 1441
diff changeset
21 from light9.effect.sequencer import CodeWatcher
1427
e070c9f1c5e7 partial fixes to KC
drewp@bigasterisk.com
parents: 1391
diff changeset
22 import light9.effect.effecteval
1633
eccbc249fee7 fix KC launch bug. log corrupt settings and move on.
Drew Perttula <drewp@bigasterisk.com>
parents: 1499
diff changeset
23 from light9.effect.settings import DeviceSettings
1692
6fa4288da8a6 rdfdb is its own package now
drewp@bigasterisk.com
parents: 1665
diff changeset
24 from rdfdb.patch import Patch
1784
1aac97248a1b fix KC simpleOutputs object
Drew Perttula <drewp@bigasterisk.com>
parents: 1777
diff changeset
25 from light9.effect.simple_outputs import SimpleOutputs
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
26
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
27 from bcf2000 import BCF2000
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
28 import imp
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
29
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
30 nudge_keys = {'up': list('qwertyui'), 'down': list('asdfghjk')}
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
31
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
32
366
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
33 class DummySliders:
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
34
366
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
35 def valueOut(self, name, value):
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
36 pass
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
37
479
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
38 def close(self):
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
39 pass
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
40
479
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
41 def reopen(self):
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
42 pass
366
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
43
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
44
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
45 class SubScale(tk.Scale, Fadable):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
46
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
47 def __init__(self, master, *args, **kw):
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
48 self.scale_var = kw.get('variable') or tk.DoubleVar()
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
49 kw.update({
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
50 'variable': self.scale_var,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
51 'from': 1,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
52 'to': 0,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
53 'showvalue': 0,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
54 'sliderlength': 15,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
55 'res': 0.01,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
56 'width': 40,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
57 'troughcolor': 'black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
58 'bg': 'grey40',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
59 'highlightthickness': 1,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
60 'bd': 1,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
61 'highlightcolor': 'red',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
62 'highlightbackground': 'black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
63 'activebackground': 'red'
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
64 })
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
65 tk.Scale.__init__(self, master, *args, **kw)
136
7e91c49fb2d6 whoops, forgot this one
dmcc
parents: 122
diff changeset
66 Fadable.__init__(self, var=self.scale_var, wheel_step=0.05)
146
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
67 self.draw_indicator_colors()
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
68
146
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
69 def draw_indicator_colors(self):
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
70 if self.scale_var.get() == 0:
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
71 self['troughcolor'] = 'black'
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
72 else:
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
73 self['troughcolor'] = 'blue'
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
74
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
75
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
76 class SubmasterBox(tk.Frame):
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
77 """
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
78 this object owns the level of the submaster (the rdf graph is the
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
79 real authority)
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
80 """
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
81
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
82 def __init__(self, master, graph, sub, session, col, row):
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
83 self.graph = graph
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
84 self.sub = sub
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
85 self.session = session
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
86 self.col, self.row = col, row
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
87 bg = self.graph.value(sub, L9.color, default='#000000')
559
3f9162973d60 KC channel color support. use statements like sub:scoop :color "#ffaa77"
drewp@bigasterisk.com
parents: 520
diff changeset
88 rgb = webcolors.hex_to_rgb(bg)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
89 hsv = colorsys.rgb_to_hsv(*[x / 255 for x in rgb])
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
90 darkBg = webcolors.rgb_to_hex(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
91 tuple([
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
92 int(x * 255) for x in colorsys.hsv_to_rgb(hsv[0], hsv[1], .2)
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
93 ]))
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
94 tk.Frame.__init__(self, master, bd=1, relief='raised', bg=bg)
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
95 self.name = self.graph.label(sub)
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
96 self.slider_var = tk.DoubleVar()
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
97 self.pauseTrace = False
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
98 self.scale = SubScale(self, variable=self.slider_var, width=20)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
99
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
100 self.namelabel = tk.Label(self,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
101 font="Arial 9",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
102 bg=darkBg,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
103 fg='white',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
104 pady=0)
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
105 self.graph.addHandler(self.updateName)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
106
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
107 self.namelabel.pack(side=tk.TOP)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
108 levellabel = tk.Label(self,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
109 textvariable=self.slider_var,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
110 font="Arial 6",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
111 bg='black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
112 fg='white',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
113 pady=0)
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
114 levellabel.pack(side=tk.TOP)
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
115 self.scale.pack(side=tk.BOTTOM, expand=1, fill=tk.BOTH)
343
fe9dff7dbffd added C-l to launch subcomposer- in progress
Drew Perttula <drewp@bigasterisk.com>
parents: 287
diff changeset
116
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
117 for w in [self, self.namelabel, levellabel]:
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
118 dragSourceRegister(w, 'copy', 'text/uri-list', sub)
734
d230824728aa drag submasters out of keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 733
diff changeset
119
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
120 self._slider_var_trace = self.slider_var.trace('w', self.slider_changed)
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
121
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
122 self.graph.addHandler(self.updateLevelFromGraph)
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
123
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
124 # initial position
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
125 # stil need? dispatcher.send("send_to_hw", sub=sub.uri, hwCol=col + 1)
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
126
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
127 def cleanup(self):
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
128 self.slider_var.trace_vdelete('w', self._slider_var_trace)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
129
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
130 def slider_changed(self, *args):
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
131 self.scale.draw_indicator_colors()
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
132
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
133 if self.pauseTrace:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
134 return
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
135 self.updateGraphWithLevel(self.sub, self.slider_var.get())
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
136
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
137 # 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
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
138 dispatcher.send("send_to_hw",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
139 sub=self.sub,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
140 hwCol=self.col + 1,
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
141 boxRow=self.row)
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
142
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
143 def updateGraphWithLevel(self, uri, level):
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
144 """in our per-session graph, we maintain SubSetting objects like this:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
145
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
146 ?session :subSetting [a :SubSetting; :sub ?s; :level ?l]
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
147 """
814
1ae8e6b287e3 improvements to file watching. outline of how resync will work
drewp@bigasterisk.com
parents: 810
diff changeset
148 # move to syncedgraph patchMapping
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
149
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
150 self.graph.patchMapping(context=self.session,
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
151 subject=self.session,
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
152 predicate=L9['subSetting'],
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
153 nodeClass=L9['SubSetting'],
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
154 keyPred=L9['sub'],
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
155 newKey=uri,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
156 valuePred=L9['level'],
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
157 newValue=Literal(level))
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
158
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
159 def updateLevelFromGraph(self):
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
160 """read rdf level, write it to subbox.slider_var"""
814
1ae8e6b287e3 improvements to file watching. outline of how resync will work
drewp@bigasterisk.com
parents: 810
diff changeset
161 # move this to syncedgraph readMapping
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
162 graph = self.graph
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
163
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
164 for setting in graph.objects(self.session, L9['subSetting']):
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
165 if graph.value(setting, L9['sub']) == self.sub:
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
166 self.pauseTrace = True # don't bounce this update back to server
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
167 try:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
168 self.slider_var.set(graph.value(setting, L9['level']))
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
169 finally:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
170 self.pauseTrace = False
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
171
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
172 def updateName(self):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
173
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
174 def shortUri(u):
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
175 return '.../' + u.split('/')[-1]
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
176
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
177 self.namelabel.config(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
178 text=self.graph.label(self.sub) or shortUri(self.sub))
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
179
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
180
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
181 class KeyboardComposer(tk.Frame, SubClient):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
182
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
183 def __init__(self, root, graph, session, hw_sliders=True):
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
184 tk.Frame.__init__(self, root, bg='black')
253
a92b6d1ac072 SubClient created, keyboardcomposer and gyrocontroller use it now
David McClosky <dmcc@bigasterisk.com>
parents: 246
diff changeset
185 SubClient.__init__(self)
559
3f9162973d60 KC channel color support. use statements like sub:scoop :color "#ffaa77"
drewp@bigasterisk.com
parents: 520
diff changeset
186 self.graph = graph
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
187 self.session = session
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
188
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
189 self.subbox = {} # sub uri : SubmasterBox
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
190 self.slider_table = {} # coords : SubmasterBox
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
191 self.rows = [] # this holds Tk Frames for each row
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
192
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
193 self.current_row = 0 # should come from session graph
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
194
390
5d2b119443f2 keyboardcomposer: fix (one) refresh bug
David McClosky <dmcc@bigasterisk.com>
parents: 389
diff changeset
195 self.use_hw_sliders = hw_sliders
362
fc87327e29c4 CC now attaches to hardware sliders and knobs. tres cool. KC gets a --sliders option to enable the sliders
Drew Perttula <drewp@bigasterisk.com>
parents: 359
diff changeset
196 self.connect_to_hw(hw_sliders)
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
197
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
198 self.make_key_hints()
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
199 self.make_buttons()
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
200
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
201 self.graph.addHandler(self.redraw_sliders)
1453
6906cacaa218 KC and SEQ share inotify code to reload effect code
drewp@bigasterisk.com
parents: 1441
diff changeset
202
6906cacaa218 KC and SEQ share inotify code to reload effect code
drewp@bigasterisk.com
parents: 1441
diff changeset
203 self.codeWatcher = CodeWatcher(
6906cacaa218 KC and SEQ share inotify code to reload effect code
drewp@bigasterisk.com
parents: 1441
diff changeset
204 onChange=lambda: self.graph.addHandler(self.redraw_sliders))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
205
1453
6906cacaa218 KC and SEQ share inotify code to reload effect code
drewp@bigasterisk.com
parents: 1441
diff changeset
206 self.send_levels_loop(delay=.05)
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
207 self.graph.addHandler(self.rowFromGraph)
362
fc87327e29c4 CC now attaches to hardware sliders and knobs. tres cool. KC gets a --sliders option to enable the sliders
Drew Perttula <drewp@bigasterisk.com>
parents: 359
diff changeset
208
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
209 def make_buttons(self):
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
210 self.buttonframe = tk.Frame(self, bg='black')
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
211 self.buttonframe.pack(side=tk.BOTTOM)
389
e708fdcb383c keyboardcomposer: move sliders toggler to better place
David McClosky <dmcc@bigasterisk.com>
parents: 386
diff changeset
212
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
213 self.sliders_status_var = tk.IntVar()
390
5d2b119443f2 keyboardcomposer: fix (one) refresh bug
David McClosky <dmcc@bigasterisk.com>
parents: 389
diff changeset
214 self.sliders_status_var.set(self.use_hw_sliders)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
215 self.sliders_checkbutton = tk.Checkbutton(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
216 self.buttonframe,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
217 text="Sliders",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
218 variable=self.sliders_status_var,
386
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
219 command=lambda: self.toggle_slider_connectedness(),
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
220 bg='black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
221 fg='white')
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
222 self.sliders_checkbutton.pack(side=tk.LEFT)
386
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
223
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
224 self.alltozerobutton = tk.Button(self.buttonframe,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
225 text="All to Zero",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
226 command=self.alltozero,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
227 bg='black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
228 fg='white')
389
e708fdcb383c keyboardcomposer: move sliders toggler to better place
David McClosky <dmcc@bigasterisk.com>
parents: 386
diff changeset
229 self.alltozerobutton.pack(side='left')
e708fdcb383c keyboardcomposer: move sliders toggler to better place
David McClosky <dmcc@bigasterisk.com>
parents: 386
diff changeset
230
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
231 self.save_stage_button = tk.Button(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
232 self.buttonframe,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
233 text="Save",
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
234 command=lambda: self.save_current_stage(self.sub_name.get()),
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
235 bg='black',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
236 fg='white')
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
237 self.save_stage_button.pack(side=tk.LEFT)
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
238 self.sub_name = tk.Entry(self.buttonframe, bg='black', fg='white')
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
239 self.sub_name.pack(side=tk.LEFT)
389
e708fdcb383c keyboardcomposer: move sliders toggler to better place
David McClosky <dmcc@bigasterisk.com>
parents: 386
diff changeset
240
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
241 def redraw_sliders(self):
1265
50f8a1a7d5cd KC don't rebuild your tree so many times
drewp@bigasterisk.com
parents: 1264
diff changeset
242 self.draw_sliders()
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
243 if len(self.rows):
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
244 self.change_row(self.current_row)
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
245 self.rows[self.current_row].focus()
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
246
136
7e91c49fb2d6 whoops, forgot this one
dmcc
parents: 122
diff changeset
247 self.stop_frequent_update_time = 0
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
248
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
249 def draw_sliders(self):
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
250 for r in self.rows:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
251 r.destroy()
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
252 self.rows = []
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
253 for b in list(self.subbox.values()):
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
254 b.cleanup()
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
255 self.subbox.clear()
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
256 self.slider_table.clear()
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
257
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
258 self.tk_focusFollowsMouse()
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
259
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
260 rowcount = -1
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
261 col = 0
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
262 last_group = None
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
263
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
264 withgroups = []
1441
bc753db699f7 KC show all effects; no more :live node
drewp@bigasterisk.com
parents: 1429
diff changeset
265 for effect in self.graph.subjects(RDF.type, L9['Effect']):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
266 withgroups.append((self.graph.value(effect, L9['group']),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
267 self.graph.value(effect, L9['order']),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
268 self.graph.label(effect), effect))
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
269 withgroups.sort()
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
270
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
271 log.info("withgroups %s", withgroups)
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
272
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
273 self.effectEval = {}
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
274 imp.reload(light9.effect.effecteval)
1784
1aac97248a1b fix KC simpleOutputs object
Drew Perttula <drewp@bigasterisk.com>
parents: 1777
diff changeset
275 simpleOutputs = SimpleOutputs(self.graph)
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
276 for group, order, sortLabel, effect in withgroups:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
277 if col == 0 or group != last_group:
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
278 row = self.make_row(group)
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
279 rowcount += 1
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
280 col = 0
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
281
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
282 subbox = SubmasterBox(row, self.graph, effect, self.session, col,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
283 rowcount)
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
284 subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1)
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
285 self.subbox[effect] = self.slider_table[(rowcount, col)] = subbox
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
286
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
287 self.setup_key_nudgers(subbox.scale)
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
288
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
289 self.effectEval[effect] = light9.effect.effecteval.EffectEval(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
290 self.graph, effect, simpleOutputs)
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
291
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
292 col = (col + 1) % 8
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
293 last_group = group
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
294
386
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
295 def toggle_slider_connectedness(self):
392
53ec93018ee7 keyboardcomposer: remember whether to use hw sliders
David McClosky <dmcc@bigasterisk.com>
parents: 390
diff changeset
296 self.use_hw_sliders = not self.use_hw_sliders
53ec93018ee7 keyboardcomposer: remember whether to use hw sliders
David McClosky <dmcc@bigasterisk.com>
parents: 390
diff changeset
297 if self.use_hw_sliders:
386
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
298 self.sliders.reopen()
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
299 else:
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
300 self.sliders.close()
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
301 self.change_row(self.current_row)
551f06733559 bcf2000 and kc: sliders can be turned off
David McClosky <dmcc@bigasterisk.com>
parents: 385
diff changeset
302 self.rows[self.current_row].focus()
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
303
362
fc87327e29c4 CC now attaches to hardware sliders and knobs. tres cool. KC gets a --sliders option to enable the sliders
Drew Perttula <drewp@bigasterisk.com>
parents: 359
diff changeset
304 def connect_to_hw(self, hw_sliders):
fc87327e29c4 CC now attaches to hardware sliders and knobs. tres cool. KC gets a --sliders option to enable the sliders
Drew Perttula <drewp@bigasterisk.com>
parents: 359
diff changeset
305 if hw_sliders:
479
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
306 try:
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
307 self.sliders = Sliders(self)
1146
b3419b3aa00d log line
drewp@bigasterisk.com
parents: 1114
diff changeset
308 log.info("connected to sliders")
479
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
309 except IOError:
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
310 log.info("no hardware sliders")
479
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
311 self.sliders = DummySliders()
52a600439ddd keyboardcomposer: don't need --no-sliders no mo', yo
drewp@bigasterisk.com
parents: 474
diff changeset
312 self.use_hw_sliders = False
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
313 dispatcher.connect(self.send_to_hw, 'send_to_hw')
362
fc87327e29c4 CC now attaches to hardware sliders and knobs. tres cool. KC gets a --sliders option to enable the sliders
Drew Perttula <drewp@bigasterisk.com>
parents: 359
diff changeset
314 else:
366
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
315 self.sliders = DummySliders()
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
316
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
317 def make_key_hints(self):
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
318 keyhintrow = tk.Frame(self)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
319
45b12307c695 Initial revision
drewp
parents:
diff changeset
320 col = 0
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
321 for upkey, downkey in zip(nudge_keys['up'], nudge_keys['down']):
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
322 # what a hack!
45b12307c695 Initial revision
drewp
parents:
diff changeset
323 downkey = downkey.replace('semicolon', ';')
136
7e91c49fb2d6 whoops, forgot this one
dmcc
parents: 122
diff changeset
324 upkey, downkey = (upkey.upper(), downkey.upper())
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
325
45b12307c695 Initial revision
drewp
parents:
diff changeset
326 # another what a hack!
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
327 keylabel = tk.Label(keyhintrow,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
328 text='%s\n%s' % (upkey, downkey),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
329 width=1,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
330 font=('Arial', 10),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
331 bg='red',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
332 fg='white',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
333 anchor='c')
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
334 keylabel.pack(side=tk.LEFT, expand=1, fill=tk.X)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
335 col += 1
45b12307c695 Initial revision
drewp
parents:
diff changeset
336
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
337 keyhintrow.pack(fill=tk.X, expand=0)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
338 self.keyhints = keyhintrow
520
c10e671adc2c KC shuffle method order for clarity
drewp@bigasterisk.com
parents: 513
diff changeset
339
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
340 def setup_key_nudgers(self, tkobject):
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
341 for d, keys in list(nudge_keys.items()):
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
342 for key in keys:
45b12307c695 Initial revision
drewp
parents:
diff changeset
343 # lowercase makes full=0
45b12307c695 Initial revision
drewp
parents:
diff changeset
344 keysym = "<KeyPress-%s>" % key
45b12307c695 Initial revision
drewp
parents:
diff changeset
345 tkobject.bind(keysym, \
45b12307c695 Initial revision
drewp
parents:
diff changeset
346 lambda evt, num=keys.index(key), d=d: \
45b12307c695 Initial revision
drewp
parents:
diff changeset
347 self.got_nudger(num, d))
45b12307c695 Initial revision
drewp
parents:
diff changeset
348
45b12307c695 Initial revision
drewp
parents:
diff changeset
349 # uppercase makes full=1
45b12307c695 Initial revision
drewp
parents:
diff changeset
350 keysym = "<KeyPress-%s>" % key.upper()
45b12307c695 Initial revision
drewp
parents:
diff changeset
351 keysym = keysym.replace('SEMICOLON', 'colon')
45b12307c695 Initial revision
drewp
parents:
diff changeset
352 tkobject.bind(keysym, \
45b12307c695 Initial revision
drewp
parents:
diff changeset
353 lambda evt, num=keys.index(key), d=d: \
45b12307c695 Initial revision
drewp
parents:
diff changeset
354 self.got_nudger(num, d, full=1))
45b12307c695 Initial revision
drewp
parents:
diff changeset
355
205
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
356 # Row changing:
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
357 # Page dn, C-n, and ] do down
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
358 # Page up, C-p, and ' do up
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
359 for key in '<Prior> <Next> <Control-n> <Control-p> ' \
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
360 '<Key-bracketright> <Key-apostrophe>'.split():
379
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
361 tkobject.bind(key, self.change_row_cb)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
362
379
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
363 def change_row_cb(self, event):
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
364 diff = 1
205
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
365 if event.keysym in ('Prior', 'p', 'bracketright'):
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
366 diff = -1
379
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
367 self.change_row(self.current_row + diff)
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
368
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
369 def rowFromGraph(self):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
370 self.change_row(int(
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
371 self.graph.value(self.session, L9['currentRow'], default=0)),
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
372 fromGraph=True)
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
373
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
374 def change_row(self, row, fromGraph=False):
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
375 old_row = self.current_row
379
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
376 self.current_row = row
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
377 self.current_row = max(0, self.current_row)
45b12307c695 Initial revision
drewp
parents:
diff changeset
378 self.current_row = min(len(self.rows) - 1, self.current_row)
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
379 try:
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
380 row = self.rows[self.current_row]
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
381 except IndexError:
810
f29788d1c8c9 kc/sc session control
drewp@bigasterisk.com
parents: 809
diff changeset
382 # if we're mid-load, this row might still appear soon. If
f29788d1c8c9 kc/sc session control
drewp@bigasterisk.com
parents: 809
diff changeset
383 # we changed interactively, the user is out of bounds and
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
384 # needs to be brought back in
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
385 if fromGraph:
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
386 return
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
387 raise
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
388
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
389 self.unhighlight_row(old_row)
45b12307c695 Initial revision
drewp
parents:
diff changeset
390 self.highlight_row(self.current_row)
45b12307c695 Initial revision
drewp
parents:
diff changeset
391 self.keyhints.pack_configure(before=row)
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
392
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
393 if not fromGraph:
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
394 self.graph.patchObject(self.session, self.session, L9['currentRow'],
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
395 Literal(self.current_row))
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
396
393
e43dcabbf9ba keyboardcomposer: fix hw slider off by one bug
David McClosky <dmcc@bigasterisk.com>
parents: 392
diff changeset
397 for col in range(1, 9):
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
398 try:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
399 subbox = self.slider_table[(self.current_row, col - 1)]
474
c4807e96ee90 KC was sending values that didn't match bcf2000 api
drewp@bigasterisk.com
parents: 459
diff changeset
400 self.sliders.valueOut("button-upper%d" % col, True)
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
401 except KeyError:
376
b74c50018564 upper button lights indicate "dead"ness
David McClosky <dmcc@bigasterisk.com>
parents: 375
diff changeset
402 # unfilled bottom row has holes (plus rows with incomplete
b74c50018564 upper button lights indicate "dead"ness
David McClosky <dmcc@bigasterisk.com>
parents: 375
diff changeset
403 # groups
474
c4807e96ee90 KC was sending values that didn't match bcf2000 api
drewp@bigasterisk.com
parents: 459
diff changeset
404 self.sliders.valueOut("button-upper%d" % col, False)
385
e6f5ffb6a1b4 keyboardcomposer: zero hw sliders not used by row
David McClosky <dmcc@bigasterisk.com>
parents: 384
diff changeset
405 self.sliders.valueOut("slider%d" % col, 0)
376
b74c50018564 upper button lights indicate "dead"ness
David McClosky <dmcc@bigasterisk.com>
parents: 375
diff changeset
406 continue
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
407 self.send_to_hw(sub=subbox.sub, hwCol=col, boxRow=self.current_row)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
408
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
409 def got_nudger(self, number, direction, full=0):
395
8a028b896913 keyboardcomposer: ignore non-existent nudgers
David McClosky <dmcc@bigasterisk.com>
parents: 394
diff changeset
410 try:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
411 subbox = self.slider_table[(self.current_row, number)]
395
8a028b896913 keyboardcomposer: ignore non-existent nudgers
David McClosky <dmcc@bigasterisk.com>
parents: 394
diff changeset
412 except KeyError:
8a028b896913 keyboardcomposer: ignore non-existent nudgers
David McClosky <dmcc@bigasterisk.com>
parents: 394
diff changeset
413 return
8a028b896913 keyboardcomposer: ignore non-existent nudgers
David McClosky <dmcc@bigasterisk.com>
parents: 394
diff changeset
414
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
415 if direction == 'up':
45b12307c695 Initial revision
drewp
parents:
diff changeset
416 if full:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
417 subbox.scale.fade(1)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
418 else:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
419 subbox.scale.increase()
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
420 else:
45b12307c695 Initial revision
drewp
parents:
diff changeset
421 if full:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
422 subbox.scale.fade(0)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
423 else:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
424 subbox.scale.decrease()
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
425
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
426 def hw_slider_moved(self, col, value):
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
427 value = int(value * 100) / 100
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
428 try:
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
429 subbox = self.slider_table[(self.current_row, col)]
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
430 except KeyError:
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
431 return # no slider assigned at that column
1003
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
432
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
433 if hasattr(self, 'pendingHwSet'):
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
434 import twisted.internet.error
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
435 try:
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
436 self.pendingHwSet.cancel()
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
437 except twisted.internet.error.AlreadyCalled:
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
438 pass
b9aec3be2b8c hw sliders send events in a way that piles up and we get big delays. this is a simple throttle that stops the pileup but interactivity is still bumpy
drewp@bigasterisk.com
parents: 956
diff changeset
439 self.pendingHwSet = reactor.callLater(.01, subbox.slider_var.set, value)
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
440
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
441 def send_to_hw(self, sub, hwCol, boxRow):
366
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
442 if isinstance(self.sliders, DummySliders):
430014be95ce fix KC dummy mode
Drew Perttula <drewp@bigasterisk.com>
parents: 362
diff changeset
443 return
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
444
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
445 assert isinstance(sub, URIRef), repr(sub)
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
446
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
447 if boxRow != self.current_row:
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
448 return
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
449
955
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
450 try:
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
451 level = self.get_levels()[sub]
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
452 except KeyError:
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
453 log.warn("%r not in %r", sub, self.get_levels())
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
454 raise
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
455 v = round(127 * level)
c0f7fc86f89b fix up hardware sliders in KC. big mess now
drewp@bigasterisk.com
parents: 948
diff changeset
456 chan = "slider%s" % hwCol
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
457
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
458 # workaround for some rounding issue, where we receive one
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
459 # value and then decide to send back a value that's one step
368
ce302e4a73dc keyboardcomposer: hw startup should move if value is 0
David McClosky <dmcc@bigasterisk.com>
parents: 366
diff changeset
460 # lower. -5 is a fallback for having no last value. hopefully
ce302e4a73dc keyboardcomposer: hw startup should move if value is 0
David McClosky <dmcc@bigasterisk.com>
parents: 366
diff changeset
461 # we won't really see it
ce302e4a73dc keyboardcomposer: hw startup should move if value is 0
David McClosky <dmcc@bigasterisk.com>
parents: 366
diff changeset
462 if abs(v - self.sliders.lastValue.get(chan, -5)) <= 1:
359
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
463 return
bd8a89743226 KC optimizations, hw sliders now follow the active row
Drew Perttula <drewp@bigasterisk.com>
parents: 356
diff changeset
464 self.sliders.valueOut(chan, v)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
465
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
466 def make_row(self, group):
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
467 """group is a URI or None"""
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
468 row = tk.Frame(self, bd=2, bg='black')
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
469 row.subGroup = group
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
470
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
471 def onDrop(ev):
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
472 self.change_group(sub=URIRef(ev.data), row=row)
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
473 return "link"
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
474
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
475 dropTargetRegister(row,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
476 onDrop=onDrop,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
477 typeList=['*'],
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
478 hoverStyle=dict(background="#555500"))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
479
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
480 row.pack(expand=1, fill=tk.BOTH)
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
481 self.setup_key_nudgers(row)
45b12307c695 Initial revision
drewp
parents:
diff changeset
482 self.rows.append(row)
45b12307c695 Initial revision
drewp
parents:
diff changeset
483 return row
45b12307c695 Initial revision
drewp
parents:
diff changeset
484
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
485 def change_group(self, sub, row):
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
486 """update this sub's group, and maybe other sub groups as needed, so
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
487 this sub displays in this row"""
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
488 group = row.subGroup
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
489 self.graph.patchObject(context=self.session,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
490 subject=sub,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
491 predicate=L9['group'],
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
492 newObject=group)
946
7e991dba05f4 KC supports dragging into (existing) named groups. still can't make a new group though
drewp@bigasterisk.com
parents: 945
diff changeset
493
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
494 def highlight_row(self, row):
45b12307c695 Initial revision
drewp
parents:
diff changeset
495 row = self.rows[row]
45b12307c695 Initial revision
drewp
parents:
diff changeset
496 row['bg'] = 'red'
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
497
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
498 def unhighlight_row(self, row):
45b12307c695 Initial revision
drewp
parents:
diff changeset
499 row = self.rows[row]
146
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
500 row['bg'] = 'black'
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
501
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
502 def get_levels(self):
1860
5bcb950024af reformat python
drewp@bigasterisk.com
parents: 1859
diff changeset
503 return dict([(uri, box.slider_var.get())
5bcb950024af reformat python
drewp@bigasterisk.com
parents: 1859
diff changeset
504 for uri, box in list(self.subbox.items())])
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
505
1654
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
506 def get_output_settings(self, _graph=None):
1825
1692e8aba9f5 optimize KC output to collector, hopefully
drewp@bigasterisk.com
parents: 1784
diff changeset
507 _graph = _graph or self.graph
1391
4a7594476905 hack up KC so it edits effect strengths instead
Drew Perttula <drewp@bigasterisk.com>
parents: 1390
diff changeset
508 outputSettings = []
1654
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
509 for setting in _graph.objects(self.session, L9['subSetting']):
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
510 effect = _graph.value(setting, L9['sub'])
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
511 strength = _graph.value(setting, L9['level'])
1429
01dd3928b635 KC can now fade in effects, which can be read from the graph
Drew Perttula <drewp@bigasterisk.com>
parents: 1427
diff changeset
512 if strength:
1499
0e746743dd0f effects should also get noteTime for doing one-shot stuff
drewp@bigasterisk.com
parents: 1479
diff changeset
513 now = time.time()
1777
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
514 out, report = self.effectEval[effect].outputFromEffect(
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
515 [(L9['strength'], strength)],
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
516 songTime=now,
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
517 # should be counting from when you bumped up from 0
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
518 noteTime=now)
299d49de85a8 effectSequencer info display
Drew Perttula <drewp@bigasterisk.com>
parents: 1698
diff changeset
519 outputSettings.append(out)
956
901884392e24 KC wasn't sending dmx whenever anything changed, only on a periodic keepalive timer
drewp@bigasterisk.com
parents: 955
diff changeset
520
1654
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
521 return DeviceSettings.fromList(_graph, outputSettings)
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
522
146
4041eefed719 many changes from the theater. mostly color effects
drewp
parents: 139
diff changeset
523 def save_current_stage(self, subname):
799
fcf95ff23cc5 PersistentSubmaster split. keyboardcomposer now notices submaster changes
drewp@bigasterisk.com
parents: 745
diff changeset
524 log.info("saving current levels as %s", subname)
1825
1692e8aba9f5 optimize KC output to collector, hopefully
drewp@bigasterisk.com
parents: 1784
diff changeset
525 with self.graph.currentState() as g:
1654
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
526 ds = self.get_output_settings(_graph=g)
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
527 effect = L9['effect/%s' % subname]
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
528 ctx = URIRef(showconfig.showUri() + '/effect/' + subname)
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
529 stmts = ds.statements(effect, ctx, effect + '/', set())
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
530 stmts.extend([
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
531 (effect, RDF.type, L9['Effect'], ctx),
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
532 (effect, RDFS.label, Literal(subname), ctx),
5849146f4eb4 KC can save new effects
drewp@bigasterisk.com
parents: 1633
diff changeset
533 (effect, L9['publishAttr'], L9['strength'], ctx),
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
534 ])
947
f7ffd7aeb7f0 fix KC save-everything form
drewp@bigasterisk.com
parents: 946
diff changeset
535
1825
1692e8aba9f5 optimize KC output to collector, hopefully
drewp@bigasterisk.com
parents: 1784
diff changeset
536 self.graph.suggestPrefixes(ctx, {'eff': effect + '/'})
1692e8aba9f5 optimize KC output to collector, hopefully
drewp@bigasterisk.com
parents: 1784
diff changeset
537 self.graph.patch(Patch(addQuads=stmts, delQuads=[]))
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
538
947
f7ffd7aeb7f0 fix KC save-everything form
drewp@bigasterisk.com
parents: 946
diff changeset
539 self.sub_name.delete(0, tk.END)
f7ffd7aeb7f0 fix KC save-everything form
drewp@bigasterisk.com
parents: 946
diff changeset
540
275
c7bba03ddc36 keyboardcomposer has 'All to Zero' aka blackout
David McClosky <dmcc@bigasterisk.com>
parents: 270
diff changeset
541 def alltozero(self):
1859
f066d6e874db 2to3 with these fixers: all idioms set_literal
drewp@bigasterisk.com
parents: 1858
diff changeset
542 for uri, subbox in list(self.subbox.items()):
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
543 if subbox.scale.scale_var.get() != 0:
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
544 subbox.scale.fade(value=0.0, length=0)
275
c7bba03ddc36 keyboardcomposer has 'All to Zero' aka blackout
David McClosky <dmcc@bigasterisk.com>
parents: 270
diff changeset
545
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
546
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
547 # move to web lib
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
548 def postArgGetter(request):
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
549 """return a function that takes arg names and returns string
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
550 values. Supports args encoded in the url or in postdata. No
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
551 support for repeated args."""
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
552 # this is something nevow normally does for me
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
553 request.content.seek(0)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
554 fields = cgi.FieldStorage(request.content,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
555 request.received_headers,
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
556 environ={'REQUEST_METHOD': 'POST'})
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
557
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
558 def getArg(n):
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
559 try:
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
560 return request.args[n][0]
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
561 except KeyError:
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
562 return fields[n].value
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
563
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
564 return getArg
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
565
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
566
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
567 class LevelServerHttp(resource.Resource):
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
568 isLeaf = True
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
569
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
570 def __init__(self, name_to_subbox):
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
571 self.name_to_subbox = name_to_subbox
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
572
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
573 def render_POST(self, request):
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
574 arg = postArgGetter(request)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
575
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
576 if request.path == '/fadesub':
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
577 # fadesub?subname=scoop&level=0&secs=.2
808
a631e075a5bf KC big rewrites, now multiple KC instances can sync with rdfdb
drewp@bigasterisk.com
parents: 801
diff changeset
578 self.name_to_subbox[arg('subname')].scale.fade(
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
579 float(arg('level')), float(arg('secs')))
513
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
580 return "set %s to %s" % (arg('subname'), arg('level'))
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
581 else:
259436a06912 keyboardcomposer now receives http, not xmlrpc
drewp@bigasterisk.com
parents: 479
diff changeset
582 raise NotImplementedError(repr(request))
205
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
583
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
584
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
585 class Sliders(BCF2000):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
586
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
587 def __init__(self, kc):
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
588 devices = [
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
589 '/dev/snd/midiC3D0', '/dev/snd/midiC2D0', '/dev/snd/midiC1D0'
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
590 ]
676
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
591 for dev in devices:
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
592 try:
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
593 BCF2000.__init__(self, dev=dev)
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
594 except IOError:
676
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
595 if dev is devices[-1]:
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
596 raise
724
27fdbe9a8118 fix sliders device search
Drew Perttula <drewp@bigasterisk.com>
parents: 721
diff changeset
597 else:
27fdbe9a8118 fix sliders device search
Drew Perttula <drewp@bigasterisk.com>
parents: 721
diff changeset
598 break
676
adc5d450f890 try multiple device paths for the midi sliders
drewp@bigasterisk.com
parents: 623
diff changeset
599
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
600 self.kc = kc
1169
1104c384d368 more debug logs
drewp@bigasterisk.com
parents: 1146
diff changeset
601 log.info('found sliders on %s', dev)
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
602
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
603 def valueIn(self, name, value):
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
604 kc = self.kc
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
605 if name.startswith("slider"):
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
606 kc.hw_slider_moved(int(name[6:]) - 1, value / 127)
382
75213189881e keyboardcomposer: ignore button-upper presses
David McClosky <dmcc@bigasterisk.com>
parents: 379
diff changeset
607 elif name.startswith("button-upper"):
75213189881e keyboardcomposer: ignore button-upper presses
David McClosky <dmcc@bigasterisk.com>
parents: 379
diff changeset
608 kc.change_row(kc.current_row)
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
609 elif name.startswith("button-lower"):
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
610 col = int(name[12:]) - 1
379
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
611 self.valueOut(name, 0)
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
612 try:
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
613 tkslider = kc.slider_table[(kc.current_row, col)]
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
614 except KeyError:
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
615 return
546e01adad37 keyboardcomposer: better bumping, save row, bug fixen
David McClosky <dmcc@bigasterisk.com>
parents: 378
diff changeset
616
378
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
617 slider_var = tkslider.slider_var
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
618 if slider_var.get() == 1:
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
619 slider_var.set(0)
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
620 else:
a4c294b8c9c2 keyboardcomposer: reorganize Sliders, add bump buttons
David McClosky <dmcc@bigasterisk.com>
parents: 377
diff changeset
621 slider_var.set(1)
383
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
622 elif name.startswith("button-corner"):
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
623 button_num = int(name[13:]) - 1
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
624 if button_num == 1:
384
d596d932a7f1 keyboardcomposer: flip corner buttons, keep corner lights off
David McClosky <dmcc@bigasterisk.com>
parents: 383
diff changeset
625 diff = -1
383
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
626 elif button_num == 3:
384
d596d932a7f1 keyboardcomposer: flip corner buttons, keep corner lights off
David McClosky <dmcc@bigasterisk.com>
parents: 383
diff changeset
627 diff = 1
383
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
628 else:
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
629 return
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
630
a78e77f9aa66 keyboardcomposer: some corner buttons change row now
David McClosky <dmcc@bigasterisk.com>
parents: 382
diff changeset
631 kc.change_row(kc.current_row + diff)
384
d596d932a7f1 keyboardcomposer: flip corner buttons, keep corner lights off
David McClosky <dmcc@bigasterisk.com>
parents: 383
diff changeset
632 self.valueOut(name, 0)
350
c7478a778992 junky first pass at bcf2000 for keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 343
diff changeset
633
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
634
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
635 def launch(opts, root, graph, session):
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
636 tl = toplevelat("Keyboard Composer - %s" % opts.session,
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
637 existingtoplevel=root,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
638 graph=graph,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
639 session=session)
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
640
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
641 kc = KeyboardComposer(tl, graph, session, hw_sliders=not opts.no_sliders)
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
642 kc.pack(fill=tk.BOTH, expand=1)
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
643
948
8bdd2d35ea61 remove KC old control-l feature
drewp@bigasterisk.com
parents: 947
diff changeset
644 for helpline in ["Bindings: B3 mute"]:
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
645 tk.Label(root, text=helpline, font="Helvetica -12 italic",
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
646 anchor='w').pack(side='top', fill='x')
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
647
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
648
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
649 if __name__ == "__main__":
343
fe9dff7dbffd added C-l to launch subcomposer- in progress
Drew Perttula <drewp@bigasterisk.com>
parents: 287
diff changeset
650 parser = OptionParser()
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
651 parser.add_option('--no-sliders',
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
652 action='store_true',
430
670f3fd83267 typo in KC usage
drewp@bigasterisk.com
parents: 395
diff changeset
653 help="don't attach to hardware sliders")
809
7f1aef5fbddb session cmdline support. KC saves current row in the session
drewp@bigasterisk.com
parents: 808
diff changeset
654 clientsession.add_option(parser)
570
5037fa2c9983 fix how KC reads its graphs. switch to logging lib and add -v flag
drewp@bigasterisk.com
parents: 559
diff changeset
655 parser.add_option('-v', action='store_true', help="log info level")
343
fe9dff7dbffd added C-l to launch subcomposer- in progress
Drew Perttula <drewp@bigasterisk.com>
parents: 287
diff changeset
656 opts, args = parser.parse_args()
559
3f9162973d60 KC channel color support. use statements like sub:scoop :color "#ffaa77"
drewp@bigasterisk.com
parents: 520
diff changeset
657
888
cad8207933d7 KC fix logging, startup after graph sync, display uri tails when there's no label
Drew Perttula <drewp@bigasterisk.com>
parents: 838
diff changeset
658 log.setLevel(logging.INFO if opts.v else logging.WARN)
570
5037fa2c9983 fix how KC reads its graphs. switch to logging lib and add -v flag
drewp@bigasterisk.com
parents: 559
diff changeset
659
1114
a38955ba6f40 rdfdb port is now in the config
Drew Perttula <drewp@bigasterisk.com>
parents: 1003
diff changeset
660 graph = SyncedGraph(networking.rdfdb.url, "keyboardcomposer")
0
45b12307c695 Initial revision
drewp
parents:
diff changeset
661
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
662 # i think this also needs delayed start (like subcomposer has), to have a valid graph
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
663 # before setting any stuff from the ui
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
664
1390
6326a26e548c clean lint in KC
Drew Perttula <drewp@bigasterisk.com>
parents: 1266
diff changeset
665 root = tk.Tk()
734
d230824728aa drag submasters out of keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents: 733
diff changeset
666 initTkdnd(root.tk, 'tkdnd/trunk/')
810
f29788d1c8c9 kc/sc session control
drewp@bigasterisk.com
parents: 809
diff changeset
667
815
d7f1f868eb6c toplevel window pos is saved in the graph. Patch conflicts no longer break as hard, but they don't exactly reset themselves right yet eiher
drewp@bigasterisk.com
parents: 814
diff changeset
668 session = clientsession.getUri('keyboardcomposer', opts)
d7f1f868eb6c toplevel window pos is saved in the graph. Patch conflicts no longer break as hard, but they don't exactly reset themselves right yet eiher
drewp@bigasterisk.com
parents: 814
diff changeset
669
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
670 graph.initiallySynced.addCallback(lambda _: launch(opts, root, graph,
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
671 session))
343
fe9dff7dbffd added C-l to launch subcomposer- in progress
Drew Perttula <drewp@bigasterisk.com>
parents: 287
diff changeset
672
205
3905d3c92aaa twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents: 167
diff changeset
673 root.protocol('WM_DELETE_WINDOW', reactor.stop)
821
295b867fd810 just whitespace (hopefully)
drewp@bigasterisk.com
parents: 815
diff changeset
674
1858
7772cc48e016 reformat all python
drewp@bigasterisk.com
parents: 1825
diff changeset
675 tksupport.install(root, ms=20)
1169
1104c384d368 more debug logs
drewp@bigasterisk.com
parents: 1146
diff changeset
676 prof.run(reactor.run, profile=None)