From 09aab70bd6616ad11afd2e10a5d946b61e97da22 Mon Sep 17 00:00:00 2001 From: jimmy Date: Fri, 23 Oct 2026 01:46:27 +1300 Subject: [PATCH] Put the movers' Wander and Ballyhoo speed on knob 13 in the test show. A Movers speed dial on knob 13 (CC 42), beside the cans' Speed dial, sets how long Wander takes to go round and gives Ballyhoo an eighth of it (scripts/shows/mover_speed.py). QLC+ 4.12 counts an EFX's fade-in inside every round, so Wander has been taking 22 s and Ballyhoo 2.5 s, not 24 s and 3 s. The dial keeps those as its starting point and runs from 62 s and 7.5 s fully left to 10 s and 1 s fully right. The fade-ins stay, so the movers don't jump when either starts. Co-Authored-By: Claude Opus 5.5 --- scripts/shows/mover_ballyhoo.py | 4 +-- scripts/shows/mover_speed.py | 64 +++++++++++++++++++++++++++++++++ scripts/shows/mover_wander.py | 5 +-- shows/test.qxw | 16 +++++++++ 4 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 scripts/shows/mover_speed.py diff --git a/scripts/shows/mover_ballyhoo.py b/scripts/shows/mover_ballyhoo.py index cb0b070..326c16b 100644 --- a/scripts/shows/mover_ballyhoo.py +++ b/scripts/shows/mover_ballyhoo.py @@ -5,11 +5,11 @@ On the movers layer (Pause on), pad 11 toggles a fast, wide figure of eight around wherever the Pan and Tilt knobs (9 and 10, CC 38 and 39) put the movers, as Wander does: - 94 Ballyhoo an Eight about ±85° of pan and ±26° of tilt, 3 s round + 94 Ballyhoo an Eight about ±85° of pan and ±26° of tilt, 2.5 s round All four start together. M1 and M4 turn the other way to M2 and M3, so the same move mirrors left to right and front to back, and the beams sweep out -and cross in the middle together. It fades in over 0.5 s. When it goes off, +and cross in the middle together. It fades in over 0.5 s, which QLC+ counts inside each 3 s round. When it goes off, the pad controller nudges the two knobs so QLC+ drops its last offset (padcontroller/layer.py). diff --git a/scripts/shows/mover_speed.py b/scripts/shows/mover_speed.py new file mode 100644 index 0000000..d820843 --- /dev/null +++ b/scripts/shows/mover_speed.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python3 +"""Add a Movers speed dial on knob 13 to shows/test.qxw. + +Knob 13 (CC 42) sets how long Wander and Ballyhoo take to go round, as knob 1 +does for the cans' chases. Wander gets the dial's time and Ballyhoo an eighth of +it. QLC+ 4.12 counts an EFX's fade-in inside every round, not just the first, so +a round takes that less its fade-in (2 s for Wander, 0.5 s for Ballyhoo): + + Knob fully left 62 s Wander, 7.5 s Ballyhoo + Starting value 22 s Wander, 2.5 s Ballyhoo (as before the dial) + Knob fully right 10 s Wander, 1 s Ballyhoo + +The fade-ins stay, so the movers don't jump when either starts. The dial sits +beside the cans' Speed dial. + + python3 scripts/shows/mover_speed.py + +Run it once on a show with Wander and Ballyhoo; it stops if the dial is already there. +QLC+ has to reopen the show to see it. +""" + +from __future__ import annotations + +import re + +from mover_bank import NO_FUNCTION, ROOT, appearance + +SHOW = ROOT / "shows" / "test.qxw" + +SPEED_CC = 42 # knob 13 +SLOWEST_MS, FASTEST_MS, START_MS = 64000, 12000, 24000 +# Index into QLC+'s speed dial factors: (Not Sent), 0, 1/16, 1/8, 1/4, 1/2, 1, 2, 4, 8, 16 +TIMES_1, TIMES_1_8 = 6, 3 +NOT_SENT = 0 + + +def main() -> None: + xml = SHOW.read_text() + if 'Caption="Movers speed"' in xml: + raise SystemExit(f"{SHOW.relative_to(ROOT)} already has the movers speed dial") + engine, console = xml.split("") + wid = max(int(i) for i in re.findall(r' ID="(\d+)"', console) if int(i) != NO_FUNCTION) + 1 + + def function(name: str) -> int: + return int(re.search(rf'', engine).group(1)) + + rows = "".join(f' {function(name)}\n' + for name, factor in (("Movers wander", TIMES_1), ("Movers ballyhoo", TIMES_1_8))) + dial = (f' \n' + ' \n' + + appearance(" ", "Sunken") + + f' \n' + f' \n' + ' \n' + f' \n' + + rows + ' \n') + + xml = xml.replace(" \n ", dial + " \n ", 1) + SHOW.write_text(xml) + print(f"Added the movers speed dial to {SHOW.relative_to(ROOT)} (widget {wid}, knob 13)") + + +if __name__ == "__main__": + main() diff --git a/scripts/shows/mover_wander.py b/scripts/shows/mover_wander.py index 83b6c5c..d9c792f 100644 --- a/scripts/shows/mover_wander.py +++ b/scripts/shows/mover_wander.py @@ -5,10 +5,11 @@ On the movers layer (Pause on), pad 10 toggles a slow relative EFX that drifts all four movers around wherever the Pan and Tilt knobs (9 and 10, CC 38 and 39) put them, so turning the knobs moves the middle of the wander: - 93 Wander a Lissajous about ±30° of pan and ±10° of tilt, 24 s round + 93 Wander a Lissajous about ±30° of pan and ±10° of tilt, 22 s round Each mover starts a quarter of the way further round, so they don't move as one. -It fades in over 2 s, so the movers ease off the knob position. QLC+ 4.12 leaves +It fades in over 2 s, so the movers ease off the knob position. QLC+ counts the +fade-in inside each 24 s round, which leaves 22 s. QLC+ 4.12 leaves a relative EFX's last offset on the movers when it stops (with or without a fade-out), so the pad controller nudges the two knobs when Wander goes off (padcontroller/layer.py). diff --git a/shows/test.qxw b/shows/test.qxw index a91c750..3c32780 100644 --- a/shows/test.qxw +++ b/shows/test.qxw @@ -2687,6 +2687,22 @@ 45 50 + + + + Sunken + Default + Default + None + Default + + + + + + 69 + 70 +