Mercurial > code > home > repos > light9
comparison bin/keyboardcomposer @ 1427:e070c9f1c5e7
partial fixes to KC
Ignore-this: 52c7627484ebcb2f9ae6b981a7344e4f
author | drewp@bigasterisk.com |
---|---|
date | Sat, 11 Jun 2016 04:33:36 +0000 |
parents | 4a7594476905 |
children | 01dd3928b635 |
comparison
equal
deleted
inserted
replaced
1426:05a5226a8d61 | 1427:e070c9f1c5e7 |
---|---|
17 from light9.uihelpers import toplevelat | 17 from light9.uihelpers import toplevelat |
18 from light9.namespaces import L9 | 18 from light9.namespaces import L9 |
19 from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister | 19 from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister |
20 from light9.rdfdb import clientsession | 20 from light9.rdfdb import clientsession |
21 from light9.rdfdb.syncedgraph import SyncedGraph | 21 from light9.rdfdb.syncedgraph import SyncedGraph |
22 from light9.effect.sequencer import EffectEval | 22 import light9.effect.effecteval |
23 | 23 |
24 from bcf2000 import BCF2000 | 24 from bcf2000 import BCF2000 |
25 | 25 |
26 nudge_keys = { | 26 nudge_keys = { |
27 'up' : list('qwertyui'), | 27 'up' : list('qwertyui'), |
222 withgroups.sort() | 222 withgroups.sort() |
223 | 223 |
224 log.info("withgroups %s", withgroups) | 224 log.info("withgroups %s", withgroups) |
225 | 225 |
226 self.effectEval = {} | 226 self.effectEval = {} |
227 reload(light9.effect.effecteval) | |
227 for group, order, sortLabel, effect in withgroups: | 228 for group, order, sortLabel, effect in withgroups: |
228 if col == 0 or group != last_group: | 229 if col == 0 or group != last_group: |
229 row = self.make_row(group) | 230 row = self.make_row(group) |
230 rowcount += 1 | 231 rowcount += 1 |
231 col = 0 | 232 col = 0 |
234 subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1) | 235 subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1) |
235 self.subbox[effect] = self.slider_table[(rowcount, col)] = subbox | 236 self.subbox[effect] = self.slider_table[(rowcount, col)] = subbox |
236 | 237 |
237 self.setup_key_nudgers(subbox.scale) | 238 self.setup_key_nudgers(subbox.scale) |
238 | 239 |
239 self.effectEval[effect] = EffectEval(self.graph, effect) | 240 self.effectEval[effect] = light9.effect.effecteval.EffectEval(self.graph, effect) |
240 | 241 |
241 col = (col + 1) % 8 | 242 col = (col + 1) % 8 |
242 last_group = group | 243 last_group = group |
243 | 244 |
244 def toggle_slider_connectedness(self): | 245 def toggle_slider_connectedness(self): |
448 for setting in graph.objects(self.session, L9['subSetting']): | 449 for setting in graph.objects(self.session, L9['subSetting']): |
449 effect = graph.value(setting, L9['sub']) | 450 effect = graph.value(setting, L9['sub']) |
450 strength = graph.value(setting, L9['level']) | 451 strength = graph.value(setting, L9['level']) |
451 outputSettings.extend( | 452 outputSettings.extend( |
452 self.effectEval[effect].outputFromEffect( | 453 self.effectEval[effect].outputFromEffect( |
453 [(L9['strength'], strength)])) | 454 [(L9['strength'], strength)], songTime=time.time())) |
454 | 455 |
455 return outputSettings | 456 return outputSettings |
456 | 457 |
457 def save_current_stage(self, subname): | 458 def save_current_stage(self, subname): |
458 raise NotImplementedError | 459 raise NotImplementedError |