Drop the movers' chases and put Wander and Ballyhoo on the top row.
The movers layer loses its Chase, Chase reverse, Zigzag and Opposing pads, with their runs, holds, colour matrices, fixture groups and Speed dial entries. Wander and Ballyhoo move up to pads 13 and 14 (notes 96 and 97), and the pad controller settles the knobs after those notes instead (scripts/shows/mover_pads_top_row.py). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
913494c0aa
commit
ae186c51ea
4 files changed
+89
-693
No files matched your search
@@ -36,7 +36,7 @@ cans, 68–83 for the movers), or None once it is pressed again: the colour
|
||||
buttons toggle in a solo frame. QLC+ does not save which buttons are on, so
|
||||
reopen() presses them again when QLC+ loads the show.
|
||||
|
||||
The movers' Wander and Ballyhoo pads (notes 93 and 94, pads 10 and 11 on the
|
||||
The movers' Wander and Ballyhoo pads (notes 96 and 97, pads 13 and 14 on the
|
||||
movers layer) each toggle a relative EFX around the Pan and Tilt knobs (9 and 10,
|
||||
CC 38 and 39). QLC+ 4.12 leaves an EFX's last offset on the movers when it stops,
|
||||
until those sliders change, so when either goes off, settle asks for the two
|
||||
@@ -60,7 +60,7 @@ SUBMASTER_CC = 100
|
||||
KNOB_CHANNEL = 0
|
||||
PEAK_CC = 35 # knob 6
|
||||
SIDE_CCS = (34, 37) # knobs 5 and 8: Cans 9–15 and Cans 1, 2, 7, 8
|
||||
RELATIVE_NOTES = (93, 94) # Wander and Ballyhoo, pads 10 and 11 on the movers layer
|
||||
RELATIVE_NOTES = (96, 97) # Wander and Ballyhoo, pads 13 and 14 on the movers layer
|
||||
POSITION_CCS = (38, 39) # knobs 9 and 10: the movers' Pan and Tilt
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Drop the movers' chases from shows/test.qxw and put Wander and Ballyhoo on the top row.
|
||||
|
||||
The movers layer loses its Chase, Chase reverse, Zigzag and Opposing pads
|
||||
(notes 96–99), their runs, holds, colour matrices and fixture groups, and their
|
||||
place on the Speed dial. Wander and Ballyhoo move up from notes 93 and 94 to
|
||||
the first two pads of the top row:
|
||||
|
||||
96 Wander pad 13 on the movers layer
|
||||
97 Ballyhoo pad 14 on the movers layer
|
||||
|
||||
The movers' Strobe (92) and Peak stay. padcontroller/layer.py settles the knobs
|
||||
after notes 96 and 97.
|
||||
|
||||
python3 scripts/shows/mover_pads_top_row.py
|
||||
|
||||
Run it once on a show with the mover chases; it stops if they are gone.
|
||||
QLC+ has to reopen the show to see it.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
from mover_bank import (F_DIMMER, F_OPP, GROUP_OPPOSING, GROUP_RINGS, GROUP_ZIGZAG, ROOT, note)
|
||||
|
||||
SHOW = ROOT / "shows" / "test.qxw"
|
||||
|
||||
CHASE_FUNCTIONS = range(F_DIMMER, F_OPP + 1) # 57–63
|
||||
CHASE_GROUPS = (GROUP_RINGS, GROUP_ZIGZAG, GROUP_OPPOSING)
|
||||
CHASE_PADS = ("Chase", "Chase reverse", "Zigzag", "Opposing")
|
||||
TOP_ROW = (("Wander", 10, note(48)), ("Ballyhoo", 100, note(49)))
|
||||
|
||||
|
||||
def cut(xml: str, pattern: str) -> str:
|
||||
xml, n = re.subn(pattern, "", xml, count=1, flags=re.S)
|
||||
assert n == 1, pattern
|
||||
return xml
|
||||
|
||||
|
||||
def main() -> None:
|
||||
xml = SHOW.read_text()
|
||||
if 'Name="Movers chase forward run"' not in xml:
|
||||
raise SystemExit(f"{SHOW.relative_to(ROOT)} has no mover chases")
|
||||
|
||||
for fid in CHASE_FUNCTIONS:
|
||||
xml = cut(xml, rf' <Function ID="{fid}" Type=.*?\n </Function>\n')
|
||||
xml = re.sub(rf' <Function FadeIn="0" FadeOut="0" Duration="\d+">{fid}</Function>\n', "", xml)
|
||||
for gid in CHASE_GROUPS:
|
||||
xml = cut(xml, rf' <FixtureGroup ID="{gid}">\n.*? </FixtureGroup>\n')
|
||||
|
||||
pads = re.search(r' <Frame Caption="Movers pads" ID="\d+">\n.*?\n </Frame>\n', xml, re.S).group(0)
|
||||
kept = pads
|
||||
for caption in CHASE_PADS:
|
||||
kept = cut(kept, rf' <Button Caption="{caption}" ID="\d+" Icon="">\n.*? </Button>\n')
|
||||
for caption, x, channel in TOP_ROW:
|
||||
kept, n = re.subn(rf'( <Button Caption="{caption}" ID="\d+" Icon="">\n <WindowState Visible="True" X=")\d+" Y="\d+"'
|
||||
rf'(.*?<Input Universe="1" Channel=")\d+"',
|
||||
rf'\g<1>{x}" Y="10"\g<2>{channel}"', kept, count=1, flags=re.S)
|
||||
assert n == 1, caption
|
||||
xml = xml.replace(pads, kept, 1)
|
||||
for caption in ("Movers chase runs", "Movers chase colours"):
|
||||
xml = cut(xml, rf' <Frame Caption="{caption}" ID="\d+">\n.*?\n </Frame>\n')
|
||||
|
||||
assert not re.search(rf'(?:Function ID="|>)(?:{"|".join(map(str, CHASE_FUNCTIONS))})(?:"|<)', xml)
|
||||
SHOW.write_text(xml)
|
||||
print(f"Dropped the mover chases from {SHOW.relative_to(ROOT)}; Wander and Ballyhoo are on notes 96 and 97")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+4
-679
@@ -307,102 +307,6 @@
|
||||
<Head X="0" Y="4" Fixture="14">0</Head>
|
||||
<Head X="1" Y="4" Fixture="7">0</Head>
|
||||
</FixtureGroup>
|
||||
<FixtureGroup ID="5">
|
||||
<Name>Movers rings</Name>
|
||||
<Size X="4" Y="7"/>
|
||||
<Head X="0" Y="0" Fixture="17">0</Head>
|
||||
<Head X="1" Y="0" Fixture="8">0</Head>
|
||||
<Head X="2" Y="0" Fixture="9">0</Head>
|
||||
<Head X="3" Y="0" Fixture="18">0</Head>
|
||||
<Head X="0" Y="1" Fixture="17">1</Head>
|
||||
<Head X="1" Y="1" Fixture="8">1</Head>
|
||||
<Head X="2" Y="1" Fixture="9">1</Head>
|
||||
<Head X="3" Y="1" Fixture="18">1</Head>
|
||||
<Head X="0" Y="2" Fixture="17">2</Head>
|
||||
<Head X="1" Y="2" Fixture="8">2</Head>
|
||||
<Head X="2" Y="2" Fixture="9">2</Head>
|
||||
<Head X="3" Y="2" Fixture="18">2</Head>
|
||||
<Head X="0" Y="3" Fixture="17">3</Head>
|
||||
<Head X="1" Y="3" Fixture="8">3</Head>
|
||||
<Head X="2" Y="3" Fixture="9">3</Head>
|
||||
<Head X="3" Y="3" Fixture="18">3</Head>
|
||||
<Head X="0" Y="4" Fixture="17">4</Head>
|
||||
<Head X="1" Y="4" Fixture="8">4</Head>
|
||||
<Head X="2" Y="4" Fixture="9">4</Head>
|
||||
<Head X="3" Y="4" Fixture="18">4</Head>
|
||||
<Head X="0" Y="5" Fixture="17">5</Head>
|
||||
<Head X="1" Y="5" Fixture="8">5</Head>
|
||||
<Head X="2" Y="5" Fixture="9">5</Head>
|
||||
<Head X="3" Y="5" Fixture="18">5</Head>
|
||||
<Head X="0" Y="6" Fixture="17">6</Head>
|
||||
<Head X="1" Y="6" Fixture="8">6</Head>
|
||||
<Head X="2" Y="6" Fixture="9">6</Head>
|
||||
<Head X="3" Y="6" Fixture="18">6</Head>
|
||||
</FixtureGroup>
|
||||
<FixtureGroup ID="6">
|
||||
<Name>Movers zigzag</Name>
|
||||
<Size X="7" Y="4"/>
|
||||
<Head X="0" Y="0" Fixture="17">0</Head>
|
||||
<Head X="1" Y="0" Fixture="17">1</Head>
|
||||
<Head X="2" Y="0" Fixture="17">2</Head>
|
||||
<Head X="3" Y="0" Fixture="17">3</Head>
|
||||
<Head X="4" Y="0" Fixture="17">4</Head>
|
||||
<Head X="5" Y="0" Fixture="17">5</Head>
|
||||
<Head X="6" Y="0" Fixture="17">6</Head>
|
||||
<Head X="0" Y="1" Fixture="8">0</Head>
|
||||
<Head X="1" Y="1" Fixture="8">1</Head>
|
||||
<Head X="2" Y="1" Fixture="8">2</Head>
|
||||
<Head X="3" Y="1" Fixture="8">3</Head>
|
||||
<Head X="4" Y="1" Fixture="8">4</Head>
|
||||
<Head X="5" Y="1" Fixture="8">5</Head>
|
||||
<Head X="6" Y="1" Fixture="8">6</Head>
|
||||
<Head X="0" Y="2" Fixture="9">0</Head>
|
||||
<Head X="1" Y="2" Fixture="9">1</Head>
|
||||
<Head X="2" Y="2" Fixture="9">2</Head>
|
||||
<Head X="3" Y="2" Fixture="9">3</Head>
|
||||
<Head X="4" Y="2" Fixture="9">4</Head>
|
||||
<Head X="5" Y="2" Fixture="9">5</Head>
|
||||
<Head X="6" Y="2" Fixture="9">6</Head>
|
||||
<Head X="0" Y="3" Fixture="18">0</Head>
|
||||
<Head X="1" Y="3" Fixture="18">1</Head>
|
||||
<Head X="2" Y="3" Fixture="18">2</Head>
|
||||
<Head X="3" Y="3" Fixture="18">3</Head>
|
||||
<Head X="4" Y="3" Fixture="18">4</Head>
|
||||
<Head X="5" Y="3" Fixture="18">5</Head>
|
||||
<Head X="6" Y="3" Fixture="18">6</Head>
|
||||
</FixtureGroup>
|
||||
<FixtureGroup ID="7">
|
||||
<Name>Movers opposing</Name>
|
||||
<Size X="4" Y="7"/>
|
||||
<Head X="0" Y="0" Fixture="17">0</Head>
|
||||
<Head X="1" Y="0" Fixture="8">0</Head>
|
||||
<Head X="2" Y="0" Fixture="9">6</Head>
|
||||
<Head X="3" Y="0" Fixture="18">6</Head>
|
||||
<Head X="0" Y="1" Fixture="17">1</Head>
|
||||
<Head X="1" Y="1" Fixture="8">1</Head>
|
||||
<Head X="2" Y="1" Fixture="9">5</Head>
|
||||
<Head X="3" Y="1" Fixture="18">5</Head>
|
||||
<Head X="0" Y="2" Fixture="17">2</Head>
|
||||
<Head X="1" Y="2" Fixture="8">2</Head>
|
||||
<Head X="2" Y="2" Fixture="9">4</Head>
|
||||
<Head X="3" Y="2" Fixture="18">4</Head>
|
||||
<Head X="0" Y="3" Fixture="17">3</Head>
|
||||
<Head X="1" Y="3" Fixture="8">3</Head>
|
||||
<Head X="2" Y="3" Fixture="9">3</Head>
|
||||
<Head X="3" Y="3" Fixture="18">3</Head>
|
||||
<Head X="0" Y="4" Fixture="17">4</Head>
|
||||
<Head X="1" Y="4" Fixture="8">4</Head>
|
||||
<Head X="2" Y="4" Fixture="9">2</Head>
|
||||
<Head X="3" Y="4" Fixture="18">2</Head>
|
||||
<Head X="0" Y="5" Fixture="17">5</Head>
|
||||
<Head X="1" Y="5" Fixture="8">5</Head>
|
||||
<Head X="2" Y="5" Fixture="9">1</Head>
|
||||
<Head X="3" Y="5" Fixture="18">1</Head>
|
||||
<Head X="0" Y="6" Fixture="17">6</Head>
|
||||
<Head X="1" Y="6" Fixture="8">6</Head>
|
||||
<Head X="2" Y="6" Fixture="9">0</Head>
|
||||
<Head X="3" Y="6" Fixture="18">0</Head>
|
||||
</FixtureGroup>
|
||||
<FixtureGroup ID="8">
|
||||
<Name>Strobe cans</Name>
|
||||
<Size X="11" Y="1"/>
|
||||
@@ -936,67 +840,6 @@
|
||||
<SpeedModes FadeIn="Common" FadeOut="Common" Duration="Common"/>
|
||||
<Step Number="0" FadeIn="0" Hold="0" FadeOut="0">55</Step>
|
||||
</Function>
|
||||
<Function ID="57" Type="Scene" Name="Movers dimmer">
|
||||
<Speed FadeIn="0" FadeOut="0" Duration="0"/>
|
||||
<FixtureVal ID="17">8,255,9,0</FixtureVal>
|
||||
<FixtureVal ID="8">8,255,9,0</FixtureVal>
|
||||
<FixtureVal ID="9">8,255,9,0</FixtureVal>
|
||||
<FixtureVal ID="18">8,255,9,0</FixtureVal>
|
||||
</Function>
|
||||
<Function ID="58" Type="RGBMatrix" Name="Movers chase forward run">
|
||||
<Speed FadeIn="0" FadeOut="500" Duration="200"/>
|
||||
<Direction>Forward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<Algorithm Type="Script">Stripes</Algorithm>
|
||||
<MonoColor>4286513407</MonoColor>
|
||||
<ControlMode>RGB</ControlMode>
|
||||
<FixtureGroup>5</FixtureGroup>
|
||||
<Property Name="orientation" Value="Vertical"/>
|
||||
</Function>
|
||||
<Function ID="59" Type="Chaser" Name="Movers dimmer hold">
|
||||
<Speed FadeIn="0" FadeOut="0" Duration="1900"/>
|
||||
<Direction>Forward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<SpeedModes FadeIn="Common" FadeOut="Common" Duration="Common"/>
|
||||
<Step Number="0" FadeIn="0" Hold="0" FadeOut="0">57</Step>
|
||||
</Function>
|
||||
<Function ID="60" Type="RGBMatrix" Name="Movers chase reverse run">
|
||||
<Speed FadeIn="0" FadeOut="500" Duration="200"/>
|
||||
<Direction>Backward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<Algorithm Type="Script">Stripes</Algorithm>
|
||||
<MonoColor>4286513407</MonoColor>
|
||||
<ControlMode>RGB</ControlMode>
|
||||
<FixtureGroup>5</FixtureGroup>
|
||||
<Property Name="orientation" Value="Vertical"/>
|
||||
</Function>
|
||||
<Function ID="61" Type="RGBMatrix" Name="Movers zigzag run">
|
||||
<Speed FadeIn="0" FadeOut="500" Duration="200"/>
|
||||
<Direction>Forward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<Algorithm Type="Script">Stripes</Algorithm>
|
||||
<MonoColor>4286513407</MonoColor>
|
||||
<ControlMode>RGB</ControlMode>
|
||||
<FixtureGroup>6</FixtureGroup>
|
||||
<Property Name="orientation" Value="Vertical"/>
|
||||
</Function>
|
||||
<Function ID="62" Type="Chaser" Name="Movers zigzag hold">
|
||||
<Speed FadeIn="0" FadeOut="0" Duration="1300"/>
|
||||
<Direction>Forward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<SpeedModes FadeIn="Common" FadeOut="Common" Duration="Common"/>
|
||||
<Step Number="0" FadeIn="0" Hold="0" FadeOut="0">57</Step>
|
||||
</Function>
|
||||
<Function ID="63" Type="RGBMatrix" Name="Movers opposing run">
|
||||
<Speed FadeIn="0" FadeOut="500" Duration="200"/>
|
||||
<Direction>Forward</Direction>
|
||||
<RunOrder>SingleShot</RunOrder>
|
||||
<Algorithm Type="Script">Stripes</Algorithm>
|
||||
<MonoColor>4286513407</MonoColor>
|
||||
<ControlMode>RGB</ControlMode>
|
||||
<FixtureGroup>7</FixtureGroup>
|
||||
<Property Name="orientation" Value="Vertical"/>
|
||||
</Function>
|
||||
<Function ID="64" Type="Scene" Name="Movers strobe">
|
||||
<Speed FadeIn="0" FadeOut="50" Duration="0"/>
|
||||
<FixtureVal ID="17">8,255,9,230</FixtureVal>
|
||||
@@ -2627,62 +2470,6 @@
|
||||
<ShowEnableButton>False</ShowEnableButton>
|
||||
<Collapsed>False</Collapsed>
|
||||
<Disabled>False</Disabled>
|
||||
<Button Caption="Chase" ID="85" Icon="">
|
||||
<WindowState Visible="True" X="10" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="59"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37088"/>
|
||||
</Button>
|
||||
<Button Caption="Chase reverse" ID="86" Icon="">
|
||||
<WindowState Visible="True" X="100" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="59"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37089"/>
|
||||
</Button>
|
||||
<Button Caption="Zigzag" ID="87" Icon="">
|
||||
<WindowState Visible="True" X="190" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="62"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37090"/>
|
||||
</Button>
|
||||
<Button Caption="Opposing" ID="88" Icon="">
|
||||
<WindowState Visible="True" X="280" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="59"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37091"/>
|
||||
</Button>
|
||||
<Button Caption="Strobe" ID="89" Icon="">
|
||||
<WindowState Visible="True" X="10" Y="100" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
@@ -2698,7 +2485,7 @@
|
||||
<Input Universe="1" Channel="37084"/>
|
||||
</Button>
|
||||
<Button Caption="Wander" ID="112" Icon="">
|
||||
<WindowState Visible="True" X="100" Y="100" Width="90" Height="90"/>
|
||||
<WindowState Visible="True" X="10" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
@@ -2709,10 +2496,10 @@
|
||||
<Function ID="69"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37085"/>
|
||||
<Input Universe="1" Channel="37088"/>
|
||||
</Button>
|
||||
<Button Caption="Ballyhoo" ID="114" Icon="">
|
||||
<WindowState Visible="True" X="190" Y="100" Width="90" Height="90"/>
|
||||
<WindowState Visible="True" X="100" Y="10" Width="90" Height="90"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
@@ -2723,7 +2510,7 @@
|
||||
<Function ID="70"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37086"/>
|
||||
<Input Universe="1" Channel="37089"/>
|
||||
</Button>
|
||||
<Slider Caption="Peak" ID="91" WidgetStyle="Slider" InvertedAppearance="false">
|
||||
<WindowState Visible="True" X="380" Y="10" Width="52" Height="360"/>
|
||||
@@ -2742,462 +2529,6 @@
|
||||
</Playback>
|
||||
</Slider>
|
||||
</Frame>
|
||||
<Frame Caption="Movers chase runs" ID="92">
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<WindowState Visible="True" X="330" Y="700" Width="310" Height="120"/>
|
||||
<AllowChildren>True</AllowChildren>
|
||||
<AllowResize>True</AllowResize>
|
||||
<ShowHeader>True</ShowHeader>
|
||||
<ShowEnableButton>False</ShowEnableButton>
|
||||
<Collapsed>True</Collapsed>
|
||||
<Disabled>False</Disabled>
|
||||
<Button Caption="Chase run" ID="93" Icon="">
|
||||
<WindowState Visible="True" X="10" Y="10" Width="70" Height="70"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="58"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37088"/>
|
||||
</Button>
|
||||
<Button Caption="Reverse run" ID="94" Icon="">
|
||||
<WindowState Visible="True" X="80" Y="10" Width="70" Height="70"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="60"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37089"/>
|
||||
</Button>
|
||||
<Button Caption="Zigzag run" ID="95" Icon="">
|
||||
<WindowState Visible="True" X="150" Y="10" Width="70" Height="70"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="61"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37090"/>
|
||||
</Button>
|
||||
<Button Caption="Opposing run" ID="96" Icon="">
|
||||
<WindowState Visible="True" X="220" Y="10" Width="70" Height="70"/>
|
||||
<Appearance>
|
||||
<FrameStyle>None</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="63"/>
|
||||
<Action>Toggle</Action>
|
||||
<Intensity Adjust="False">100</Intensity>
|
||||
<Input Universe="1" Channel="37091"/>
|
||||
</Button>
|
||||
</Frame>
|
||||
<Frame Caption="Movers chase colours" ID="97">
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<WindowState Visible="True" X="330" Y="750" Width="640" Height="510"/>
|
||||
<AllowChildren>True</AllowChildren>
|
||||
<AllowResize>True</AllowResize>
|
||||
<ShowHeader>True</ShowHeader>
|
||||
<ShowEnableButton>False</ShowEnableButton>
|
||||
<Collapsed>True</Collapsed>
|
||||
<Disabled>False</Disabled>
|
||||
<Matrix Caption="Movers chase colour" ID="98">
|
||||
<WindowState Visible="True" X="10" Y="45" Width="300" Height="220"/>
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="58" InstantApply="true"/>
|
||||
<Visibility>6</Visibility>
|
||||
<Control ID="1">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff0000</Color>
|
||||
<Input Universe="1" Channel="37044"/>
|
||||
</Control>
|
||||
<Control ID="2">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7f00</Color>
|
||||
<Input Universe="1" Channel="37045"/>
|
||||
</Control>
|
||||
<Control ID="3">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffbf00</Color>
|
||||
<Input Universe="1" Channel="37046"/>
|
||||
</Control>
|
||||
<Control ID="4">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffff00</Color>
|
||||
<Input Universe="1" Channel="37047"/>
|
||||
</Control>
|
||||
<Control ID="5">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7fff00</Color>
|
||||
<Input Universe="1" Channel="37048"/>
|
||||
</Control>
|
||||
<Control ID="6">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff00</Color>
|
||||
<Input Universe="1" Channel="37049"/>
|
||||
</Control>
|
||||
<Control ID="7">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff7f</Color>
|
||||
<Input Universe="1" Channel="37050"/>
|
||||
</Control>
|
||||
<Control ID="8">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ffff</Color>
|
||||
<Input Universe="1" Channel="37051"/>
|
||||
</Control>
|
||||
<Control ID="9">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#007fff</Color>
|
||||
<Input Universe="1" Channel="37052"/>
|
||||
</Control>
|
||||
<Control ID="10">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#0000ff</Color>
|
||||
<Input Universe="1" Channel="37053"/>
|
||||
</Control>
|
||||
<Control ID="11">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7f00ff</Color>
|
||||
<Input Universe="1" Channel="37054"/>
|
||||
</Control>
|
||||
<Control ID="12">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff00ff</Color>
|
||||
<Input Universe="1" Channel="37055"/>
|
||||
</Control>
|
||||
<Control ID="13">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff2878</Color>
|
||||
<Input Universe="1" Channel="37056"/>
|
||||
</Control>
|
||||
<Control ID="14">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7828</Color>
|
||||
<Input Universe="1" Channel="37057"/>
|
||||
</Control>
|
||||
<Control ID="15">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffffff</Color>
|
||||
<Input Universe="1" Channel="37058"/>
|
||||
</Control>
|
||||
<Control ID="16">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#5078ff</Color>
|
||||
<Input Universe="1" Channel="37059"/>
|
||||
</Control>
|
||||
</Matrix>
|
||||
<Matrix Caption="Movers reverse colour" ID="99">
|
||||
<WindowState Visible="True" X="320" Y="45" Width="300" Height="220"/>
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="60" InstantApply="true"/>
|
||||
<Visibility>6</Visibility>
|
||||
<Control ID="1">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff0000</Color>
|
||||
<Input Universe="1" Channel="37044"/>
|
||||
</Control>
|
||||
<Control ID="2">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7f00</Color>
|
||||
<Input Universe="1" Channel="37045"/>
|
||||
</Control>
|
||||
<Control ID="3">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffbf00</Color>
|
||||
<Input Universe="1" Channel="37046"/>
|
||||
</Control>
|
||||
<Control ID="4">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffff00</Color>
|
||||
<Input Universe="1" Channel="37047"/>
|
||||
</Control>
|
||||
<Control ID="5">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7fff00</Color>
|
||||
<Input Universe="1" Channel="37048"/>
|
||||
</Control>
|
||||
<Control ID="6">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff00</Color>
|
||||
<Input Universe="1" Channel="37049"/>
|
||||
</Control>
|
||||
<Control ID="7">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff7f</Color>
|
||||
<Input Universe="1" Channel="37050"/>
|
||||
</Control>
|
||||
<Control ID="8">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ffff</Color>
|
||||
<Input Universe="1" Channel="37051"/>
|
||||
</Control>
|
||||
<Control ID="9">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#007fff</Color>
|
||||
<Input Universe="1" Channel="37052"/>
|
||||
</Control>
|
||||
<Control ID="10">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#0000ff</Color>
|
||||
<Input Universe="1" Channel="37053"/>
|
||||
</Control>
|
||||
<Control ID="11">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7f00ff</Color>
|
||||
<Input Universe="1" Channel="37054"/>
|
||||
</Control>
|
||||
<Control ID="12">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff00ff</Color>
|
||||
<Input Universe="1" Channel="37055"/>
|
||||
</Control>
|
||||
<Control ID="13">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff2878</Color>
|
||||
<Input Universe="1" Channel="37056"/>
|
||||
</Control>
|
||||
<Control ID="14">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7828</Color>
|
||||
<Input Universe="1" Channel="37057"/>
|
||||
</Control>
|
||||
<Control ID="15">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffffff</Color>
|
||||
<Input Universe="1" Channel="37058"/>
|
||||
</Control>
|
||||
<Control ID="16">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#5078ff</Color>
|
||||
<Input Universe="1" Channel="37059"/>
|
||||
</Control>
|
||||
</Matrix>
|
||||
<Matrix Caption="Movers zigzag colour" ID="100">
|
||||
<WindowState Visible="True" X="10" Y="275" Width="300" Height="220"/>
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="61" InstantApply="true"/>
|
||||
<Visibility>6</Visibility>
|
||||
<Control ID="1">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff0000</Color>
|
||||
<Input Universe="1" Channel="37044"/>
|
||||
</Control>
|
||||
<Control ID="2">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7f00</Color>
|
||||
<Input Universe="1" Channel="37045"/>
|
||||
</Control>
|
||||
<Control ID="3">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffbf00</Color>
|
||||
<Input Universe="1" Channel="37046"/>
|
||||
</Control>
|
||||
<Control ID="4">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffff00</Color>
|
||||
<Input Universe="1" Channel="37047"/>
|
||||
</Control>
|
||||
<Control ID="5">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7fff00</Color>
|
||||
<Input Universe="1" Channel="37048"/>
|
||||
</Control>
|
||||
<Control ID="6">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff00</Color>
|
||||
<Input Universe="1" Channel="37049"/>
|
||||
</Control>
|
||||
<Control ID="7">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff7f</Color>
|
||||
<Input Universe="1" Channel="37050"/>
|
||||
</Control>
|
||||
<Control ID="8">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ffff</Color>
|
||||
<Input Universe="1" Channel="37051"/>
|
||||
</Control>
|
||||
<Control ID="9">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#007fff</Color>
|
||||
<Input Universe="1" Channel="37052"/>
|
||||
</Control>
|
||||
<Control ID="10">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#0000ff</Color>
|
||||
<Input Universe="1" Channel="37053"/>
|
||||
</Control>
|
||||
<Control ID="11">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7f00ff</Color>
|
||||
<Input Universe="1" Channel="37054"/>
|
||||
</Control>
|
||||
<Control ID="12">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff00ff</Color>
|
||||
<Input Universe="1" Channel="37055"/>
|
||||
</Control>
|
||||
<Control ID="13">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff2878</Color>
|
||||
<Input Universe="1" Channel="37056"/>
|
||||
</Control>
|
||||
<Control ID="14">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7828</Color>
|
||||
<Input Universe="1" Channel="37057"/>
|
||||
</Control>
|
||||
<Control ID="15">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffffff</Color>
|
||||
<Input Universe="1" Channel="37058"/>
|
||||
</Control>
|
||||
<Control ID="16">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#5078ff</Color>
|
||||
<Input Universe="1" Channel="37059"/>
|
||||
</Control>
|
||||
</Matrix>
|
||||
<Matrix Caption="Movers opposing colour" ID="101">
|
||||
<WindowState Visible="True" X="320" Y="275" Width="300" Height="220"/>
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
<ForegroundColor>Default</ForegroundColor>
|
||||
<BackgroundColor>Default</BackgroundColor>
|
||||
<BackgroundImage>None</BackgroundImage>
|
||||
<Font>Default</Font>
|
||||
</Appearance>
|
||||
<Function ID="63" InstantApply="true"/>
|
||||
<Visibility>6</Visibility>
|
||||
<Control ID="1">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff0000</Color>
|
||||
<Input Universe="1" Channel="37044"/>
|
||||
</Control>
|
||||
<Control ID="2">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7f00</Color>
|
||||
<Input Universe="1" Channel="37045"/>
|
||||
</Control>
|
||||
<Control ID="3">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffbf00</Color>
|
||||
<Input Universe="1" Channel="37046"/>
|
||||
</Control>
|
||||
<Control ID="4">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffff00</Color>
|
||||
<Input Universe="1" Channel="37047"/>
|
||||
</Control>
|
||||
<Control ID="5">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7fff00</Color>
|
||||
<Input Universe="1" Channel="37048"/>
|
||||
</Control>
|
||||
<Control ID="6">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff00</Color>
|
||||
<Input Universe="1" Channel="37049"/>
|
||||
</Control>
|
||||
<Control ID="7">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ff7f</Color>
|
||||
<Input Universe="1" Channel="37050"/>
|
||||
</Control>
|
||||
<Control ID="8">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#00ffff</Color>
|
||||
<Input Universe="1" Channel="37051"/>
|
||||
</Control>
|
||||
<Control ID="9">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#007fff</Color>
|
||||
<Input Universe="1" Channel="37052"/>
|
||||
</Control>
|
||||
<Control ID="10">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#0000ff</Color>
|
||||
<Input Universe="1" Channel="37053"/>
|
||||
</Control>
|
||||
<Control ID="11">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#7f00ff</Color>
|
||||
<Input Universe="1" Channel="37054"/>
|
||||
</Control>
|
||||
<Control ID="12">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff00ff</Color>
|
||||
<Input Universe="1" Channel="37055"/>
|
||||
</Control>
|
||||
<Control ID="13">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff2878</Color>
|
||||
<Input Universe="1" Channel="37056"/>
|
||||
</Control>
|
||||
<Control ID="14">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ff7828</Color>
|
||||
<Input Universe="1" Channel="37057"/>
|
||||
</Control>
|
||||
<Control ID="15">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#ffffff</Color>
|
||||
<Input Universe="1" Channel="37058"/>
|
||||
</Control>
|
||||
<Control ID="16">
|
||||
<Type>StartColor</Type>
|
||||
<Color>#5078ff</Color>
|
||||
<Input Universe="1" Channel="37059"/>
|
||||
</Control>
|
||||
</Matrix>
|
||||
</Frame>
|
||||
<Frame Caption="Movers position" ID="106">
|
||||
<Appearance>
|
||||
<FrameStyle>Sunken</FrameStyle>
|
||||
@@ -3353,14 +2684,8 @@
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">47</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="5">49</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">52</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">58</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">60</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">61</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="6">63</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="9">45</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="9">50</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="9">59</Function>
|
||||
<Function FadeIn="0" FadeOut="0" Duration="9">62</Function>
|
||||
</SpeedDial>
|
||||
</Frame>
|
||||
<Properties>
|
||||
|
||||
+12
-12
@@ -191,28 +191,28 @@ class PlayLayerTest(unittest.TestCase):
|
||||
self.assertEqual(layer.handle([0xB0, 38, 40]), [[0xB0, 38, 40]])
|
||||
layer.handle([0xB0, 39, 0])
|
||||
layer.handle(PAUSE_DOWN)
|
||||
self.assertEqual(layer.handle([0x99, 45, 100]), [[0x99, 93, 100]])
|
||||
layer.handle([0x89, 45, 0])
|
||||
self.assertEqual((layer.moving, layer.settle), ({93}, False))
|
||||
layer.handle([0x99, 45, 100])
|
||||
self.assertEqual(layer.handle([0x99, 48, 100]), [[0x99, 96, 100]])
|
||||
layer.handle([0x89, 48, 0])
|
||||
self.assertEqual((layer.moving, layer.settle), ({96}, False))
|
||||
layer.handle([0x99, 48, 100])
|
||||
self.assertEqual((layer.moving, layer.settle), (set(), True))
|
||||
self.assertEqual(layer.nudge(), [[0xB0, 38, 39], [0xB0, 39, 1]])
|
||||
self.assertEqual(layer.positions(), [[0xB0, 38, 40], [0xB0, 39, 0]])
|
||||
|
||||
def test_strobe_2_on_the_cans_layer_is_not_wander(self):
|
||||
def test_chase_on_the_cans_layer_is_not_wander(self):
|
||||
layer = PlayLayer()
|
||||
layer.handle([0x99, 45, 100])
|
||||
layer.handle([0x99, 45, 100])
|
||||
layer.handle([0x99, 48, 100])
|
||||
layer.handle([0x99, 48, 100])
|
||||
self.assertEqual((layer.moving, layer.settle), (set(), False))
|
||||
|
||||
def test_ballyhoo_off_settles_while_wander_runs_on(self):
|
||||
layer = PlayLayer()
|
||||
layer.handle(PAUSE_DOWN)
|
||||
layer.handle([0x99, 45, 100])
|
||||
self.assertEqual(layer.handle([0x99, 46, 100]), [[0x99, 94, 100]])
|
||||
self.assertEqual((layer.moving, layer.settle), ({93, 94}, False))
|
||||
layer.handle([0x99, 46, 100])
|
||||
self.assertEqual((layer.moving, layer.settle), ({93}, True))
|
||||
layer.handle([0x99, 48, 100])
|
||||
self.assertEqual(layer.handle([0x99, 49, 100]), [[0x99, 97, 100]])
|
||||
self.assertEqual((layer.moving, layer.settle), ({96, 97}, False))
|
||||
layer.handle([0x99, 49, 100])
|
||||
self.assertEqual((layer.moving, layer.settle), ({96}, True))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in new issue
Block a user