light9: bin/curvecalc annotate

annotate bin/curvecalc @ 789:ea8ca6502255

refactor to prepare for submasters to work out of the main graph Ignore-this: a5d4b63cf6b7daf52cce9bbfc3e0c5b3

author	drewp@bigasterisk.com
date	Mon, 18 Jun 2012 01:34:40 +0000
parents	d3f6830f55a2
children	431ddd043b47

rev	line source
686 a301a0039c66 buildout and rdflib updates Drew Perttula <drewp@bigasterisk.com> parents: 684 diff changeset	1 #!bin/python
0 45b12307c695 Initial revision drewp parents: diff changeset	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 45b12307c695 Initial revision drewp parents: diff changeset	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 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	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 03453848ed4c refactor musicaccess drewp@bigasterisk.com parents: 688 diff changeset	20 import louie as dispatcher
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	21 from rdflib import URIRef, Graph, Literal, RDF, RDFS
319 2193eab0650b add startup logging to curvecalc Drew Perttula <drewp@bigasterisk.com> parents: 296 diff changeset	22 import logging
2193eab0650b add startup logging to curvecalc Drew Perttula <drewp@bigasterisk.com> parents: 296 diff changeset	23 log = logging.getLogger()
0 45b12307c695 Initial revision drewp parents: diff changeset	24
210 f41004d5a507 factored out some networking, new show/ layout, curvecalc works drewp@bigasterisk.com parents: 205 diff changeset	25 import run_local
763 ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	26 from light9 import showconfig, prof, networking
688 97b028ed0e47 curvecalc package move drewp@bigasterisk.com parents: 687 diff changeset	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
689 03453848ed4c refactor musicaccess drewp@bigasterisk.com parents: 688 diff changeset	29 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	30 from light9.wavelength import wavelength
335 8a1ec8aca432 more rdf updates drewp@bigasterisk.com parents: 332 diff changeset	31 from light9.namespaces import L9
690 847edbfe65c8 refactor subterms drewp@bigasterisk.com parents: 689 diff changeset	32 from light9.curvecalc.subterm import read_all_subs, savekey, graphPathForSubterms
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 847edbfe65c8 refactor subterms drewp@bigasterisk.com parents: 689 diff changeset	34 from light9.curvecalc.output import Output
708 10ee0756a119 new python console Drew Perttula <drewp@bigasterisk.com> parents: 707 diff changeset	35 from light9.gtkpyconsole import togglePyConsole
0 45b12307c695 Initial revision drewp parents: diff changeset	36
789 ea8ca6502255 refactor to prepare for submasters to work out of the main graph drewp@bigasterisk.com parents: 779 diff changeset	37 @prof.logTime
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	38 def makeGraph():
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	39 graphOrig = showconfig.getGraph()
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	40 graph = Graph() # a copy, since we're going to add subs into it
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	41 for s in graphOrig:
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	42 graph.add(s)
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	43 read_all_subs(graph)
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	44 return graph
0 45b12307c695 Initial revision drewp parents: diff changeset	45
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	46 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	47 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	48
691 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	49 class Main(object):
698 2aac2ef23495 time cursor, control-p over curveviews Drew Perttula <drewp@bigasterisk.com> parents: 697 diff changeset	50 def __init__(self, graph, opts, song, curveset, subterms, music):
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	51 self.graph, self.opts, self.song = graph, opts, song
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	52 self.curveset, self.subterms, self.music = curveset, subterms, music
751 5656767ca025 first drop action of a sub successfully gets current music time drewp@bigasterisk.com parents: 745 diff changeset	53 self.lastSeenInputTime = 0
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	54
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	55 wtree = self.wtree = gtk.Builder()
702 155c7bb9c948 window geom Drew Perttula <drewp@bigasterisk.com> parents: 701 diff changeset	56 wtree.add_from_file("light9/curvecalc/curvecalc.glade")
691 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	57 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	58
d5692ab6bc2a fix quit and ctrl-q by using kill -9 Drew Perttula <drewp@bigasterisk.com> parents: 699 diff changeset	59 mainwin.connect("destroy", self.onQuit)
691 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	60 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	61 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	62 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	63 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	64 self.refreshTheme()
691 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	65 mainwin.show_all()
62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	66
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	67 mainwin.connect("delete-event", lambda *args: reactor.crash())
692 ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	68 mainwin.set_title("curvecalc - %s" % graph.label(song))
752 20d6884478bc fixes for machine swap drewp@bigasterisk.com parents: 751 diff changeset	69 mainwin.parse_geometry("1x1-0+0")
702 155c7bb9c948 window geom Drew Perttula <drewp@bigasterisk.com> parents: 701 diff changeset	70
155c7bb9c948 window geom Drew Perttula <drewp@bigasterisk.com> parents: 701 diff changeset	71 # this is the only one i found that would set the size right,
155c7bb9c948 window geom Drew Perttula <drewp@bigasterisk.com> parents: 701 diff changeset	72 # but it's a minimum size, which i don't really want
745 62f99e2a00ac updates for screen size drewp@bigasterisk.com parents: 737 diff changeset	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
761 857aab04f7bd CC layout to fit more curves drewp@bigasterisk.com parents: 760 diff changeset	75
725 e8f9f4815ab4 attempt at subtermview autoscroll but it doesn't work Drew Perttula <drewp@bigasterisk.com> parents: 717 diff changeset	76 wtree.get_object("subterms").connect("add", self.onSubtermChildAdded)
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	77 self.add_subterms_for_song(song, curveset, subterms)
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	78 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	79
34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	80 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	81
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	82 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	83 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	84 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	85 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	86 w.connect("drag-data-received", self.onDataReceived)
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	87 connect(mainwin)
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	88 # 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	89 # event.
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	90 mainwin.forall(connect) # not very effective
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	91 connect(wtree.get_object("subterms")) # works for that area
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	92
761 857aab04f7bd CC layout to fit more curves drewp@bigasterisk.com parents: 760 diff changeset	93 # may not work
857aab04f7bd CC layout to fit more curves drewp@bigasterisk.com parents: 760 diff changeset	94 wtree.get_object("paned1").set_position(600)
857aab04f7bd CC layout to fit more curves drewp@bigasterisk.com parents: 760 diff changeset	95
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	96 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	97 targetType, time):
778 a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	98 data = selection.data.strip()
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	99 if '?' in data:
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	100 self.handleSubtermDrop(data)
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	101 return
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	102 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	103 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	104
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	105 if not list(self.graph.subjects(L9['sub'], uri)):
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	106 # might be a new one just created in KC
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	107 print "didn't find %r, reloading subs" % uri
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	108 self.onReloadSubs()
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	109
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	110 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	111 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	112 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	113 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	114 curveView = self.curvesetView.row(subName).curveView
759 f22f925442a2 reformat drewp@bigasterisk.com parents: 757 diff changeset	115 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	116 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	117 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	118 (t, 1)])
778 a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	119
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	120 def handleSubtermDrop(self, data):
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	121 params = parse_qsl(data.split('?')[1])
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	122 flattened = dict(params)
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	123 self.makeSubterm(flattened['subtermName'],
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	124 expr=flattened['subtermExpr'])
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	125
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	126 for cmd, name in params:
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	127 if cmd == 'curve':
a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	128 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	129
705 ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	130 def onNewCurve(self, *args):
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	131 dialog = self.wtree.get_object("newCurve")
705 ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	132 entry = self.wtree.get_object("newCurveName")
ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	133 # if you don't have songx, that should be the suggested name
ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	134 entry.set_text("")
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	135 if dialog.run() == 1:
705 ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	136 self.curveset.new_curve(entry.get_text())
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	137 dialog.hide()
705 ed50631cf333 new curve dialog Drew Perttula <drewp@bigasterisk.com> parents: 704 diff changeset	138
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	139 def onNewSubterm(self, *args):
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	140 dialog = self.wtree.get_object("newSubterm")
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	141 # 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	142 # (but let you make one up, too)
16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	143 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	144 entry.set_text("")
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	145 entry.grab_focus()
c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	146 if dialog.run() == 1:
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	147 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	148 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	149 self.makeSubterm(newname, withCurve=wc)
707 c4a38a247b26 cleanup. 'create' menu Drew Perttula <drewp@bigasterisk.com> parents: 706 diff changeset	150 dialog.hide()
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	151
778 a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	152 def makeSubterm(self, newname, withCurve=False, expr=None):
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	153 uri = L9['sub/%s' % newname]
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	154 if (uri, RDF.type, L9.Subterm) in self.graph:
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	155 raise SubtermExists("already have a subterm named %r" % newname)
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	156 self.graph.add((uri, RDF.type, L9.Subterm))
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	157 self.graph.add((uri, RDFS.label, Literal(newname)))
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	158 add_one_subterm(self.graph, uri,
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	159 self.curveset, self.subterms,
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	160 self.wtree.get_object("subterms"),
778 a2c1dc358bb1 support dragging in a url to make curves and subterms drewp@bigasterisk.com parents: 773 diff changeset	161 expr=expr, show=True)
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	162 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	163 self.curveset.new_curve(newname)
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	164
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	165 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	166 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	167 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	168
725 e8f9f4815ab4 attempt at subtermview autoscroll but it doesn't work Drew Perttula <drewp@bigasterisk.com> parents: 717 diff changeset	169 def onSubtermChildAdded(self, subtermsTable, *args):
e8f9f4815ab4 attempt at subtermview autoscroll but it doesn't work Drew Perttula <drewp@bigasterisk.com> parents: 717 diff changeset	170 # this would probably work, but isn't getting called
e8f9f4815ab4 attempt at subtermview autoscroll but it doesn't work Drew Perttula <drewp@bigasterisk.com> parents: 717 diff changeset	171 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	172 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	173
700 d5692ab6bc2a fix quit and ctrl-q by using kill -9 Drew Perttula <drewp@bigasterisk.com> parents: 699 diff changeset	174 def onQuit(self, *args):
d5692ab6bc2a fix quit and ctrl-q by using kill -9 Drew Perttula <drewp@bigasterisk.com> parents: 699 diff changeset	175 reactor.crash()
d5692ab6bc2a fix quit and ctrl-q by using kill -9 Drew Perttula <drewp@bigasterisk.com> parents: 699 diff changeset	176 # 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	177 # threads. I don't know whose they are.
d5692ab6bc2a fix quit and ctrl-q by using kill -9 Drew Perttula <drewp@bigasterisk.com> parents: 699 diff changeset	178 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	179
715 9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	180 def onCollapseAll(self, *args):
9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	181 self.curvesetView.collapseAll()
9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	182
9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	183 def onCollapseNone(self, *args):
9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	184 self.curvesetView.collapseNone()
9865cf5e07fd collapse and mute support. very hard Drew Perttula <drewp@bigasterisk.com> parents: 711 diff changeset	185
711 e94989da079c more curve editor bindings. delete signal isn't done drewp@bigasterisk.com parents: 708 diff changeset	186 def onDelete(self, *args):
e94989da079c more curve editor bindings. delete signal isn't done drewp@bigasterisk.com parents: 708 diff changeset	187 self.curvesetView.onDelete()
e94989da079c more curve editor bindings. delete signal isn't done drewp@bigasterisk.com parents: 708 diff changeset	188
708 10ee0756a119 new python console Drew Perttula <drewp@bigasterisk.com> parents: 707 diff changeset	189 def onPythonConsole(self, item):
773 24db623e2097 more vars in the python console drewp@bigasterisk.com parents: 772 diff changeset	190 ns = dict()
24db623e2097 more vars in the python console drewp@bigasterisk.com parents: 772 diff changeset	191 ns.update(globals())
24db623e2097 more vars in the python console drewp@bigasterisk.com parents: 772 diff changeset	192 ns.update(self.__dict__)
24db623e2097 more vars in the python console drewp@bigasterisk.com parents: 772 diff changeset	193 togglePyConsole(self, item, ns)
708 10ee0756a119 new python console Drew Perttula <drewp@bigasterisk.com> parents: 707 diff changeset	194
699 d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	195 def onSeeCurrentTime(self, item):
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	196 dispatcher.send("see time")
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	197
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	198 def onSeeTimeUntilEnd(self, item):
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	199 dispatcher.send("see time until end")
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	200
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	201 def onZoomAll(self, item):
d12bc8919d6e ported the zoom control Drew Perttula <drewp@bigasterisk.com> parents: 698 diff changeset	202 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	203
698 2aac2ef23495 time cursor, control-p over curveviews Drew Perttula <drewp@bigasterisk.com> parents: 697 diff changeset	204 def onPlayPause(self, item):
2aac2ef23495 time cursor, control-p over curveviews Drew Perttula <drewp@bigasterisk.com> parents: 697 diff changeset	205 # 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	206 # 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	207 results = dispatcher.send("onPlayPause")
2aac2ef23495 time cursor, control-p over curveviews Drew Perttula <drewp@bigasterisk.com> parents: 697 diff changeset	208 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	209 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	210
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	211 def onSave(self, *args):
703 54a3dcba6597 save works Drew Perttula <drewp@bigasterisk.com> parents: 702 diff changeset	212 savekey(self.song, self.subterms, self.curveset)
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	213
706 16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	214 def add_subterms_for_song(self, song, curveset, subterms):
16042667ab51 ui for making a new subterm Drew Perttula <drewp@bigasterisk.com> parents: 705 diff changeset	215 master = self.wtree.get_object("subterms")
692 ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	216 for st in self.graph.objects(song, L9['subterm']):
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	217 log.info("song %s has subterm %s", song, st)
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	218 add_one_subterm(self.graph,
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	219 self.graph.value(st, L9['sub']),
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	220 curveset,
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	221 subterms,
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	222 master,
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	223 self.graph.value(st, L9['expression']))
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	224 master.show_all()
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	225
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	226 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	227 """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	228 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	229 ('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	230 ('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	231 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	232 for n,v in
779 d3f6830f55a2 stop output entry box bouncing around drewp@bigasterisk.com parents: 778 diff changeset	233 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	234 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	235 ('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	236 ('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	237 ]):
34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	238 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	239 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	240 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	241 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	242 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	243 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	244 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	245
34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	246 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	247 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	248 signame, weak=False)
751 5656767ca025 first drop action of a sub successfully gets current music time drewp@bigasterisk.com parents: 745 diff changeset	249 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	250 '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	251 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	252
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	253 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	254 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	255 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	256 '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	257 '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	258 ]]
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	259
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	260 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	261 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	262 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	263 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	264 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	265 [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	266 [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	267 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	268 try:
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	269 linecache.clearcache()
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	270 reload(curveview)
716 348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	271
348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	272 # old ones are not getting deleted right
348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	273 if hasattr(self, 'curvesetView'):
348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	274 self.curvesetView.live = False
348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	275
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	276 # 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	277 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	278 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	279 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	280
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	281 # 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	282 # 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	283 # 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	284 # 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	285 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	286 except Exception:
716 348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	287 print "reload failed:"
348b68723238 collapse mode. reload() hacks. rebuild key Drew Perttula <drewp@bigasterisk.com> parents: 715 diff changeset	288 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	289 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	290 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	291
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	292 def onReloadSubs(self, *args): # wants to be ctrl-r too
757 5f384443e3ed CC reload discovers new subs drewp@bigasterisk.com parents: 752 diff changeset	293 read_all_subs(self.graph) # this will discover new subs (additive only)
5f384443e3ed CC reload discovers new subs drewp@bigasterisk.com parents: 752 diff changeset	294 dispatcher.send('reload all subs') # this rereads each sub from its graph file
736 d1bff8a3b069 r key can't rebuild curves now that it's a marker key. let c-r rebuild all the curves Drew Perttula <drewp@bigasterisk.com> parents: 725 diff changeset	295 dispatcher.send("all curves rebuild")
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	296
34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	297
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	298 def main():
680 ad17b0a09f5c CC more startup logging, timing option to quit after init drewp@bigasterisk.com parents: 641 diff changeset	299 startTime = time.time()
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	300 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	301 parser.set_usage("%prog [opts] [songURI]")
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	302 parser.add_option("--sliders", action='store_true',
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	303 help='use hardware sliders')
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	304 parser.add_option("--skip-music", action='store_true',
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	305 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	306 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	307 help="log at DEBUG")
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	308 parser.add_option("--reload", action="store_true",
417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	309 help="live reload of themes and code")
680 ad17b0a09f5c CC more startup logging, timing option to quit after init drewp@bigasterisk.com parents: 641 diff changeset	310 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	311 help="quit after loading everything (for timing tests)")
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	312 opts, args = parser.parse_args()
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	313
590 0cf00fffd921 logging drewp@bigasterisk.com parents: 551 diff changeset	314 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	315 log.setLevel(logging.DEBUG if opts.debug else logging.INFO)
590 0cf00fffd921 logging drewp@bigasterisk.com parents: 551 diff changeset	316
680 ad17b0a09f5c CC more startup logging, timing option to quit after init drewp@bigasterisk.com parents: 641 diff changeset	317 log.debug("startup: music %s", time.time() - startTime)
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	318 try:
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	319 song = URIRef(args[0])
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	320 except IndexError:
551 ad5043f70fda bin/curvecalc (with no song choice) defaults to whatever-ascoltami-is-currently-on drewp@bigasterisk.com parents: 532 diff changeset	321 song = currentlyPlayingSong()
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	322
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	323 music = Music()
516 73b181155555 curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code drewp@bigasterisk.com parents: 505 diff changeset	324 graph = makeGraph()
691 62d83d456f2e curvecalc start gtk porting drewp@bigasterisk.com parents: 690 diff changeset	325
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	326 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	327 subterms = []
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	328
704 d5a9933a2222 don't reload curve files upon curve code reload Drew Perttula <drewp@bigasterisk.com> parents: 703 diff changeset	329 curveset.load(basename=os.path.join(
d5a9933a2222 don't reload curve files upon curve code reload Drew Perttula <drewp@bigasterisk.com> parents: 703 diff changeset	330 showconfig.curvesDir(),
d5a9933a2222 don't reload curve files upon curve code reload Drew Perttula <drewp@bigasterisk.com> parents: 703 diff changeset	331 showconfig.songFilenameFromURI(song)),
d5a9933a2222 don't reload curve files upon curve code reload Drew Perttula <drewp@bigasterisk.com> parents: 703 diff changeset	332 skipMusic=opts.skip_music)
d5a9933a2222 don't reload curve files upon curve code reload Drew Perttula <drewp@bigasterisk.com> parents: 703 diff changeset	333
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	334 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	335 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	336 graph.parse(subtermPath, format='n3')
717 d8202a0a7fd5 fix up musicpad and wavecurve. ascoltami2 can now use relative paths in the config Drew Perttula <drewp@bigasterisk.com> parents: 716 diff changeset	337 except IOError, e:
d8202a0a7fd5 fix up musicpad and wavecurve. ascoltami2 can now use relative paths in the config Drew Perttula <drewp@bigasterisk.com> parents: 716 diff changeset	338 if e.errno != 2:
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	339 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	340 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	341
680 ad17b0a09f5c CC more startup logging, timing option to quit after init drewp@bigasterisk.com parents: 641 diff changeset	342 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	343 out = Output(subterms, music)
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	344
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	345 musicfilename = showconfig.songOnDisk(song)
cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	346 maxtime = wavelength(musicfilename)
516 73b181155555 curvecalc ui touchups, adjustable pane, curve draw speedup, restructured main layout code drewp@bigasterisk.com parents: 505 diff changeset	347 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	348
698 2aac2ef23495 time cursor, control-p over curveviews Drew Perttula <drewp@bigasterisk.com> parents: 697 diff changeset	349 start = Main(graph, opts, song, curveset, subterms, music)
692 ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	350
694 34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	351 dispatcher.send("max time", maxtime=maxtime)
34dacd800505 eval loop is running, music drives lights. started to add goocanvas curve view Drew Perttula <drewp@bigasterisk.com> parents: 692 diff changeset	352 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	353
692 ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	354 if opts.startup_only:
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	355 log.debug("quitting now because of --startup-only")
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	356 return
ccdd04f4ca7d subterm display is working Drew Perttula <drewp@bigasterisk.com> parents: 691 diff changeset	357
763 ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	358 from twisted.web import server, resource
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	359 class Hover(resource.Resource):
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	360 isLeaf = True
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	361 def render_GET(self, request):
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	362 if request.path == '/hoverTime':
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	363 results = dispatcher.send("onPlayPause")
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	364 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	365 if not times:
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	366 request.setResponseCode(404)
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	367 return "not hovering over any time"
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	368
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	369 return json.dumps({"song":song, "hoverTime" : times[0]})
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	370 raise NotImplementedError()
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	371
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	372 reactor.listenTCP(networking.curveCalc.port,
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	373 server.Site(Hover()))
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	374
ffecebbdcc95 curvecalc serves the time you're hovering over drewp@bigasterisk.com parents: 761 diff changeset	375
701 417e23dc0af0 add marble-ice theme. use --reload to opt in to all autoreloading Drew Perttula <drewp@bigasterisk.com> parents: 700 diff changeset	376 prof.run(reactor.run, profile=False)
505 cbc98de2ab06 refactor curveCalc toplevel drewp@bigasterisk.com parents: 493 diff changeset	377
789 ea8ca6502255 refactor to prepare for submasters to work out of the main graph drewp@bigasterisk.com parents: 779 diff changeset	378 prof.run(main, profile=False)
ea8ca6502255 refactor to prepare for submasters to work out of the main graph drewp@bigasterisk.com parents: 779 diff changeset	379

Mercurial > code > home > repos > light9

annotate bin/curvecalc @ 789:ea8ca6502255