Mercurial > code > home > repos > light9
annotate bin/curvecalc @ 915:5054d49ed44e
rework some CC currentGraph optimizations
Ignore-this: f01851abc4f649b169a1753670a5fbe
| author | drewp@bigasterisk.com |
|---|---|
| date | Mon, 10 Jun 2013 19:57:15 +0000 |
| parents | bca2e8d754aa |
| children | 9ed01a562288 |
| 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 |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
13 |
| 691 | 14 from twisted.internet import gtk2reactor |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
15 gtk2reactor.install() |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
16 from twisted.internet import reactor |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
17 |
|
763
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
18 import time, textwrap, os, optparse, gtk, linecache, signal, traceback, json |
|
778
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
19 from urlparse import parse_qsl |
| 689 | 20 import louie as dispatcher |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
21 from rdflib import URIRef, Literal, RDF, RDFS |
|
319
2193eab0650b
add startup logging to curvecalc
Drew Perttula <drewp@bigasterisk.com>
parents:
296
diff
changeset
|
22 import logging |
| 0 | 23 |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
24 from run_local import log |
|
901
0dacbba70d06
remove some broken profiler attempts
Drew Perttula <drewp@bigasterisk.com>
parents:
898
diff
changeset
|
25 from light9 import showconfig, networking |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
26 from light9.rdfdb import clientsession |
| 688 | 27 from light9.curvecalc.curve import Curveset |
|
696
929ccd4ec800
live reloading of curveview.py, very nice
Drew Perttula <drewp@bigasterisk.com>
parents:
695
diff
changeset
|
28 from light9.curvecalc import curveview |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
29 from light9.curvecalc.musicaccess import Music |
|
264
0f112a7dd6b3
fix window positoins for subcomposer and curvecalc. now saves geometry continuously
drewp@bigasterisk.com
parents:
248
diff
changeset
|
30 from light9.wavelength import wavelength |
| 335 | 31 from light9.namespaces import L9 |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
32 from light9.curvecalc.subterm import Subterm |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
33 from light9.curvecalc.subtermview import add_one_subterm |
| 690 | 34 from light9.curvecalc.output import Output |
| 708 | 35 from light9.gtkpyconsole import togglePyConsole |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
36 from light9.rdfdb.syncedgraph import SyncedGraph |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
37 from light9.rdfdb.patch import Patch |
| 856 | 38 from light9.editchoicegtk import EditChoice |
| 39 from light9.observable import Observable | |
| 0 | 40 |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
41 class SubtermExists(ValueError): |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
42 pass |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
43 |
| 691 | 44 class Main(object): |
| 892 | 45 def __init__(self, graph, opts, session, curveset, music): |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
46 self.graph, self.opts, self.session = graph, opts, session |
| 892 | 47 self.curveset, self.music = curveset, music |
|
751
5656767ca025
first drop action of a sub successfully gets current music time
drewp@bigasterisk.com
parents:
745
diff
changeset
|
48 self.lastSeenInputTime = 0 |
|
903
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
49 self.currentSubterms = [] # Subterm objects that are synced to the graph |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
50 |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
51 wtree = self.wtree = gtk.Builder() |
| 702 | 52 wtree.add_from_file("light9/curvecalc/curvecalc.glade") |
| 691 | 53 mainwin = wtree.get_object("MainWindow") |
|
700
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
54 |
|
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
55 mainwin.connect("destroy", self.onQuit) |
| 691 | 56 wtree.connect_signals(self) |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
57 gtk.rc_parse("theme/marble-ice/gtk-2.0/gtkrc") |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
58 gtk.rc_parse_string("""style "default" {font_name = "sans 7"}""") |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
59 if self.opts.reload: |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
60 self.refreshTheme() |
| 691 | 61 mainwin.show_all() |
| 62 | |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
63 mainwin.connect("delete-event", lambda *args: reactor.crash()) |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
64 def updateTitle(): |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
65 mainwin.set_title("curvecalc - %s" % |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
66 graph.label( |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
67 graph.value(session, L9['currentSong']))) |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
68 graph.addHandler(updateTitle) |
| 752 | 69 mainwin.parse_geometry("1x1-0+0") |
| 702 | 70 |
| 71 # this is the only one i found that would set the size right, | |
| 72 # but it's a minimum size, which i don't really want | |
| 745 | 73 mainwin.set_size_request(1678, 922) |
|
725
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
74 |
| 856 | 75 songChoice = Observable(None) # to be connected with the session song |
| 761 | 76 |
| 856 | 77 def setSong(): |
| 78 songChoice(graph.value(session, L9['currentSong'])) | |
| 79 graph.addHandler(setSong) | |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
80 # next here, watch songChoice and patch the graph |
| 856 | 81 |
| 82 ec = EditChoice(graph, songChoice, label="Editing song:") | |
| 83 wtree.get_object("currentSongEditChoice").add(ec) | |
| 84 ec.show() | |
| 85 | |
|
725
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
86 wtree.get_object("subterms").connect("add", self.onSubtermChildAdded) |
|
893
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
87 |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
88 |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
89 self.refreshCurveView() |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
90 |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
91 self.makeStatusLines(wtree.get_object("status")) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
92 |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
93 def connect(w): |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
94 w.drag_dest_set(flags=gtk.DEST_DEFAULT_ALL, |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
95 targets=[('text/uri-list', 0, 0)], |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
96 actions=gtk.gdk.ACTION_COPY) |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
97 w.connect("drag-data-received", self.onDataReceived) |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
98 #connect(mainwin) |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
99 # that's not enough- deeper windows don't accept the |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
100 # event. |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
101 #mainwin.forall(connect) # not very effective |
| 892 | 102 |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
103 wtree.get_object("newSubZone").drag_dest_set(flags=gtk.DEST_DEFAULT_ALL, |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
104 targets=[('text/uri-list', 0, 0)], |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
105 actions=gtk.gdk.ACTION_COPY) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
106 |
| 892 | 107 # this probably isn't rerunning often enough to catch new data |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
108 #connect(wtree.get_object("subterms")) # works for that area |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
109 |
| 761 | 110 # may not work |
| 111 wtree.get_object("paned1").set_position(600) | |
| 112 | |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
113 def onDataReceived(self, widget, context, x, y, selection, |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
114 targetType, time): |
|
778
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
115 data = selection.data.strip() |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
116 if '?' in data: |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
117 self.handleSubtermDrop(data) |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
118 return |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
119 uri = URIRef(data) |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
120 subName = self.graph.label(uri) |
|
772
c0977217a7da
attempt to receive a brand new submaster. doesn't work, this fix doesn't address the problem. But you can drag it in twice as a workaround
drewp@bigasterisk.com
parents:
763
diff
changeset
|
121 |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
122 try: |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
123 self.makeSubterm(subName, withCurve=True) |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
124 except SubtermExists: |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
125 pass |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
126 curveView = self.curvesetView.row(subName).curveView |
| 759 | 127 t = self.lastSeenInputTime # curveView.current_time() # new curve hasn't heard the time yet. this has gotten too messy- everyone just needs to be able to reach the time source |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
128 print "time", t |
|
760
634e8a3ebd0a
when you drag a sub into CC and it makes a new fade, leave both points in the fade selected
drewp@bigasterisk.com
parents:
759
diff
changeset
|
129 curveView.add_points([(t - .5, 0), |
|
634e8a3ebd0a
when you drag a sub into CC and it makes a new fade, leave both points in the fade selected
drewp@bigasterisk.com
parents:
759
diff
changeset
|
130 (t, 1)]) |
|
778
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
131 |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
132 def onDragDataInNewSubZone(self, widget, context, x, y, selection, |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
133 targetType, time): |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
134 self.makeSubterm(newname="cx", withCurve=True, |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
135 sub=URIRef(selection.data.strip())) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
136 |
|
778
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
137 def handleSubtermDrop(self, data): |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
138 params = parse_qsl(data.split('?')[1]) |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
139 flattened = dict(params) |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
140 self.makeSubterm(flattened['subtermName'], |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
141 expr=flattened['subtermExpr']) |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
142 |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
143 for cmd, name in params: |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
144 if cmd == 'curve': |
|
a2c1dc358bb1
support dragging in a url to make curves and subterms
drewp@bigasterisk.com
parents:
773
diff
changeset
|
145 self.curveset.new_curve(name) |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
146 |
| 705 | 147 def onNewCurve(self, *args): |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
148 dialog = self.wtree.get_object("newCurve") |
| 705 | 149 entry = self.wtree.get_object("newCurveName") |
| 150 # if you don't have songx, that should be the suggested name | |
| 151 entry.set_text("") | |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
152 if dialog.run() == 1: |
| 705 | 153 self.curveset.new_curve(entry.get_text()) |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
154 dialog.hide() |
|
893
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
155 |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
156 def onSubtermsMap(self, *args): |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
157 # if this was called too soon, like in __init__, the gtktable |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
158 # would get its children but it wouldn't lay anything out that |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
159 # I can see, and I'm not sure why. Waiting for map event is |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
160 # just a wild guess. |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
161 self.graph.addHandler(self.set_subterms_from_graph) |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
162 |
|
706
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
163 def onNewSubterm(self, *args): |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
164 dialog = self.wtree.get_object("newSubterm") |
|
706
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
165 # the plan is to autocomplete this on existing subterm names |
|
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
166 # (but let you make one up, too) |
|
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
167 entry = self.wtree.get_object("newSubtermName").get_children()[0] |
|
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
168 entry.set_text("") |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
169 entry.grab_focus() |
|
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
170 if dialog.run() == 1: |
|
706
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
171 newname = entry.get_text() |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
172 wc = self.wtree.get_object("newSubtermMakeCurve").get_active() |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
173 self.makeSubterm(newname, withCurve=wc) |
|
707
c4a38a247b26
cleanup. 'create' menu
Drew Perttula <drewp@bigasterisk.com>
parents:
706
diff
changeset
|
174 dialog.hide() |
|
706
16042667ab51
ui for making a new subterm
Drew Perttula <drewp@bigasterisk.com>
parents:
705
diff
changeset
|
175 |
|
915
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
176 def currentSong(self): |
|
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
177 |
|
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
178 with self.graph.currentState( |
|
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
179 tripleFilter=(self.session, L9['currentSong'], None) |
|
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
180 ) as current: |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
181 return current.value(self.session, L9['currentSong']) |
|
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
182 |
|
915
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
183 def songSubtermsContext(self): |
|
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
184 return self.currentSong() |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
185 |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
186 def makeSubterm(self, newname, withCurve=False, expr=None, sub=None): |
|
898
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
187 with self.graph.currentState() as current: |
|
915
5054d49ed44e
rework some CC currentGraph optimizations
drewp@bigasterisk.com
parents:
903
diff
changeset
|
188 song = self.currentSong() |
|
898
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
189 for i in range(1000): |
|
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
190 uri = song + "/subterm/%d" % i |
|
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
191 if (uri, None, None) not in current: |
|
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
192 break |
|
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
193 else: |
|
db265102f7b5
shorter names on subterm uris. new sub zone ui padding.
Drew Perttula <drewp@bigasterisk.com>
parents:
897
diff
changeset
|
194 raise ValueError("can't pick a name for the new subterm") |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
195 |
|
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
196 ctx = self.songSubtermsContext() |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
197 quads = [ |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
198 (uri, RDF.type, L9.Subterm, ctx), |
|
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
199 (uri, RDFS.label, Literal(newname), ctx), |
|
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
200 (self.currentSong(), L9['subterm'], uri, ctx), |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
201 ] |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
202 if sub is not None: |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
203 quads.append((uri, L9['sub'], sub, ctx)) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
204 if expr is not None: |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
205 quads.append((uri, L9['expression'], Literal(expr), ctx)) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
206 self.graph.patch(Patch(addQuads=quads)) |
|
889
3b1a435a29b8
start fixing curvecalc data model; not done yet
Drew Perttula <drewp@bigasterisk.com>
parents:
887
diff
changeset
|
207 |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
208 if withCurve: |
|
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
209 self.curveset.new_curve(newname) |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
210 return uri |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
211 |
| 892 | 212 def set_subterms_from_graph(self): |
|
903
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
213 """rebuild all the gtktable 'subterms' widgets and the |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
214 self.currentSubterms list""" |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
215 song = self.graph.value(self.session, L9['currentSong']) |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
216 |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
217 newList = [] |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
218 for st in set(self.graph.objects(song, L9['subterm'])): |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
219 log.info("song %s has subterm %s", song, st) |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
220 term = Subterm(self.graph, st, self.songSubtermsContext(), |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
221 self.curveset) |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
222 newList.append(term) |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
223 self.currentSubterms[:] = newList |
|
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
224 |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
225 master = self.wtree.get_object("subterms") |
| 892 | 226 log.info("removing subterm widgets") |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
227 [master.remove(c) for c in master.get_children()] |
|
903
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
228 for term in self.currentSubterms: |
|
893
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
229 add_one_subterm(term, self.curveset, master) |
|
847
431ddd043b47
started porting curvecalc to SyncedGraph
drewp@bigasterisk.com
parents:
789
diff
changeset
|
230 master.show_all() |
|
893
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
231 log.info("%s table children showing" % len(master.get_children())) |
|
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
232 |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
233 def refreshTheme(self): |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
234 gtk.rc_reparse_all() |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
235 reactor.callLater(1, self.refreshTheme) |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
236 |
|
725
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
237 def onSubtermChildAdded(self, subtermsTable, *args): |
|
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
238 # this would probably work, but isn't getting called |
|
893
1b19038f42e2
tricky fix for curvecalc not displaying subterms at launch
Drew Perttula <drewp@bigasterisk.com>
parents:
892
diff
changeset
|
239 log.info("onSubtermChildAdded") |
|
725
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
240 v = subtermsTable.get_parent().props.vadjustment |
|
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
241 v.props.value = v.props.upper |
|
e8f9f4815ab4
attempt at subtermview autoscroll but it doesn't work
Drew Perttula <drewp@bigasterisk.com>
parents:
717
diff
changeset
|
242 |
|
700
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
243 def onQuit(self, *args): |
|
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
244 reactor.crash() |
|
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
245 # there's a hang after this, maybe in sem_wait in two |
|
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
246 # threads. I don't know whose they are. |
|
901
0dacbba70d06
remove some broken profiler attempts
Drew Perttula <drewp@bigasterisk.com>
parents:
898
diff
changeset
|
247 # This fix affects profilers who want to write output at the end. |
|
700
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
248 os.kill(os.getpid(), signal.SIGKILL) |
|
d5692ab6bc2a
fix quit and ctrl-q by using kill -9
Drew Perttula <drewp@bigasterisk.com>
parents:
699
diff
changeset
|
249 |
|
715
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
250 def onCollapseAll(self, *args): |
|
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
251 self.curvesetView.collapseAll() |
|
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
252 |
|
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
253 def onCollapseNone(self, *args): |
|
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
254 self.curvesetView.collapseNone() |
|
9865cf5e07fd
collapse and mute support. very hard
Drew Perttula <drewp@bigasterisk.com>
parents:
711
diff
changeset
|
255 |
|
711
e94989da079c
more curve editor bindings. delete signal isn't done
drewp@bigasterisk.com
parents:
708
diff
changeset
|
256 def onDelete(self, *args): |
|
e94989da079c
more curve editor bindings. delete signal isn't done
drewp@bigasterisk.com
parents:
708
diff
changeset
|
257 self.curvesetView.onDelete() |
|
e94989da079c
more curve editor bindings. delete signal isn't done
drewp@bigasterisk.com
parents:
708
diff
changeset
|
258 |
| 708 | 259 def onPythonConsole(self, item): |
| 773 | 260 ns = dict() |
| 261 ns.update(globals()) | |
| 262 ns.update(self.__dict__) | |
| 263 togglePyConsole(self, item, ns) | |
| 708 | 264 |
|
699
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
265 def onSeeCurrentTime(self, item): |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
266 dispatcher.send("see time") |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
267 |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
268 def onSeeTimeUntilEnd(self, item): |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
269 dispatcher.send("see time until end") |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
270 |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
271 def onZoomAll(self, item): |
|
d12bc8919d6e
ported the zoom control
Drew Perttula <drewp@bigasterisk.com>
parents:
698
diff
changeset
|
272 dispatcher.send("show all") |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
273 |
|
698
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
274 def onPlayPause(self, item): |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
275 # since the X coord in a curveview affects the handling, one |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
276 # of them may be able to pick this up |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
277 results = dispatcher.send("onPlayPause") |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
278 times = [t for listener, t in results if t is not None] |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
279 self.music.playOrPause(t=times[0] if times else None) |
|
2aac2ef23495
time cursor, control-p over curveviews
Drew Perttula <drewp@bigasterisk.com>
parents:
697
diff
changeset
|
280 |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
281 def onSave(self, *args): |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
282 with self.graph.currentState() as g: |
|
897
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
283 song = g.value(self.session, L9['currentSong']) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
284 |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
285 log.info("saving curves for %r", song) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
286 self.curveset.save(basename=os.path.join( |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
287 showconfig.curvesDir(), |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
288 showconfig.songFilenameFromURI(song))) |
|
fc651955d6d9
curvecalc takes drops for new subterms and also to edit the sub of an existing one
Drew Perttula <drewp@bigasterisk.com>
parents:
894
diff
changeset
|
289 log.info("saved") |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
290 |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
291 def makeStatusLines(self, master): |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
292 """various labels that listen for dispatcher signals""" |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
293 for row, (signame, textfilter) in enumerate([ |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
294 ('input time', lambda t: "%.2fs"%t), |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
295 ('output levels', |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
296 lambda levels: textwrap.fill("; ".join(["%s:%.2f"%(n,v) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
297 for n,v in |
|
779
d3f6830f55a2
stop output entry box bouncing around
drewp@bigasterisk.com
parents:
778
diff
changeset
|
298 levels.items()[:2] |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
299 if v>0]),70)), |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
300 ('update period', lambda t: "%.1fms"%(t*1000)), |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
301 ('update status', lambda x: str(x)), |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
302 ]): |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
303 key = gtk.Label("%s:" % signame) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
304 value = gtk.Label("") |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
305 master.resize(row + 1, 2) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
306 master.attach(key, 0, 1, row, row + 1) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
307 master.attach(value, 1, 2, row, row + 1) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
308 key.set_alignment(1, 0) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
309 value.set_alignment(0, 0) |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
310 |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
311 dispatcher.connect(lambda val, value=value, tf=textfilter: |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
312 value.set_text(tf(val)), |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
313 signame, weak=False) |
|
751
5656767ca025
first drop action of a sub successfully gets current music time
drewp@bigasterisk.com
parents:
745
diff
changeset
|
314 dispatcher.connect(lambda val: setattr(self, 'lastSeenInputTime', val), |
|
5656767ca025
first drop action of a sub successfully gets current music time
drewp@bigasterisk.com
parents:
745
diff
changeset
|
315 'input time', weak=False) |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
316 master.show_all() |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
317 |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
318 def refreshCurveView(self): |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
319 wtree = self.wtree |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
320 mtimes = [os.path.getmtime(f) for f in [ |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
321 'light9/curvecalc/curveview.py', |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
322 'light9/curvecalc/zoomcontrol.py', |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
323 ]] |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
324 |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
325 if (not hasattr(self, 'curvesetView') or |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
326 self.curvesetView._mtimes != mtimes): |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
327 print "reload curveview.py" |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
328 curvesVBox = wtree.get_object("curves") |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
329 zoomControlBox = wtree.get_object("zoomControlBox") |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
330 [curvesVBox.remove(c) for c in curvesVBox.get_children()] |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
331 [zoomControlBox.remove(c) for c in |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
332 zoomControlBox.get_children()] |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
333 try: |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
334 linecache.clearcache() |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
335 reload(curveview) |
|
716
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
336 |
|
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
337 # old ones are not getting deleted right |
|
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
338 if hasattr(self, 'curvesetView'): |
|
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
339 self.curvesetView.live = False |
|
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
340 |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
341 # mem problem somewhere; need to hold a ref to this |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
342 self.curvesetView = curveview.Curvesetview( |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
343 curvesVBox, zoomControlBox, self.curveset) |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
344 self.curvesetView._mtimes = mtimes |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
345 |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
346 # this is scheduled after some tk shuffling, to |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
347 # try to minimize the number of times we redraw |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
348 # the curve at startup. If tk is very slow, it's |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
349 # ok. You'll just get some wasted redraws. |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
350 self.curvesetView.goLive() |
|
737
3d1112a894df
drag subs from KC into CC to make a new subterm (if needed) and curve and some points that turn the sub on right now. some bugs about adding a subterm more than once
Drew Perttula <drewp@bigasterisk.com>
parents:
736
diff
changeset
|
351 except Exception: |
|
716
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
352 print "reload failed:" |
|
348b68723238
collapse mode. reload() hacks. rebuild key
Drew Perttula <drewp@bigasterisk.com>
parents:
715
diff
changeset
|
353 traceback.print_exc() |
|
701
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
354 if self.opts.reload: |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
355 reactor.callLater(1, self.refreshCurveView) |
|
417e23dc0af0
add marble-ice theme. use --reload to opt in to all autoreloading
Drew Perttula <drewp@bigasterisk.com>
parents:
700
diff
changeset
|
356 |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
357 |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
358 class MaxTime(object): |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
359 """ |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
360 looks up the time in seconds for the session's current song |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
361 """ |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
362 def __init__(self, graph, session): |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
363 self.graph, self.session = graph, session |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
364 graph.addHandler(self.update) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
365 |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
366 def update(self): |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
367 song = self.graph.value(self.session, L9['currentSong']) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
368 if song is None: |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
369 self.maxtime = 0 |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
370 return |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
371 musicfilename = showconfig.songOnDisk(song) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
372 self.maxtime = wavelength(musicfilename) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
373 log.info("new max time %r", self.maxtime) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
374 dispatcher.send("max time", maxtime=self.maxtime) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
375 |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
376 def get(self): |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
377 return self.maxtime |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
378 |
|
887
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
379 def launch(args, graph, session, opts, startTime, music): |
| 691 | 380 |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
381 try: |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
382 song = URIRef(args[0]) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
383 graph.patchObject(context=session, |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
384 subject=session, |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
385 predicate=L9['currentSong'], |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
386 newObject=song) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
387 except IndexError: |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
388 pass |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
389 |
| 505 | 390 curveset = Curveset(sliders=opts.sliders) |
| 391 | |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
392 def curvesetReload(): |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
393 # not sure if this clears right or not yet |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
394 song = graph.value(session, L9['currentSong']) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
395 if song is None: |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
396 return |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
397 curveset.load(basename=os.path.join( |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
398 showconfig.curvesDir(), |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
399 showconfig.songFilenameFromURI(song)), |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
400 skipMusic=opts.skip_music) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
401 graph.addHandler(curvesetReload) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
402 |
|
680
ad17b0a09f5c
CC more startup logging, timing option to quit after init
drewp@bigasterisk.com
parents:
641
diff
changeset
|
403 log.debug("startup: output %s", time.time() - startTime) |
| 505 | 404 |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
405 mt = MaxTime(graph, session) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
406 dispatcher.connect(lambda: mt.get(), "get max time", weak=False) |
|
516
73b181155555
curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code
drewp@bigasterisk.com
parents:
505
diff
changeset
|
407 |
| 892 | 408 start = Main(graph, opts, session, curveset, music) |
|
903
bca2e8d754aa
tripleFilter optimization on currentState. optimize how often curvecalc rebuilds Subterm objs
Drew Perttula <drewp@bigasterisk.com>
parents:
901
diff
changeset
|
409 out = Output(graph, session, music, curveset, start.currentSubterms) |
|
692
ccdd04f4ca7d
subterm display is working
Drew Perttula <drewp@bigasterisk.com>
parents:
691
diff
changeset
|
410 |
|
694
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
411 dispatcher.send("show all") |
|
34dacd800505
eval loop is running, music drives lights. started to add goocanvas curve view
Drew Perttula <drewp@bigasterisk.com>
parents:
692
diff
changeset
|
412 |
|
692
ccdd04f4ca7d
subterm display is working
Drew Perttula <drewp@bigasterisk.com>
parents:
691
diff
changeset
|
413 if opts.startup_only: |
|
ccdd04f4ca7d
subterm display is working
Drew Perttula <drewp@bigasterisk.com>
parents:
691
diff
changeset
|
414 log.debug("quitting now because of --startup-only") |
|
ccdd04f4ca7d
subterm display is working
Drew Perttula <drewp@bigasterisk.com>
parents:
691
diff
changeset
|
415 return |
|
ccdd04f4ca7d
subterm display is working
Drew Perttula <drewp@bigasterisk.com>
parents:
691
diff
changeset
|
416 |
|
763
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
417 from twisted.web import server, resource |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
418 class Hover(resource.Resource): |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
419 isLeaf = True |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
420 def render_GET(self, request): |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
421 if request.path == '/hoverTime': |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
422 results = dispatcher.send("onPlayPause") |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
423 times = [t for listener, t in results if t is not None] |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
424 if not times: |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
425 request.setResponseCode(404) |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
426 return "not hovering over any time" |
|
848
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
427 with graph.currentState() as g: |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
428 song = g.value(session, L9['currentSong']) |
|
dacbb278d91d
curvecalc port to SyncedGraph. starts up ok, saving is broken
drewp@bigasterisk.com
parents:
847
diff
changeset
|
429 return json.dumps({"song": song, "hoverTime" : times[0]}) |
|
763
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
430 raise NotImplementedError() |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
431 |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
432 reactor.listenTCP(networking.curveCalc.port, |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
433 server.Site(Hover())) |
|
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
434 |
|
887
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
435 def main(): |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
436 startTime = time.time() |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
437 parser = optparse.OptionParser() |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
438 parser.set_usage("%prog [opts] [songURI]") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
439 parser.add_option("--sliders", action='store_true', |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
440 help='use hardware sliders') |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
441 parser.add_option("--skip-music", action='store_true', |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
442 help="ignore music and smooth_music curve files") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
443 parser.add_option("--debug", action="store_true", |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
444 help="log at DEBUG") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
445 parser.add_option("--reload", action="store_true", |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
446 help="live reload of themes and code") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
447 parser.add_option("--startup-only", action='store_true', |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
448 help="quit after loading everything (for timing tests)") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
449 clientsession.add_option(parser) |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
450 opts, args = parser.parse_args() |
|
763
ffecebbdcc95
curvecalc serves the time you're hovering over
drewp@bigasterisk.com
parents:
761
diff
changeset
|
451 |
|
887
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
452 log.setLevel(logging.DEBUG if opts.debug else logging.INFO) |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
453 |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
454 log.debug("startup: music %s", time.time() - startTime) |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
455 |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
456 |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
457 session = clientsession.getUri('curvecalc', opts) |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
458 |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
459 music = Music() |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
460 graph = SyncedGraph("curvecalc") |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
461 |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
462 graph.initiallySynced.addCallback( |
|
4fe5612db2ed
curvecalc don't start doing graph work until our first sync
Drew Perttula <drewp@bigasterisk.com>
parents:
856
diff
changeset
|
463 lambda _: launch(args, graph, session, opts, startTime, music)) |
|
901
0dacbba70d06
remove some broken profiler attempts
Drew Perttula <drewp@bigasterisk.com>
parents:
898
diff
changeset
|
464 |
|
0dacbba70d06
remove some broken profiler attempts
Drew Perttula <drewp@bigasterisk.com>
parents:
898
diff
changeset
|
465 reactor.run() |
| 505 | 466 |
|
901
0dacbba70d06
remove some broken profiler attempts
Drew Perttula <drewp@bigasterisk.com>
parents:
898
diff
changeset
|
467 main() |
|
789
ea8ca6502255
refactor to prepare for submasters to work out of the main graph
drewp@bigasterisk.com
parents:
779
diff
changeset
|
468 |