# HG changeset patch # User drewp@bigasterisk.com # Date 1113705194 0 # Node ID 233ee9b1e56188ad5d705ad791f05a2c89622991 # Parent 2072a0dd7b19ab9652f7c7d00d3cec8db6def7c2 checked the showconfig patch and fixed bugs diff -r 2072a0dd7b19 -r 233ee9b1e561 bin/curvecalc --- a/bin/curvecalc Sun Apr 17 02:24:29 2005 +0000 +++ b/bin/curvecalc Sun Apr 17 02:33:14 2005 +0000 @@ -19,7 +19,7 @@ from light9.zoomcontrol import Zoomcontrol from light9.curve import Curve, Curveview, Curveset, Curvesetview -sys.path.append("../../semprini") +sys.path.extend(["../semprini","../../semprini"]) from lengther import wavelength # for measuring duration of .wav class Music: @@ -249,7 +249,7 @@ subterms = [] subterm_adder(root, curveset, subterms, root, ssv).pack(side='top',fill='x') -for line in file(showconfig.subtermsForSong()): +for line in file(showconfig.subtermsForSong(song)): subname,expr = line.strip().split(" ",1) term = add_one_subterm(subname, curveset, subterms, root, ssv, expr) diff -r 2072a0dd7b19 -r 233ee9b1e561 bin/keyboardcomposer --- a/bin/keyboardcomposer Sun Apr 17 02:24:29 2005 +0000 +++ b/bin/keyboardcomposer Sun Apr 17 02:33:14 2005 +0000 @@ -11,7 +11,7 @@ import run_local from light9.Fadable import Fadable from light9.Submaster import Submasters, sub_maxes -from light9 import dmxclient +from light9 import dmxclient, showconfig from light9.uihelpers import toplevelat nudge_keys = { diff -r 2072a0dd7b19 -r 233ee9b1e561 light9/Patch.py --- a/light9/Patch.py Sun Apr 17 02:24:29 2005 +0000 +++ b/light9/Patch.py Sun Apr 17 02:33:14 2005 +0000 @@ -1,4 +1,5 @@ import os +from light9 import showconfig def resolve_name(channelname): "Ensure that we're talking about the primary name of the light."