Give the movers every EFX shape and drop their Strobe in the test show.
The movers layer loses its Strobe (pad 9): its button, its scene and the forced-HTP strobe channel it needed. Its pad, the rest of the second row and pad 5 take the five shapes the movers did not have yet: Diamond, Square, Corners (SquareChoppy), Leaf, and Tilt (Line2 on tilt alone). All nine sit in the Movement solo frame, one at a time, mirrored and relative to the knobs. Knob 13's speed dial gives Corners an eighth of its time and the rest a quarter (scripts/shows/mover_all_efx.py). The pad controller settles the knobs after all nine. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
c3fe965e79
commit
f674dc9fe0
6 files changed
+437
-41
No files matched your search
@@ -36,9 +36,9 @@ 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
|
buttons toggle in a solo frame. QLC+ does not save which buttons are on, so
|
||||||
reopen() presses them again when QLC+ loads the show.
|
reopen() presses them again when QLC+ loads the show.
|
||||||
|
|
||||||
The movers' Wander, Ballyhoo, Circle and Sweep pads (notes 96–99, pads 13–16 on
|
The movers' movement pads (pads 13–16, 9–12 and 5 on the movers layer: notes
|
||||||
the movers layer) each toggle a relative EFX around the Pan and Tilt knobs (9 and
|
96–99, 92–95 and 88) each toggle a relative EFX around the Pan and Tilt knobs (9
|
||||||
10, CC 38 and 39). They share a solo frame in QLC+, so starting one stops the others.
|
and 10, CC 38 and 39). They share a solo frame in QLC+, so starting one stops the others.
|
||||||
QLC+ 4.12 leaves an EFX's last offset on the movers when it stops, until those
|
QLC+ 4.12 leaves an EFX's last offset on the movers when it stops, until those
|
||||||
sliders change, so when the one that is on goes off, settle asks for the two
|
sliders change, so when the one that is on goes off, settle asks for the two
|
||||||
knobs one step off and then back (nudge() and positions()). Swapping needs
|
knobs one step off and then back (nudge() and positions()). Swapping needs
|
||||||
@@ -62,7 +62,8 @@ SUBMASTER_CC = 100
|
|||||||
KNOB_CHANNEL = 0
|
KNOB_CHANNEL = 0
|
||||||
PEAK_CC = 35 # knob 6
|
PEAK_CC = 35 # knob 6
|
||||||
SIDE_CCS = (34, 37) # knobs 5 and 8: Cans 9–15 and Cans 1, 2, 7, 8
|
SIDE_CCS = (34, 37) # knobs 5 and 8: Cans 9–15 and Cans 1, 2, 7, 8
|
||||||
RELATIVE_NOTES = (96, 97, 98, 99) # Wander, Ballyhoo, Circle, Sweep: pads 13–16 on the movers layer
|
# Wander, Ballyhoo, Circle, Sweep; Diamond, Square, Corners, Leaf; Tilt: pads 13–16, 9–12, 5
|
||||||
|
RELATIVE_NOTES = (96, 97, 98, 99, 92, 93, 94, 95, 88)
|
||||||
POSITION_CCS = (38, 39) # knobs 9 and 10: the movers' Pan and Tilt
|
POSITION_CCS = (38, 39) # knobs 9 and 10: the movers' Pan and Tilt
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ the pad controller runs means the show has just loaded with every button off.
|
|||||||
REOPEN_DELAY later it presses the last colour pads again (see PlayLayer.colours),
|
REOPEN_DELAY later it presses the last colour pads again (see PlayLayer.colours),
|
||||||
which it keeps in COLOURS_FILE so they outlive a restart of the pad controller.
|
which it keeps in COLOURS_FILE so they outlive a restart of the pad controller.
|
||||||
|
|
||||||
When the movers' Wander, Ballyhoo, Circle or Sweep pad goes off, SETTLE_DELAY
|
When one of the movers' movement pads goes off, SETTLE_DELAY later it
|
||||||
later it nudges the Pan and Tilt knobs a step and puts them back, so QLC+ drops
|
nudges the Pan and Tilt knobs a step and puts them back, so QLC+ drops
|
||||||
the EFX's last offset (see PlayLayer.settle).
|
the EFX's last offset (see PlayLayer.settle).
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Drop the movers' Strobe from shows/test.qxw and add the rest of QLC+'s EFX shapes.
|
||||||
|
|
||||||
|
The movers layer has no Strobe any more (pad 9, note 92): its button, its scene
|
||||||
|
and the HTP strobe channel that let it beat the colour scenes all go. Its pad and
|
||||||
|
the rest of the second row, and pad 5, take the five EFX shapes the movers did
|
||||||
|
not have yet. They join Wander, Ballyhoo, Circle and Sweep in the Movement solo
|
||||||
|
frame, now three rows deep, so still only one runs at a time:
|
||||||
|
|
||||||
|
92 Diamond pad 9 a diamond, about ±64° of pan and ±21° of tilt
|
||||||
|
93 Square pad 10 a square, about ±53° of pan and ±16° of tilt
|
||||||
|
94 Corners pad 11 SquareChoppy: jumps corner to corner of the same square
|
||||||
|
95 Leaf pad 12 a four-petal leaf, about ±53° of pan and ±26° of tilt
|
||||||
|
88 Tilt pad 5 Line2 on tilt alone, about ±26° up and down
|
||||||
|
|
||||||
|
Like the others each is a relative EFX around the Pan and Tilt knobs, with all
|
||||||
|
four movers together so the pairs mirror, fading in over 0.5 s. Knob 13's speed
|
||||||
|
dial gives Corners an eighth of its time (2.5 s a round to start with) and the
|
||||||
|
rest a quarter (5.5 s). padcontroller/layer.py settles the knobs after all nine.
|
||||||
|
|
||||||
|
python3 scripts/shows/mover_all_efx.py
|
||||||
|
|
||||||
|
Run it once on a show with Circle and Sweep and the movers' Strobe; it stops if
|
||||||
|
Diamond is already there. QLC+ has to reopen the show to see it.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
from mover_bank import M1, M2, M3, M4, NO_FUNCTION, ROOT, STROBE, button, note
|
||||||
|
from mover_more_efx import SIZE, START_MS, efx
|
||||||
|
|
||||||
|
SHOW = ROOT / "shows" / "test.qxw"
|
||||||
|
|
||||||
|
# Speed dial factor indexes: (Not Sent), 0, 1/16, 1/8, 1/4, ...
|
||||||
|
TIMES_1_8, TIMES_1_4 = 3, 4
|
||||||
|
|
||||||
|
# Caption, function name, algorithm, width, height (of 255 each way), can note, column, row, dial factor
|
||||||
|
MOVES = (
|
||||||
|
("Diamond", "Movers diamond", "Diamond", 30, 20, 44, 0, 1, TIMES_1_4),
|
||||||
|
("Square", "Movers square", "Square", 25, 15, 45, 1, 1, TIMES_1_4),
|
||||||
|
("Corners", "Movers corners", "SquareChoppy", 25, 15, 46, 2, 1, TIMES_1_8),
|
||||||
|
("Leaf", "Movers leaf", "Leaf", 25, 25, 47, 3, 1, TIMES_1_4),
|
||||||
|
("Tilt", "Movers tilt", "Line2", 0, 25, 40, 0, 2, TIMES_1_4),
|
||||||
|
)
|
||||||
|
ROWS = 3
|
||||||
|
|
||||||
|
|
||||||
|
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 diamond"' in xml:
|
||||||
|
raise SystemExit(f"{SHOW.relative_to(ROOT)} already has the movers diamond")
|
||||||
|
|
||||||
|
strobe = int(re.search(r'<Function ID="(\d+)" Type="Scene" Name="Movers strobe">', xml).group(1))
|
||||||
|
xml = cut(xml, rf' <Function ID="{strobe}" Type="Scene" Name="Movers strobe">\n.*? </Function>\n')
|
||||||
|
# The cans' Strobe has the same caption; the movers' one is widget 89 (scripts/shows/mover_bank.py).
|
||||||
|
xml = cut(xml, r' <Button Caption="Strobe" ID="89" Icon="">\n.*? </Button>\n')
|
||||||
|
for fid in (M1, M2, M3, M4):
|
||||||
|
xml, n = re.subn(rf'( <ID>{fid}</ID>\n(?: .*\n)*?) <ForcedHTP>{STROBE}</ForcedHTP>\n', r"\1", xml, count=1)
|
||||||
|
assert n == 1, fid
|
||||||
|
|
||||||
|
engine, console = xml.split("<VirtualConsole>")
|
||||||
|
fid = max(int(i) for i in re.findall(r'<Function ID="(\d+)" Type', engine)) + 1
|
||||||
|
wid = max(int(i) for i in re.findall(r' ID="(\d+)"', console) if int(i) != NO_FUNCTION) + 1
|
||||||
|
|
||||||
|
solo = re.search(r' <SoloFrame Caption="Movement" ID="\d+">\n.*? </SoloFrame>\n', xml, re.S).group(0)
|
||||||
|
dial = re.search(r' <SpeedDial Caption="Movers speed" ID="\d+">\n.*? </SpeedDial>\n', xml, re.S).group(0)
|
||||||
|
functions, buttons, rows = "", "", ""
|
||||||
|
for i, (caption, name, algorithm, width, height, can_note, column, row, factor) in enumerate(MOVES):
|
||||||
|
start_ms = START_MS // 2 if factor == TIMES_1_8 else START_MS
|
||||||
|
functions += efx(fid + i, name, algorithm, width, height, start_ms)
|
||||||
|
buttons += button(wid + i, caption, SIZE * column, SIZE * row, SIZE, fid + i, note(can_note), indent=" ")
|
||||||
|
rows += f' <Function FadeIn="0" FadeOut="0" Duration="{factor}">{fid + i}</Function>\n'
|
||||||
|
|
||||||
|
grown = re.sub(r'(<WindowState Visible="True" X="10" Y="10" Width="\d+" Height=")\d+"', rf'\g<1>{SIZE * ROWS}"',
|
||||||
|
solo, count=1)
|
||||||
|
grown = grown.replace(" </SoloFrame>\n", buttons + " </SoloFrame>\n")
|
||||||
|
xml = xml.replace(solo, grown, 1)
|
||||||
|
xml = xml.replace(dial, dial.replace(" </SpeedDial>\n", rows + " </SpeedDial>\n"), 1)
|
||||||
|
xml = xml.replace(" </Engine>", functions + " </Engine>", 1)
|
||||||
|
SHOW.write_text(xml)
|
||||||
|
print(f"Dropped the movers' Strobe and added {len(MOVES)} shapes to {SHOW.relative_to(ROOT)} "
|
||||||
|
f"(functions {fid}–{fid + len(MOVES) - 1}, widgets {wid}–{wid + len(MOVES) - 1})")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -40,7 +40,7 @@ MOVES = (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def efx(fid: int, name: str, algorithm: str, width: int, height: int) -> str:
|
def efx(fid: int, name: str, algorithm: str, width: int, height: int, start_ms: int = START_MS) -> str:
|
||||||
fixtures = "".join(f""" <Fixture>
|
fixtures = "".join(f""" <Fixture>
|
||||||
<ID>{f}</ID>
|
<ID>{f}</ID>
|
||||||
<Head>0</Head>
|
<Head>0</Head>
|
||||||
@@ -58,7 +58,7 @@ def efx(fid: int, name: str, algorithm: str, width: int, height: int) -> str:
|
|||||||
# Relative: the EFX adds its offset from 127 to the Pan and Tilt sliders' levels.
|
# Relative: the EFX adds its offset from 127 to the Pan and Tilt sliders' levels.
|
||||||
return f""" <Function ID="{fid}" Type="EFX" Name="{name}">
|
return f""" <Function ID="{fid}" Type="EFX" Name="{name}">
|
||||||
{fixtures} <PropagationMode>Parallel</PropagationMode>
|
{fixtures} <PropagationMode>Parallel</PropagationMode>
|
||||||
<Speed FadeIn="{FADE_IN_MS}" FadeOut="0" Duration="{START_MS}"/>
|
<Speed FadeIn="{FADE_IN_MS}" FadeOut="0" Duration="{start_ms}"/>
|
||||||
<Direction>Forward</Direction>
|
<Direction>Forward</Direction>
|
||||||
<RunOrder>Loop</RunOrder>
|
<RunOrder>Loop</RunOrder>
|
||||||
<Algorithm>{algorithm}</Algorithm>
|
<Algorithm>{algorithm}</Algorithm>
|
||||||
|
|||||||
+326
-26
@@ -120,7 +120,6 @@
|
|||||||
<Universe>0</Universe>
|
<Universe>0</Universe>
|
||||||
<Address>44</Address>
|
<Address>44</Address>
|
||||||
<Channels>43</Channels>
|
<Channels>43</Channels>
|
||||||
<ForcedHTP>9</ForcedHTP>
|
|
||||||
</Fixture>
|
</Fixture>
|
||||||
<Fixture>
|
<Fixture>
|
||||||
<Manufacturer>Small Eye 7</Manufacturer>
|
<Manufacturer>Small Eye 7</Manufacturer>
|
||||||
@@ -131,7 +130,6 @@
|
|||||||
<Universe>0</Universe>
|
<Universe>0</Universe>
|
||||||
<Address>0</Address>
|
<Address>0</Address>
|
||||||
<Channels>43</Channels>
|
<Channels>43</Channels>
|
||||||
<ForcedHTP>9</ForcedHTP>
|
|
||||||
</Fixture>
|
</Fixture>
|
||||||
<Fixture>
|
<Fixture>
|
||||||
<Manufacturer>beamZ</Manufacturer>
|
<Manufacturer>beamZ</Manufacturer>
|
||||||
@@ -225,7 +223,6 @@
|
|||||||
<Universe>0</Universe>
|
<Universe>0</Universe>
|
||||||
<Address>257</Address>
|
<Address>257</Address>
|
||||||
<Channels>43</Channels>
|
<Channels>43</Channels>
|
||||||
<ForcedHTP>9</ForcedHTP>
|
|
||||||
</Fixture>
|
</Fixture>
|
||||||
<Fixture>
|
<Fixture>
|
||||||
<Manufacturer>Small Eye 7</Manufacturer>
|
<Manufacturer>Small Eye 7</Manufacturer>
|
||||||
@@ -236,7 +233,6 @@
|
|||||||
<Universe>0</Universe>
|
<Universe>0</Universe>
|
||||||
<Address>300</Address>
|
<Address>300</Address>
|
||||||
<Channels>43</Channels>
|
<Channels>43</Channels>
|
||||||
<ForcedHTP>9</ForcedHTP>
|
|
||||||
</Fixture>
|
</Fixture>
|
||||||
<FixtureGroup ID="0">
|
<FixtureGroup ID="0">
|
||||||
<Name>Cans</Name>
|
<Name>Cans</Name>
|
||||||
@@ -840,13 +836,6 @@
|
|||||||
<SpeedModes FadeIn="Common" FadeOut="Common" Duration="Common"/>
|
<SpeedModes FadeIn="Common" FadeOut="Common" Duration="Common"/>
|
||||||
<Step Number="0" FadeIn="0" Hold="0" FadeOut="0">55</Step>
|
<Step Number="0" FadeIn="0" Hold="0" FadeOut="0">55</Step>
|
||||||
</Function>
|
</Function>
|
||||||
<Function ID="64" Type="Scene" Name="Movers strobe">
|
|
||||||
<Speed FadeIn="0" FadeOut="50" Duration="0"/>
|
|
||||||
<FixtureVal ID="17">8,255,9,230</FixtureVal>
|
|
||||||
<FixtureVal ID="8">8,255,9,230</FixtureVal>
|
|
||||||
<FixtureVal ID="9">8,255,9,230</FixtureVal>
|
|
||||||
<FixtureVal ID="18">8,255,9,230</FixtureVal>
|
|
||||||
</Function>
|
|
||||||
<Function ID="67" Type="Scene" Name="Cans strobe 2">
|
<Function ID="67" Type="Scene" Name="Cans strobe 2">
|
||||||
<Speed FadeIn="0" FadeOut="50" Duration="0"/>
|
<Speed FadeIn="0" FadeOut="50" Duration="0"/>
|
||||||
<FixtureVal ID="0">0,255,1,230,5,0</FixtureVal>
|
<FixtureVal ID="0">0,255,1,230,5,0</FixtureVal>
|
||||||
@@ -1070,6 +1059,256 @@
|
|||||||
<Phase>0</Phase>
|
<Phase>0</Phase>
|
||||||
</Axis>
|
</Axis>
|
||||||
</Function>
|
</Function>
|
||||||
|
<Function ID="73" Type="EFX" Name="Movers diamond">
|
||||||
|
<Fixture>
|
||||||
|
<ID>17</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>8</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>9</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>18</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<PropagationMode>Parallel</PropagationMode>
|
||||||
|
<Speed FadeIn="500" FadeOut="0" Duration="6000"/>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<RunOrder>Loop</RunOrder>
|
||||||
|
<Algorithm>Diamond</Algorithm>
|
||||||
|
<Width>30</Width>
|
||||||
|
<Height>20</Height>
|
||||||
|
<Rotation>0</Rotation>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
<IsRelative>1</IsRelative>
|
||||||
|
<Axis Name="X">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
<Axis Name="Y">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
</Function>
|
||||||
|
<Function ID="74" Type="EFX" Name="Movers square">
|
||||||
|
<Fixture>
|
||||||
|
<ID>17</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>8</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>9</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>18</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<PropagationMode>Parallel</PropagationMode>
|
||||||
|
<Speed FadeIn="500" FadeOut="0" Duration="6000"/>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<RunOrder>Loop</RunOrder>
|
||||||
|
<Algorithm>Square</Algorithm>
|
||||||
|
<Width>25</Width>
|
||||||
|
<Height>15</Height>
|
||||||
|
<Rotation>0</Rotation>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
<IsRelative>1</IsRelative>
|
||||||
|
<Axis Name="X">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
<Axis Name="Y">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
</Function>
|
||||||
|
<Function ID="75" Type="EFX" Name="Movers corners">
|
||||||
|
<Fixture>
|
||||||
|
<ID>17</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>8</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>9</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>18</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<PropagationMode>Parallel</PropagationMode>
|
||||||
|
<Speed FadeIn="500" FadeOut="0" Duration="3000"/>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<RunOrder>Loop</RunOrder>
|
||||||
|
<Algorithm>SquareChoppy</Algorithm>
|
||||||
|
<Width>25</Width>
|
||||||
|
<Height>15</Height>
|
||||||
|
<Rotation>0</Rotation>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
<IsRelative>1</IsRelative>
|
||||||
|
<Axis Name="X">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
<Axis Name="Y">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
</Function>
|
||||||
|
<Function ID="76" Type="EFX" Name="Movers leaf">
|
||||||
|
<Fixture>
|
||||||
|
<ID>17</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>8</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>9</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>18</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<PropagationMode>Parallel</PropagationMode>
|
||||||
|
<Speed FadeIn="500" FadeOut="0" Duration="6000"/>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<RunOrder>Loop</RunOrder>
|
||||||
|
<Algorithm>Leaf</Algorithm>
|
||||||
|
<Width>25</Width>
|
||||||
|
<Height>25</Height>
|
||||||
|
<Rotation>0</Rotation>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
<IsRelative>1</IsRelative>
|
||||||
|
<Axis Name="X">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
<Axis Name="Y">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
</Function>
|
||||||
|
<Function ID="77" Type="EFX" Name="Movers tilt">
|
||||||
|
<Fixture>
|
||||||
|
<ID>17</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>8</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>9</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<Fixture>
|
||||||
|
<ID>18</ID>
|
||||||
|
<Head>0</Head>
|
||||||
|
<Mode>0</Mode>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
</Fixture>
|
||||||
|
<PropagationMode>Parallel</PropagationMode>
|
||||||
|
<Speed FadeIn="500" FadeOut="0" Duration="6000"/>
|
||||||
|
<Direction>Forward</Direction>
|
||||||
|
<RunOrder>Loop</RunOrder>
|
||||||
|
<Algorithm>Line2</Algorithm>
|
||||||
|
<Width>0</Width>
|
||||||
|
<Height>25</Height>
|
||||||
|
<Rotation>0</Rotation>
|
||||||
|
<StartOffset>0</StartOffset>
|
||||||
|
<IsRelative>1</IsRelative>
|
||||||
|
<Axis Name="X">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
<Axis Name="Y">
|
||||||
|
<Offset>127</Offset>
|
||||||
|
<Frequency>1</Frequency>
|
||||||
|
<Phase>0</Phase>
|
||||||
|
</Axis>
|
||||||
|
</Function>
|
||||||
</Engine>
|
</Engine>
|
||||||
<VirtualConsole>
|
<VirtualConsole>
|
||||||
<Frame Caption="">
|
<Frame Caption="">
|
||||||
@@ -2578,7 +2817,7 @@
|
|||||||
<BackgroundImage>None</BackgroundImage>
|
<BackgroundImage>None</BackgroundImage>
|
||||||
<Font>Default</Font>
|
<Font>Default</Font>
|
||||||
</Appearance>
|
</Appearance>
|
||||||
<WindowState Visible="True" X="10" Y="10" Width="360" Height="90"/>
|
<WindowState Visible="True" X="10" Y="10" Width="360" Height="270"/>
|
||||||
<AllowChildren>True</AllowChildren>
|
<AllowChildren>True</AllowChildren>
|
||||||
<AllowResize>True</AllowResize>
|
<AllowResize>True</AllowResize>
|
||||||
<ShowHeader>False</ShowHeader>
|
<ShowHeader>False</ShowHeader>
|
||||||
@@ -2642,21 +2881,77 @@
|
|||||||
<Intensity Adjust="False">100</Intensity>
|
<Intensity Adjust="False">100</Intensity>
|
||||||
<Input Universe="1" Channel="37091"/>
|
<Input Universe="1" Channel="37091"/>
|
||||||
</Button>
|
</Button>
|
||||||
|
<Button Caption="Diamond" ID="119" Icon="">
|
||||||
|
<WindowState Visible="True" X="0" Y="90" Width="90" Height="90"/>
|
||||||
|
<Appearance>
|
||||||
|
<FrameStyle>None</FrameStyle>
|
||||||
|
<ForegroundColor>Default</ForegroundColor>
|
||||||
|
<BackgroundColor>Default</BackgroundColor>
|
||||||
|
<BackgroundImage>None</BackgroundImage>
|
||||||
|
<Font>Default</Font>
|
||||||
|
</Appearance>
|
||||||
|
<Function ID="73"/>
|
||||||
|
<Action>Toggle</Action>
|
||||||
|
<Intensity Adjust="False">100</Intensity>
|
||||||
|
<Input Universe="1" Channel="37084"/>
|
||||||
|
</Button>
|
||||||
|
<Button Caption="Square" ID="120" Icon="">
|
||||||
|
<WindowState Visible="True" X="90" Y="90" Width="90" Height="90"/>
|
||||||
|
<Appearance>
|
||||||
|
<FrameStyle>None</FrameStyle>
|
||||||
|
<ForegroundColor>Default</ForegroundColor>
|
||||||
|
<BackgroundColor>Default</BackgroundColor>
|
||||||
|
<BackgroundImage>None</BackgroundImage>
|
||||||
|
<Font>Default</Font>
|
||||||
|
</Appearance>
|
||||||
|
<Function ID="74"/>
|
||||||
|
<Action>Toggle</Action>
|
||||||
|
<Intensity Adjust="False">100</Intensity>
|
||||||
|
<Input Universe="1" Channel="37085"/>
|
||||||
|
</Button>
|
||||||
|
<Button Caption="Corners" ID="121" Icon="">
|
||||||
|
<WindowState Visible="True" X="180" Y="90" Width="90" Height="90"/>
|
||||||
|
<Appearance>
|
||||||
|
<FrameStyle>None</FrameStyle>
|
||||||
|
<ForegroundColor>Default</ForegroundColor>
|
||||||
|
<BackgroundColor>Default</BackgroundColor>
|
||||||
|
<BackgroundImage>None</BackgroundImage>
|
||||||
|
<Font>Default</Font>
|
||||||
|
</Appearance>
|
||||||
|
<Function ID="75"/>
|
||||||
|
<Action>Toggle</Action>
|
||||||
|
<Intensity Adjust="False">100</Intensity>
|
||||||
|
<Input Universe="1" Channel="37086"/>
|
||||||
|
</Button>
|
||||||
|
<Button Caption="Leaf" ID="122" Icon="">
|
||||||
|
<WindowState Visible="True" X="270" Y="90" Width="90" Height="90"/>
|
||||||
|
<Appearance>
|
||||||
|
<FrameStyle>None</FrameStyle>
|
||||||
|
<ForegroundColor>Default</ForegroundColor>
|
||||||
|
<BackgroundColor>Default</BackgroundColor>
|
||||||
|
<BackgroundImage>None</BackgroundImage>
|
||||||
|
<Font>Default</Font>
|
||||||
|
</Appearance>
|
||||||
|
<Function ID="76"/>
|
||||||
|
<Action>Toggle</Action>
|
||||||
|
<Intensity Adjust="False">100</Intensity>
|
||||||
|
<Input Universe="1" Channel="37087"/>
|
||||||
|
</Button>
|
||||||
|
<Button Caption="Tilt" ID="123" Icon="">
|
||||||
|
<WindowState Visible="True" X="0" Y="180" Width="90" Height="90"/>
|
||||||
|
<Appearance>
|
||||||
|
<FrameStyle>None</FrameStyle>
|
||||||
|
<ForegroundColor>Default</ForegroundColor>
|
||||||
|
<BackgroundColor>Default</BackgroundColor>
|
||||||
|
<BackgroundImage>None</BackgroundImage>
|
||||||
|
<Font>Default</Font>
|
||||||
|
</Appearance>
|
||||||
|
<Function ID="77"/>
|
||||||
|
<Action>Toggle</Action>
|
||||||
|
<Intensity Adjust="False">100</Intensity>
|
||||||
|
<Input Universe="1" Channel="37080"/>
|
||||||
|
</Button>
|
||||||
</SoloFrame>
|
</SoloFrame>
|
||||||
<Button Caption="Strobe" ID="89" Icon="">
|
|
||||||
<WindowState Visible="True" X="10" Y="100" Width="90" Height="90"/>
|
|
||||||
<Appearance>
|
|
||||||
<FrameStyle>None</FrameStyle>
|
|
||||||
<ForegroundColor>Default</ForegroundColor>
|
|
||||||
<BackgroundColor>Default</BackgroundColor>
|
|
||||||
<BackgroundImage>None</BackgroundImage>
|
|
||||||
<Font>Default</Font>
|
|
||||||
</Appearance>
|
|
||||||
<Function ID="64"/>
|
|
||||||
<Action>Flash</Action>
|
|
||||||
<Intensity Adjust="False">100</Intensity>
|
|
||||||
<Input Universe="1" Channel="37084"/>
|
|
||||||
</Button>
|
|
||||||
<Slider Caption="Peak" ID="91" WidgetStyle="Slider" InvertedAppearance="false">
|
<Slider Caption="Peak" ID="91" WidgetStyle="Slider" InvertedAppearance="false">
|
||||||
<WindowState Visible="True" X="380" Y="10" Width="52" Height="360"/>
|
<WindowState Visible="True" X="380" Y="10" Width="52" Height="360"/>
|
||||||
<Appearance>
|
<Appearance>
|
||||||
@@ -2849,6 +3144,11 @@
|
|||||||
<Function FadeIn="0" FadeOut="0" Duration="3">70</Function>
|
<Function FadeIn="0" FadeOut="0" Duration="3">70</Function>
|
||||||
<Function FadeIn="0" FadeOut="0" Duration="4">71</Function>
|
<Function FadeIn="0" FadeOut="0" Duration="4">71</Function>
|
||||||
<Function FadeIn="0" FadeOut="0" Duration="4">72</Function>
|
<Function FadeIn="0" FadeOut="0" Duration="4">72</Function>
|
||||||
|
<Function FadeIn="0" FadeOut="0" Duration="4">73</Function>
|
||||||
|
<Function FadeIn="0" FadeOut="0" Duration="4">74</Function>
|
||||||
|
<Function FadeIn="0" FadeOut="0" Duration="3">75</Function>
|
||||||
|
<Function FadeIn="0" FadeOut="0" Duration="4">76</Function>
|
||||||
|
<Function FadeIn="0" FadeOut="0" Duration="4">77</Function>
|
||||||
</SpeedDial>
|
</SpeedDial>
|
||||||
</Frame>
|
</Frame>
|
||||||
<Properties>
|
<Properties>
|
||||||
|
|||||||
@@ -214,13 +214,14 @@ class PlayLayerTest(unittest.TestCase):
|
|||||||
layer.handle([0x99, 49, 100])
|
layer.handle([0x99, 49, 100])
|
||||||
self.assertEqual((layer.moving, layer.settle), (None, True))
|
self.assertEqual((layer.moving, layer.settle), (None, True))
|
||||||
|
|
||||||
def test_sweep_off_settles(self):
|
def test_every_movement_pad_settles_when_it_goes_off(self):
|
||||||
layer = PlayLayer()
|
for pad_note, sent in ((51, 99), (44, 92), (47, 95), (40, 88)):
|
||||||
layer.handle(PAUSE_DOWN)
|
layer = PlayLayer()
|
||||||
self.assertEqual(layer.handle([0x99, 51, 100]), [[0x99, 99, 100]])
|
layer.handle(PAUSE_DOWN)
|
||||||
self.assertEqual((layer.moving, layer.settle), (99, False))
|
self.assertEqual(layer.handle([0x99, pad_note, 100]), [[0x99, sent, 100]])
|
||||||
layer.handle([0x99, 51, 100])
|
self.assertEqual((layer.moving, layer.settle), (sent, False))
|
||||||
self.assertEqual((layer.moving, layer.settle), (None, True))
|
layer.handle([0x99, pad_note, 100])
|
||||||
|
self.assertEqual((layer.moving, layer.settle), (None, True))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
Reference in new issue
Block a user