annotate bin/keyboardcomposer @ 1879:cb8222319cb8

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