diff --git a/bin/subcomposer b/bin/subcomposer --- a/bin/subcomposer +++ b/bin/subcomposer @@ -14,7 +14,7 @@ from light9.dmxchanedit import Levelbox 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 --git a/light9/dmxchanedit.py b/light9/dmxchanedit.py --- a/light9/dmxchanedit.py +++ b/light9/dmxchanedit.py @@ -123,7 +123,7 @@ class Levelbox(tk.Frame): 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 --git a/show/dance2008/patch-source.n3 b/show/dance2008/patch-source.n3 --- a/show/dance2008/patch-source.n3 +++ b/show/dance2008/patch-source.n3 @@ -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 --git a/show/dance2008/subs/house b/show/dance2008/subs/house --- a/show/dance2008/subs/house +++ b/show/dance2008/subs/house @@ -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 --git a/show/dance2008/subs/house-side b/show/dance2008/subs/house-side new file mode 100644 --- /dev/null +++ b/show/dance2008/subs/house-side @@ -0,0 +1,4 @@ +_:wXdfflUK50 "1"^^. +_:wXdfflUK50 . + "house-side". + _:wXdfflUK50.