light9 Changeset - 0e3743492eae

Changeset - 0e3743492eae

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 16 years ago 2009-06-12 22:46:17
drewp@bigasterisk.com

curvecalc: new keyboard shortcut hotness

2 files changed with 13 insertions and 2 deletions:

bin/curvecalc

light9/curve.py

0 comments (0 inline, 0 general)

bin/curvecalc

➞

Show inline comments

@@ @@ -333,29 +333,34 @@ def sub_commands_tk(master, curveset, su @@
         graph.add((uri, RDFS.label, Literal(newname.get())))
         add_one_subterm(graph, uri,
                         curveset, subterms, root, ssv, None)
         if evt.state & 4: # control key modifier
             curveset.new_curve(newname.get())
         newname.set('')
     def reload_subs():
         dispatcher.send('reload all subs')
     tk.Button(f, text="reload subs (C-r)",
         command=reload_subs).pack(side='left')
     tk.Label(f, text="new subterm named (C-Enter for curve too):").pack(side='left')
+    tk.Label(f, text="new subterm named (C-Enter for curve too, C-n for focus):").pack(side='left')
     entry = tk.Entry(f, textvariable=newname)
     entry.pack(side='left', fill='x', exp=1)
     entry.bind("<Key-Return>", add_cmd)
     def focus_entry():
         entry.focus()
     dispatcher.connect(focus_entry, "focus new subterm", weak=False)
     return f
 def savesubterms(filename,subterms):
     raise NotImplementedError
     s=""
     for st in subterms:
         s=s+"%s %s\n" % (st.submaster.name, st.subexpr.expr)
     file(filename,'w').write(s)
 def createSubtermGraph(song, subterms):
     """rdf graph describing the subterms, readable by add_subterms_for_song"""
@@ @@ -455,24 +460,26 @@ log.debug("output") @@
 out = Output(subterms, music)
 def savekey(*args):
     print "saving",song
     g = createSubtermGraph(song, subterms)
     g.serialize(graphPathForSubterms(song), format="nt")
     curveset.save(basename=os.path.join(showconfig.curvesDir(), showconfig.songFilenameFromURI(song)))
     print "saved"
 root.bind("<Control-Key-s>",savekey)
 root.bind("<Control-Key-r>", lambda evt: dispatcher.send('reload all subs'))
 root.bind("<Control-Key-n>", lambda evt: dispatcher.send('focus new subterm'))
 root.bind("<Control-Key-N>", lambda evt: dispatcher.send('focus new curve'))
 create_status_lines(root)
 for helpline in ["Bindings: C-s save subterms;  Esc see current time; S-Esc see curtime to end; C-Esc show all; Mousewheel zoom; C-p play/pause music at mouse",
                  "Curve point bindings: B1 drag point; C-B1 curve add point; S-B1 sketch points; Del selected points; 1..5 add point at time; B1 drag select points",
                  "Available in functions: nsin/ncos period=amp=1; within(a,b) bef(x) aft(x) compare to time; smoove(x) cubic smoothstep; chan(name); curvename(t) eval curve"]:
     tk.Label(root,text=helpline, font="Helvetica -12 italic",
              anchor='w').pack(side='top',fill='x')
 #def logprint(msg):
 #    print "log",msg
 #twisted.python.log.addObserver(logprint)

light9/curve.py

➞

Show inline comments

@@ @@ -688,37 +688,41 @@ class Curveset: @@
             return
         self.sliders.valueOut("knob%s" % num, value * 127)
 class Curvesetview(tk.Frame):
     curves = None # curvename : Curveview
     def __init__(self, master, curveset, **kw):
         self.curves = {}
         self.curveset = curveset
         tk.Frame.__init__(self,master,**kw)
         f = tk.Frame(self,relief='raised',bd=1)
         f.pack(side='top',fill='x')
         tk.Label(f, text="new curve named:").pack(side='left')
+        tk.Label(f, text="new curve named: (C-N)").pack(side='left')
         self.newcurvename = tk.StringVar()
         def new_curve(event):
             self.curveset.new_curve(self.newcurvename.get())
             self.newcurvename.set('')
         entry = tk.Entry(f, textvariable=self.newcurvename)
         entry.pack(side='left', fill='x',exp=1)
         entry.bind("<Key-Return>", new_curve)
         def focus_entry():
             entry.focus()
         dispatcher.connect(self.add_curve,"add_curve",sender=self.curveset)
         dispatcher.connect(focus_entry, "focus new curve", weak=False)
     def add_curve(self,name, slider=None, knobEnabled=False):
         f = tk.Frame(self,relief='raised',bd=1)
         f.pack(side='top',fill='both',exp=1)
         leftside = tk.Frame(f)
         leftside.pack(side='left')
         collapsed = tk.IntVar()
         txt = "curve '%s'" % name
         if len(name) > 7:

0 comments (0 inline, 0 general)