annotate bin/keyboardcomposer @ 1633:eccbc249fee7

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