# HG changeset patch # User drewp@bigasterisk.com # Date 1213461297 0 # Node ID f6ca2b2fa154e9d7707fa1e5c9e1f85863246933 # Parent 9ec478661d53d2736a555841ec31110f3b4bcd99 72 dimmers, split up house lights diff -r 9ec478661d53 -r f6ca2b2fa154 bin/subcomposer --- a/bin/subcomposer Sat Jun 14 06:56:44 2008 +0000 +++ b/bin/subcomposer Sat Jun 14 16:34:57 2008 +0000 @@ -14,7 +14,7 @@ from light9 import dmxclient, Patch, Submaster class Subcomposer(tk.Frame): - def __init__(self, master, levelboxopts=None, dmxdummy=0, numchannels=68, + def __init__(self, master, levelboxopts=None, dmxdummy=0, numchannels=72, use_persistentlevels=0): tk.Frame.__init__(self, master, bg='black') self.dmxdummy = dmxdummy diff -r 9ec478661d53 -r f6ca2b2fa154 light9/dmxchanedit.py --- a/light9/dmxchanedit.py Sat Jun 14 06:56:44 2008 +0000 +++ b/light9/dmxchanedit.py Sat Jun 14 16:34:57 2008 +0000 @@ -123,7 +123,7 @@ tk.Frame.__init__(self,parent) self.levels = [] # Onelevel objects - rows = 35 + rows = 37 frames = [make_frame(self) for x in range((num_channels // rows) + 1)] for channel in range(1, num_channels+1): diff -r 9ec478661d53 -r f6ca2b2fa154 show/dance2008/patch-source.n3 --- a/show/dance2008/patch-source.n3 Sat Jun 14 06:56:44 2008 +0000 +++ b/show/dance2008/patch-source.n3 Sat Jun 14 16:34:57 2008 +0000 @@ -70,6 +70,9 @@ [ :name "cyc-mid"; :output dmx:c42 ] . [ :name "cyc"; :output dmx:c44 ] . -[ :name "house"; :output dmx:c68 ] . +[ :name "house-side"; :output dmx:c68 ] . +[ :name "house1"; :output dmx:c69 ] . +[ :name "house4"; :output dmx:c70 ] . +[ :name "house3"; :output dmx:c71 ] . +[ :name "house2"; :output dmx:c72 ] . - diff -r 9ec478661d53 -r f6ca2b2fa154 show/dance2008/subs/house --- a/show/dance2008/subs/house Sat Jun 14 06:56:44 2008 +0000 +++ b/show/dance2008/subs/house Sat Jun 14 16:34:57 2008 +0000 @@ -1,4 +1,16 @@ - _:jYuUgATG25. +_:TxVYQPeu53 "1"^^. +_:TxVYQPeu53 . +_:TxVYQPeu52 "1"^^. +_:TxVYQPeu52 . +_:TxVYQPeu50 "1"^^. +_:TxVYQPeu50 . "house". -_:jYuUgATG25 "1"^^. -_:jYuUgATG25 . + _:TxVYQPeu54. + _:TxVYQPeu51. + _:TxVYQPeu50. + _:TxVYQPeu52. + _:TxVYQPeu53. +_:TxVYQPeu54 "1"^^. +_:TxVYQPeu54 . +_:TxVYQPeu51 "1"^^. +_:TxVYQPeu51 . diff -r 9ec478661d53 -r f6ca2b2fa154 show/dance2008/subs/house-side --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2008/subs/house-side Sat Jun 14 16:34:57 2008 +0000 @@ -0,0 +1,4 @@ +_:wXdfflUK50 "1"^^. +_:wXdfflUK50 . + "house-side". + _:wXdfflUK50.