Mercurial > code > home > repos > light9
annotate bin/curvecalc @ 689:03453848ed4c
refactor musicaccess
Ignore-this: e9cb1810285e3730c9d7381ab0229075
| author | drewp@bigasterisk.com |
|---|---|
| date | Tue, 05 Jun 2012 22:56:41 +0000 |
| parents | 97b028ed0e47 |
| children | 847edbfe65c8 |
| rev | line source |
|---|---|
|
686
a301a0039c66
buildout and rdflib updates
Drew Perttula <drewp@bigasterisk.com>
parents:
684
diff
changeset
|
1 #!bin/python |
| 0 | 2 |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
3 """ |
|
351
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
4 now launches like this: |
|
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
5 % bin/curvecalc http://light9.bigasterisk.com/show/dance2007/song1 |
|
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
6 |
|
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
7 |
|
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
8 |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
9 todo: curveview should preserve more objects, for speed maybe |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
10 |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
11 """ |
| 0 | 12 from __future__ import division |
|
636
54c863b2553e
CC don't run musicPlayer.path as often
Drew Perttula <drewp@bigasterisk.com>
parents:
623
diff
changeset
|
13 import time,textwrap,math,random,os,optparse, urllib2 |
| 505 | 14 import Tix as tk |
| 689 | 15 import louie as dispatcher |
| 0 | 16 from twisted.internet import reactor,tksupport |
| 689 | 17 |
|
473
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
18 from rdflib import Literal, URIRef, RDF, RDFS |
|
686
a301a0039c66
buildout and rdflib updates
Drew Perttula <drewp@bigasterisk.com>
parents:
684
diff
changeset
|
19 from rdflib import Graph |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
20 import rdflib |
|
319
2193eab0650b
add startup logging to curvecalc
Drew Perttula <drewp@bigasterisk.com>
parents:
296
diff
changeset
|
21 import logging |
|
2193eab0650b
add startup logging to curvecalc
Drew Perttula <drewp@bigasterisk.com>
parents:
296
diff
changeset
|
22 log = logging.getLogger() |
| 0 | 23 |
|
210
f41004d5a507
factored out some networking, new show/ layout, curvecalc works
drewp@bigasterisk.com
parents:
205
diff
changeset
|
24 import run_local |
| 689 | 25 from light9 import Submaster, dmxclient, showconfig, prof, Patch |
| 505 | 26 from light9.TLUtility import make_attributes_from_args |
| 688 | 27 from light9.curvecalc.zoomcontrol import Zoomcontrol |
| 28 from light9.curvecalc.curve import Curveset | |
| 29 from light9.curvecalc.curveview import Curvesetview | |
| 689 | 30 from light9.curvecalc.musicaccess import Music, currentlyPlayingSong |
|
264
0f112a7dd6b3
fix window positoins for subcomposer and curvecalc. now saves geometry continuously
drewp@bigasterisk.com
parents:
248
diff
changeset
|
31 from light9.wavelength import wavelength |
|
0f112a7dd6b3
fix window positoins for subcomposer and curvecalc. now saves geometry continuously
drewp@bigasterisk.com
parents:
248
diff
changeset
|
32 from light9.uihelpers import toplevelat |
| 335 | 33 from light9.namespaces import L9 |
|
293
1c590824dd14
chase logic is (mostly) fixed, integrate with curvecalc
David McClosky <dmcc@bigasterisk.com>
parents:
290
diff
changeset
|
34 import light9.Effects |
|
1c590824dd14
chase logic is (mostly) fixed, integrate with curvecalc
David McClosky <dmcc@bigasterisk.com>
parents:
290
diff
changeset
|
35 |
|
399
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
36 class Expr(object): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
37 """singleton, provides functions for use in subterm expressions, |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
38 e.g. chases""" |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
39 def __init__(self): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
40 self.effectGlobals = light9.Effects.configExprGlobals() |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
41 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
42 def exprGlobals(self, startDict, t): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
43 """globals dict for use by expressions""" |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
44 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
45 glo = startDict.copy() |
| 0 | 46 |
|
293
1c590824dd14
chase logic is (mostly) fixed, integrate with curvecalc
David McClosky <dmcc@bigasterisk.com>
parents:
290
diff
changeset
|
47 # add in functions from Effects |
|
399
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
48 glo.update(self.effectGlobals) |
|
293
1c590824dd14
chase logic is (mostly) fixed, integrate with curvecalc
David McClosky <dmcc@bigasterisk.com>
parents:
290
diff
changeset
|
49 |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
50 glo['nsin'] = lambda x: (math.sin(x * (2 * math.pi)) + 1) / 2 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
51 glo['ncos'] = lambda x: (math.cos(x * (2 * math.pi)) + 1) / 2 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
52 glo['within'] = lambda a, b: a < t < b |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
53 glo['bef'] = lambda x: t < x |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
54 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
55 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
56 def smoove(x): |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
57 return -2 * (x ** 3) + 3 * (x ** 2) |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
58 glo['smoove'] = smoove |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
59 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
60 def aft(t, x, smooth=0): |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
61 left = x - smooth / 2 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
62 right = x + smooth / 2 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
63 if left < t < right: |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
64 return smoove((t - left) / (right - left)) |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
65 return t > x |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
66 glo['aft'] = lambda x, smooth=0: aft(t, x, smooth) |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
67 |
|
399
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
68 def chan(name): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
69 return Submaster.Submaster( |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
70 leveldict={Patch.get_dmx_channel(name) : 1.0}, |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
71 temporary=True) |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
72 glo['chan'] = chan |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
73 |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
74 def smooth_random(speed=1): |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
75 """1 = new stuff each second, <1 is slower, fade-ier""" |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
76 x = (t * speed) % len(self._smooth_random_items) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
77 x1 = int(x) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
78 x2 = (int(x) + 1) % len(self._smooth_random_items) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
79 y1 = self._smooth_random_items[x1] |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
80 y2 = self._smooth_random_items[x2] |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
81 return y1 + (y2 - y1) * ((x - x1)) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
82 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
83 def notch_random(speed=1): |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
84 """1 = new stuff each second, <1 is slower, notch-ier""" |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
85 x = (t * speed) % len(self._smooth_random_items) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
86 x1 = int(x) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
87 y1 = self._smooth_random_items[x1] |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
88 return y1 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
89 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
90 glo['noise'] = smooth_random |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
91 glo['notch'] = notch_random |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
92 |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
93 |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
94 |
|
399
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
95 return glo |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
96 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
97 exprglo = Expr() |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
98 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
99 class Subexpr: |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
100 curveset = None |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
101 def __init__(self,curveset,expr=""): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
102 self.curveset = curveset |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
103 self.lasteval = None |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
104 self.expr=expr |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
105 self._smooth_random_items = [random.random() for x in range(100)] |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
106 def eval(self,t): |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
107 if self.expr=="": |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
108 dispatcher.send("expr_error",sender=self,exc="no expr, using 0") |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
109 return 0 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
110 glo = self.curveset.globalsdict() |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
111 glo['t'] = t |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
112 |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
113 glo = exprglo.exprGlobals(glo, t) |
|
40b6a06bd090
rework Effects.py to fix chase(). now uses chase lists from config.n3
Drew Perttula <drewp@bigasterisk.com>
parents:
398
diff
changeset
|
114 |
| 0 | 115 try: |
| 116 self.lasteval = eval(self.expr,glo) | |
| 117 except Exception,e: | |
| 118 dispatcher.send("expr_error",sender=self,exc=e) | |
| 119 else: | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
120 dispatcher.send("expr_error",sender=self,exc="ok") |
| 0 | 121 return self.lasteval |
| 122 | |
| 123 def expr(): | |
| 124 doc = "python expression for level as a function of t, using curves" | |
| 125 def fget(self): | |
| 126 return self._expr | |
| 127 def fset(self, value): | |
| 128 self._expr = value | |
| 129 dispatcher("expr_changed",sender=self) | |
| 130 return locals() | |
| 131 expr = property(**expr()) | |
| 132 | |
| 133 class Subexprview(tk.Frame): | |
| 134 def __init__(self,master,se,**kw): | |
| 135 self.subexpr=se | |
| 136 tk.Frame.__init__(self,master,**kw) | |
| 137 self.evar = tk.StringVar() | |
| 212 | 138 e = self.ent = tk.Entry(self,textvariable=self.evar) |
| 139 e.pack(side='left',fill='x',exp=1) | |
| 0 | 140 self.expr_changed() |
| 141 self.evar.trace_variable('w',self.evar_changed) | |
| 142 dispatcher.connect(self.expr_changed,"expr_changed", | |
| 143 sender=self.subexpr) | |
| 212 | 144 self.error = tk.Label(self) |
| 0 | 145 self.error.pack(side='left') |
| 146 dispatcher.connect(lambda exc: self.error.config(text=str(exc)), | |
| 147 "expr_error",sender=self.subexpr,weak=0) | |
| 148 def expr_changed(self): | |
| 149 if self.subexpr.expr!=self.evar.get(): | |
| 150 self.evar.set(self.subexpr.expr) | |
| 151 def evar_changed(self,*args): | |
| 152 self.subexpr.expr = self.evar.get() | |
| 153 | |
| 154 class Subterm: | |
| 155 """one Submaster and its Subexpr""" | |
|
274
9bf9685f5aae
curvecalc exprs can return a whole Submaster now
David McClosky <dmcc@bigasterisk.com>
parents:
267
diff
changeset
|
156 def __init__(self, submaster, subexpr): |
|
9bf9685f5aae
curvecalc exprs can return a whole Submaster now
David McClosky <dmcc@bigasterisk.com>
parents:
267
diff
changeset
|
157 make_attributes_from_args('submaster', 'subexpr') |
|
9bf9685f5aae
curvecalc exprs can return a whole Submaster now
David McClosky <dmcc@bigasterisk.com>
parents:
267
diff
changeset
|
158 def scaled(self, t): |
|
9bf9685f5aae
curvecalc exprs can return a whole Submaster now
David McClosky <dmcc@bigasterisk.com>
parents:
267
diff
changeset
|
159 subexpr_eval = self.subexpr.eval(t) |
|
296
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
160 # we prevent any exceptions from escaping, since they cause us to |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
161 # stop sending levels |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
162 try: |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
163 if isinstance(subexpr_eval, Submaster.Submaster): |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
164 # if the expression returns a submaster, just return it |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
165 return subexpr_eval |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
166 else: |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
167 # otherwise, return our submaster multiplied by the value |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
168 # returned |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
169 return self.submaster * subexpr_eval |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
170 except Exception, e: |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
171 dispatcher.send("expr_error", sender=self.subexpr, exc=str(e)) |
|
e99bd20dad85
curvecalc: fully catch and display errors in expr eval
David McClosky <dmcc@bigasterisk.com>
parents:
294
diff
changeset
|
172 return Submaster.Submaster('Error: %s' % str(e), temporary=True) |
| 0 | 173 |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
174 def __repr__(self): |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
175 return "<Subterm %s %s>" % (self.submaster, self.subexpr) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
176 |
| 0 | 177 class Subtermview(tk.Frame): |
|
360
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
178 def __init__(self, master, graph, st, **kw): |
| 0 | 179 self.subterm = st |
| 180 tk.Frame.__init__(self,master,bd=1,relief='raised',**kw) | |
|
599
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
181 l = tk.Label(self, text="sub %s" % self.subterm.submaster.name) |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
182 l.pack(side='left') |
| 0 | 183 sev=Subexprview(self,self.subterm.subexpr) |
| 184 sev.pack(side='left',fill='both',exp=1) | |
| 185 | |
| 186 class Output: | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
187 lastsendtime=0 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
188 lastsendlevs=None |
| 505 | 189 def __init__(self, subterms, music): |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
190 make_attributes_from_args('subterms','music') |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
191 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
192 self.recent_t=[] |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
193 self.later = None |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
194 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
195 self.update() |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
196 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
197 def update(self): |
| 505 | 198 d = self.music.current_time() |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
199 d.addCallback(self.update2) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
200 d.addErrback(self.updateerr) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
201 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
202 def updateerr(self,e): |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
203 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
204 print e.getTraceback() |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
205 dispatcher.send("update status",val=e.getErrorMessage()) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
206 if self.later and not self.later.cancelled and not self.later.called: |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
207 self.later.cancel() |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
208 self.later = reactor.callLater(1,self.update) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
209 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
210 def update2(self,t): |
|
326
a3267d8c498e
leave in a comment about how to offset the audio time in case your sound card is lying
Drew Perttula <drewp@bigasterisk.com>
parents:
319
diff
changeset
|
211 # spot alsa soundcard offset is always 0, we get times about a |
|
a3267d8c498e
leave in a comment about how to offset the audio time in case your sound card is lying
Drew Perttula <drewp@bigasterisk.com>
parents:
319
diff
changeset
|
212 # second ahead of what's really getting played |
|
a3267d8c498e
leave in a comment about how to offset the audio time in case your sound card is lying
Drew Perttula <drewp@bigasterisk.com>
parents:
319
diff
changeset
|
213 #t = t - .7 |
|
a3267d8c498e
leave in a comment about how to offset the audio time in case your sound card is lying
Drew Perttula <drewp@bigasterisk.com>
parents:
319
diff
changeset
|
214 |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
215 dispatcher.send("update status", |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
216 val="ok: receiving time from music player") |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
217 if self.later and not self.later.cancelled and not self.later.called: |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
218 self.later.cancel() |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
219 |
|
493
b8012dcb714b
increase curvecalc update frequency 50ms to 20ms
drewp@bigasterisk.com
parents:
476
diff
changeset
|
220 self.later = reactor.callLater(.02, self.update) |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
221 |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
222 self.recent_t = self.recent_t[-50:]+[t] |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
223 period = (self.recent_t[-1] - self.recent_t[0]) / len(self.recent_t) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
224 dispatcher.send("update period", val=period) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
225 self.send_dmx(t) |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
226 |
| 0 | 227 def send_dmx(self,t): |
|
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:
361
diff
changeset
|
228 dispatcher.send("curves to sliders", t=t) |
| 0 | 229 scaledsubs=[] |
| 230 for st in self.subterms: | |
| 231 scl = st.scaled(t) | |
| 232 scaledsubs.append(scl) | |
| 233 out = Submaster.sub_maxes(*scaledsubs) | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
234 levs = out.get_levels() |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
235 now=time.time() |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
236 if now-self.lastsendtime>5 or levs!=self.lastsendlevs: |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
237 dispatcher.send("output levels",val=levs) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
238 dmxclient.outputlevels(out.get_dmx_list(), |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
239 twisted=1,clientid='curvecalc') |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
240 self.lastsendtime = now |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
241 self.lastsendlevs = levs |
| 0 | 242 |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
243 def makeStatusLines(master): |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
244 """various labels that listen for dispatcher signals""" |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
245 for signame,textfilter in [ |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
246 ('input time',lambda t: "%.2fs"%t), |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
247 ('output levels', |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
248 lambda levels: textwrap.fill("; ".join(["%s:%.2f"%(n,v) |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
249 for n,v in |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
250 levels.items()[:5] |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
251 if v>0]),70)), |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
252 ('update period',lambda t: "%.1fms"%(t*1000)), |
|
236
63601fe0c3b0
curvecalc cmdline checking, connection status now in gui
drewp@bigasterisk.com
parents:
230
diff
changeset
|
253 ('update status',lambda t: str(t)), |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
254 ]: |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
255 l = tk.Label(master, anchor='w', justify='left', text='%s:' % signame) |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
256 l.pack(side='top',fill='x') |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
257 dispatcher.connect(lambda val,l=l,sn=signame,tf=textfilter: |
|
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
258 l.config(text=sn+": "+tf(val)), |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
259 signame, weak=False) |
|
197
ba2677823b35
zoom control and other cleanups. also reads song length now
drewp
parents:
196
diff
changeset
|
260 |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
261 def add_one_subterm(graph, subUri, curveset, subterms, master, expr=None): |
|
360
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
262 subname = graph.label(subUri) |
|
599
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
263 print "%s's label is %s" % (subUri, subname) |
|
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
264 if not subname: # fake sub, like for a chase |
|
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
265 st = graph.subjects(L9['sub'], subUri).next() |
|
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
266 subname = graph.label(st) |
|
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
267 print "using parent subterm's name instead. parent %r, name %r" % (st, subname) |
|
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
268 assert subname, "%s has no name" % subUri |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
269 if expr is None: |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
270 expr = '%s(t)' % subname |
|
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
271 |
|
599
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
272 term = Subterm(Submaster.Submaster(graph=graph, name=subname, sub=subUri), |
|
360
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
273 Subexpr(curveset,expr)) |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
274 subterms.append(term) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
275 |
| 505 | 276 stv=Subtermview(master, graph, term) |
| 277 stv.pack(side='top',fill='x') | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
278 |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
279 return term |
| 0 | 280 |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
281 def makeSubtermCommandRow(master, curveset, subterms, root, ssv, graph): |
| 505 | 282 """ |
| 283 the row that starts with 'reload subs' button | |
| 284 """ | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
285 f=tk.Frame(master,relief='raised',bd=1) |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
286 newname = tk.StringVar() |
|
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
287 |
|
398
c5f0b530ade5
curvecalc: easy curve+sub creation
David McClosky <dmcc@bigasterisk.com>
parents:
397
diff
changeset
|
288 def add_cmd(evt): |
|
473
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
289 uri = L9['sub/%s' % newname.get()] |
|
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
290 graph.add((uri, RDF.type, L9.Subterm)) |
|
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
291 graph.add((uri, RDFS.label, Literal(newname.get()))) |
|
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
292 add_one_subterm(graph, uri, |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
293 curveset, subterms, ssv, None) |
|
398
c5f0b530ade5
curvecalc: easy curve+sub creation
David McClosky <dmcc@bigasterisk.com>
parents:
397
diff
changeset
|
294 if evt.state & 4: # control key modifier |
|
c5f0b530ade5
curvecalc: easy curve+sub creation
David McClosky <dmcc@bigasterisk.com>
parents:
397
diff
changeset
|
295 curveset.new_curve(newname.get()) |
|
281
e3362ad9a123
curvecalc gets "see time until end", C-r for reload, doc updates
David McClosky <dmcc@bigasterisk.com>
parents:
280
diff
changeset
|
296 newname.set('') |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
297 |
|
279
5bfcf309e1ad
Submaster objects listen for a signal to reload, curvecalc can broadcast it
David McClosky <dmcc@bigasterisk.com>
parents:
277
diff
changeset
|
298 def reload_subs(): |
|
5bfcf309e1ad
Submaster objects listen for a signal to reload, curvecalc can broadcast it
David McClosky <dmcc@bigasterisk.com>
parents:
277
diff
changeset
|
299 dispatcher.send('reload all subs') |
|
5bfcf309e1ad
Submaster objects listen for a signal to reload, curvecalc can broadcast it
David McClosky <dmcc@bigasterisk.com>
parents:
277
diff
changeset
|
300 |
|
281
e3362ad9a123
curvecalc gets "see time until end", C-r for reload, doc updates
David McClosky <dmcc@bigasterisk.com>
parents:
280
diff
changeset
|
301 tk.Button(f, text="reload subs (C-r)", |
|
e3362ad9a123
curvecalc gets "see time until end", C-r for reload, doc updates
David McClosky <dmcc@bigasterisk.com>
parents:
280
diff
changeset
|
302 command=reload_subs).pack(side='left') |
|
476
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
303 tk.Label(f, text="new subterm named (C-Enter for curve too, C-n for focus):").pack(side='left') |
|
282
d482699decbd
curvecalc: "Enter" in the new term entry creates new term
David McClosky <dmcc@bigasterisk.com>
parents:
281
diff
changeset
|
304 entry = tk.Entry(f, textvariable=newname) |
|
d482699decbd
curvecalc: "Enter" in the new term entry creates new term
David McClosky <dmcc@bigasterisk.com>
parents:
281
diff
changeset
|
305 entry.pack(side='left', fill='x', exp=1) |
|
398
c5f0b530ade5
curvecalc: easy curve+sub creation
David McClosky <dmcc@bigasterisk.com>
parents:
397
diff
changeset
|
306 entry.bind("<Key-Return>", add_cmd) |
|
282
d482699decbd
curvecalc: "Enter" in the new term entry creates new term
David McClosky <dmcc@bigasterisk.com>
parents:
281
diff
changeset
|
307 |
|
476
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
308 def focus_entry(): |
|
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
309 entry.focus() |
|
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
310 |
|
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
311 dispatcher.connect(focus_entry, "focus new subterm", weak=False) |
|
0e3743492eae
curvecalc: new keyboard shortcut hotness
drewp@bigasterisk.com
parents:
473
diff
changeset
|
312 |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
313 return f |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
314 |
|
357
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
315 def savesubterms(filename,subterms): |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
316 raise NotImplementedError |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
317 s="" |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
318 for st in subterms: |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
319 s=s+"%s %s\n" % (st.submaster.name, st.subexpr.expr) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
320 |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
321 file(filename,'w').write(s) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
322 |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
323 def createSubtermGraph(song, subterms): |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
324 """rdf graph describing the subterms, readable by add_subterms_for_song""" |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
325 graph = Graph() |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
326 for subterm in subterms: |
|
599
b50e4d43dd3e
curvecalc would make multiple subterms with the same empty name, and this would lose expressions
drewp@bigasterisk.com
parents:
590
diff
changeset
|
327 assert subterm.submaster.name, "submaster has no name" |
|
357
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
328 uri = URIRef(song + "/subterm/" + subterm.submaster.name) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
329 graph.add((song, L9['subterm'], uri)) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
330 graph.add((uri, RDF.type, L9['Subterm'])) |
|
473
9ed6c40b3d6a
new subterms get a good uri and label
drewp@bigasterisk.com
parents:
454
diff
changeset
|
331 graph.add((uri, RDFS.label, Literal(subterm.submaster.name))) |
|
357
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
332 graph.add((uri, L9['sub'], L9['sub/%s' % subterm.submaster.name])) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
333 graph.add((uri, L9['expression'], Literal(subterm.subexpr.expr))) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
334 return graph |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
335 |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
336 def add_subterms_for_song(graph, song, curveset, subterms, master): |
| 335 | 337 for st in graph.objects(song, L9['subterm']): |
| 590 | 338 log.info("song %s has subterm %s", song, st) |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
339 try: |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
340 add_one_subterm(graph, graph.value(st, L9['sub']), curveset, |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
341 subterms, master, graph.value(st, L9['expression'])) |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
342 except rdflib.exceptions.UniquenessError: |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
343 print "working around curvecalc save corruption" |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
344 # curvecalc put all the expressions on one subterm, which is wrong |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
345 for expr in graph.objects(st, L9['expression']): |
|
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
346 add_one_subterm(graph, graph.value(st, L9['sub']), |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
347 curveset, subterms, master, expr) |
|
400
b2858c2d4a4d
aft() has smooth arg; workaround for CC writing poor subterms
Drew Perttula <drewp@bigasterisk.com>
parents:
399
diff
changeset
|
348 |
|
287
5322639d61e9
refactoring and little fixes in curvecalc and keyboardcomposer
Drew Perttula <drewp@bigasterisk.com>
parents:
284
diff
changeset
|
349 |
|
357
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
350 def graphPathForSubterms(song): |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
351 return showconfig.subtermsForSong(showconfig.songFilenameFromURI(song)) + ".n3" |
|
351
a6662d61ebcd
SC, KC, CC now run and seem to load and save ok. CC does not have any rdf for its data files
Drew Perttula <drewp@bigasterisk.com>
parents:
335
diff
changeset
|
352 |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
353 @prof.logTime |
|
360
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
354 def read_all_subs(graph): |
|
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
355 """read all sub files into this graph so when add_one_subterm tries |
|
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
356 to add, the sub will be available""" |
|
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
357 subsDir = showconfig.subsDir() |
|
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
358 for filename in os.listdir(subsDir): |
|
684
83c239d3fd33
a note about where to use nt instead of n3, but i'm not doing it yet
drewp@bigasterisk.com
parents:
680
diff
changeset
|
359 # parsing nt is faster, but it should try n3 format if the parsing fails |
|
360
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
360 graph.parse(os.path.join(subsDir, filename), format="n3") |
|
415c206f7534
fix sub loading and reloading in CC
Drew Perttula <drewp@bigasterisk.com>
parents:
357
diff
changeset
|
361 |
| 505 | 362 def makeGraph(): |
| 363 graphOrig = showconfig.getGraph() | |
| 364 graph = Graph() # a copy, since we're going to add subs into it | |
| 365 for s in graphOrig: | |
| 366 graph.add(s) | |
| 367 read_all_subs(graph) | |
| 368 return graph | |
| 0 | 369 |
| 505 | 370 def savekey(song, subterms, curveset): |
| 371 print "saving", song | |
|
357
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
372 g = createSubtermGraph(song, subterms) |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
373 g.serialize(graphPathForSubterms(song), format="nt") |
|
7771f37252da
curvecalc persistence, wavecurve -a option
Drew Perttula <drewp@bigasterisk.com>
parents:
351
diff
changeset
|
374 |
| 505 | 375 curveset.save(basename=os.path.join(showconfig.curvesDir(), |
| 376 showconfig.songFilenameFromURI(song))) | |
|
205
3905d3c92aaa
twisted mainloop, more row-change keys, xmlrpc fadesub command on port 8050
drewp
parents:
202
diff
changeset
|
377 print "saved" |
| 505 | 378 |
| 379 def setupKeyBindings(root, song, subterms, curveset): | |
| 380 root.bind("<Control-Key-s>", | |
| 381 lambda *args: savekey(song, subterms, curveset)) | |
| 382 root.bind("<Control-Key-r>", lambda evt: dispatcher.send('reload all subs')) | |
| 383 root.bind("<Control-Key-n>", | |
| 384 lambda evt: dispatcher.send('focus new subterm')) | |
| 385 root.bind("<Control-Key-N>", lambda evt: dispatcher.send('focus new curve')) | |
| 386 root.bind("<Control-Key-q>",lambda ev: reactor.stop) | |
| 387 root.bind("<Destroy>",lambda ev: reactor.stop) | |
| 388 root.protocol('WM_DELETE_WINDOW', reactor.stop) | |
| 389 | |
|
641
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
390 def setupMenubar(barFrame, root, song, subterms, curveset): |
| 639 | 391 class newMenu(object): |
| 392 def __init__(self, name): | |
| 393 self.name = name | |
| 394 def __enter__(self): | |
| 395 m = tk.Menubutton(barFrame, text=self.name) | |
| 396 m.pack(side='left') | |
| 397 mm = tk.Menu(m) | |
| 398 m.config(menu=mm) | |
| 399 return mm | |
| 400 def __exit__(self, type, value, traceback): | |
| 401 return False | |
| 402 | |
|
641
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
403 def notImpl(*args): |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
404 print "sorry, menu command binding isn't done yet. Use the keyboard shortcut" |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
405 |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
406 with newMenu("Curvecalc") as m: |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
407 m.add_command(label='Save', underline=0, accelerator="Ctrl+s", |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
408 command=lambda *args: savekey(song, subterms, curveset)) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
409 m.add_command(label='Quit', command=root.destroy) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
410 |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
411 with newMenu("View") as m: |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
412 m.add_command(label="See current time", accelerator="Esc", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
413 m.add_command(label="See from current time -> end", accelerator="Shift+Esc", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
414 m.add_command(label="Zoom all", accelerator="Ctrl+Esc", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
415 m.add_command(label="Zoom in", accelerator="Wheel up", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
416 m.add_command(label="Zoom out", accelerator="Wheel down", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
417 |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
418 with newMenu("Playback") as m: |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
419 m.add_command(label="Play/pause at mouse", accelerator="Ctrl+P", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
420 |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
421 with newMenu("Points") as m: |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
422 m.add_command(label="Delete", accelerator="Del", command=notImpl) |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
423 |
| 639 | 424 |
| 505 | 425 def createHelpLines(root): |
|
641
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
426 for helpline in ["Mousewheel zoom; C-p play/pause music at mouse", |
|
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
427 "Curve point bindings: B1 drag point; C-B1 curve add point; S-B1 sketch points; 1..5 add point at time; B1 drag select points", |
| 505 | 428 "Available in functions: nsin/ncos period=amp=1; within(a,b) bef(x) aft(x) compare to time; smoove(x) cubic smoothstep; chan(name); curvename(t) eval curve"]: |
| 429 line = tk.Label(root, text=helpline, font="Helvetica -12 italic", | |
| 430 anchor='w') | |
| 431 line.pack(side='top',fill='x') | |
| 432 | |
| 433 def main(): | |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
434 startTime = time.time() |
| 505 | 435 parser = optparse.OptionParser() |
|
551
ad5043f70fda
bin/curvecalc (with no song choice) defaults to whatever-ascoltami-is-currently-on
drewp@bigasterisk.com
parents:
532
diff
changeset
|
436 parser.set_usage("%prog [opts] [songURI]") |
| 505 | 437 parser.add_option("--sliders", action='store_true', |
| 438 help='use hardware sliders') | |
| 439 parser.add_option("--skip-music", action='store_true', | |
| 440 help="ignore music and smooth_music curve files") | |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
441 parser.add_option("--debug", action="store_true", |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
442 help="log at DEBUG") |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
443 parser.add_option("--startup-only", action='store_true', |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
444 help="quit after loading everything (for timing tests)") |
| 505 | 445 opts, args = parser.parse_args() |
| 446 | |
| 590 | 447 logging.basicConfig(format="%(asctime)s %(levelname)-5s %(name)s %(filename)s:%(lineno)d: %(message)s") |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
448 log.setLevel(logging.DEBUG if opts.debug else logging.INFO) |
| 590 | 449 |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
450 log.debug("startup: music %s", time.time() - startTime) |
| 505 | 451 try: |
| 452 song = URIRef(args[0]) | |
| 453 except IndexError: | |
|
551
ad5043f70fda
bin/curvecalc (with no song choice) defaults to whatever-ascoltami-is-currently-on
drewp@bigasterisk.com
parents:
532
diff
changeset
|
454 song = currentlyPlayingSong() |
| 505 | 455 |
| 456 music=Music() | |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
457 graph = makeGraph() |
| 505 | 458 curveset = Curveset(sliders=opts.sliders) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
459 subterms = [] |
| 505 | 460 |
|
637
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
461 subtermPath = graphPathForSubterms(song) |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
462 try: |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
463 graph.parse(subtermPath, format='n3') |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
464 except urllib2.URLError, e: |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
465 if e.reason.errno != 2: |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
466 raise |
|
af5539fe35a7
CC startup doesn't need a subterms file. it'll make the first one
Drew Perttula <drewp@bigasterisk.com>
parents:
636
diff
changeset
|
467 log.info("%s not found, starting with empty graph" % subtermPath) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
468 |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
469 log.debug("startup: output %s", time.time() - startTime) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
470 out = Output(subterms, music) |
| 505 | 471 |
| 472 musicfilename = showconfig.songOnDisk(song) | |
| 473 maxtime = wavelength(musicfilename) | |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
474 dispatcher.connect(lambda: maxtime, "get max time", weak=False) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
475 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
476 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
477 root=tk.Tk() |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
478 root.tk_setPalette("gray50") |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
479 toplevelat("curvecalc",root) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
480 root.tk_focusFollowsMouse() |
| 639 | 481 root.title("curvecalc - %s" % graph.label(song)) |
| 482 | |
| 483 menubar = tk.Frame(root) | |
| 484 menubar.pack(side='top', fill='x') | |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
485 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
486 if 'fixed top rows': |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
487 zc = Zoomcontrol(root) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
488 zc.pack(side='top', fill='x') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
489 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
490 if 'panes': |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
491 panes = tk.PanedWindow(root, height=1) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
492 panes.add('curvesetView') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
493 panes.add('subterms') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
494 panes.pack(side='top', fill='both', expand=True) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
495 |
|
519
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
496 curvesetView = Curvesetview(panes.subwidget('curvesetView'), curveset, |
| 613 | 497 height=600) |
|
519
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
498 curvesetView.pack(fill='both', expand=True) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
499 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
500 subtermArea = tk.Frame(panes.subwidget('subterms'), height=100) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
501 subtermArea.pack(fill='both', expand=True) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
502 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
503 subtermScroll = tk.ScrolledWindow(subtermArea) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
504 subtermScroll.pack(fill='both') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
505 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
506 if 'fixed bottom rows': |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
507 makeSubtermCommandRow(root, curveset, subterms, root, subtermArea, |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
508 graph).pack(side='top', fill='x') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
509 makeStatusLines(root) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
510 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
511 helpBox = tk.Frame(root) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
512 createHelpLines(helpBox) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
513 helpBox.pack(side='top', fill='x') |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
514 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
515 add_subterms_for_song(graph, song, curveset, subterms, |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
516 subtermScroll.subwidget('window')) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
517 setupKeyBindings(root, song, subterms, curveset) |
|
641
c113c759559b
more menubar. not many working actions yet
Drew Perttula <drewp@bigasterisk.com>
parents:
639
diff
changeset
|
518 setupMenubar(menubar, root, song, subterms, curveset) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
519 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
520 # curvesetview must already exist, since this makes 'add_curve' |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
521 # signals for all the initial curves |
| 505 | 522 curveset.load(basename=os.path.join(showconfig.curvesDir(), |
| 523 showconfig.songFilenameFromURI(song)), | |
| 524 skipMusic=opts.skip_music) | |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
525 |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
526 dispatcher.send("max time",maxtime=maxtime) |
|
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
527 dispatcher.send("show all") |
|
519
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
528 |
|
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
529 # this is scheduled after some tk shuffling, to try to minimize |
|
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
530 # the number of times we redraw the curve at startup. If tk is |
|
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
531 # very slow, it's ok. You'll just get some wasted redraws. |
|
f2dbb0b1fb35
optimize the number of curve redraws at curvecalc's startup
drewp@bigasterisk.com
parents:
517
diff
changeset
|
532 reactor.callLater(.1, curvesetView.goLive) |
| 505 | 533 |
|
517
f15ffbfc5cd6
speed up curvecalc tk update to 10ms (since we recently sped up the recalcs)
drewp@bigasterisk.com
parents:
516
diff
changeset
|
534 tksupport.install(root, ms=10) |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
535 log.debug("startup: run %s", time.time() - startTime) |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
536 if opts.startup_only: |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
537 log.debug("quitting now because of --startup-only") |
|
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
538 return |
| 505 | 539 prof.run(reactor.run, profile=False) |
| 540 | |
| 541 main() |