From b4e7581da1a52db22646a8676c9c8aaf19451363 Mon Sep 17 00:00:00 2001 From: Massimo Callegari Date: Fri, 4 Dec 2020 21:14:03 +0100 Subject: [PATCH] Manual merge of master --- appveyor.yml | 26 +- debian/changelog | 29 +- engine/src/chaserrunner.cpp | 9 +- engine/src/doc.cpp | 6 + engine/src/inputoutputmap.cpp | 9 + engine/src/inputoutputmap.h | 6 + engine/src/keypadparser.cpp | 173 +++ engine/src/keypadparser.h | 47 + engine/src/qlcfixturedef.h | 8 +- engine/src/qlcfixturedefcache.cpp | 26 + engine/src/qlcfixturehead.h | 1 + engine/src/qlcfixturemode.cpp | 62 +- engine/src/qlcfixturemode.h | 24 +- engine/src/rgbmatrix.cpp | 244 +++- engine/src/rgbmatrix.h | 33 + engine/src/script.cpp | 14 +- engine/src/scriptrunner.cpp | 5 +- engine/src/scriptv4.cpp | 5 +- engine/src/src.pro | 2 + .../qlcinputprofile/qlcinputprofile_test.cpp | 2 +- engine/test/rgbmatrix/rgbmatrix_test.cpp | 13 +- engine/test/rgbtext/rgbtext_test.cpp | 2 +- fixtureeditor/capabilitywizard.cpp | 2 +- fixtureeditor/edithead.cpp | 2 +- fixtureeditor/editmode.cpp | 99 +- fixtureeditor/editmode.h | 4 + fixtureeditor/editmode.ui | 88 +- fixtureeditor/fixtureeditor.cpp | 18 +- fixtureeditor/main.cpp | 4 + main/main.cpp | 4 + platforms/ios/Info.plist | 2 - .../linux/org.qlcplus.QLCPlus.appdata.xml | 3 +- ...g.qlcplus.QLCPlusFixtureEditor.appdata.xml | 3 +- platforms/macos/Info.plist | 9 +- platforms/macos/Info.plist.qmlui | 9 +- platforms/macos/macos.pro | 4 +- platforms/windows/qlcplus4Qt4.nsi | 2 +- platforms/windows/qlcplus4Qt5.nsi | 2 +- platforms/windows/qlcplus5Qt5.nsi | 2 +- platforms/windows/windows.pro | 239 ++-- plugins/E1.31/e131controller.cpp | 2 +- plugins/E1.31/e131packetizer.cpp | 17 +- plugins/E1.31/e131packetizer.h | 2 +- .../org.qlcplus.QLCPlus.e131.metainfo.xml | 2 +- .../org.qlcplus.QLCPlus.artnet.metainfo.xml | 2 +- ...org.qlcplus.QLCPlus.dmx4linux.metainfo.xml | 2 +- plugins/dmxusb/src/nanodmx.cpp | 2 +- .../org.qlcplus.QLCPlus.dmxusb.metainfo.xml | 2 +- plugins/dmxusb/src/stageprofi.cpp | 2 +- ...rg.qlcplus.QLCPlus.enttecwing.metainfo.xml | 2 +- .../org.qlcplus.QLCPlus.hid.metainfo.xml | 2 +- .../org.qlcplus.QLCPlus.loopback.metainfo.xml | 2 +- .../src/org.qlcplus.QLCPlus.midi.metainfo.xml | 2 +- .../ola/org.qlcplus.QLCPlus.ola.metainfo.xml | 2 +- .../org.qlcplus.QLCPlus.os2l.metainfo.xml | 2 +- .../osc/org.qlcplus.QLCPlus.osc.metainfo.xml | 2 +- plugins/osc/oscpacketizer.cpp | 6 +- .../org.qlcplus.QLCPlus.peperoni.metainfo.xml | 2 +- .../win32/peperoni/usbdmx-dynamic.cpp | 76 +- .../spi/org.qlcplus.QLCPlus.spi.metainfo.xml | 2 +- .../src/org.qlcplus.QLCPlus.udmx.metainfo.xml | 2 +- qmlui/app.cpp | 10 +- qmlui/app.h | 2 + qmlui/contextmanager.cpp | 54 +- qmlui/contextmanager.h | 16 +- qmlui/fixturemanager.cpp | 13 +- qmlui/fixturemanager.h | 4 - qmlui/functionmanager.cpp | 35 +- qmlui/listmodel.h | 2 +- qmlui/main.cpp | 4 + qmlui/mainview2d.cpp | 14 +- qmlui/mainview3d.cpp | 4 +- qmlui/previewcontext.cpp | 12 + qmlui/previewcontext.h | 6 + qmlui/qml/ContextMenuEntry.qml | 4 +- qmlui/qml/CustomCheckBox.qml | 2 +- qmlui/qml/CustomComboBox.qml | 8 +- qmlui/qml/CustomSlider.qml | 4 +- qmlui/qml/CustomSpinBox.qml | 4 +- qmlui/qml/CustomTextEdit.qml | 4 +- qmlui/qml/FixtureConsole.qml | 48 +- qmlui/qml/IconButton.qml | 6 +- qmlui/qml/KeyPad.qml | 33 +- qmlui/qml/RobotoText.qml | 4 +- qmlui/qml/SectionBox.qml | 4 +- qmlui/qml/SimpleDesk.qml | 451 ++++++ qmlui/qml/UISettings.qml | 1 + qmlui/qml/fixturesfunctions/3DView/3DView.qml | 149 +- .../fixturesfunctions/3DView/SceneEntity.qml | 16 - .../3DView/SettingsView3D.qml | 7 + .../fixturesfunctions/FixtureGroupEditor.qml | 3 +- .../qml/fixturesfunctions/RGBMatrixEditor.qml | 42 +- .../fixturesfunctions/SceneFixtureConsole.qml | 6 +- .../qml/fixturesfunctions/UniverseSummary.qml | 23 +- qmlui/qml/inputoutput/InputPatchItem.qml | 4 +- qmlui/qml/popup/CustomPopupDialog.qml | 2 +- .../qml/virtualconsole/VCButtonProperties.qml | 3 +- .../virtualconsole/VCCueListProperties.qml | 3 +- qmlui/qml/virtualconsole/VCSliderItem.qml | 3 +- .../qml/virtualconsole/VCSliderProperties.qml | 3 +- qmlui/qml/virtualconsole/VirtualConsole.qml | 1 + qmlui/qmlui.pro | 2 + qmlui/qmlui.qrc | 1 + qmlui/rgbmatrixeditor.cpp | 44 + qmlui/rgbmatrixeditor.h | 23 + qmlui/sceneeditor.cpp | 60 +- qmlui/sceneeditor.h | 5 + qmlui/showmanager.cpp | 4 +- qmlui/showmanager.h | 4 +- qmlui/simpledesk.cpp | 443 ++++++ qmlui/simpledesk.h | 154 ++ qmlui/tardis/networkmanager.cpp | 1 + qmlui/tardis/networkmanager.h | 5 +- qmlui/tardis/simplecrypt.cpp | 6 +- qmlui/tardis/simplecrypt.h | 4 +- qmlui/tardis/tardis.cpp | 41 +- qmlui/tardis/tardis.h | 10 +- resources/docs/html_en_EN/modeeditor.html | 4 +- resources/docs/html_en_EN/pdf_cover.html | 4 +- .../docs/html_en_EN/rgbmatrixeditor.html | 10 + resources/docs/html_ja_JP/pdf_cover.html | 4 +- resources/fixtures/AFX/AFX-Spot-180-LED.qxf | 32 +- .../American_DJ/American-DJ-12P-Hex-IP.qxf | 179 +++ .../American-DJ-Accu-Roller-250.qxf | 18 +- .../American-DJ-Accu-Spot-250-II.qxf | 32 +- .../American_DJ/American-DJ-Accu-Spot-Pro.qxf | 46 +- .../American_DJ/American-DJ-Auto-Spot-150.qxf | 22 +- .../American_DJ/American-DJ-Comscan-LED.qxf | 4 +- .../American_DJ/American-DJ-DJ-Spot-250.qxf | 60 +- .../American_DJ/American-DJ-DJ-Spot-300.qxf | 32 +- .../American_DJ/American-DJ-Focus-Spot-4Z.qxf | 20 +- .../American-DJ-Focus-Spot-Three-Z.qxf | 62 +- .../American-DJ-Inno-Pocket-Roll.qxf | 4 +- .../American-DJ-Inno-Pocket-Scan.qxf | 4 +- .../American-DJ-Inno-Pocket-Spot-Twins.qxf | 74 +- .../American-DJ-Inno-Pocket-Spot.qxf | 24 +- .../American_DJ/American-DJ-Inno-Scan-LED.qxf | 32 +- .../American-DJ-Inno-Spot-Elite.qxf | 50 +- .../American_DJ/American-DJ-Inno-Spot-LED.qxf | 32 +- .../American_DJ/American-DJ-Inno-Spot-Pro.qxf | 34 +- .../American_DJ/American-DJ-Pocket-Pro.qxf | 8 +- .../American_DJ/American-DJ-Stinger-Spot.qxf | 26 +- .../American_DJ/American-DJ-Vizi-BSW-300.qxf | 34 +- .../American_DJ/American-DJ-Vizi-Beam-5R.qxf | 36 +- .../American-DJ-Vizi-Beam-RXONE.qxf | 82 +- .../American_DJ/American-DJ-Vizi-LED-Spot.qxf | 48 +- .../American-DJ-Vizi-Roller-Beam-2R.qxf | 75 +- .../American_DJ/American-DJ-Warlock.qxf | 30 +- .../American-DJ-X-Scan-LED-Plus.qxf | 26 +- .../fixtures/Ayra/Ayra-ERO-Microspot.qxf | 118 ++ .../Blizzard-Lighting-Lil-G.qxf | 42 +- resources/fixtures/Briteq/Briteq-BT-575S.qxf | 38 +- .../fixtures/Briteq/Briteq-BT-W07L12.qxf | 2 +- .../fixtures/Briteq/Briteq-BTX-180LS.qxf | 12 +- .../Chauvet-Intimidator-Barrel-300.qxf | 14 +- .../Chauvet-Intimidator-Barrel-305-IRC.qxf | 14 +- .../Chauvet-Intimidator-Beam-LED-350.qxf | 10 +- .../Chauvet-Intimidator-Hybrid-140SR.qxf | 16 +- .../Chauvet-Intimidator-Scan-305-IRC.qxf | 14 +- .../Chauvet-Intimidator-Scan-LED-200.qxf | 14 +- .../Chauvet-Intimidator-Scan-LED-300.qxf | 14 +- .../Chauvet-Intimidator-Spot-100-IRC.qxf | 14 +- .../Chauvet/Chauvet-Intimidator-Spot-155.qxf | 18 +- .../Chauvet/Chauvet-Intimidator-Spot-250.qxf | 14 +- .../Chauvet-Intimidator-Spot-255-IRC.qxf | 14 +- .../Chauvet-Intimidator-Spot-355Z-IRC.qxf | 14 +- .../Chauvet-Intimidator-Spot-400-IRC.qxf | 14 +- .../Chauvet/Chauvet-Intimidator-Spot-Duo.qxf | 54 +- .../Chauvet-Intimidator-Spot-LED-150.qxf | 18 +- .../Chauvet-Intimidator-Spot-LED-250.qxf | 14 +- .../Chauvet-Intimidator-Spot-LED-350.qxf | 12 +- .../Chauvet/Chauvet-Legend-230SR-Beam.qxf | 34 +- .../Chauvet/Chauvet-Q-Beam-260-LED.qxf | 14 +- .../Chauvet/Chauvet-Q-Spot-560-LED.qxf | 26 +- .../Chauvet/Chauvet-Rogue-RH1-Hybrid.qxf | 46 +- .../Clay_Paky/Clay-Paky-Alpha-Beam-300.qxf | 12 +- .../fixtures/Clay_Paky/Clay-Paky-Mini-B.qxf | 284 ++++ .../fixtures/Clay_Paky/Clay-Paky-Mythos.qxf | 48 +- .../fixtures/Clay_Paky/Clay-Paky-Sharpy.qxf | 30 +- .../fixtures/Contest/Contest-EvoraB2R.qxf | 28 +- .../fixtures/Contest/Contest-PSC-930.qxf | 12 +- .../Elation/Elation-Platinum-Beam-5R.qxf | 16 +- .../Elation/Elation-Platinum-Spot-5R.qxf | 44 +- .../fixtures/Elation/Elation-Proteus-Beam.qxf | 26 +- .../fixtures/Elumen8/Elumen8-MS-700PE.qxf | 26 +- .../Equinox/Equinox-Microbar-Quad-System.qxf | 183 +++ .../Eurolite-LED-PT-100-32-Pixel-DMX-Tube.qxf | 643 +++++++++ .../fixtures/Eurolite/Eurolite-TSL-100.qxf | 2 +- .../fixtures/Eurolite/Eurolite-TSL-200.qxf | 2 +- resources/fixtures/FixturesMap.xml | 15 + .../Futurelight/Futurelight-PHS-260.qxf | 28 +- .../Involight/Involight-LED-CC60S.qxf | 14 +- .../Involight/Involight-LED-MH50S.qxf | 14 +- .../Involight/Involight-LED-MH60S.qxf | 14 +- .../Involight/Involight-LED-MH77S.qxf | 14 +- .../JB-Lighting/JB-Lighting-Varyscan-P3.qxf | 2 +- .../JB-Lighting/JB-Lighting-Varyscan-P6.qxf | 6 +- .../fixtures/Ledj/Ledj-Stage-Color-Quad.qxf | 159 +++ resources/fixtures/MFL/MFL-Spot-G60.qxf | 14 +- resources/fixtures/Martin/Martin-MAC-101.qxf | 2 +- .../Martin/Martin-MAC-2000-Performance-II.qxf | 20 +- .../Martin/Martin-MAC-2000-Profile-II.qxf | 40 +- .../Martin/Martin-MAC-700-Profile.qxf | 24 +- resources/fixtures/Martin/Martin-MAC-Aura.qxf | 2 +- .../Martin/Martin-MAC-Quantum-Profile.qxf | 14 +- .../Martin/Martin-MAC-Viper-Performance.qxf | 10 +- .../Martin/Martin-MAC-Viper-Wash-DX.qxf | 10 +- .../fixtures/Martin/Martin-MAC250-Entour.qxf | 16 +- resources/fixtures/Martin/Martin-MH2-Wash.qxf | 4 +- resources/fixtures/Martin/Martin-MX-10.qxf | 6 +- .../Martin/Martin-MiniMAC-Maestro.qxf | 2 +- .../Martin/Martin-Roboscan-Pro-918.qxf | 18 +- .../Martin/Martin-Rush-MH1-Profile.qxf | 30 +- resources/fixtures/Martin/Martin-Rush-MH3.qxf | 32 +- .../Martin/Martin-Rush-MH5-Profile.qxf | 12 +- .../fixtures/Martin/Martin-Viper-AirFX.qxf | 10 +- .../PR_Lighting/PR-Lighting-PR-5000-Spot.qxf | 38 +- .../PR_Lighting/PR-Lighting-XR-230-Spot.qxf | 52 +- .../Pro-Lights/Pro-Lights-CromoSpot150.qxf | 14 +- .../Pro-Lights/Pro-Lights-CromoSpot300.qxf | 30 +- .../Pro-Lights/Pro-Lights-Fury-FY250S.qxf | 14 +- .../Pro-Lights/Pro-Lights-Moonstone.qxf | 28 +- .../fixtures/Pro-Lights/Pro-Lights-Onyx.qxf | 22 +- .../Pro-Lights/Pro-Lights-StudioCOBFC.qxf | 26 +- .../fixtures/Pro-Lights/Pro-Lights-V200.qxf | 66 +- .../fixtures/Pro-Lights/Pro-Lights-XP250.qxf | 8 +- .../Pro-Lights/Pro-Lights-XP575-Spot.qxf | 8 +- .../Pro-Lights/Pro-Lights-XP575-Wash.qxf | 52 +- resources/fixtures/Pulse/Pulse-Impstar-40.qxf | 14 +- .../fixtures/Pulse/Pulse-SlimLite-56.qxf | 100 +- resources/fixtures/QTX/QTX-MHS-60.qxf | 46 +- .../fixtures/Robe/Robe-ClubSpot-150CT.qxf | 28 +- .../fixtures/Robe/Robe-ClubSpot-160CT.qxf | 28 +- .../fixtures/Robe/Robe-ClubSpot-250CT.qxf | 66 +- .../fixtures/Robe/Robe-ClubSpot-300-CT.qxf | 88 +- .../fixtures/Robe/Robe-ClubSpot-500-CT.qxf | 38 +- .../fixtures/Robe/Robe-ClubWash-250CT.qxf | 24 +- .../fixtures/Robe/Robe-ClubWash-300CT.qxf | 44 +- .../fixtures/Robe/Robe-ClubWash-500-CT.qxf | 38 +- .../fixtures/Robe/Robe-ColorSpot-170-AT.qxf | 56 +- .../fixtures/Robe/Robe-ColorSpot-250-AT.qxf | 28 +- .../fixtures/Robe/Robe-ColorSpot-575-AT.qxf | 220 +-- .../fixtures/Robe/Robe-ColorSpot-700E-AT.qxf | 40 +- .../fixtures/Robe/Robe-ColorWash-1200E-AT.qxf | 340 ++--- .../fixtures/Robe/Robe-Colorwash-250-AT.qxf | 12 +- .../fixtures/Robe/Robe-LED-Blinder-196LT.qxf | 20 +- resources/fixtures/Robe/Robe-ParFect-150.qxf | 20 +- resources/fixtures/Robe/Robe-Pointe.qxf | 30 +- .../fixtures/Robe/Robe-Robin-100-LEDBeam.qxf | 94 +- .../fixtures/Robe/Robe-Robin-150-LEDBeam.qxf | 8 +- .../fixtures/Robe/Robe-Robin-300E-Beam.qxf | 192 +-- .../fixtures/Robe/Robe-Robin-600-LED-Wash.qxf | 84 +- .../fixtures/Robe/Robe-Robin-600E-Beam.qxf | 178 +-- .../fixtures/Robe/Robe-Robin-600E-Spot.qxf | 60 +- .../fixtures/Robe/Robe-Robin-600E-Wash.qxf | 80 +- .../fixtures/Robe/Robe-Robin-800-LEDWash.qxf | 6 +- .../fixtures/Robe/Robe-Robin-DLX-Spot.qxf | 194 +-- resources/fixtures/Robe/Robe-Robin-MiniMe.qxf | 72 +- .../fixtures/Robe/Robe-Robin-Viva-CMY.qxf | 8 +- resources/fixtures/Robe/Robe-Scan-575-XT.qxf | 86 +- resources/fixtures/Robe/Robe-Spot-160-XT.qxf | 114 +- resources/fixtures/Robe/Robe-Spot-575-XT.qxf | 84 +- resources/fixtures/Robe/Robe-Wash-575-XT.qxf | 52 +- .../fixtures/Robe/Robe_ColorMix_240_AT.qxf | 34 +- .../Rockville/Rockville-Motionstrip-RGBW.qxf | 186 +++ resources/fixtures/SGM/SGM-Colorlab-250.qxf | 106 +- .../fixtures/SGM/SGM-Giotto-Spot-250.qxf | 4 +- .../fixtures/SGM/SGM-Giotto-Spot-400-CMY.qxf | 6 +- .../fixtures/SGM/SGM-Giotto-Spot-400.qxf | 4 +- .../fixtures/SGM/SGM-Giotto-Wash-400.qxf | 4 +- resources/fixtures/SGM/SGM-Idea-Beam-300.qxf | 48 +- .../fixtures/SGM/SGM-Idea-Led-Bar-100.qxf | 14 +- resources/fixtures/SGM/SGM-Idea-Spot-250.qxf | 44 +- resources/fixtures/SGM/SGM-Idea-Spot-575.qxf | 48 +- resources/fixtures/SGM/SGM-Idea-Spot-700.qxf | 26 +- resources/fixtures/SGM/SGM-Newton-1200.qxf | 34 +- resources/fixtures/SGM/SGM-Victory-250.qxf | 102 +- resources/fixtures/SGM/SGM-Victory-II-250.qxf | 102 +- .../fixtures/SGM/SGM-Victory-II-Pro150.qxf | 102 +- .../Sagitter/Sagitter-Miniscan-2001.qxf | 24 +- .../Sagitter/Sagitter-Slimpar-18-RGB.qxf | 22 +- .../Sagitter/Sagitter-Slimpar-7DL.qxf | 22 +- .../fixtures/Showtec/Showtec-Acrobat.qxf | 94 +- .../Showtec/Showtec-Club-Par-12x6-RGBWAUV.qxf | 78 ++ .../Showtec/Showtec-Compact-Par-18-MKII.qxf | 46 +- .../Showtec-Compact-Par-18-Tri-MKII.qxf | 80 +- .../Showtec/Showtec-Compact-Par-7-Q4.qxf | 10 +- .../Showtec/Showtec-Explorer-250-Pro-MKII.qxf | 98 +- .../Showtec/Showtec-Expression-5000.qxf | 22 +- .../fixtures/Showtec/Showtec-Giant-XL-LED.qxf | 112 +- .../fixtures/Showtec/Showtec-Indigo-4600.qxf | 64 +- .../fixtures/Showtec/Showtec-Indigo-6500.qxf | 118 +- .../Showtec/Showtec-Infinity-iB-5R.qxf | 146 +- .../Showtec/Showtec-Infinity-iW-1915.qxf | 40 +- .../Showtec/Showtec-Infinity-iW-715.qxf | 34 +- .../Showtec/Showtec-Infinity-iW-720.qxf | 36 +- .../Showtec/Showtec-Kanjo-Spot-60.qxf | 66 +- .../Showtec/Showtec-Mini-Max-LED-RGB.qxf | 22 +- .../fixtures/Showtec/Showtec-MiniMax-250.qxf | 26 +- .../Showtec/Showtec-Phantom-130-LED-Spot.qxf | 16 +- .../Showtec/Showtec-Phantom-20-LED-Beam.qxf | 50 +- .../Showtec/Showtec-Phantom-250-Wash.qxf | 34 +- .../fixtures/Showtec/Showtec-Phantom-250.qxf | 72 +- .../fixtures/Showtec/Showtec-Phantom-50.qxf | 18 +- .../fixtures/Showtec/Showtec-Phantom-65.qxf | 108 +- .../Showtec-Phantom-75-LED-Spot-V2.qxf | 112 +- .../Showtec/Showtec-Phantom-95-LED-Spot.qxf | 114 +- .../Showtec/Showtec-Pixel-Bar-12-RGBW.qxf | 6 +- .../Showtec/Showtec-Power-Spot-Q5.qxf | 38 +- .../Showtec/Showtec-Shark-Beam-FX-One.qxf | 56 +- .../Showtec/Showtec-Shark-Wash-One.qxf | 66 +- .../Showtec/Showtec-Spectral-CYC650.qxf | 6 +- .../Showtec/Showtec-Spectral-ZP-5.qxf | 4 +- .../fixtures/Showtec/Showtec-XB-Wave.qxf | 62 +- .../Showtec-XS-1W-Mini-Moving-Beam.qxf | 38 +- .../fixtures/Solena/Solena-Mini-Par-12.qxf | 24 +- .../StageTech/StageTech-LeaderScan-Roto.qxf | 8 +- .../Stairville/StairVille-MH-z720.qxf | 46 +- .../Stairville-Beam-Moving-Head-B5R.qxf | 178 +-- .../Stairville/Stairville-Crown-FX-PAR77.qxf | 20 +- .../Stairville-DJ-Lase-GR-140-RGY-MKII.qxf | 22 +- ...Stairville-HL-x9-Quad-Color-Flood-9x8W.qxf | 22 +- .../Stairville/Stairville-JunoScan-MKII.qxf | 118 +- .../Stairville-LED-Blinder-2-COB-2x65W.qxf | 30 +- .../Stairville-LED-Flood-Panel-7x3W.qxf | 86 +- .../Stairville-MH-100-Beam-36x3-LED.qxf | 112 +- .../Stairville/Stairville-MH-110-Wash.qxf | 28 +- .../Stairville/Stairville-MH-250-S.qxf | 98 +- .../fixtures/Stairville/Stairville-MH-360.qxf | 36 +- .../fixtures/Stairville/Stairville-MH-X20.qxf | 94 +- .../fixtures/Stairville/Stairville-MH-X25.qxf | 110 +- .../fixtures/Stairville/Stairville-MH-X50.qxf | 110 +- .../Stairville-MH-X60th-LED-Spot.qxf | 112 +- .../Stairville-MH-x200-Pro-Spot.qxf | 136 +- .../Stairville/Stairville-MH-x30-LED-Beam.qxf | 126 +- .../Stairville/Stairville-MH-z1915.qxf | 44 +- .../Stairville/Stairville-PAR64-CX-3-RGBW.qxf | 22 +- .../fixtures/Stairville/Stairville-SC-100.qxf | 22 +- .../Stairville/Stairville-SC-X50-MKII.qxf | 114 +- .../fixtures/Stairville/Stairville-SC250H.qxf | 26 +- .../Stairville/Stairville-SF-1500.qxf | 20 +- .../Stairville-TRI-LED-Bundle-Complete.qxf | 6 +- .../Stairville-Wild-Wash-132-RGB-LED.qxf | 24 +- .../fixtures/Stairville/Stairville-Z100M.qxf | 8 +- .../Stairville-novaWash-Quad-LED.qxf | 38 +- .../Star-Lights-mini-Wash-Moving-Head.qxf | 30 +- .../fixtures/Starway/Starway-Axis-250.qxf | 92 +- .../fixtures/Starway/Starway-EventKolor.qxf | 40 +- .../fixtures/Starway/Starway-MaxSpot500.qxf | 150 ++ .../fixtures/Starway/Starway-MiniKolor.qxf | 22 +- resources/fixtures/Starway/Starway-Mode-B.qxf | 116 +- .../Starway/Starway-Servo-Beam-5R.qxf | 168 +-- .../Starway/Starway-Servo-Color-4k.qxf | 8 +- .../Starway/Starway-Servocolor-600.qxf | 20 +- .../Starway/Starway-Servocolor-800.qxf | 4 +- .../fixtures/Starway/Starway-UrbanKolor.qxf | 34 +- .../Studio_Due/Studio-Due-Shark-150C.qxf | 52 +- resources/fixtures/Talent/Talent-BL252A.qxf | 6 +- .../Talent/Talent-BL63-10-LED-Bar.qxf | 62 +- .../Tomshine-Mini-Gobo-Moving-Head.qxf | 4 +- .../Triton_Blue/Triton-Blue-Wally-MH-20.qxf | 88 +- .../fixtures/UKing/UKing-4-Head-Beam-RGBW.qxf | 134 ++ .../UKing/UKing-7x10W-Mini-Moving-Head.qxf | 86 ++ .../UKing/UKing-LED-Spot-Moving-Head-100W.qxf | 108 ++ .../UKing/UKing-Mini-RGBW-Moving-Head.qxf | 4 +- .../Vari-Lite/Vari-Lite-VL2500-Wash.qxf | 22 +- .../Vari-Lite/Vari-Lite-VL3000-Spot.qxf | 10 +- .../Vari-Lite/Vari-Lite-VL3000-Wash.qxf | 10 +- .../Vari-Lite/Vari-Lite-VL3500-Spot.qxf | 104 +- .../Varytec/Varytec-Easy-Scan-XT-Mini.qxf | 38 +- .../Varytec/Varytec-Giga-Bar-Pix-8-RGB.qxf | 154 ++ ...ytec-LED-Easy-Move-Mini-Beam-Wash-RGBW.qxf | 22 +- .../Varytec/Varytec-LED-Hellball-3.qxf | 22 +- .../fixtures/Varytec/Varytec-LED-Laser-4.qxf | 22 +- .../Velleman/Velleman-Beam-Driver-250.qxf | 60 +- resources/fixtures/Venue/Venue-LEDPAR64.qxf | 24 +- resources/fixtures/Venue/Venue-ThinPar-38.qxf | 22 +- resources/gobos/SGM/gobo00359.svg | 1 - .../inputprofiles/KORG-nanoKONTROLStudio.qxi | 1237 +++++++++++++++++ .../Novation-LaunchPadMiniMK3.qxi | 417 ++++++ .../Novation-LaunchPadMiniMK3.qxm | 9 + resources/rgbscripts/alternate.js | 275 ++++ resources/rgbscripts/devtool.html | 314 +++-- resources/rgbscripts/devtool.js | 354 ++++- resources/schemas/fixture.xsd | 1 + ui/src/chasereditor.cpp | 2 + ui/src/ctkrangeslider.cpp | 4 +- ui/src/dmxdumpfactory.cpp | 1 + ui/src/fixturetreewidget.cpp | 6 +- ui/src/flowlayout.cpp | 2 +- ui/src/functionselection.cpp | 2 +- ui/src/monitor/monitor.h | 2 +- ui/src/monitor/monitorlayout.cpp | 2 +- ui/src/rgbmatrixeditor.cpp | 133 +- ui/src/rgbmatrixeditor.h | 2 + ui/src/rgbmatrixeditor.ui | 338 +++-- ui/src/scripteditor.cpp | 2 +- ui/src/simpledesk.cpp | 2 +- ui/src/virtualconsole/vcbutton.cpp | 19 + ui/src/virtualconsole/vccuelist.cpp | 3 + ui/src/virtualconsole/vcmatrixcontrol.cpp | 33 +- ui/src/virtualconsole/vcmatrixcontrol.h | 4 +- ui/src/virtualconsole/vcslider.cpp | 14 +- ui/src/virtualconsole/vcslider.h | 2 + ui/src/virtualconsole/vcspeeddialpreset.cpp | 32 +- ui/src/virtualconsole/vcspeeddialpreset.h | 1 + ui/src/virtualconsole/vcxypadpreset.cpp | 39 +- ui/src/virtualconsole/vcxypadpreset.h | 3 +- ui/test/vcbutton/vcbutton_test.cpp | 8 +- ui/test/vccuelist/vccuelist_test.cpp | 2 +- ui/test/vclabel/vclabel_test.cpp | 2 +- ui/test/vcwidget/vcwidget_test.cpp | 14 +- ui/test/vcxypadarea/vcxypadarea_test.cpp | 4 +- variables.pri | 4 +- webaccess/src/webaccessauth.cpp | 11 + 415 files changed, 13276 insertions(+), 6225 deletions(-) create mode 100644 engine/src/keypadparser.cpp create mode 100644 engine/src/keypadparser.h create mode 100644 qmlui/qml/SimpleDesk.qml create mode 100644 qmlui/simpledesk.cpp create mode 100644 qmlui/simpledesk.h create mode 100644 resources/fixtures/American_DJ/American-DJ-12P-Hex-IP.qxf create mode 100644 resources/fixtures/Ayra/Ayra-ERO-Microspot.qxf create mode 100644 resources/fixtures/Clay_Paky/Clay-Paky-Mini-B.qxf create mode 100644 resources/fixtures/Equinox/Equinox-Microbar-Quad-System.qxf create mode 100644 resources/fixtures/Eurolite/Eurolite-LED-PT-100-32-Pixel-DMX-Tube.qxf create mode 100644 resources/fixtures/Ledj/Ledj-Stage-Color-Quad.qxf create mode 100644 resources/fixtures/Rockville/Rockville-Motionstrip-RGBW.qxf create mode 100644 resources/fixtures/Showtec/Showtec-Club-Par-12x6-RGBWAUV.qxf create mode 100644 resources/fixtures/Starway/Starway-MaxSpot500.qxf create mode 100644 resources/fixtures/UKing/UKing-4-Head-Beam-RGBW.qxf create mode 100644 resources/fixtures/UKing/UKing-7x10W-Mini-Moving-Head.qxf create mode 100644 resources/fixtures/UKing/UKing-LED-Spot-Moving-Head-100W.qxf create mode 100644 resources/fixtures/Varytec/Varytec-Giga-Bar-Pix-8-RGB.qxf delete mode 100644 resources/gobos/SGM/gobo00359.svg create mode 100644 resources/inputprofiles/KORG-nanoKONTROLStudio.qxi create mode 100644 resources/inputprofiles/Novation-LaunchPadMiniMK3.qxi create mode 100644 resources/miditemplates/Novation-LaunchPadMiniMK3.qxm create mode 100644 resources/rgbscripts/alternate.js diff --git a/appveyor.yml b/appveyor.yml index b4b4976e4c..adc3d2f2a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ -version: 4.12.3.{build} +version: 4.12.4.{build} + +image: Visual Studio 2019 environment: MSYSTEM: MSYS @@ -14,16 +16,18 @@ configuration: install: #- pacman --noconfirm -Sy #- pacman --noconfirm --needed -S pacman-mirrors - #- pacman --noconfirm -Sy + #- pacman --noconfirm -Syu - pacman --noconfirm --needed -S unzip mingw32/mingw-w64-i686-libmad mingw32/mingw-w64-i686-libsndfile mingw32/mingw-w64-i686-flac mingw32/mingw-w64-i686-fftw mingw32/mingw-w64-i686-nsis - - wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz -P /c/projects - - wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz -P /c/projects - - wget http://www.qlcplus.org/misc/mingw-w64-i686-qt5-5.6.2-4-any.pkg.tar.xz -P /c/projects - - pacman --noconfirm -Rdd mingw-w64-i686-gcc - - pacman --noconfirm -Rdd mingw-w64-i686-gcc-libs - - pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-gcc-libs-7.4.0-1-any.pkg.tar.xz - - pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-gcc-7.4.0-1-any.pkg.tar.xz - - pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-qt5-5.6.2-4-any.pkg.tar.xz + #- wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-9.3.0-2-any.pkg.tar.xz -P /c/projects + #- wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-9.3.0-2-any.pkg.tar.xz -P /c/projects + - wget http://www.qlcplus.org/misc/mingw-w64-i686-qt5-5.14.2-2-any.pkg.tar.zst -P /c/projects + - wget http://www.qlcplus.org/misc/qttools-5.14.2.zip -P /c/projects + #- pacman --noconfirm -Rdd mingw-w64-i686-gcc + #- pacman --noconfirm -Rdd mingw-w64-i686-gcc-libs + #- pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-gcc-libs-9.3.0-2-any.pkg.tar.xz + #- pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-gcc-9.3.0-2-any.pkg.tar.xz + - pacman --noconfirm --needed -U /c/projects/mingw-w64-i686-qt5-5.14.2-2-any.pkg.tar.zst + - unzip -d /c/msys64/mingw32/ /c/projects/qttools-5.14.2.zip build_script: - ps: >- @@ -66,4 +70,4 @@ build_script: artifacts: - path: QLC+_$(APPVEYOR_BUILD_VERSION).exe - name: qlcplus_4_12_3 + name: qlcplus_4_12_4 diff --git a/debian/changelog b/debian/changelog index 267683a6e9..6c728cd939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,37 @@ +qlcplus (4.12.4) stable; urgency=low + + * engine: RGB Matrix can now control white, amber, UV, dimmer and shutter channels too (started by Hans-Jürgen Tappe) + * engine: add "acts on" property to channels (thanks to Michał Kluska) + * Virtual Console/Button: fix submaster not affecting a Chaser startup intensity + * Plugins/E1.31: make CID unique on each network interface + * New input profile: Novation Launchpad Mini MK3 (thanks to Felix) + * New input profile: KORG nanoKONTROL Studio (thanks to Hans-Jürgen Tappe) + * New fixture: Varytec Giga Bar Pix 8 RGB (thanks to Felix) + * New fixture: Clay Paky Mini-B + * New fixture: Eurolite LED PT-100/32 Pixel DMX Tube (thanks to Torsten Caninenberg) + * New fixture: U'King LED Spot Moving Head 100W (thanks to Jay Seaman) + * New fixtures: Equinox Microbar Quad System, U'King 7x10W Mini Moving Head (thanks to Peter Crowther) + * New fixture: Starway MaxSpot 500 (thanks to David Thomas) + + -- Massimo Callegari Sun, 20 Dec 2020 12:13:14 +0200 + qlcplus (4.12.3) stable; urgency=low * engine: fix cloning a Show * engine: audio/video files not found are now shown in error log * engine: reduce audio playback startup latency in some cases + * engine: improved audio input level (thanks to Damien Zammit) * UI: fix virtual console resize * UI: fix crash on 2D monitor strobing + * UI: fix sorting in DMX dump dialog * UI/Audio Editor: fix selected device index (thanks to Santiago Benejam Torres) + * UI/Simple Desk: fix playback sliders numbering * Virtual Console: fix Animation and Audio Trigger widgets to respond to submaster (thanks to Branimir Amidžić) * Virtual Console: fix submaster not affecting a Sequence in a Cue List (thanks to ryhel) + * Virtual Console/Cue List: fix input when side fader type is set to None * Resources: added Novation Launch Control XL input profile (thanks to pille) * Resources: updated Novation Launchpad Pro input profile (thanks to Nate Doyon) + * Resources: added RGB script 'Alternate' (thanks to Hans-Jürgen Tappe) * New fixtures: Cameo Auro Spot 300, Auro Spot 400, Storm, Zenit B60 (thanks to Jannis Achstetter and Henrik Bauer) * New fixtures: American DJ Vizi Wash LED 108, Eurolite LED B-40 Beam, Eurolite TMH X3 (thanks to Jannis Achstetter and Henrik Bauer) * New fixtures: Litecraft OutLED AT10, Litecraft WashX.36, Martin JEM ZR24-7 (thanks to Jannis Achstetter and Henrik Bauer) @@ -49,8 +71,13 @@ qlcplus (4.12.3) stable; urgency=low * New fixture: American DJ Emerald Scan (thanks to Skye Peterson) * New fixture: lightmaXX Platinum CLS-3 MKII (thanks to Hans-Juergen Tappe) * New fixture: Chauvet Scorpion Dual RGB (thanks to Ryan Morgan) + * New fixtures: Rockville Motionstrip RGBW, U'King 4 Head Beam RGBW (thanks to Donny Lockart) + * New fixture: Ayra ERO Micro Spot (thanks to Bob) + * New fixture: American DJ 12P Hex IP (thanks to István Király) + * New fixture: Showtec Club Par 12-6 RGBWAUV (thanks to Santiago Benejam Torres) + * New fixture: Ledj Stage Color Quad (thanks to Peter Crowther) - -- Massimo Callegari Sun, 26 Apr 2020 12:13:14 +0200 + -- Massimo Callegari Sun, 30 Aug 2020 12:13:14 +0200 qlcplus (4.12.2) stable; urgency=low diff --git a/engine/src/chaserrunner.cpp b/engine/src/chaserrunner.cpp index a879e394ab..aa3e1c0465 100644 --- a/engine/src/chaserrunner.cpp +++ b/engine/src/chaserrunner.cpp @@ -20,6 +20,9 @@ */ #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#include +#endif #include #include "chaserrunner.h" @@ -380,7 +383,11 @@ void ChaserRunner::shuffle(QVector & data) int n = data.size(); for (int i = n - 1; i > 0; --i) { - qSwap(data[i], data[qrand() % (i + 1)]); +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + qSwap(data[i], data[qrand() % (i + 1)]); +#else + qSwap(data[i], data[QRandomGenerator::global()->generate() % (i + 1)]); +#endif } } diff --git a/engine/src/doc.cpp b/engine/src/doc.cpp index 18b604cc9a..6402e544d1 100644 --- a/engine/src/doc.cpp +++ b/engine/src/doc.cpp @@ -26,6 +26,9 @@ #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#include +#endif #include "qlcfixturemode.h" #include "qlcfixturedef.h" @@ -85,7 +88,10 @@ Doc::Doc(QObject* parent, int universes) { Bus::init(this); resetModified(); +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) qsrand(QTime::currentTime().msec()); +#endif + } Doc::~Doc() diff --git a/engine/src/inputoutputmap.cpp b/engine/src/inputoutputmap.cpp index b8d749e3c1..83d901fd9c 100644 --- a/engine/src/inputoutputmap.cpp +++ b/engine/src/inputoutputmap.cpp @@ -280,6 +280,15 @@ QList InputOutputMap::universes() const return m_universeArray; } +Universe *InputOutputMap::universe(quint32 id) +{ + for (int i = 0; i < m_universeArray.size(); i++) + if (m_universeArray.at(i)->id() == id) + return m_universeArray.at(i); + + return NULL; +} + QList InputOutputMap::claimUniverses() { m_universeMutex.lock(); diff --git a/engine/src/inputoutputmap.h b/engine/src/inputoutputmap.h index 0bf6afb34d..ad27a45460 100644 --- a/engine/src/inputoutputmap.h +++ b/engine/src/inputoutputmap.h @@ -241,6 +241,12 @@ class InputOutputMap : public QObject */ QList universes() const; + /** + * Get a reference to a Universe from the given Universe ID + * Return NULL if no Universe is found + */ + Universe *universe(quint32 id); + /** * Claim access to a universe. This is declared virtual to make * unit testing a bit easier. diff --git a/engine/src/keypadparser.cpp b/engine/src/keypadparser.cpp new file mode 100644 index 0000000000..2ab693cbc5 --- /dev/null +++ b/engine/src/keypadparser.cpp @@ -0,0 +1,173 @@ +/* + Q Light Controller Plus + keypadparser.cpp + + Copyright (c) Massimo Callegari + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "keypadparser.h" +#include "qlcmacros.h" + +KeyPadParser::KeyPadParser() +{ + +} + +QList KeyPadParser::parseCommand(Doc *doc, QString command, QByteArray &uniData) +{ + QList values; + if (doc == NULL) + return values; + + QStringList tokens = command.split(" "); + + int lastCommand = CommandNone; + quint32 fromChannel = 0; + quint32 toChannel = 0; + quint32 byChannel = 1; + float fromValue = 0; + float toValue = 0; + int thruCount = 0; + + foreach (QString token, tokens) + { + if (token.isEmpty()) + continue; + + if (token == "AT") + { + lastCommand = CommandAT; + } + else if (token == "THRU") + { + lastCommand = CommandTHRU; + } + else if (token == "FULL") + { + lastCommand = CommandFULL; + } + else if (token == "ZERO") + { + lastCommand = CommandZERO; + } + else if (token == "BY") + { + lastCommand = CommandBY; + } + else if (token == "+") + { + lastCommand = CommandPlus; + } + else if (token == "-") + { + lastCommand = CommandMinus; + } + else if (token == "+%") + { + lastCommand = CommandPlusPercent; + } + + else if (token == "-%") + { + lastCommand = CommandMinusPercent; + } + else if (token == "%") + { + if (lastCommand == CommandPlus) + lastCommand = CommandPlusPercent; + else if (lastCommand == CommandMinus) + lastCommand = CommandMinusPercent; + } + else + { + // most likely a number + bool ok = false; + int number = token.toUInt(&ok); + + if (ok == false) + continue; + + switch (lastCommand) + { + case CommandNone: + // no command: this is a channel number + fromChannel = number; + toChannel = fromChannel; + break; + case CommandAT: + fromValue = float(number); + toValue = fromValue; + break; + case CommandTHRU: + if (thruCount == 0) + toChannel = number; + else + toValue = float(number); + thruCount++; + break; + case CommandFULL: + fromValue = toValue = 255; + break; + case CommandZERO: + fromValue = toValue = 0; + break; + case CommandBY: + byChannel = number; + break; + case CommandPlus: + case CommandMinus: + toValue = number; + break; + case CommandPlusPercent: + case CommandMinusPercent: + toValue = float(number) / 100.0; + break; + } + } + } + + float valueDelta = 0; + if (toValue != fromValue) + { + valueDelta = (float(toChannel) - float(fromChannel)) / float(byChannel); + valueDelta = (float(toValue) - float(fromValue)) / valueDelta; + } + + for (quint32 i = fromChannel - 1; i <= toChannel - 1; i += byChannel) + { + uchar uniValue = 0; + SceneValue scv; + + if (quint32(uniData.length()) >= i) + uniValue = uchar(uniData.at(i)); + + scv.channel = i; + if (lastCommand == CommandPlus) + scv.value = CLAMP(uniValue + toValue, 0, 255); + else if (lastCommand == CommandMinus) + scv.value = CLAMP(uniValue - toValue, 0, 255); + else if (lastCommand == CommandPlusPercent) + scv.value = CLAMP(uniValue * (1.0 + toValue), 0, 255); + else if (lastCommand == CommandMinusPercent) + scv.value = CLAMP(uniValue - (float(uniValue) * toValue), 0, 255); + else + scv.value = uchar(fromValue); + + values.append(scv); + fromValue += valueDelta; + } + + return values; +} diff --git a/engine/src/keypadparser.h b/engine/src/keypadparser.h new file mode 100644 index 0000000000..4d609f9951 --- /dev/null +++ b/engine/src/keypadparser.h @@ -0,0 +1,47 @@ +/* + Q Light Controller Plus + keypadparser.h + + Copyright (c) Massimo Callegari + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef KEYPADPARSER_H +#define KEYPADPARSER_H + +#include "scenevalue.h" + +class KeyPadParser +{ +public: + KeyPadParser(); + + enum KeyPadCommands + { + CommandNone, + CommandAT, + CommandTHRU, + CommandFULL, + CommandZERO, + CommandBY, + CommandPlus, + CommandPlusPercent, + CommandMinus, + CommandMinusPercent + }; + + static QList parseCommand(Doc *doc, QString command, QByteArray &uniData); +}; + +#endif // KEYPADPARSER_H diff --git a/engine/src/qlcfixturedef.h b/engine/src/qlcfixturedef.h index 4bd4e292a0..de602fde9f 100644 --- a/engine/src/qlcfixturedef.h +++ b/engine/src/qlcfixturedef.h @@ -98,13 +98,13 @@ class QLCFixtureDef Flower, Hazer, Laser, - LEDBarBeams, - LEDBarPixels, MovingHead, - Other, Scanner, Smoke, - Strobe + Strobe, + LEDBarBeams, + LEDBarPixels, + Other }; /** Get the temporary definition file absolute path */ diff --git a/engine/src/qlcfixturedefcache.cpp b/engine/src/qlcfixturedefcache.cpp index ad00e429b0..6f4843a4cb 100644 --- a/engine/src/qlcfixturedefcache.cpp +++ b/engine/src/qlcfixturedefcache.cpp @@ -289,6 +289,32 @@ bool QLCFixtureDefCache::loadMap(const QDir &dir) } qDebug() << fxCount << "fixtures found in map"; +#if 0 + /* Attempt to read all files not in FixtureMap */ + QStringList definitionPaths; + + // Gather a list of manufacturers + QListIterator mfit(m_defs); + while (mfit.hasNext() == true) + definitionPaths << mfit.next()->definitionSourceFile(); + + QStringListIterator it(dir.entryList()); + while (it.hasNext() == true) + { + QString path(dir.absoluteFilePath(it.next())); + if (definitionPaths.contains(path)) + continue; + + qWarning() << path << "not in" << FIXTURES_MAP_NAME; + + if (path.toLower().endsWith(KExtFixture) == true) + loadQXF(path); + else if (path.toLower().endsWith(KExtAvolitesFixture) == true) + loadD4(path); + else + qWarning() << Q_FUNC_INFO << "Unrecognized fixture extension:" << path; + } +#endif return true; } diff --git a/engine/src/qlcfixturehead.h b/engine/src/qlcfixturehead.h index 955f0bf317..94eac63808 100644 --- a/engine/src/qlcfixturehead.h +++ b/engine/src/qlcfixturehead.h @@ -22,6 +22,7 @@ #define QLCFIXTUREHEAD_H #include +#include class QLCFixtureMode; class QXmlStreamReader; diff --git a/engine/src/qlcfixturemode.cpp b/engine/src/qlcfixturemode.cpp index 50ef6eb4e9..1a5a7546eb 100644 --- a/engine/src/qlcfixturemode.cpp +++ b/engine/src/qlcfixturemode.cpp @@ -40,6 +40,7 @@ QLCFixtureMode::QLCFixtureMode(QLCFixtureDef* fixtureDef) QLCFixtureMode::QLCFixtureMode(QLCFixtureDef* fixtureDef, const QLCFixtureMode* mode) : m_fixtureDef(fixtureDef) + , m_actsOnChannelsList(mode->actsOnChannelsList()) , m_masterIntensityChannel(QLCChannel::invalid()) , m_useGlobalPhysical(true) { @@ -63,6 +64,7 @@ QLCFixtureMode& QLCFixtureMode::operator=(const QLCFixtureMode& mode) m_physical = mode.m_physical; m_heads = mode.m_heads; m_masterIntensityChannel = QLCChannel::invalid(); + m_actsOnChannelsList = mode.actsOnChannelsList(); /* Clear the existing list of channels */ m_channels.clear(); @@ -244,6 +246,16 @@ quint32 QLCFixtureMode::masterIntensityChannel() const return m_masterIntensityChannel; } +void QLCFixtureMode::updateActsOnChannel(QLCChannel *mainChannel, QLCChannel *actsOnChannel) +{ + m_actsOnChannelsList.insert(mainChannel, actsOnChannel); +} + +QHash QLCFixtureMode::actsOnChannelsList() const +{ + return m_actsOnChannelsList; +} + /***************************************************************************** * Heads *****************************************************************************/ @@ -357,6 +369,9 @@ bool QLCFixtureMode::loadXML(QXmlStreamReader &doc) setName(str); } + /* Temporary list with mode's channels pointer and acts on indexes. */ + QList listChannelsWithActsOnIndex; + /* Subtags */ while (doc.readNextStartElement()) { @@ -365,7 +380,21 @@ bool QLCFixtureMode::loadXML(QXmlStreamReader &doc) /* Channel */ Q_ASSERT(m_fixtureDef != NULL); str = doc.attributes().value(KXMLQLCFixtureModeChannelNumber).toString(); - insertChannel(m_fixtureDef->channel(doc.readElementText()), + + int actsOnChannelIndex = -1; + + if (doc.attributes().hasAttribute(KXMLQLCFixtureModeChannelActsOn)) + { + actsOnChannelIndex = doc.attributes().value(KXMLQLCFixtureModeChannelActsOn).toInt(); + } + + QLCChannel *currentChannel = m_fixtureDef->channel(doc.readElementText()); + + ChannelActsOnData channelActsData(currentChannel, actsOnChannelIndex); + + listChannelsWithActsOnIndex.append(channelActsData); + + insertChannel(currentChannel, str.toInt()); } else if (doc.name() == KXMLQLCFixtureHead) @@ -389,6 +418,19 @@ bool QLCFixtureMode::loadXML(QXmlStreamReader &doc) } } + // Set acts on channels + + foreach (ChannelActsOnData channelSctsOnData, listChannelsWithActsOnIndex) + { + if(m_channels.contains(channelSctsOnData.channel) && + channelSctsOnData.actsOnIndex >= 0 && + m_channels.size() > channelSctsOnData.actsOnIndex) + { + m_actsOnChannelsList.insert(channelSctsOnData.channel, + m_channels.at(channelSctsOnData.actsOnIndex)); + } + } + // Cache all head channels cacheHeads(); @@ -412,9 +454,20 @@ bool QLCFixtureMode::saveXML(QXmlStreamWriter *doc) QVectorIterator it(m_channels); while (it.hasNext() == true) { + QLCChannel* channel = it.next(); + doc->writeStartElement(KXMLQLCFixtureModeChannel); doc->writeAttribute(KXMLQLCFixtureModeChannelNumber, QString::number(i++)); - doc->writeCharacters(it.next()->name()); + + if (m_actsOnChannelsList.contains(channel)) + { + QLCChannel *ChannelActsOn = m_actsOnChannelsList.value(channel); + if(ChannelActsOn != NULL){ + doc->writeAttribute(KXMLQLCFixtureModeChannelActsOn, QString::number(m_channels.indexOf(ChannelActsOn))); + } + } + + doc->writeCharacters(channel->name()); doc->writeEndElement(); } @@ -427,3 +480,8 @@ bool QLCFixtureMode::saveXML(QXmlStreamWriter *doc) return true; } + +QLCFixtureMode::ChannelActsOnData::ChannelActsOnData(QLCChannel *newChannel, int newAcsOnIndex) : + channel(newChannel), + actsOnIndex(newAcsOnIndex) +{} diff --git a/engine/src/qlcfixturemode.h b/engine/src/qlcfixturemode.h index 47922ce3c7..1ccf7d4bca 100644 --- a/engine/src/qlcfixturemode.h +++ b/engine/src/qlcfixturemode.h @@ -45,6 +45,7 @@ class QLCChannel; #define KXMLQLCFixtureModeName "Name" #define KXMLQLCFixtureModeChannel "Channel" #define KXMLQLCFixtureModeChannelNumber "Number" +#define KXMLQLCFixtureModeChannelActsOn "ActsOn" /** * QLCFixtureMode is essentially a collection of QLCChannels, arranged in such @@ -206,9 +207,29 @@ class QLCFixtureMode quint32 masterIntensityChannel() const; + /*! + * \brief The ChannelActsOnData struct + * + * Contains channel pointer and acts on channel index. + * + */ + + struct ChannelActsOnData + { + QLCChannel *channel; + int actsOnIndex; + + ChannelActsOnData(QLCChannel *newChannel, int newAcsOnIndex); + }; + + void updateActsOnChannel(QLCChannel *mainChannel, QLCChannel *actsOnChannel); + protected: /** List of channels (pointers are not owned) */ - QVector m_channels; + QVector m_channels; + + /** List of acts on channels */ + QHash m_actsOnChannelsList; quint32 m_masterIntensityChannel; @@ -299,6 +320,7 @@ class QLCFixtureMode /** Save a mode to an XML document */ bool saveXML(QXmlStreamWriter *doc); + QHash actsOnChannelsList() const; }; /** @} */ diff --git a/engine/src/rgbmatrix.cpp b/engine/src/rgbmatrix.cpp index 52da36ffca..3afd94cabe 100644 --- a/engine/src/rgbmatrix.cpp +++ b/engine/src/rgbmatrix.cpp @@ -45,13 +45,21 @@ #define KXMLQLCRGBMatrixPropertyName "Name" #define KXMLQLCRGBMatrixPropertyValue "Value" +#define KXMLQLCRGBMatrixControlMode "ControlMode" +#define KXMLQLCRGBMatrixControlModeRgb "RGB" +#define KXMLQLCRGBMatrixControlModeAmber "Amber" +#define KXMLQLCRGBMatrixControlModeWhite "White" +#define KXMLQLCRGBMatrixControlModeUV "UV" +#define KXMLQLCRGBMatrixControlModeDimmer "Dimmer" +#define KXMLQLCRGBMatrixControlModeShutter "Shutter" + /**************************************************************************** * Initialization ****************************************************************************/ RGBMatrix::RGBMatrix(Doc* doc) : Function(doc, Function::RGBMatrixType) - , m_dimmerControl(true) + , m_dimmerControl(false) , m_fixtureGroupID(FixtureGroup::invalidId()) , m_group(NULL) , m_algorithm(NULL) @@ -62,6 +70,7 @@ RGBMatrix::RGBMatrix(Doc* doc) , m_roundTime(new QElapsedTimer()) , m_stepsCount(0) , m_stepBeatDuration(0) + , m_controlMode(RGBMatrix::ControlModeRgb) { setName(tr("New RGB Matrix")); setDuration(500); @@ -392,6 +401,10 @@ bool RGBMatrix::loadXML(QXmlStreamReader &root) { setEndColor(QColor::fromRgb(QRgb(root.readElementText().toUInt()))); } + else if (root.name() == KXMLQLCRGBMatrixControlMode) + { + setControlMode(stringToControlMode(root.readElementText())); + } else if (root.name() == KXMLQLCRGBMatrixProperty) { QString name = root.attributes().value(KXMLQLCRGBMatrixPropertyName).toString(); @@ -436,17 +449,19 @@ bool RGBMatrix::saveXML(QXmlStreamWriter *doc) if (m_algorithm != NULL) m_algorithm->saveXML(doc); - /* Dimmer Control */ - doc->writeTextElement(KXMLQLCRGBMatrixDimmerControl, QString::number(dimmerControl())); + /* LEGACY - Dimmer Control */ + if (dimmerControl()) + doc->writeTextElement(KXMLQLCRGBMatrixDimmerControl, QString::number(dimmerControl())); /* Start Color */ doc->writeTextElement(KXMLQLCRGBMatrixStartColor, QString::number(startColor().rgb())); /* End Color */ if (endColor().isValid()) - { doc->writeTextElement(KXMLQLCRGBMatrixEndColor, QString::number(endColor().rgb())); - } + + /* Control Mode */ + doc->writeTextElement(KXMLQLCRGBMatrixControlMode, RGBMatrix::controlModeToString(m_controlMode)); /* Fixture Group */ doc->writeTextElement(KXMLQLCRGBMatrixFixtureGroup, QString::number(fixtureGroup())); @@ -698,80 +713,123 @@ void RGBMatrix::updateMapChannels(const RGBMap& map, const FixtureGroup *grp, QL QLCFixtureHead head = fxi->head(grpHead.head); - QVector rgb = head.rgbChannels(); - QVector cmy = head.cmyChannels(); - - quint32 masterDim = fxi->masterIntensityChannel(); - quint32 headDim = head.channelNumber(QLCChannel::Intensity, QLCChannel::MSB); - - // Collect all dimmers that affect current head: - // They are the master dimmer (affects whole fixture) - // and per-head dimmer. - // - // If there are no RGB or CMY channels, the least important* dimmer channel - // is used to create grayscale image. - // - // The rest of the dimmer channels are set to full if dimmer control is - // enabled and target color is > 0 (see - // http://www.qlcplus.org/forum/viewtopic.php?f=29&t=11090) - // - // Note: If there is only one head, and only one dimmer channel, - // make it a master dimmer in fixture definition. - // - // *least important - per head dimmer if present, - // otherwise per fixture dimmer if present - QVector dim; - if (masterDim != QLCChannel::invalid()) - dim << masterDim; - - if (headDim != QLCChannel::invalid()) - dim << headDim; - if (pt.y() >= map.count() || pt.x() >= map[pt.y()].count()) continue; uint col = map[pt.y()][pt.x()]; - if (rgb.size() == 3) + if (m_controlMode == ControlModeRgb) { - // RGB color mixing - FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(0)); - updateFaderValues(fc, qRed(col), fadeTime); + QVector rgb = head.rgbChannels(); + QVector cmy = head.cmyChannels(); + + if (rgb.size() == 3) + { + // RGB color mixing + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(0)); + updateFaderValues(fc, qRed(col), fadeTime); + + fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(1)); + updateFaderValues(fc, qGreen(col), fadeTime); + + fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(2)); + updateFaderValues(fc, qBlue(col), fadeTime); + } + else if (cmy.size() == 3) + { + // CMY color mixing + QColor cmyCol(col); - fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(1)); - updateFaderValues(fc, qGreen(col), fadeTime); + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(0)); + updateFaderValues(fc, cmyCol.cyan(), fadeTime); - fc = getFader(universes, fxi->universe(), grpHead.fxi, rgb.at(2)); - updateFaderValues(fc, qBlue(col), fadeTime); + fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(1)); + updateFaderValues(fc, cmyCol.magenta(), fadeTime); + + fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(2)); + updateFaderValues(fc, cmyCol.yellow(), fadeTime); + } } - else if (cmy.size() == 3) + else if (m_controlMode == ControlModeWhite) { - // CMY color mixing - QColor cmyCol(col); + quint32 white = head.channelNumber(QLCChannel::White, QLCChannel::MSB); - FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(0)); - updateFaderValues(fc, cmyCol.cyan(), fadeTime); + if (white != QLCChannel::invalid()) + { + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, white); + updateFaderValues(fc, rgbToGrey(col), fadeTime); + } + } + else if (m_controlMode == ControlModeAmber) + { + quint32 amber = head.channelNumber(QLCChannel::Amber, QLCChannel::MSB); - fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(1)); - updateFaderValues(fc, cmyCol.magenta(), fadeTime); + if (amber != QLCChannel::invalid()) + { + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, amber); + updateFaderValues(fc, rgbToGrey(col), fadeTime); + } + } + else if (m_controlMode == ControlModeUV) + { + quint32 uv = head.channelNumber(QLCChannel::UV, QLCChannel::MSB); - fc = getFader(universes, fxi->universe(), grpHead.fxi, cmy.at(2)); - updateFaderValues(fc, cmyCol.yellow(), fadeTime); + if (uv != QLCChannel::invalid()) + { + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, uv); + updateFaderValues(fc, rgbToGrey(col), fadeTime); + } } - else if (!dim.empty()) + else if (m_controlMode == ControlModeShutter) { - // Set dimmer to value of the color (e.g. for PARs) - FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, dim.last()); - // the weights are taken from - // https://en.wikipedia.org/wiki/YUV#SDTV_with_BT.601 - updateFaderValues(fc, 0.299 * qRed(col) + 0.587 * qGreen(col) + 0.114 * qBlue(col), fadeTime); - dim.pop_back(); + QVector shutters = head.shutterChannels(); + + if (shutters.size()) + { + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, shutters.first()); + updateFaderValues(fc, rgbToGrey(col), fadeTime); + } } - if (m_dimmerControl) + if (m_controlMode == ControlModeDimmer || m_dimmerControl) { + quint32 masterDim = fxi->masterIntensityChannel(); + quint32 headDim = head.channelNumber(QLCChannel::Intensity, QLCChannel::MSB); + QVector dimmers; + + // Collect all dimmers that affect current head: + // They are the master dimmer (affects whole fixture) + // and per-head dimmer. + // + // If there are no RGB or CMY channels, the least important* dimmer channel + // is used to create grayscale image. + // + // The rest of the dimmer channels are set to full if dimmer control is + // enabled and target color is > 0 (see + // http://www.qlcplus.org/forum/viewtopic.php?f=29&t=11090) + // + // Note: If there is only one head, and only one dimmer channel, + // make it a master dimmer in fixture definition. + // + // *least important - per head dimmer if present, + // otherwise per fixture dimmer if present + + if (masterDim != QLCChannel::invalid()) + dimmers << masterDim; + + if (headDim != QLCChannel::invalid()) + dimmers << headDim; + + if (dimmers.size()) + { + // Set dimmer to value of the color (e.g. for PARs) + FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, dimmers.last()); + updateFaderValues(fc, rgbToGrey(col), fadeTime); + dimmers.pop_back(); + } + // Set the rest of the dimmer channels to full on - foreach(quint32 ch, dim) + foreach (quint32 ch, dimmers) { FadeChannel *fc = getFader(universes, fxi->universe(), grpHead.fxi, ch); updateFaderValues(fc, col == 0 ? 0 : 255, fadeTime); @@ -780,6 +838,13 @@ void RGBMatrix::updateMapChannels(const RGBMap& map, const FixtureGroup *grp, QL } } +uchar RGBMatrix::rgbToGrey(uint col) +{ + // the weights are taken from + // https://en.wikipedia.org/wiki/YUV#SDTV_with_BT.601 + return (0.299 * qRed(col) + 0.587 * qGreen(col) + 0.114 * qBlue(col)); +} + /********************************************************************* * Attributes *********************************************************************/ @@ -819,6 +884,65 @@ void RGBMatrix::setBlendMode(Universe::BlendMode mode) emit changed(id()); } +/************************************************************************* + * Control Mode + *************************************************************************/ + +RGBMatrix::ControlMode RGBMatrix::controlMode() const +{ + return m_controlMode; +} + +void RGBMatrix::setControlMode(RGBMatrix::ControlMode mode) +{ + m_controlMode = mode; + emit changed(id()); +} + +RGBMatrix::ControlMode RGBMatrix::stringToControlMode(QString mode) +{ + if (mode == KXMLQLCRGBMatrixControlModeRgb) + return ControlModeRgb; + else if (mode == KXMLQLCRGBMatrixControlModeAmber) + return ControlModeAmber; + else if (mode == KXMLQLCRGBMatrixControlModeWhite) + return ControlModeWhite; + else if (mode == KXMLQLCRGBMatrixControlModeUV) + return ControlModeUV; + else if (mode == KXMLQLCRGBMatrixControlModeDimmer) + return ControlModeDimmer; + else if (mode == KXMLQLCRGBMatrixControlModeShutter) + return ControlModeShutter; + + return ControlModeRgb; +} + +QString RGBMatrix::controlModeToString(RGBMatrix::ControlMode mode) +{ + switch(mode) + { + default: + case ControlModeRgb: + return QString(KXMLQLCRGBMatrixControlModeRgb); + break; + case ControlModeAmber: + return QString(KXMLQLCRGBMatrixControlModeAmber); + break; + case ControlModeWhite: + return QString(KXMLQLCRGBMatrixControlModeWhite); + break; + case ControlModeUV: + return QString(KXMLQLCRGBMatrixControlModeUV); + break; + case ControlModeDimmer: + return QString(KXMLQLCRGBMatrixControlModeDimmer); + break; + case ControlModeShutter: + return QString(KXMLQLCRGBMatrixControlModeShutter); + break; + } +} + /************************************************************************* ************************************************************************* diff --git a/engine/src/rgbmatrix.h b/engine/src/rgbmatrix.h index b6085bf1f5..f0546d74fc 100644 --- a/engine/src/rgbmatrix.h +++ b/engine/src/rgbmatrix.h @@ -125,6 +125,7 @@ class RGBMatrix : public Function bool dimmerControl() const; private: + // LEGACY: replaced by ControlModeDimmer bool m_dimmerControl; /********************************************************************* @@ -242,6 +243,10 @@ class RGBMatrix : public Function /** Update FadeChannels when $map has changed since last time */ void updateMapChannels(const RGBMap& map, const FixtureGroup* grp, QList universes); +public: + /** Convert color values to fader value */ + uchar rgbToGrey(uint col); + private: /** Reference to a timer counting the time in ms between steps */ QElapsedTimer *m_roundTime; @@ -265,6 +270,34 @@ class RGBMatrix : public Function public: /** @reimp */ void setBlendMode(Universe::BlendMode mode); + + /************************************************************************* + * Control Mode + *************************************************************************/ +public: + /** Control modes for the RGB Matrix */ + enum ControlMode + { + ControlModeRgb = 0, + ControlModeWhite, + ControlModeAmber, + ControlModeUV, + ControlModeDimmer, + ControlModeShutter + }; + + /** Get/Set the control mode associated to this RGBMatrix */ + ControlMode controlMode() const; + void setControlMode(ControlMode mode); + + /** Return a control mode from a string */ + static ControlMode stringToControlMode(QString mode); + + /** Return a string from a control mode, to be saved into a XML */ + static QString controlModeToString(ControlMode mode); + +private: + ControlMode m_controlMode; }; /** @} */ diff --git a/engine/src/script.cpp b/engine/src/script.cpp index c9503858b6..819fbbc54a 100644 --- a/engine/src/script.cpp +++ b/engine/src/script.cpp @@ -25,7 +25,10 @@ #endif #include #include - +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#include +#endif + #include "genericfader.h" #include "fadechannel.h" #include "mastertimer.h" @@ -140,7 +143,7 @@ bool Script::setData(const QString& str) if (m_data.isEmpty() == false) { int i = 1; - QStringList lines = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts); + QStringList lines = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)")); foreach (QString line, lines) { bool ok = false; @@ -184,8 +187,7 @@ QString Script::data() const QStringList Script::dataLines() const { - QStringList result = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts); - + QStringList result = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)")); while (result.count() && result.last().isEmpty()) result.takeLast(); @@ -405,7 +407,11 @@ quint32 Script::getValueFromString(QString str, bool *ok) int max = Function::stringToSpeed(valList.at(1)); *ok = true; +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) return qrand() % ((max + 1) - min) + min; +#else + return QRandomGenerator::global()->generate() % ((max + 1) - min) + min; +#endif } bool Script::executeCommand(int index, MasterTimer* timer, QList universes) diff --git a/engine/src/scriptrunner.cpp b/engine/src/scriptrunner.cpp index c0d85c8a6e..d3a3d6f1b7 100644 --- a/engine/src/scriptrunner.cpp +++ b/engine/src/scriptrunner.cpp @@ -19,6 +19,7 @@ #include #include +#include #if !defined(Q_OS_IOS) #include #endif @@ -521,7 +522,7 @@ int ScriptRunner::random(QString minTime, QString maxTime) int min = Function::stringToSpeed(minTime); int max = Function::stringToSpeed(maxTime); - return qrand() % ((max + 1) - min) + min; + return QRandomGenerator::global()->generate() % ((max + 1) - min) + min; } int ScriptRunner::random(int minTime, int maxTime) @@ -529,6 +530,6 @@ int ScriptRunner::random(int minTime, int maxTime) if (m_running == false) return 0; - return qrand() % ((maxTime + 1) - minTime) + minTime; + return QRandomGenerator::global()->generate() % ((maxTime + 1) - minTime) + minTime; } diff --git a/engine/src/scriptv4.cpp b/engine/src/scriptv4.cpp index 72202e7188..8a659ad0a1 100644 --- a/engine/src/scriptv4.cpp +++ b/engine/src/scriptv4.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -137,7 +138,7 @@ QString Script::data() const QStringList Script::dataLines() const { - QStringList result = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts); + QStringList result = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)")); while (result.count() && result.last().isEmpty()) result.takeLast(); @@ -358,7 +359,7 @@ quint32 Script::getValueFromString(QString str, bool *ok) int max = Function::stringToSpeed(valList.at(1)); *ok = true; - return qrand() % ((max + 1) - min) + min; + return QRandomGenerator::global()->generate() % ((max + 1) - min) + min; } QString Script::convertLine(const QString& str, bool *ok) diff --git a/engine/src/src.pro b/engine/src/src.pro index 91d4de7cec..7adf5cb4f9 100644 --- a/engine/src/src.pro +++ b/engine/src/src.pro @@ -92,6 +92,7 @@ HEADERS += bus.h \ inputoutputmap.h \ inputpatch.h \ ioplugincache.h \ + keypadparser.h \ mastertimer.h \ monitorproperties.h \ outputpatch.h \ @@ -171,6 +172,7 @@ SOURCES += bus.cpp \ inputoutputmap.cpp \ inputpatch.cpp \ ioplugincache.cpp \ + keypadparser.cpp \ mastertimer.cpp \ monitorproperties.cpp \ outputpatch.cpp \ diff --git a/engine/test/qlcinputprofile/qlcinputprofile_test.cpp b/engine/test/qlcinputprofile/qlcinputprofile_test.cpp index ec7a67d53e..d5cb0f5390 100644 --- a/engine/test/qlcinputprofile/qlcinputprofile_test.cpp +++ b/engine/test/qlcinputprofile/qlcinputprofile_test.cpp @@ -386,7 +386,7 @@ void QLCInputProfile_Test::save() #if !defined(WIN32) && !defined(Q_OS_WIN) QFile::Permissions perm = QFile::permissions(path); - QFile::setPermissions(path, 0); + QFile::setPermissions(path, QFileDevice::WriteOther); QVERIFY(ip.saveXML(path) == false); QFile::setPermissions(path, perm); #endif diff --git a/engine/test/rgbmatrix/rgbmatrix_test.cpp b/engine/test/rgbmatrix/rgbmatrix_test.cpp index 300d77c89f..ecce021785 100644 --- a/engine/test/rgbmatrix/rgbmatrix_test.cpp +++ b/engine/test/rgbmatrix/rgbmatrix_test.cpp @@ -205,6 +205,7 @@ void RGBMatrix_Test::loadSave() RGBMatrix* mtx = new RGBMatrix(m_doc); mtx->setStartColor(Qt::magenta); mtx->setEndColor(Qt::blue); + mtx->setControlMode(RGBMatrix::ControlModeRgb); mtx->setFixtureGroup(42); mtx->setAlgorithm(RGBAlgorithm::algorithm(m_doc, "Stripes")); QVERIFY(mtx->algorithm() != NULL); @@ -216,7 +217,6 @@ void RGBMatrix_Test::loadSave() mtx->setDuration(1200); mtx->setFadeInSpeed(10); mtx->setFadeOutSpeed(20); - mtx->setDimmerControl(false); m_doc->addFunction(mtx); QBuffer buffer; @@ -237,7 +237,7 @@ void RGBMatrix_Test::loadSave() QCOMPARE(xmlReader.attributes().value("ID").toString(), QString::number(mtx->id())); QCOMPARE(xmlReader.attributes().value("Name").toString(), QString("Xyzzy")); - int speed = 0, dir = 0, run = 0, algo = 0, monocolor = 0, endcolor = 0, grp = 0, dimmer = 0; + int speed = 0, dir = 0, run = 0, algo = 0, monocolor = 0, endcolor = 0, grp = 0, colormode = 0; while (xmlReader.readNextStartElement()) { @@ -280,10 +280,10 @@ void RGBMatrix_Test::loadSave() QCOMPARE(xmlReader.readElementText(), QString("42")); grp++; } - else if (xmlReader.name() == "DimmerControl") + else if (xmlReader.name() == "ControlMode") { - QCOMPARE(xmlReader.readElementText(), QString("0")); - dimmer++; + QCOMPARE(xmlReader.readElementText(), QString("RGB")); + colormode++; } else { @@ -298,7 +298,7 @@ void RGBMatrix_Test::loadSave() QCOMPARE(monocolor, 1); QCOMPARE(endcolor, 1); QCOMPARE(grp, 1); - QCOMPARE(dimmer, 1); + QCOMPARE(colormode, 1); xmlReader.setDevice(NULL); buffer.seek(0); @@ -311,6 +311,7 @@ void RGBMatrix_Test::loadSave() QCOMPARE(mtx2.runOrder(), Function::PingPong); QCOMPARE(mtx2.startColor(), QColor(Qt::magenta)); QCOMPARE(mtx2.endColor(), QColor(Qt::blue)); + QCOMPARE(mtx2.controlMode(), RGBMatrix::ControlModeRgb); QCOMPARE(mtx2.fixtureGroup(), uint(42)); QVERIFY(mtx2.algorithm() != NULL); QCOMPARE(mtx2.algorithm()->name(), mtx->algorithm()->name()); diff --git a/engine/test/rgbtext/rgbtext_test.cpp b/engine/test/rgbtext/rgbtext_test.cpp index ef03a46c4b..26da78a8c7 100644 --- a/engine/test/rgbtext/rgbtext_test.cpp +++ b/engine/test/rgbtext/rgbtext_test.cpp @@ -249,7 +249,7 @@ void RGBText_Test::load() buffer.close(); QByteArray bData = buffer.data(); - bData.replace(fn.toString(), "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"); + bData.replace(fn.toString().toUtf8(), "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"); buffer.setData(bData); buffer.open(QIODevice::ReadWrite | QIODevice::Text); buffer.seek(0); diff --git a/fixtureeditor/capabilitywizard.cpp b/fixtureeditor/capabilitywizard.cpp index ddb4c5b269..009377afd4 100644 --- a/fixtureeditor/capabilitywizard.cpp +++ b/fixtureeditor/capabilitywizard.cpp @@ -113,7 +113,7 @@ void CapabilityWizard::slotCreateCapabilities() m_channel->searchCapability(cap->max()) != NULL) { /* Disable the item to indicate overlapping */ - item->setFlags(0); + item->setFlags(Qt::NoItemFlags); } } } diff --git a/fixtureeditor/edithead.cpp b/fixtureeditor/edithead.cpp index 68025b70d1..a42a651651 100644 --- a/fixtureeditor/edithead.cpp +++ b/fixtureeditor/edithead.cpp @@ -69,7 +69,7 @@ void EditHead::fillChannelTree(const QLCFixtureMode* mode) if (ch->group() == QLCChannel::Intensity && ch->colour() == QLCChannel::NoColour) item->setFlags(item->flags() | Qt::ItemIsUserCheckable); else if (m_head.channels().contains(i) == false && mode->headForChannel(i) != -1) - item->setFlags(0); + item->setFlags(Qt::NoItemFlags); else item->setFlags(item->flags() | Qt::ItemIsUserCheckable); diff --git a/fixtureeditor/editmode.cpp b/fixtureeditor/editmode.cpp index 5ba6c859c2..87add204d1 100644 --- a/fixtureeditor/editmode.cpp +++ b/fixtureeditor/editmode.cpp @@ -50,6 +50,7 @@ #define PROP_PTR Qt::UserRole #define COL_NUM 0 #define COL_NAME 1 +#define COL_ACTS_ON 2 EditMode::EditMode(QWidget *parent, QLCFixtureMode *mode) : QDialog(parent) @@ -114,7 +115,7 @@ void EditMode::init() connect(m_phyEdit, SIGNAL(requestPasteFromClipboard()), this, SIGNAL(requestPasteFromClipboard())); // Close shortcut - QAction* action = new QAction(this); + QAction *action = new QAction(this); action->setShortcut(QKeySequence(QKeySequence::Close)); connect(action, SIGNAL(triggered(bool)), this, SLOT(reject())); addAction(action); @@ -141,13 +142,13 @@ void EditMode::slotAddChannelClicked() if (ach.exec() != QDialog::Accepted) return; - QList newChannelList = ach.getModeChannelsList(); + QList newChannelList = ach.getModeChannelsList(); // clear the previous list m_mode->removeAllChannels(); // Append the channels - foreach(QLCChannel *ch, newChannelList) + foreach (QLCChannel *ch, newChannelList) m_mode->insertChannel(ch, m_mode->channels().size()); // Easier to refresh the whole list @@ -156,11 +157,11 @@ void EditMode::slotAddChannelClicked() void EditMode::slotRemoveChannelClicked() { - QLCChannel* ch = currentChannel(); + QLCChannel *ch = currentChannel(); if (ch != NULL) { - QTreeWidgetItem* item; + QTreeWidgetItem *item; QString select; // Pick the item above or below to be selected next @@ -185,7 +186,7 @@ void EditMode::slotRemoveChannelClicked() void EditMode::slotRaiseChannelClicked() { - QLCChannel* ch = currentChannel(); + QLCChannel *ch = currentChannel(); int index = 0; if (ch == NULL) @@ -206,7 +207,7 @@ void EditMode::slotRaiseChannelClicked() void EditMode::slotLowerChannelClicked() { - QLCChannel* ch = currentChannel(); + QLCChannel *ch = currentChannel(); int index = 0; if (ch == NULL) @@ -225,14 +226,28 @@ void EditMode::slotLowerChannelClicked() selectChannel(ch->name()); } +void EditMode::slotActsOnChannelChanged(QLCChannel *newActsOnChannel) +{ + QLCChannel *channel = currentChannel(); + + if (channel == NULL) + return; + + m_mode->updateActsOnChannel(channel, newActsOnChannel); + refreshChannelList(); +} + void EditMode::refreshChannelList() { m_channelList->clear(); for (int i = 0; i < m_mode->channels().size(); i++) { - QTreeWidgetItem* item = new QTreeWidgetItem(m_channelList); - QLCChannel* ch = m_mode->channel(i); + QTreeWidgetItem *item = new QTreeWidgetItem(m_channelList); + QLCChannel *ch = m_mode->channel(i); + + int actsOnChannelIndex = m_mode->channels().indexOf(m_mode->actsOnChannelsList().value(ch)); + Q_ASSERT(ch != NULL); QString str; @@ -240,19 +255,41 @@ void EditMode::refreshChannelList() item->setText(COL_NAME, ch->name()); item->setIcon(COL_NAME, ch->getIcon()); item->setData(COL_NAME, PROP_PTR, (qulonglong) ch); + + QStringList comboList; + + comboList << "-"; + + for (int index = 0; index < m_mode->channels().size(); index++) + { + QLCChannel *currentChannel = m_mode->channels().at(index); + comboList << QString::number(index) + " - " + currentChannel->name(); + } + + QComboBox *comboBox = new QComboBox(this); + comboBox->addItems(comboList); + + if (actsOnChannelIndex >= 0) + comboBox->setCurrentIndex(actsOnChannelIndex + 1); + else + comboBox->setCurrentIndex(0); + + m_channelList->setItemWidget(item, COL_ACTS_ON, comboBox); + + connect(comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setActsOnChannel(int))); } m_channelList->header()->resizeSections(QHeaderView::ResizeToContents); } QLCChannel* EditMode::currentChannel() { - QTreeWidgetItem* item; - QLCChannel* ch = NULL; + QTreeWidgetItem *item; + QLCChannel *ch = NULL; // Convert the string-form ulong to a QLCChannel pointer and return it item = m_channelList->currentItem(); if (item != NULL) - ch = (QLCChannel*) item->data(COL_NAME, PROP_PTR).toULongLong(); + ch = (QLCChannel*)item->data(COL_NAME, PROP_PTR).toULongLong(); return ch; } @@ -272,6 +309,18 @@ void EditMode::selectChannel(const QString &name) } } +void EditMode::setActsOnChannel(int index) +{ + int channelNumber = index - 1; + + QLCChannel *actsOnChannel = NULL; + + if (channelNumber >= 0) + actsOnChannel = m_mode->channels().at(channelNumber); + + slotActsOnChannelChanged(actsOnChannel); +} + /**************************************************************************** * Heads page ****************************************************************************/ @@ -288,7 +337,7 @@ void EditMode::slotAddHeadClicked() void EditMode::slotRemoveHeadClicked() { - QTreeWidgetItem* item = m_headList->currentItem(); + QTreeWidgetItem *item = m_headList->currentItem(); if (item == NULL) return; @@ -299,7 +348,7 @@ void EditMode::slotRemoveHeadClicked() void EditMode::slotEditHeadClicked() { - QTreeWidgetItem* item = m_headList->currentItem(); + QTreeWidgetItem *item = m_headList->currentItem(); if (item == NULL) return; @@ -314,7 +363,7 @@ void EditMode::slotEditHeadClicked() void EditMode::slotRaiseHeadClicked() { - QTreeWidgetItem* item = m_headList->currentItem(); + QTreeWidgetItem *item = m_headList->currentItem(); if (item == NULL) return; @@ -334,7 +383,7 @@ void EditMode::slotRaiseHeadClicked() void EditMode::slotLowerHeadClicked() { - QTreeWidgetItem* item = m_headList->currentItem(); + QTreeWidgetItem *item = m_headList->currentItem(); if (item == NULL) return; @@ -358,26 +407,24 @@ void EditMode::refreshHeadList() for (int i = 0; i < m_mode->heads().size(); i++) { - QTreeWidgetItem* item = new QTreeWidgetItem(m_headList); - + QTreeWidgetItem *item = new QTreeWidgetItem(m_headList); QLCFixtureHead head = m_mode->heads().at(i); - QList channels(head.channels()); - std::sort(channels.begin(), channels.end()); - QString summary; + std::sort(channels.begin(), channels.end()); + QListIterator it(channels); while (it.hasNext() == true) { quint32 chnum = it.next(); - const QLCChannel* ch = m_mode->channel(chnum); - QTreeWidgetItem* chitem = new QTreeWidgetItem(item); + const QLCChannel *ch = m_mode->channel(chnum); + QTreeWidgetItem *chitem = new QTreeWidgetItem(item); if (ch != NULL) chitem->setText(0, QString("%1: %2").arg(chnum + 1).arg(ch->name())); else chitem->setText(0, QString("%1: INVALID!")); - chitem->setFlags(0); // Disable channel selection inside heads + chitem->setFlags(Qt::NoItemFlags); // Disable channel selection inside heads summary += QString::number(chnum + 1); if (it.hasNext() == true) @@ -391,7 +438,7 @@ void EditMode::refreshHeadList() QLCFixtureHead EditMode::currentHead() { - QTreeWidgetItem* item = m_headList->currentItem(); + QTreeWidgetItem *item = m_headList->currentItem(); if (item == NULL) return QLCFixtureHead(); @@ -404,7 +451,7 @@ void EditMode::selectHead(int index) if (index >= m_headList->topLevelItemCount()) return; - QTreeWidgetItem* item = m_headList->topLevelItem(index); + QTreeWidgetItem *item = m_headList->topLevelItem(index); m_headList->setCurrentItem(item); } diff --git a/fixtureeditor/editmode.h b/fixtureeditor/editmode.h index cf3f8732cf..45a581893d 100644 --- a/fixtureeditor/editmode.h +++ b/fixtureeditor/editmode.h @@ -71,12 +71,16 @@ protected slots: void slotRemoveChannelClicked(); void slotRaiseChannelClicked(); void slotLowerChannelClicked(); + void slotActsOnChannelChanged(QLCChannel *); protected: void refreshChannelList(); QLCChannel *currentChannel(); void selectChannel(const QString &name); +private slots: + void setActsOnChannel(int index); + /************************************************************************ * Heads page ************************************************************************/ diff --git a/fixtureeditor/editmode.ui b/fixtureeditor/editmode.ui index 885dc4d699..d63564f532 100644 --- a/fixtureeditor/editmode.ui +++ b/fixtureeditor/editmode.ui @@ -53,49 +53,17 @@ Channels - - - - true - - - - 24 - 24 - - - - false - - - false - - - true - - - - Number - - - - - Name - - - - - - + + - Add channel(s) to this mode + Remove the selected channel ... - :/edit_add.png:/edit_add.png + :/edit_remove.png:/edit_remove.png @@ -105,17 +73,17 @@ - - + + - Remove the selected channel + Add channel(s) to this mode ... - :/edit_remove.png:/edit_remove.png + :/edit_add.png:/edit_add.png @@ -165,6 +133,46 @@ + + + + true + + + + 24 + 24 + + + + false + + + false + + + true + + + 3 + + + + Number + + + + + Name + + + + + Acts On + + + + diff --git a/fixtureeditor/fixtureeditor.cpp b/fixtureeditor/fixtureeditor.cpp index 20d675fd35..297a25383d 100644 --- a/fixtureeditor/fixtureeditor.cpp +++ b/fixtureeditor/fixtureeditor.cpp @@ -512,6 +512,20 @@ void QLCFixtureEditor::slotRemoveChannel() m_channelList->setCurrentItem(next); setModified(); + + // Remove channel from modes and set nullptr for acts on channels + for (int i = 0; i < m_modeList->topLevelItemCount(); ++i) + { + QTreeWidgetItem *item = m_modeList->topLevelItem(i); + + QLCFixtureMode *mode = (QLCFixtureMode*)item->data(MODE_COL_NAME, PROP_PTR).toULongLong(); + mode->actsOnChannelsList().remove(channel); + + QLCChannel *mainChannel = mode->actsOnChannelsList().value(channel); + mode->actsOnChannelsList()[mainChannel] = NULL; + } + + refreshModeList(); } } @@ -644,7 +658,7 @@ void QLCFixtureEditor::updateChannelItem(const QLCChannel *channel, QTreeWidgetI capitem->setText(CH_COL_NAME, QString("[%1-%2]: %3").arg(cap->min()) .arg(cap->max()).arg(cap->name())); - capitem->setFlags(0); /* No selection etc. */ + capitem->setFlags(Qt::NoItemFlags); /* No selection etc. */ } } @@ -988,7 +1002,7 @@ void QLCFixtureEditor::updateModeItem(const QLCFixtureMode *mode, chitem->setText(MODE_COL_NAME, ch->name()); chitem->setIcon(MODE_COL_NAME, ch->getIcon()); chitem->setText(MODE_COL_CHS, QString("%1").arg(i + 1)); - chitem->setFlags(0); /* No selection etc. */ + chitem->setFlags(Qt::NoItemFlags); /* No selection etc. */ } } diff --git a/fixtureeditor/main.cpp b/fixtureeditor/main.cpp index 83aea48201..38740f0026 100644 --- a/fixtureeditor/main.cpp +++ b/fixtureeditor/main.cpp @@ -45,6 +45,10 @@ QString fixture; QString locale; } +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) +#define endl Qt::endl +#endif + /** * Prints the application version */ diff --git a/main/main.cpp b/main/main.cpp index cf45ef7159..a2ed3acbde 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -149,6 +149,10 @@ void qlcMessageHandler(QtMsgType type, const QMessageLogContext &context, const } #endif +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) +#define endl Qt::endl +#endif + /** * Prints the application version */ diff --git a/platforms/ios/Info.plist b/platforms/ios/Info.plist index 0a0f550ac8..7b2a5bfb1a 100644 --- a/platforms/ios/Info.plist +++ b/platforms/ios/Info.plist @@ -6,8 +6,6 @@ qlcplus.icns CFBundlePackageType APPL - CFBundleGetInfoString - Q Light Controller Plus CFBundleSignature ???? CFBundleExecutable diff --git a/platforms/linux/org.qlcplus.QLCPlus.appdata.xml b/platforms/linux/org.qlcplus.QLCPlus.appdata.xml index f0a2155710..c8014092ac 100644 --- a/platforms/linux/org.qlcplus.QLCPlus.appdata.xml +++ b/platforms/linux/org.qlcplus.QLCPlus.appdata.xml @@ -79,8 +79,9 @@ Show Manager - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues + qlcplus.desktop qlcplus diff --git a/platforms/linux/org.qlcplus.QLCPlusFixtureEditor.appdata.xml b/platforms/linux/org.qlcplus.QLCPlusFixtureEditor.appdata.xml index 8279273600..7a492be16b 100644 --- a/platforms/linux/org.qlcplus.QLCPlusFixtureEditor.appdata.xml +++ b/platforms/linux/org.qlcplus.QLCPlusFixtureEditor.appdata.xml @@ -41,8 +41,9 @@ Fixture Definition Editor - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues + qlcplus-fixtureeditor.desktop qlcplus-fixtureeditor diff --git a/platforms/macos/Info.plist b/platforms/macos/Info.plist index 0b0214d177..f5d8f90612 100644 --- a/platforms/macos/Info.plist +++ b/platforms/macos/Info.plist @@ -8,8 +8,11 @@ CFBundlePackageType APPL - CFBundleGetInfoString - QLC+ http://www.qlcplus.org/ + CFBundleShortVersionString + __QLC_VERSION__ + + CFBundleVersion + 1 CFBundleSignature ???? @@ -25,7 +28,7 @@ NSHighResolutionCapable True - + NSMicrophoneUsageDescription Process incoming audio diff --git a/platforms/macos/Info.plist.qmlui b/platforms/macos/Info.plist.qmlui index 91e2030983..77f3e5367e 100644 --- a/platforms/macos/Info.plist.qmlui +++ b/platforms/macos/Info.plist.qmlui @@ -8,8 +8,11 @@ CFBundlePackageType APPL - CFBundleGetInfoString - QLC+ http://www.qlcplus.org/ + CFBundleShortVersionString + __QLC_VERSION__ + + CFBundleVersion + 1 CFBundleSignature ???? @@ -25,7 +28,7 @@ NSHighResolutionCapable True - + NSMicrophoneUsageDescription Process incoming audio diff --git a/platforms/macos/macos.pro b/platforms/macos/macos.pro index 4ade0a951a..bbb5c6914a 100644 --- a/platforms/macos/macos.pro +++ b/platforms/macos/macos.pro @@ -286,10 +286,10 @@ icons.files += ../../resources/icons/qlcplus.icns qmlui: { plist.path = $$INSTALLROOT - plist.commands = cp Info.plist.qmlui $$INSTALLROOT/Info.plist + plist.commands = sed \'s/__QLC_VERSION__/$$APPVERSION/g\' Info.plist.qmlui > $$INSTALLROOT/Info.plist } else { plist.path = $$INSTALLROOT - plist.files += Info.plist + plist.commands = sed \'s/__QLC_VERSION__/$$APPVERSION/g\' Info.plist > $$INSTALLROOT/Info.plist } INSTALLS += icons plist diff --git a/platforms/windows/qlcplus4Qt4.nsi b/platforms/windows/qlcplus4Qt4.nsi index f50b3b2aed..e3009b236e 100644 --- a/platforms/windows/qlcplus4Qt4.nsi +++ b/platforms/windows/qlcplus4Qt4.nsi @@ -15,7 +15,7 @@ ;-------------------------------- ;General Name "Q Light Controller Plus" -OutFile "QLC+_4.12.3.exe" +OutFile "QLC+_4.12.4.exe" InstallDir C:\QLC+ InstallDirRegKey HKCU "Software\qlcplus" "Install_Dir" RequestExecutionLevel user diff --git a/platforms/windows/qlcplus4Qt5.nsi b/platforms/windows/qlcplus4Qt5.nsi index 5a943840bd..0dd6659420 100644 --- a/platforms/windows/qlcplus4Qt5.nsi +++ b/platforms/windows/qlcplus4Qt5.nsi @@ -15,7 +15,7 @@ ;-------------------------------- ;General Name "Q Light Controller Plus" -OutFile "QLC+_4.12.3.exe" +OutFile "QLC+_4.12.4.exe" InstallDir C:\QLC+ InstallDirRegKey HKCU "Software\qlcplus" "Install_Dir" RequestExecutionLevel user diff --git a/platforms/windows/qlcplus5Qt5.nsi b/platforms/windows/qlcplus5Qt5.nsi index bef6f5ce47..e2ecf445c3 100644 --- a/platforms/windows/qlcplus5Qt5.nsi +++ b/platforms/windows/qlcplus5Qt5.nsi @@ -15,7 +15,7 @@ ;-------------------------------- ;General Name "Q Light Controller Plus" -OutFile "QLC+_5.0.0_alpha4.exe" +OutFile "QLC+_5.0.0_beta1.exe" InstallDir C:\QLC+5 InstallDirRegKey HKCU "Software\qlcplus" "Install_Dir" RequestExecutionLevel user diff --git a/platforms/windows/windows.pro b/platforms/windows/windows.pro index 79c56eaa08..0a2e809248 100644 --- a/platforms/windows/windows.pro +++ b/platforms/windows/windows.pro @@ -13,125 +13,124 @@ debug: QT_D="d" # Qt Libraries qtlibs.path = $$INSTALLROOT/$$LIBSDIR -lessThan(QT_MAJOR_VERSION, 5) { - qtlibs.files = $$QT_LIBS_PATH/QtCore4$${QT_D}.dll \ - $$QT_LIBS_PATH/QtGui4$${QT_D}.dll \ - $$QT_LIBS_PATH/QtScript4$${QT_D}.dll \ - $$QT_LIBS_PATH/QtNetwork4$${QT_D}.dll -} else { - qtlibs.files = $$QT_LIBS_PATH/Qt5Core$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Script$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Network$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Gui$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Svg$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Widgets$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5OpenGL$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Multimedia$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5MultimediaWidgets$${QT_D}.dll - - qmlui: { - qtlibs.files += $$QT_LIBS_PATH/Qt5Qml$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Quick$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5QuickControls2$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5QuickTemplates2$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Sql$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DCore$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DExtras$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DInput$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DLogic$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DAnimation$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DQuick$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DQuickExtras$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DQuickInput$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DQuickAnimation$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DQuickRender$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt53DRender$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Concurrent$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5Gamepad$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5PrintSupport$${QT_D}.dll \ - $$QT_LIBS_PATH/Qt5MultimediaQuick$${QT_D}.dll - } - - # Qt library dependencies - qt5deps.path = $$INSTALLROOT/$$LIBSDIR - - qt5deps.files += $$SYS_LIBS_PATH/libbz2-1.dll \ - $$SYS_LIBS_PATH/libfreetype-6.dll \ - $$SYS_LIBS_PATH/libglib-2.0-0.dll \ - $$SYS_LIBS_PATH/libgraphite2.dll \ - $$SYS_LIBS_PATH/libharfbuzz-0.dll \ - $$SYS_LIBS_PATH/libiconv-2.dll \ - $$SYS_LIBS_PATH/libintl-8.dll \ - $$SYS_LIBS_PATH/libpcre-1.dll \ - $$SYS_LIBS_PATH/libpng16-16.dll \ - $$SYS_LIBS_PATH/libjpeg-8.dll \ - $$SYS_LIBS_PATH/libspeex-1.dll \ - $$SYS_LIBS_PATH/zlib1.dll - - qmlui: { - qt5deps.files += $$SYS_LIBS_PATH/libassimp.dll \ - $$SYS_LIBS_PATH/libminizip-1.dll - } - INSTALLS += qt5deps +qtlibs.files = $$QT_LIBS_PATH/Qt5Core$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Script$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Network$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Gui$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Svg$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Widgets$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5OpenGL$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Multimedia$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5MultimediaWidgets$${QT_D}.dll + +qmlui: { + qtlibs.files += $$QT_LIBS_PATH/Qt5Qml$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Quick$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5QuickControls2$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5QuickTemplates2$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Sql$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DCore$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DExtras$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DInput$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DLogic$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DAnimation$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DQuick$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DQuickExtras$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DQuickInput$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DQuickAnimation$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DQuickRender$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt53DRender$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Concurrent$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5Gamepad$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5PrintSupport$${QT_D}.dll \ + $$QT_LIBS_PATH/Qt5MultimediaQuick$${QT_D}.dll +} + +# Qt library dependencies +qt5deps.path = $$INSTALLROOT/$$LIBSDIR + +qt5deps.files += $$SYS_LIBS_PATH/libbz2-1.dll \ + $$SYS_LIBS_PATH/libfreetype-6.dll \ + $$SYS_LIBS_PATH/libglib-2.0-0.dll \ + $$SYS_LIBS_PATH/libgraphite2.dll \ + $$SYS_LIBS_PATH/libharfbuzz-0.dll \ + $$SYS_LIBS_PATH/libdouble-conversion.dll \ + $$SYS_LIBS_PATH/libiconv-2.dll \ + $$SYS_LIBS_PATH/libintl-8.dll \ + $$SYS_LIBS_PATH/libpcre2-16-0.dll \ + $$SYS_LIBS_PATH/libpcre-1.dll \ + $$SYS_LIBS_PATH/libpng16-16.dll \ + $$SYS_LIBS_PATH/libjpeg-8.dll \ + $$SYS_LIBS_PATH/libspeex-1.dll \ + $$SYS_LIBS_PATH/libzstd.dll \ + $$SYS_LIBS_PATH/libbrotlidec.dll \ + $$SYS_LIBS_PATH/libbrotlicommon.dll \ + $$SYS_LIBS_PATH/zlib1.dll + +qmlui: { + qt5deps.files += $$SYS_LIBS_PATH/libassimp.dll \ + $$SYS_LIBS_PATH/libminizip-1.dll } +INSTALLS += qt5deps INSTALLS += qtlibs -greaterThan(QT_MAJOR_VERSION, 4) { - qtplatform.path = $$INSTALLROOT/$$LIBSDIR/platforms - qtplatform.files = $$QT_PLUGINS_PATH/platforms/qwindows$${QT_D}.dll - INSTALLS += qtplatform - - qtaudio.path = $$INSTALLROOT/$$LIBSDIR/audio - qtaudio.files = $$QT_PLUGINS_PATH/audio/qtaudio_windows$${QT_D}.dll - INSTALLS += qtaudio - - qtmedia.path = $$INSTALLROOT/$$LIBSDIR/mediaservice - qtmedia.files = $$QT_PLUGINS_PATH/mediaservice/dsengine$${QT_D}.dll \ - $$QT_PLUGINS_PATH/mediaservice/qtmedia_audioengine$${QT_D}.dll - INSTALLS += qtmedia - - qtimageformats.path = $$INSTALLROOT/$$LIBSDIR/imageformats - qtimageformats.files = $$QT_PLUGINS_PATH/imageformats/qgif$${QT_D}.dll \ - $$QT_PLUGINS_PATH/imageformats/qjpeg$${QT_D}.dll \ - $$QT_PLUGINS_PATH/imageformats/qsvg$${QT_D}.dll - INSTALLS += qtimageformats - - qmlui: { - - qtprintsupport.path = $$INSTALLROOT/$$LIBSDIR/printsupport - qtprintsupport.files = $$QT_PLUGINS_PATH/printsupport/windowsprintersupport$${QT_D}.dll - INSTALLS += qtprintsupport - - geometryloaders.path = $$INSTALLROOT/$$LIBSDIR/geometryloaders - geometryloaders.files = $$QT_PLUGINS_PATH/geometryloaders/defaultgeometryloader$${QT_D}.dll - INSTALLS += geometryloaders - - sceneparsers.path = $$INSTALLROOT/$$LIBSDIR/sceneparsers - sceneparsers.files = $$QT_PLUGINS_PATH/sceneparsers/assimpsceneimport$${QT_D}.dll - INSTALLS += sceneparsers - - qmldeps.path = $$INSTALLROOT/$$LIBSDIR - qmldeps.files += $$QT_QML_PATH/Qt \ - $$QT_QML_PATH/QtQml \ - $$QT_QML_PATH/QtQuick \ - $$QT_QML_PATH/QtQuick.2 \ - $$QT_QML_PATH/Qt3D \ - $$QT_QML_PATH/QtMultimedia - - INSTALLS += qmldeps - - qmlpostinstall.path = $$INSTALLROOT/$$LIBSDIR - qmlpostinstall.commands = cd $$INSTALLROOT/$$LIBSDIR && \ - find . -name plugins.qmltypes -type f -delete && \ - find . -name *.qmlc -type f -delete && \ - rm -rf Qt/WebSockets Qt/labs/location QtQml/RemoteObjects \ - rm -rf QtQuick/Extras QtQuick/Particles.2 QtQuick/XmlListModel \ - rm -rf QtQuick/Controls.2/designer QtQuick/Controls.2/Material \ - rm -rf QtQuick/Controls.2/Universal QtQuick/Controls.2/Fusion \ - rm -rf QtQuick/Controls.2/Imagine QtQuick/Scene2D - INSTALLS += qmlpostinstall - } +qtplatform.path = $$INSTALLROOT/$$LIBSDIR/platforms +qtplatform.files = $$QT_PLUGINS_PATH/platforms/qwindows$${QT_D}.dll +INSTALLS += qtplatform + +qtstyles.path = $$INSTALLROOT/$$LIBSDIR/styles +qtstyles.files = $$QT_PLUGINS_PATH/styles/qwindowsvistastyle$${QT_D}.dll +INSTALLS += qtstyles + +qtaudio.path = $$INSTALLROOT/$$LIBSDIR/audio +qtaudio.files = $$QT_PLUGINS_PATH/audio/qtaudio_windows$${QT_D}.dll +INSTALLS += qtaudio + +qtmedia.path = $$INSTALLROOT/$$LIBSDIR/mediaservice +qtmedia.files = $$QT_PLUGINS_PATH/mediaservice/dsengine$${QT_D}.dll \ + $$QT_PLUGINS_PATH/mediaservice/qtmedia_audioengine$${QT_D}.dll +INSTALLS += qtmedia + +qtimageformats.path = $$INSTALLROOT/$$LIBSDIR/imageformats +qtimageformats.files = $$QT_PLUGINS_PATH/imageformats/qgif$${QT_D}.dll \ + $$QT_PLUGINS_PATH/imageformats/qjpeg$${QT_D}.dll \ + $$QT_PLUGINS_PATH/imageformats/qsvg$${QT_D}.dll +INSTALLS += qtimageformats + +qmlui: { + qtprintsupport.path = $$INSTALLROOT/$$LIBSDIR/printsupport + qtprintsupport.files = $$QT_PLUGINS_PATH/printsupport/windowsprintersupport$${QT_D}.dll + INSTALLS += qtprintsupport + + geometryloaders.path = $$INSTALLROOT/$$LIBSDIR/geometryloaders + geometryloaders.files = $$QT_PLUGINS_PATH/geometryloaders/defaultgeometryloader$${QT_D}.dll + INSTALLS += geometryloaders + + sceneparsers.path = $$INSTALLROOT/$$LIBSDIR/sceneparsers + sceneparsers.files = $$QT_PLUGINS_PATH/sceneparsers/assimpsceneimport$${QT_D}.dll + INSTALLS += sceneparsers + + qmldeps.path = $$INSTALLROOT/$$LIBSDIR + qmldeps.files += $$QT_QML_PATH/Qt \ + $$QT_QML_PATH/QtQml \ + $$QT_QML_PATH/QtQuick \ + $$QT_QML_PATH/QtQuick.2 \ + $$QT_QML_PATH/Qt3D \ + $$QT_QML_PATH/QtMultimedia + + INSTALLS += qmldeps + + qmlpostinstall.path = $$INSTALLROOT/$$LIBSDIR + qmlpostinstall.commands = cd $$INSTALLROOT/$$LIBSDIR && \ + find . -name plugins.qmltypes -type f -delete && \ + find . -name *.qmlc -type f -delete && \ + rm -rf Qt/WebSockets Qt/labs/location QtQml/RemoteObjects \ + rm -rf QtQuick/Extras QtQuick/Particles.2 QtQuick/XmlListModel \ + rm -rf QtQuick/Controls.2/designer QtQuick/Controls.2/Material \ + rm -rf QtQuick/Controls.2/Universal QtQuick/Controls.2/Fusion \ + rm -rf QtQuick/Controls.2/Imagine QtQuick/Scene2D + INSTALLS += qmlpostinstall } # MSYS2 libraries @@ -180,14 +179,10 @@ INSTALLS += audio # NullSoft installer files nsis.path = $$INSTALLROOT/$$DATADIR -lessThan(QT_MAJOR_VERSION, 5) { - nsis.files = qlcplus4Qt4.nsi +qmlui: { + nsis.files = qlcplus5Qt5.nsi } else { - qmlui: { - nsis.files = qlcplus5Qt5.nsi - } else { - nsis.files = qlcplus4Qt5.nsi - } + nsis.files = qlcplus4Qt5.nsi } INSTALLS += nsis diff --git a/plugins/E1.31/e131controller.cpp b/plugins/E1.31/e131controller.cpp index 1ea7adfcd6..b24032ed1c 100644 --- a/plugins/E1.31/e131controller.cpp +++ b/plugins/E1.31/e131controller.cpp @@ -34,7 +34,7 @@ E131Controller::E131Controller(QNetworkInterface const& interface, QNetworkAddre , m_packetReceived(0) , m_line(line) , m_UdpSocket(new QUdpSocket(this)) - , m_packetizer(new E131Packetizer()) + , m_packetizer(new E131Packetizer(interface.hardwareAddress())) { qDebug() << Q_FUNC_INFO; m_UdpSocket->bind(m_ipAddr, 0); diff --git a/plugins/E1.31/e131packetizer.cpp b/plugins/E1.31/e131packetizer.cpp index 2d83451910..17512c1710 100644 --- a/plugins/E1.31/e131packetizer.cpp +++ b/plugins/E1.31/e131packetizer.cpp @@ -22,7 +22,7 @@ #include #include -E131Packetizer::E131Packetizer() +E131Packetizer::E131Packetizer(QString MACaddr) { // Initialize a commond header. m_commonHeader.clear(); @@ -70,12 +70,13 @@ E131Packetizer::E131Packetizer() m_commonHeader.append((char)0xE2); m_commonHeader.append((char)0x99); m_commonHeader.append((char)0x19); - m_commonHeader.append((char)0x31); - m_commonHeader.append((char)0x7A); - m_commonHeader.append((char)0x07); - m_commonHeader.append((char)0xC1); - m_commonHeader.append((char)0x00); - m_commonHeader.append((char)0x52); + + QStringList MAC = MACaddr.split(":"); + foreach (QString couple, MAC) + { + bool ok; + m_commonHeader.append((char)couple.toInt(&ok, 16)); + } // empty flags & PDU length (bytes 38-39) m_commonHeader.append('\0'); @@ -89,7 +90,7 @@ E131Packetizer::E131Packetizer() // User Assigned Name of source !!must be 64 bytes long!! QString sourceName("Q Light Controller Plus - E1.31"); - m_commonHeader.append(sourceName); + m_commonHeader.append(sourceName.toUtf8()); for (int i = 0; i < 64 - sourceName.length(); i++) m_commonHeader.append((char)0x00); diff --git a/plugins/E1.31/e131packetizer.h b/plugins/E1.31/e131packetizer.h index bfdbabce68..0785a7eb16 100644 --- a/plugins/E1.31/e131packetizer.h +++ b/plugins/E1.31/e131packetizer.h @@ -33,7 +33,7 @@ class E131Packetizer * Initialization *********************************************************************/ public: - E131Packetizer(); + E131Packetizer(QString MACaddr); ~E131Packetizer(); public: diff --git a/plugins/E1.31/org.qlcplus.QLCPlus.e131.metainfo.xml b/plugins/E1.31/org.qlcplus.QLCPlus.e131.metainfo.xml index 6b574a8acb..ac81d4cc1b 100644 --- a/plugins/E1.31/org.qlcplus.QLCPlus.e131.metainfo.xml +++ b/plugins/E1.31/org.qlcplus.QLCPlus.e131.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus E1.31 E1.31 plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[e1.31]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/artnet/src/org.qlcplus.QLCPlus.artnet.metainfo.xml b/plugins/artnet/src/org.qlcplus.QLCPlus.artnet.metainfo.xml index c5a8c115c9..3c2969c456 100644 --- a/plugins/artnet/src/org.qlcplus.QLCPlus.artnet.metainfo.xml +++ b/plugins/artnet/src/org.qlcplus.QLCPlus.artnet.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Artnet ArtNet plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[artnet]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/dmx4linux/org.qlcplus.QLCPlus.dmx4linux.metainfo.xml b/plugins/dmx4linux/org.qlcplus.QLCPlus.dmx4linux.metainfo.xml index da1ed046f5..3498208fcb 100644 --- a/plugins/dmx4linux/org.qlcplus.QLCPlus.dmx4linux.metainfo.xml +++ b/plugins/dmx4linux/org.qlcplus.QLCPlus.dmx4linux.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus DMX4Linux DMX4Linux plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[DMX4Linux]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/dmxusb/src/nanodmx.cpp b/plugins/dmxusb/src/nanodmx.cpp index 05761e03b7..888e43e604 100644 --- a/plugins/dmxusb/src/nanodmx.cpp +++ b/plugins/dmxusb/src/nanodmx.cpp @@ -78,7 +78,7 @@ bool NanoDMX::sendChannelValue(int channel, uchar value) { QByteArray chanMsg; QString msg; - chanMsg.append(msg.asprintf("C%03dL%03d", channel, value)); + chanMsg.append(msg.asprintf("C%03dL%03d", channel, value).toUtf8()); return interface()->write(chanMsg); } diff --git a/plugins/dmxusb/src/org.qlcplus.QLCPlus.dmxusb.metainfo.xml b/plugins/dmxusb/src/org.qlcplus.QLCPlus.dmxusb.metainfo.xml index 116fad3b2a..d1c2c37717 100644 --- a/plugins/dmxusb/src/org.qlcplus.QLCPlus.dmxusb.metainfo.xml +++ b/plugins/dmxusb/src/org.qlcplus.QLCPlus.dmxusb.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus DMXUSB DMX USB plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[DMXUSB]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/dmxusb/src/stageprofi.cpp b/plugins/dmxusb/src/stageprofi.cpp index 482c0d30dd..ef50424ae6 100644 --- a/plugins/dmxusb/src/stageprofi.cpp +++ b/plugins/dmxusb/src/stageprofi.cpp @@ -71,7 +71,7 @@ bool Stageprofi::sendChannelValue(int channel, uchar value) { QByteArray chanMsg; QString msg; - chanMsg.append(msg.asprintf("C%03dL%03d", channel, value)); + chanMsg.append(msg.asprintf("C%03dL%03d", channel, value).toUtf8()); return interface()->write(chanMsg); } diff --git a/plugins/enttecwing/src/org.qlcplus.QLCPlus.enttecwing.metainfo.xml b/plugins/enttecwing/src/org.qlcplus.QLCPlus.enttecwing.metainfo.xml index a15658a6a9..be1f42c9f0 100644 --- a/plugins/enttecwing/src/org.qlcplus.QLCPlus.enttecwing.metainfo.xml +++ b/plugins/enttecwing/src/org.qlcplus.QLCPlus.enttecwing.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Enttec Wing Enttec Wing plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[enttecwing]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/hid/linux/org.qlcplus.QLCPlus.hid.metainfo.xml b/plugins/hid/linux/org.qlcplus.QLCPlus.hid.metainfo.xml index d28bc60993..4aa2f6ae10 100644 --- a/plugins/hid/linux/org.qlcplus.QLCPlus.hid.metainfo.xml +++ b/plugins/hid/linux/org.qlcplus.QLCPlus.hid.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Hid HID plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[hid]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/loopback/src/org.qlcplus.QLCPlus.loopback.metainfo.xml b/plugins/loopback/src/org.qlcplus.QLCPlus.loopback.metainfo.xml index cb1ab00127..513b325f5e 100644 --- a/plugins/loopback/src/org.qlcplus.QLCPlus.loopback.metainfo.xml +++ b/plugins/loopback/src/org.qlcplus.QLCPlus.loopback.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Loopback Loopback plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[e1.31]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/midi/src/org.qlcplus.QLCPlus.midi.metainfo.xml b/plugins/midi/src/org.qlcplus.QLCPlus.midi.metainfo.xml index 8d176dcc41..ed3d525571 100644 --- a/plugins/midi/src/org.qlcplus.QLCPlus.midi.metainfo.xml +++ b/plugins/midi/src/org.qlcplus.QLCPlus.midi.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Midi MIDI plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[Midi]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/ola/org.qlcplus.QLCPlus.ola.metainfo.xml b/plugins/ola/org.qlcplus.QLCPlus.ola.metainfo.xml index 0323c5e2e4..28b3f48b45 100644 --- a/plugins/ola/org.qlcplus.QLCPlus.ola.metainfo.xml +++ b/plugins/ola/org.qlcplus.QLCPlus.ola.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus OLA OLA plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[OLA]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/os2l/org.qlcplus.QLCPlus.os2l.metainfo.xml b/plugins/os2l/org.qlcplus.QLCPlus.os2l.metainfo.xml index 4a802238ab..5a7cb304b9 100644 --- a/plugins/os2l/org.qlcplus.QLCPlus.os2l.metainfo.xml +++ b/plugins/os2l/org.qlcplus.QLCPlus.os2l.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus OS2L OS2L plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[OS2L]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/osc/org.qlcplus.QLCPlus.osc.metainfo.xml b/plugins/osc/org.qlcplus.QLCPlus.osc.metainfo.xml index c3f09865f2..fce3045030 100644 --- a/plugins/osc/org.qlcplus.QLCPlus.osc.metainfo.xml +++ b/plugins/osc/org.qlcplus.QLCPlus.osc.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus OSC OSC plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[OSC]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/osc/oscpacketizer.cpp b/plugins/osc/oscpacketizer.cpp index a3cd6be0c0..5deb9926bf 100644 --- a/plugins/osc/oscpacketizer.cpp +++ b/plugins/osc/oscpacketizer.cpp @@ -38,7 +38,7 @@ void OSCPacketizer::setupOSCDmx(QByteArray &data, quint32 universe, quint32 chan { data.clear(); QString path = QString("/%1/dmx/%2").arg(universe).arg(channel); - data.append(path); + data.append(path.toUtf8()); // add trailing zeros to reach a multiple of 4 int zeroNumber = 4 - (path.length() % 4); @@ -65,14 +65,14 @@ void OSCPacketizer::setupOSCGeneric(QByteArray &data, QString &path, QString typ return; } - data.append(path); + data.append(path.toUtf8()); // add trailing zeros to reach a multiple of 4 int zeroNumber = 4 - (path.length() % 4); if (zeroNumber > 0) data.append(QByteArray(zeroNumber, 0x00)); data.append(","); - data.append(types); + data.append(types.toUtf8()); zeroNumber = 4 - ((types.length() + 1) % 4); if (zeroNumber > 0) diff --git a/plugins/peperoni/unix/org.qlcplus.QLCPlus.peperoni.metainfo.xml b/plugins/peperoni/unix/org.qlcplus.QLCPlus.peperoni.metainfo.xml index 2fe5d0d2cc..d093804ff1 100644 --- a/plugins/peperoni/unix/org.qlcplus.QLCPlus.peperoni.metainfo.xml +++ b/plugins/peperoni/unix/org.qlcplus.QLCPlus.peperoni.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus Peperoni Peperoni plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[peperoni]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/peperoni/win32/peperoni/usbdmx-dynamic.cpp b/plugins/peperoni/win32/peperoni/usbdmx-dynamic.cpp index 7353623d77..2355d94290 100644 --- a/plugins/peperoni/win32/peperoni/usbdmx-dynamic.cpp +++ b/plugins/peperoni/win32/peperoni/usbdmx-dynamic.cpp @@ -56,44 +56,44 @@ struct usbdmx_functions *usbdmx_init(VOID) return NULL; // load all functions of the DLL - if ((usbdmx.version = (USBDMX_TYPE_VERSION) GetProcAddress(hLib, ("usbdmx_version"))) && - (usbdmx.open = (USBDMX_TYPE_OPEN) GetProcAddress(hLib, ("usbdmx_open"))) && - (usbdmx.close = (USBDMX_TYPE_CLOSE) GetProcAddress(hLib, ("usbdmx_close"))) && - (usbdmx.device_id = (USBDMX_TYPE_DEVICE_ID) GetProcAddress(hLib, ("usbdmx_device_id"))) && - (usbdmx.is_xswitch = (USBDMX_TYPE_IS_XSWITCH) GetProcAddress(hLib, ("usbdmx_is_xswitch"))) && - (usbdmx.is_rodin1 = (USBDMX_TYPE_IS_RODIN1) GetProcAddress(hLib, ("usbdmx_is_rodin1"))) && - (usbdmx.is_rodin2 = (USBDMX_TYPE_IS_RODIN2) GetProcAddress(hLib, ("usbdmx_is_rodin2"))) && - (usbdmx.is_rodint = (USBDMX_TYPE_IS_RODINT) GetProcAddress(hLib, ("usbdmx_is_rodint"))) && - (usbdmx.is_usbdmx21 = (USBDMX_TYPE_IS_USBDMX21) GetProcAddress(hLib, ("usbdmx_is_usbdmx21"))) && - (usbdmx.product_get = (USBDMX_TYPE_PRODUCT_GET) GetProcAddress(hLib, ("usbdmx_product_get"))) && - (usbdmx.device_version = (USBDMX_TYPE_DEVICE_VERSION) GetProcAddress(hLib, ("usbdmx_device_version"))) && - (usbdmx.tx = (USBDMX_TYPE_TX) GetProcAddress(hLib, ("usbdmx_tx"))) && - (usbdmx.rx = (USBDMX_TYPE_RX) GetProcAddress(hLib, ("usbdmx_rx"))) && - (usbdmx.tx_set = (USBDMX_TYPE_TX_SET) GetProcAddress(hLib, ("usbdmx_tx_set"))) && - (usbdmx.tx_set_blocking = (USBDMX_TYPE_TX_SET_BLOCKING) GetProcAddress(hLib, ("usbdmx_tx_set_blocking"))) && - (usbdmx.tx2_set = (USBDMX_TYPE_TX2_SET) GetProcAddress(hLib, ("usbdmx_tx2_set"))) && - (usbdmx.tx2_set_blocking= (USBDMX_TYPE_TX2_SET_BLOCKING)GetProcAddress(hLib, ("usbdmx_tx2_set_blocking"))) && - (usbdmx.tx_get = (USBDMX_TYPE_TX_GET) GetProcAddress(hLib, ("usbdmx_tx_get"))) && - (usbdmx.tx_get_blocking = (USBDMX_TYPE_TX_GET_BLOCKING) GetProcAddress(hLib, ("usbdmx_tx_get_blocking"))) && - (usbdmx.tx2_get = (USBDMX_TYPE_TX2_GET) GetProcAddress(hLib, ("usbdmx_tx2_get"))) && - (usbdmx.tx2_get_blocking= (USBDMX_TYPE_TX2_GET_BLOCKING)GetProcAddress(hLib, ("usbdmx_tx2_get_blocking"))) && - (usbdmx.rx_set = (USBDMX_TYPE_RX_SET) GetProcAddress(hLib, ("usbdmx_rx_set"))) && - (usbdmx.rx_set_blocking = (USBDMX_TYPE_RX_SET_BLOCKING) GetProcAddress(hLib, ("usbdmx_rx_set_blocking"))) && - (usbdmx.rx_get = (USBDMX_TYPE_RX_GET) GetProcAddress(hLib, ("usbdmx_rx_get"))) && - (usbdmx.rx_get_blocking = (USBDMX_TYPE_RX_GET_BLOCKING) GetProcAddress(hLib, ("usbdmx_rx_get_blocking"))) && - (usbdmx.tx_frames = (USBDMX_TYPE_TX_FRAMES) GetProcAddress(hLib, ("usbdmx_tx_frames"))) && - (usbdmx.rx_frames = (USBDMX_TYPE_RX_FRAMES) GetProcAddress(hLib, ("usbdmx_rx_frames"))) && - (usbdmx.tx_startcode_set= (USBDMX_TYPE_TX_STARTCODE_SET)GetProcAddress(hLib, ("usbdmx_tx_startcode_set"))) && - (usbdmx.tx_startcode_get= (USBDMX_TYPE_TX_STARTCODE_GET)GetProcAddress(hLib, ("usbdmx_tx_startcode_get"))) && - (usbdmx.rx_startcode_set= (USBDMX_TYPE_RX_STARTCODE_SET)GetProcAddress(hLib, ("usbdmx_rx_startcode_set"))) && - (usbdmx.rx_startcode_get= (USBDMX_TYPE_RX_STARTCODE_GET)GetProcAddress(hLib, ("usbdmx_rx_startcode_get"))) && - (usbdmx.tx_slots_set = (USBDMX_TYPE_TX_SLOTS_SET) GetProcAddress(hLib, ("usbdmx_tx_slots_set"))) && - (usbdmx.tx_slots_get = (USBDMX_TYPE_TX_SLOTS_GET) GetProcAddress(hLib, ("usbdmx_tx_slots_get"))) && - (usbdmx.rx_slots_get = (USBDMX_TYPE_RX_SLOTS_GET) GetProcAddress(hLib, ("usbdmx_rx_slots_get"))) && - (usbdmx.tx_timing_set = (USBDMX_TYPE_TX_TIMING_SET) GetProcAddress(hLib, ("usbdmx_tx_timing_set"))) && - (usbdmx.tx_timing_get = (USBDMX_TYPE_TX_TIMING_GET) GetProcAddress(hLib, ("usbdmx_tx_timing_get"))) && - (usbdmx.id_led_set = (USBDMX_TYPE_ID_LED_SET) GetProcAddress(hLib, ("usbdmx_id_led_set"))) && - (usbdmx.id_led_get = (USBDMX_TYPE_ID_LED_GET) GetProcAddress(hLib, ("usbdmx_id_led_get")))) + if ((usbdmx.version = (USBDMX_TYPE_VERSION) (void *)GetProcAddress(hLib, ("usbdmx_version"))) && + (usbdmx.open = (USBDMX_TYPE_OPEN) (void *)GetProcAddress(hLib, ("usbdmx_open"))) && + (usbdmx.close = (USBDMX_TYPE_CLOSE) (void *)GetProcAddress(hLib, ("usbdmx_close"))) && + (usbdmx.device_id = (USBDMX_TYPE_DEVICE_ID) (void *)GetProcAddress(hLib, ("usbdmx_device_id"))) && + (usbdmx.is_xswitch = (USBDMX_TYPE_IS_XSWITCH) (void *)GetProcAddress(hLib, ("usbdmx_is_xswitch"))) && + (usbdmx.is_rodin1 = (USBDMX_TYPE_IS_RODIN1) (void *)GetProcAddress(hLib, ("usbdmx_is_rodin1"))) && + (usbdmx.is_rodin2 = (USBDMX_TYPE_IS_RODIN2) (void *)GetProcAddress(hLib, ("usbdmx_is_rodin2"))) && + (usbdmx.is_rodint = (USBDMX_TYPE_IS_RODINT) (void *)GetProcAddress(hLib, ("usbdmx_is_rodint"))) && + (usbdmx.is_usbdmx21 = (USBDMX_TYPE_IS_USBDMX21) (void *)GetProcAddress(hLib, ("usbdmx_is_usbdmx21"))) && + (usbdmx.product_get = (USBDMX_TYPE_PRODUCT_GET) (void *)GetProcAddress(hLib, ("usbdmx_product_get"))) && + (usbdmx.device_version = (USBDMX_TYPE_DEVICE_VERSION) (void *)GetProcAddress(hLib, ("usbdmx_device_version"))) && + (usbdmx.tx = (USBDMX_TYPE_TX) (void *)GetProcAddress(hLib, ("usbdmx_tx"))) && + (usbdmx.rx = (USBDMX_TYPE_RX) (void *)GetProcAddress(hLib, ("usbdmx_rx"))) && + (usbdmx.tx_set = (USBDMX_TYPE_TX_SET) (void *)GetProcAddress(hLib, ("usbdmx_tx_set"))) && + (usbdmx.tx_set_blocking = (USBDMX_TYPE_TX_SET_BLOCKING) (void *)GetProcAddress(hLib, ("usbdmx_tx_set_blocking"))) && + (usbdmx.tx2_set = (USBDMX_TYPE_TX2_SET) (void *)GetProcAddress(hLib, ("usbdmx_tx2_set"))) && + (usbdmx.tx2_set_blocking= (USBDMX_TYPE_TX2_SET_BLOCKING)(void *)GetProcAddress(hLib, ("usbdmx_tx2_set_blocking"))) && + (usbdmx.tx_get = (USBDMX_TYPE_TX_GET) (void *)GetProcAddress(hLib, ("usbdmx_tx_get"))) && + (usbdmx.tx_get_blocking = (USBDMX_TYPE_TX_GET_BLOCKING) (void *)GetProcAddress(hLib, ("usbdmx_tx_get_blocking"))) && + (usbdmx.tx2_get = (USBDMX_TYPE_TX2_GET) (void *)GetProcAddress(hLib, ("usbdmx_tx2_get"))) && + (usbdmx.tx2_get_blocking= (USBDMX_TYPE_TX2_GET_BLOCKING)(void *)GetProcAddress(hLib, ("usbdmx_tx2_get_blocking"))) && + (usbdmx.rx_set = (USBDMX_TYPE_RX_SET) (void *)GetProcAddress(hLib, ("usbdmx_rx_set"))) && + (usbdmx.rx_set_blocking = (USBDMX_TYPE_RX_SET_BLOCKING) (void *)GetProcAddress(hLib, ("usbdmx_rx_set_blocking"))) && + (usbdmx.rx_get = (USBDMX_TYPE_RX_GET) (void *)GetProcAddress(hLib, ("usbdmx_rx_get"))) && + (usbdmx.rx_get_blocking = (USBDMX_TYPE_RX_GET_BLOCKING) (void *)GetProcAddress(hLib, ("usbdmx_rx_get_blocking"))) && + (usbdmx.tx_frames = (USBDMX_TYPE_TX_FRAMES) (void *)GetProcAddress(hLib, ("usbdmx_tx_frames"))) && + (usbdmx.rx_frames = (USBDMX_TYPE_RX_FRAMES) (void *)GetProcAddress(hLib, ("usbdmx_rx_frames"))) && + (usbdmx.tx_startcode_set= (USBDMX_TYPE_TX_STARTCODE_SET)(void *)GetProcAddress(hLib, ("usbdmx_tx_startcode_set"))) && + (usbdmx.tx_startcode_get= (USBDMX_TYPE_TX_STARTCODE_GET)(void *)GetProcAddress(hLib, ("usbdmx_tx_startcode_get"))) && + (usbdmx.rx_startcode_set= (USBDMX_TYPE_RX_STARTCODE_SET)(void *)GetProcAddress(hLib, ("usbdmx_rx_startcode_set"))) && + (usbdmx.rx_startcode_get= (USBDMX_TYPE_RX_STARTCODE_GET)(void *)GetProcAddress(hLib, ("usbdmx_rx_startcode_get"))) && + (usbdmx.tx_slots_set = (USBDMX_TYPE_TX_SLOTS_SET) (void *)GetProcAddress(hLib, ("usbdmx_tx_slots_set"))) && + (usbdmx.tx_slots_get = (USBDMX_TYPE_TX_SLOTS_GET) (void *)GetProcAddress(hLib, ("usbdmx_tx_slots_get"))) && + (usbdmx.rx_slots_get = (USBDMX_TYPE_RX_SLOTS_GET) (void *)GetProcAddress(hLib, ("usbdmx_rx_slots_get"))) && + (usbdmx.tx_timing_set = (USBDMX_TYPE_TX_TIMING_SET) (void *)GetProcAddress(hLib, ("usbdmx_tx_timing_set"))) && + (usbdmx.tx_timing_get = (USBDMX_TYPE_TX_TIMING_GET) (void *)GetProcAddress(hLib, ("usbdmx_tx_timing_get"))) && + (usbdmx.id_led_set = (USBDMX_TYPE_ID_LED_SET) (void *)GetProcAddress(hLib, ("usbdmx_id_led_set"))) && + (usbdmx.id_led_get = (USBDMX_TYPE_ID_LED_GET) (void *)GetProcAddress(hLib, ("usbdmx_id_led_get")))) { // Library loaded successfully return &usbdmx; diff --git a/plugins/spi/org.qlcplus.QLCPlus.spi.metainfo.xml b/plugins/spi/org.qlcplus.QLCPlus.spi.metainfo.xml index 841a2c457f..5b142f75fe 100644 --- a/plugins/spi/org.qlcplus.QLCPlus.spi.metainfo.xml +++ b/plugins/spi/org.qlcplus.QLCPlus.spi.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus SPI SPI plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[SPI]: CC-BY-SA-3.0 Apache-2.0 diff --git a/plugins/udmx/src/org.qlcplus.QLCPlus.udmx.metainfo.xml b/plugins/udmx/src/org.qlcplus.QLCPlus.udmx.metainfo.xml index 54466f6e8b..0aba6e4fa5 100644 --- a/plugins/udmx/src/org.qlcplus.QLCPlus.udmx.metainfo.xml +++ b/plugins/udmx/src/org.qlcplus.QLCPlus.udmx.metainfo.xml @@ -4,7 +4,7 @@ org.qlcplus.QLCPlus uDMX uDMX plugin for QLC+ - http://www.qlcplus.org/ + https://www.qlcplus.org/ https://github.com/mcallegari/qlcplus/issues/new?title=[uDMX]: CC-BY-SA-3.0 Apache-2.0 diff --git a/qmlui/app.cpp b/qmlui/app.cpp index 5ce527554c..d40b6bf6ba 100644 --- a/qmlui/app.cpp +++ b/qmlui/app.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include "app.h" #include "mainview2d.h" +#include "simpledesk.h" #include "showmanager.h" #include "fixtureeditor.h" #include "modelselector.h" @@ -72,6 +74,8 @@ App::App() , m_fixtureManager(nullptr) , m_contextManager(nullptr) , m_ioManager(nullptr) + , m_showManager(nullptr) + , m_simpleDesk(nullptr) , m_videoProvider(nullptr) , m_doc(nullptr) , m_docLoaded(false) @@ -139,7 +143,8 @@ void App::startup() m_fixtureManager = new FixtureManager(this, m_doc); m_fixtureGroupEditor = new FixtureGroupEditor(this, m_doc); m_functionManager = new FunctionManager(this, m_doc); - m_contextManager = new ContextManager(this, m_doc, m_fixtureManager, m_functionManager); + m_simpleDesk = new SimpleDesk(this, m_doc); + m_contextManager = new ContextManager(this, m_doc, m_fixtureManager, m_functionManager, m_simpleDesk); m_paletteManager = new PaletteManager(this, m_doc, m_contextManager); m_virtualConsole = new VirtualConsole(this, m_doc, m_contextManager); @@ -152,7 +157,7 @@ void App::startup() connect(m_networkManager, &NetworkManager::requestProjectLoad, this, &App::slotLoadDocFromMemory); m_tardis = new Tardis(this, m_doc, m_networkManager, m_fixtureManager, m_functionManager, - m_contextManager, m_showManager, m_virtualConsole); + m_contextManager, m_simpleDesk, m_showManager, m_virtualConsole); rootContext()->setContextProperty("tardis", m_tardis); m_contextManager->registerContext(m_virtualConsole); @@ -163,6 +168,7 @@ void App::startup() qmlRegisterUncreatableType("org.qlcplus.classes", 1, 0, "ContextManager", "Can't create a ContextManager!"); qmlRegisterUncreatableType("org.qlcplus.classes", 1, 0, "ShowManager", "Can't create a ShowManager!"); qmlRegisterUncreatableType("org.qlcplus.classes", 1, 0, "NetworkManager", "Can't create a NetworkManager!"); + qmlRegisterUncreatableType("org.qlcplus.classes", 1, 0, "SimpleDesk", "Can't create a NetworkManager!"); // Start up in non-modified state m_doc->resetModified(); diff --git a/qmlui/app.h b/qmlui/app.h index c0173c2b2b..08c1baad2c 100644 --- a/qmlui/app.h +++ b/qmlui/app.h @@ -28,6 +28,7 @@ class MainView2D; class ShowManager; +class SimpleDesk; class ActionManager; class FixtureBrowser; class FixtureManager; @@ -182,6 +183,7 @@ protected slots: InputOutputManager *m_ioManager; VirtualConsole *m_virtualConsole; ShowManager *m_showManager; + SimpleDesk *m_simpleDesk; ActionManager *m_actionManager; VideoProvider *m_videoProvider; NetworkManager *m_networkManager; diff --git a/qmlui/contextmanager.cpp b/qmlui/contextmanager.cpp index 36226afb7c..48891eaa5a 100644 --- a/qmlui/contextmanager.cpp +++ b/qmlui/contextmanager.cpp @@ -32,12 +32,13 @@ #include "mainviewdmx.h" #include "mainview2d.h" #include "mainview3d.h" +#include "simpledesk.h" #include "tardis.h" #include "doc.h" ContextManager::ContextManager(QQuickView *view, Doc *doc, FixtureManager *fxMgr, - FunctionManager *funcMgr, + FunctionManager *funcMgr, SimpleDesk *sDesk, QObject *parent) : QObject(parent) , m_view(view) @@ -45,6 +46,7 @@ ContextManager::ContextManager(QQuickView *view, Doc *doc, , m_monProps(doc->monitorProperties()) , m_fixtureManager(fxMgr) , m_functionManager(funcMgr) + , m_simpleDesk(sDesk) , m_multipleSelection(false) , m_positionPicking(false) , m_universeFilter(Universe::invalid()) @@ -86,6 +88,7 @@ ContextManager::ContextManager(QQuickView *view, Doc *doc, connect(m_fixtureManager, &FixtureManager::fixtureFlagsChanged, this, &ContextManager::slotFixtureFlagsChanged); connect(m_fixtureManager, &FixtureManager::channelValueChanged, this, &ContextManager::slotChannelValueChanged); + connect(m_simpleDesk, &SimpleDesk::channelValueChanged, this, &ContextManager::slotSimpleDeskValueChanged); connect(m_fixtureManager, SIGNAL(channelTypeValueChanged(int, quint8)), this, SLOT(slotChannelTypeValueChanged(int, quint8))); connect(m_fixtureManager, &FixtureManager::colorChanged, this, &ContextManager::slotColorChanged); @@ -768,11 +771,18 @@ QVector3D ContextManager::fixturesPosition() const void ContextManager::setFixturesPosition(QVector3D position) { + if (m_selectedFixtures.isEmpty()) + return; + if (m_selectedFixtures.count() == 1) { - quint32 fxID = FixtureUtils::itemFixtureID(m_selectedFixtures.first()); - quint16 headIndex = FixtureUtils::itemHeadIndex(m_selectedFixtures.first()); - quint16 linkedIndex = FixtureUtils::itemLinkedIndex(m_selectedFixtures.first()); + quint32 itemID = m_selectedFixtures.first(); + quint32 fxID = FixtureUtils::itemFixtureID(itemID); + quint16 headIndex = FixtureUtils::itemHeadIndex(itemID); + quint16 linkedIndex = FixtureUtils::itemLinkedIndex(itemID); + QVector3D currPos = m_monProps->fixturePosition(fxID, headIndex, linkedIndex); + + Tardis::instance()->enqueueAction(Tardis::FixtureSetPosition, itemID, QVariant(currPos), QVariant(position)); // absolute position change m_monProps->setFixturePosition(fxID, headIndex, linkedIndex, position); @@ -787,8 +797,10 @@ void ContextManager::setFixturesPosition(QVector3D position) quint32 fxID = FixtureUtils::itemFixtureID(itemID); quint16 headIndex = FixtureUtils::itemHeadIndex(itemID); quint16 linkedIndex = FixtureUtils::itemLinkedIndex(itemID); + QVector3D currPos = m_monProps->fixturePosition(fxID, headIndex, linkedIndex); + QVector3D newPos = currPos + position; + Tardis::instance()->enqueueAction(Tardis::FixtureSetPosition, itemID, QVariant(currPos), QVariant(newPos)); - QVector3D newPos = m_monProps->fixturePosition(fxID, headIndex, linkedIndex) + position; m_monProps->setFixturePosition(fxID, headIndex, linkedIndex, newPos); if (m_3DView->isEnabled()) m_3DView->updateFixturePosition(itemID, newPos); @@ -1275,6 +1287,12 @@ void ContextManager::slotPresetChanged(const QLCChannel *channel, quint8 value) } } +void ContextManager::slotSimpleDeskValueChanged(quint32 fxID, quint32 channel, quint8 value) +{ + if (m_editingEnabled == false) + setDumpValue(fxID, channel, uchar(value), false); +} + void ContextManager::slotUniverseWritten(quint32 idx, const QByteArray &ua) { for (Fixture *fixture : m_doc->fixtures()) @@ -1307,7 +1325,7 @@ void ContextManager::slotFunctionEditingChanged(bool status) * DMX channels dump *********************************************************************/ -void ContextManager::setDumpValue(quint32 fxID, quint32 channel, uchar value) +void ContextManager::setDumpValue(quint32 fxID, quint32 channel, uchar value, bool output) { QVariant currentVal, newVal; SceneValue sValue(fxID, channel, value); @@ -1318,9 +1336,12 @@ void ContextManager::setDumpValue(quint32 fxID, quint32 channel, uchar value) if (currentVal != newVal || value != currDmxValue) { - Tardis::instance()->enqueueAction(Tardis::FixtureSetDumpValue, 0, currentVal, newVal); - if (m_source) - m_source->set(fxID, channel, value); + if (output) + { + Tardis::instance()->enqueueAction(Tardis::FixtureSetDumpValue, 0, currentVal, newVal); + if (m_source) + m_source->set(fxID, channel, value); + } if (valIndex >= 0) { @@ -1355,6 +1376,18 @@ void ContextManager::setDumpValue(quint32 fxID, quint32 channel, uchar value) } } +void ContextManager::unsetDumpValue(quint32 fxID, quint32 channel) +{ + SceneValue sValue(fxID, channel, 0); + int valIndex = m_dumpValues.indexOf(sValue); + + if (valIndex >= 0) + { + m_dumpValues.removeAt(valIndex); + emit dumpValuesCountChanged(); + } +} + QList ContextManager::selectedFixtureIDList() const { QList fxIDList; @@ -1374,6 +1407,9 @@ int ContextManager::dumpValuesCount() const int i = 0; QList fxIDList = selectedFixtureIDList(); + if (fxIDList.isEmpty()) + return m_dumpValues.count(); + for (SceneValue sv : m_dumpValues) if (fxIDList.contains(sv.fxi)) i++; diff --git a/qmlui/contextmanager.h b/qmlui/contextmanager.h index 2de55aae62..ae61e90b51 100644 --- a/qmlui/contextmanager.h +++ b/qmlui/contextmanager.h @@ -36,6 +36,7 @@ class FunctionManager; class GenericDMXSource; class MonitorProperties; class PreviewContext; +class SimpleDesk; class ContextManager : public QObject { @@ -55,7 +56,7 @@ class ContextManager : public QObject public: explicit ContextManager(QQuickView *view, Doc *doc, FixtureManager *fxMgr, FunctionManager *funcMgr, - QObject *parent = 0); + SimpleDesk *sDesk, QObject *parent = 0); ~ContextManager(); /** Register/Unregister a context to the map of known contexts */ @@ -129,6 +130,8 @@ public slots: FixtureManager *m_fixtureManager; /** Reference to the Function Manager */ FunctionManager *m_functionManager; + /** Reference to the Simple Desk context */ + SimpleDesk *m_simpleDesk; QMap m_contextsMap; @@ -230,8 +233,10 @@ protected slots: void slotPresetChanged(const QLCChannel *channel, quint8 value); - /** Invoked by the QLC+ engine to inform the UI that the Universe at $idx - * has changed */ + void slotSimpleDeskValueChanged(quint32 fxID, quint32 channel, quint8 value); + + /** Invoked by the QLC+ engine to inform the UI that the + * Universe at $idx has changed */ void slotUniverseWritten(quint32 idx, const QByteArray& ua); /** Invoked when Function editing begins or ends in the Function Manager. @@ -278,7 +283,10 @@ protected slots: Q_ENUM(ChannelType) /** Store a channel value for Scene dumping */ - void setDumpValue(quint32 fxID, quint32 channel, uchar value); + Q_INVOKABLE void setDumpValue(quint32 fxID, quint32 channel, uchar value, bool output = true); + + /** Remove a channel from the Scene dumping list */ + Q_INVOKABLE void unsetDumpValue(quint32 fxID, quint32 channel); /** Return the number of DMX channels currently available for dumping */ int dumpValuesCount() const; diff --git a/qmlui/fixturemanager.cpp b/qmlui/fixturemanager.cpp index a6df74002b..4dd95ab75a 100644 --- a/qmlui/fixturemanager.cpp +++ b/qmlui/fixturemanager.cpp @@ -303,8 +303,6 @@ bool FixtureManager::addFixture(QString manuf, QString model, QString mode, QStr connect(m_doc, SIGNAL(fixtureAdded(quint32)), this, SLOT(slotFixtureAdded(quint32))); - m_fixtureList.clear(); - m_fixtureList = m_doc->fixtures(); emit fixturesCountChanged(); emit fixturesMapChanged(); @@ -347,8 +345,6 @@ bool FixtureManager::deleteFixtures(QVariantList IDList) emit fixtureDeleted(itemID); } - m_fixtureList.clear(); - m_fixtureList = m_doc->fixtures(); emit fixturesCountChanged(); updateGroupsTree(m_doc, m_fixtureTree, m_searchFilter); @@ -379,13 +375,6 @@ int FixtureManager::fixturesCount() return m_doc->fixtures().count(); } -QQmlListProperty FixtureManager::fixtures() -{ - m_fixtureList.clear(); - m_fixtureList = m_doc->fixtures(); - return QQmlListProperty(this, m_fixtureList); -} - QVariant FixtureManager::groupsTreeModel() { if (m_fixtureTree == nullptr) @@ -784,6 +773,8 @@ void FixtureManager::updateGroupsTree(Doc *doc, TreeModel *treeModel, QString se QString universeName = uniNames.at(fixture->universe()); int matchMask = 0; + qDebug() << "----> add fixture:" << fixture->name(); + addFixtureNode(doc, treeModel, fixture, universeName, fixture->universe(), matchMask, searchFilter, showFlags, checkedChannels); } diff --git a/qmlui/fixturemanager.h b/qmlui/fixturemanager.h index 3736d2bdcf..c6eecf3e6d 100644 --- a/qmlui/fixturemanager.h +++ b/qmlui/fixturemanager.h @@ -42,7 +42,6 @@ class FixtureManager : public QObject Q_OBJECT Q_PROPERTY(int fixturesCount READ fixturesCount NOTIFY fixturesCountChanged) - Q_PROPERTY(QQmlListProperty fixtures READ fixtures) Q_PROPERTY(QVariantList fixturesMap READ fixturesMap NOTIFY fixturesMapChanged) Q_PROPERTY(QVariantList fixtureNamesMap READ fixtureNamesMap NOTIFY fixtureNamesMapChanged) Q_PROPERTY(QVariant groupsTreeModel READ groupsTreeModel NOTIFY groupsTreeModelChanged) @@ -172,9 +171,6 @@ public slots: /** Returns the number of fixtures currently loaded in the project */ int fixturesCount(); - /** Returns a QML-readable list of references to Fixture classes */ - QQmlListProperty fixtures(); - /** Returns the data model to display a tree of Fixture Groups/Fixtures */ QVariant groupsTreeModel(); diff --git a/qmlui/functionmanager.cpp b/qmlui/functionmanager.cpp index d4a41adcee..6d59e2a8ed 100644 --- a/qmlui/functionmanager.cpp +++ b/qmlui/functionmanager.cpp @@ -1074,14 +1074,14 @@ quint32 FunctionManager::getChannelTypeMask(quint32 fxID, quint32 channel) void FunctionManager::dumpOnNewScene(QList dumpValues, QList selectedFixtures, quint32 channelMask, QString name) { - if (selectedFixtures.isEmpty() || dumpValues.isEmpty() || channelMask == 0) + if (dumpValues.isEmpty() || channelMask == 0) return; Scene *newScene = new Scene(m_doc); for (SceneValue sv : dumpValues) { - if (selectedFixtures.contains(sv.fxi) == false) + if (selectedFixtures.count() && selectedFixtures.contains(sv.fxi) == false) continue; quint32 chTypeBit = getChannelTypeMask(sv.fxi, sv.channel); @@ -1108,7 +1108,7 @@ void FunctionManager::dumpOnNewScene(QList dumpValues, QList dumpValues, QList selectedFixtures, quint32 channelMask, quint32 sceneID) { - if (selectedFixtures.isEmpty() || dumpValues.isEmpty() || channelMask == 0) + if (dumpValues.isEmpty() || channelMask == 0) return; Scene *scene = qobject_cast(m_doc->function(sceneID)); @@ -1118,7 +1118,7 @@ void FunctionManager::dumpOnScene(QList dumpValues, QList s for (SceneValue sv : dumpValues) { - if (selectedFixtures.contains(sv.fxi) == false) + if (selectedFixtures.count() && selectedFixtures.contains(sv.fxi) == false) continue; quint32 chTypeBit = getChannelTypeMask(sv.fxi, sv.channel); @@ -1142,29 +1142,42 @@ void FunctionManager::setChannelValue(quint32 fxID, quint32 channel, uchar value { FunctionEditor *editor = m_currentEditor; SceneValue scv(fxID, channel, value); + QVariant currentVal, newVal; - if (editor != nullptr && editor->functionType() == Function::SequenceType) + if (editor == nullptr) + return; + + if (editor->functionType() == Function::SequenceType) { ChaserEditor *cEditor = qobject_cast(editor); cEditor->setSequenceStepValue(scv); editor = m_sceneEditor; } - if (editor != nullptr && editor->functionType() == Function::SceneType) + if (editor->functionType() == Function::SceneType) { Scene *scene = qobject_cast(m_doc->function(editor->functionID())); if (scene == nullptr) return; - QVariant currentVal, newVal; - uchar currDmxValue = scene->value(fxID, channel); - currentVal.setValue(SceneValue(fxID, channel, currDmxValue)); newVal.setValue(scv); - if (currentVal != newVal || value != currDmxValue) + + if (scene->checkValue(scv) == false) { - Tardis::instance()->enqueueAction(Tardis::SceneSetChannelValue, scene->id(), currentVal, newVal); + Tardis::instance()->enqueueAction(Tardis::SceneSetChannelValue, scene->id(), QVariant(), newVal); scene->setValue(fxID, channel, value); } + else + { + uchar currDmxValue = scene->value(fxID, channel); + currentVal.setValue(SceneValue(fxID, channel, currDmxValue)); + + if (currentVal != newVal || value != currDmxValue) + { + Tardis::instance()->enqueueAction(Tardis::SceneSetChannelValue, scene->id(), currentVal, newVal); + scene->setValue(fxID, channel, value); + } + } } } diff --git a/qmlui/listmodel.h b/qmlui/listmodel.h index a1ab0dfb85..1cdf153056 100644 --- a/qmlui/listmodel.h +++ b/qmlui/listmodel.h @@ -57,4 +57,4 @@ class ListModel : public QAbstractListModel QVariantList m_data; }; -#endif // TREEMODEL_H +#endif // LISTMODEL_H diff --git a/qmlui/main.cpp b/qmlui/main.cpp index d48edde624..d815499737 100644 --- a/qmlui/main.cpp +++ b/qmlui/main.cpp @@ -25,6 +25,10 @@ #include "app.h" #include "qlcconfig.h" +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) +#define endl Qt::endl +#endif + void debugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { Q_UNUSED(context) diff --git a/qmlui/mainview2d.cpp b/qmlui/mainview2d.cpp index da4ce0d4bd..e8769a661c 100644 --- a/qmlui/mainview2d.cpp +++ b/qmlui/mainview2d.cpp @@ -757,19 +757,7 @@ void MainView2D::setPointOfView(int pointOfView) emit pointOfViewChanged(pointOfView); setGridSize(m_monProps->gridSize()); - - for (Fixture *fixture : m_doc->fixtures()) - { - for (quint32 subID : m_monProps->fixtureIDList(fixture->id())) - { - quint16 headIndex = m_monProps->fixtureHeadIndex(subID); - quint16 linkedIndex = m_monProps->fixtureLinkedIndex(subID); - quint32 itemID = FixtureUtils::fixtureItemID(fixture->id(), headIndex, linkedIndex); - - updateFixturePosition(itemID, m_monProps->fixturePosition(fixture->id(), headIndex, linkedIndex)); - updateFixtureSize(itemID, fixture); - } - } + slotRefreshView(); } diff --git a/qmlui/mainview3d.cpp b/qmlui/mainview3d.cpp index 64f613c820..e2dc98dbba 100644 --- a/qmlui/mainview3d.cpp +++ b/qmlui/mainview3d.cpp @@ -1310,7 +1310,7 @@ void MainView3D::updateFixturePosition(quint32 itemID, QVector3D pos) if (mesh == nullptr || mesh->m_rootTransform == nullptr) return; - qDebug() << Q_FUNC_INFO << pos; + //qDebug() << "Update 3D fixture position" << pos; float x = (pos.x() / 1000.0) - (m_monProps->gridSize().x() / 2) + (mesh->m_volume.m_extents.x() / 2); float y = (pos.y() / 1000.0) + (mesh->m_volume.m_extents.y() / 2); @@ -1678,7 +1678,7 @@ void MainView3D::setGenericItemsPosition(QVector3D pos) for (int itemID : m_genericSelectedItems) { QVector3D newPos = m_monProps->itemPosition(itemID) + pos; - updateGenericItemPosition(m_genericSelectedItems.first(), newPos); + updateGenericItemPosition(itemID, newPos); } } diff --git a/qmlui/previewcontext.cpp b/qmlui/previewcontext.cpp index 5acc75402c..95bd0c8c05 100644 --- a/qmlui/previewcontext.cpp +++ b/qmlui/previewcontext.cpp @@ -34,6 +34,7 @@ PreviewContext::PreviewContext(QQuickView *view, Doc *doc, QString name, QObject , m_page(0) , m_enabled(false) , m_detached(false) + , m_universeFilter(0) { //connect(m_doc, &Doc::loaded, this, &PreviewContext::slotRefreshView); } @@ -69,9 +70,19 @@ bool PreviewContext::isEnabled() return m_enabled; } +quint32 PreviewContext::universeFilter() const +{ + return m_universeFilter; +} + void PreviewContext::setUniverseFilter(quint32 universeFilter) { + if (m_universeFilter == universeFilter) + return; + m_universeFilter = universeFilter; + + emit universeFilterChanged(universeFilter); } QQuickView *PreviewContext::view() @@ -145,6 +156,7 @@ void PreviewContext::setDetached(bool detached) m_view->rootContext()->setContextProperty("contextManager", m_mainView->rootContext()->contextProperty("contextManager")); m_view->rootContext()->setContextProperty("virtualConsole", m_mainView->rootContext()->contextProperty("virtualConsole")); m_view->rootContext()->setContextProperty("showManager", m_mainView->rootContext()->contextProperty("showManager")); + m_view->rootContext()->setContextProperty("simpleDesk", m_mainView->rootContext()->contextProperty("simpleDesk")); m_view->rootContext()->setContextProperty("actionManager", m_mainView->rootContext()->contextProperty("actionManager")); m_view->rootContext()->setContextProperty("View2D", m_mainView->rootContext()->contextProperty("View2D")); m_view->rootContext()->setContextProperty("View3D", m_mainView->rootContext()->contextProperty("View3D")); diff --git a/qmlui/previewcontext.h b/qmlui/previewcontext.h index 1cf07d7af0..6d53a08a4b 100644 --- a/qmlui/previewcontext.h +++ b/qmlui/previewcontext.h @@ -50,6 +50,8 @@ class PreviewContext : public QObject { Q_OBJECT + Q_PROPERTY(quint32 universeFilter READ universeFilter WRITE setUniverseFilter NOTIFY universeFilterChanged) + public: explicit PreviewContext(QQuickView *view, Doc *doc, QString name, QObject *parent = 0); ~PreviewContext(); @@ -62,8 +64,11 @@ class PreviewContext : public QObject virtual bool isEnabled(); + /** Get/Set the current universe filter */ + virtual quint32 universeFilter() const; virtual void setUniverseFilter(quint32 universeFilter); + /** Get a handler for the associated QuickView */ QQuickView *view(); /** Get/Set the Quick item to access the context properties/objects */ @@ -96,6 +101,7 @@ protected slots: void slotWindowClosing(); signals: + void universeFilterChanged(quint32 universeFilter); void keyPressed(QKeyEvent *e); void keyReleased(QKeyEvent *e); diff --git a/qmlui/qml/ContextMenuEntry.qml b/qmlui/qml/ContextMenuEntry.qml index 1a9488d0d8..dcdf80586c 100644 --- a/qmlui/qml/ContextMenuEntry.qml +++ b/qmlui/qml/ContextMenuEntry.qml @@ -102,7 +102,7 @@ Rectangle { anchors.fill: parent color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.6 + visible: !parent.enabled } } diff --git a/qmlui/qml/CustomCheckBox.qml b/qmlui/qml/CustomCheckBox.qml index ddf7bc8c9a..79f19a1f38 100644 --- a/qmlui/qml/CustomCheckBox.qml +++ b/qmlui/qml/CustomCheckBox.qml @@ -41,7 +41,7 @@ RadioButton z: 3 color: "black" opacity: 0.4 - visible: !enabled + visible: !parent.enabled } ToolTip diff --git a/qmlui/qml/CustomComboBox.qml b/qmlui/qml/CustomComboBox.qml index 747a4f5c22..6cadc5db14 100644 --- a/qmlui/qml/CustomComboBox.qml +++ b/qmlui/qml/CustomComboBox.qml @@ -46,7 +46,7 @@ ComboBox signal valueChanged(int value) - onCurrValueChanged: updateCurrentItem() + onCurrValueChanged: updateFromValue() onCurrentIndexChanged: updateFromIndex() function updateFromIndex() @@ -59,6 +59,8 @@ ComboBox //console.log("Index changed: " + currentIndex + ", label: " + displayText) if (item.mIcon) currentIcon = item.mIcon + + control.valueChanged(item.mValue) } function updateFromValue() @@ -88,8 +90,8 @@ ComboBox anchors.fill: parent z: 3 color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.6 + visible: !parent.enabled } delegate: diff --git a/qmlui/qml/CustomSlider.qml b/qmlui/qml/CustomSlider.qml index eb3e0161af..14990790a6 100644 --- a/qmlui/qml/CustomSlider.qml +++ b/qmlui/qml/CustomSlider.qml @@ -65,7 +65,7 @@ Slider anchors.fill: parent z: 3 color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.6 + visible: !parent.enabled } } diff --git a/qmlui/qml/CustomSpinBox.qml b/qmlui/qml/CustomSpinBox.qml index 254fd1c651..8cf703c743 100644 --- a/qmlui/qml/CustomSpinBox.qml +++ b/qmlui/qml/CustomSpinBox.qml @@ -62,8 +62,8 @@ SpinBox anchors.fill: parent z: 3 color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.6 + visible: !parent.enabled } background: Rectangle { diff --git a/qmlui/qml/CustomTextEdit.qml b/qmlui/qml/CustomTextEdit.qml index c064d3fe72..623b73053e 100644 --- a/qmlui/qml/CustomTextEdit.qml +++ b/qmlui/qml/CustomTextEdit.qml @@ -73,8 +73,8 @@ Rectangle anchors.fill: parent z: 3 color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.5 + visible: !parent.enabled } TextInput diff --git a/qmlui/qml/FixtureConsole.qml b/qmlui/qml/FixtureConsole.qml index c59866f1a0..8193627731 100644 --- a/qmlui/qml/FixtureConsole.qml +++ b/qmlui/qml/FixtureConsole.qml @@ -43,6 +43,7 @@ Rectangle property Fixture fixtureObj property variant values property bool dmxValues: true + property real maxValue: 255 property bool isSelected: false property bool showEnablers: false property bool sceneConsole: false @@ -60,10 +61,7 @@ Rectangle for (var i = 0; i < values.length; i++) { //console.log("Value " + i + " = " + values[i]); - if (dmxValues) - channelsRpt.itemAt(i).dmxValue = values[i] - else - channelsRpt.itemAt(i).dmxValue = (values[i] / 255) * 100 + channelsRpt.itemAt(i).dmxValue = values[i] } externalChange = false } @@ -113,16 +111,15 @@ Rectangle dmxMode: dmxValues onClicked: { - dmxValues = !dmxValues - for (var i = 0; i < channelsRpt.count; i++) + if (dmxValues) { - var newVal; - if (dmxValues == false) - newVal = (channelsRpt.itemAt(i).dmxValue / 255) * 100 - else - newVal = (channelsRpt.itemAt(i).dmxValue / 100) * 255 - channelsRpt.itemAt(i).dmxMode = dmxValues - channelsRpt.itemAt(i).dmxValue = newVal + dmxValues = false + maxValue = 100 + } + else + { + maxValue = 255 + dmxValues = true } } } @@ -153,8 +150,7 @@ Rectangle width: UISettings.iconSizeDefault height: channelsRow.height - property alias dmxValue: chValueSpin.value - property bool dmxMode: true + property real dmxValue property bool isEnabled: showEnablers ? false : true function updateChannel() @@ -168,13 +164,12 @@ Rectangle if (externalChange == true) return - var val = dmxMode ? dmxValue : dmxValue * 2.55 if (sceneConsole == false) - fixtureManager.setChannelValue(fixtureObj.id, index, val) + fixtureManager.setChannelValue(fixtureObj.id, index, dmxValue) else - functionManager.setChannelValue(fixtureObj.id, index, val) + functionManager.setChannelValue(fixtureObj.id, index, dmxValue) - consoleRoot.valueChanged(fixtureObj.id, index, val) + consoleRoot.valueChanged(fixtureObj.id, index, dmxValue) } // This is the black overlay to "simulate" a disabled channel @@ -229,7 +224,7 @@ Rectangle if (sceneConsole == true) { if (isEnabled == true) - functionManager.setChannelValue(fixtureObj.id, index, dmxMode ? dmxValue : dmxValue * 2.55) + functionManager.setChannelValue(fixtureObj.id, index, dmxValue) else sceneEditor.unsetChannel(fixtureObj.id, index) } @@ -263,10 +258,10 @@ Rectangle width: parent.width * 0.95 height: chDelegate.height - (showEnablers ? enableCheckBox.height : 0) - chIcon.height - chValueSpin.height from: 0 - to: dmxMode ? 255 : 100 + to: 255 value: dmxValue enabled: showEnablers ? isEnabled : true - onPositionChanged: dmxValue = valueAt(position) + onMoved: dmxValue = valueAt(position) Component.onCompleted: { @@ -274,8 +269,6 @@ Rectangle { if (showEnablers && sceneEditor.hasChannel(fixtureObj.id, index) === true) isEnabled = true - - dmxValue = sceneEditor.channelValue(fixtureObj.id, index) } } } @@ -287,12 +280,13 @@ Rectangle width: parent.width height: UISettings.listItemHeight * 0.75 from: 0 - to: dmxMode ? 255 : 100 - suffix: dmxMode ? "" : "%" + to: maxValue + suffix: dmxValues ? "" : "%" showControls: false padding: 0 horizontalAlignment: Qt.AlignHCenter - onValueModified: dmxValue = value + value: dmxValues ? dmxValue : (dmxValue / 255.0) * 100.0 + onValueModified: dmxValue = dmxValues ? value : value * 2.55 } } } diff --git a/qmlui/qml/IconButton.qml b/qmlui/qml/IconButton.qml index 4fa71a2e39..c8882def3e 100644 --- a/qmlui/qml/IconButton.qml +++ b/qmlui/qml/IconButton.qml @@ -46,7 +46,7 @@ Button property string imgSource: "" property int imgMargins: 4 property string faSource: "" - property color faColor: "#222" + property color faColor: UISettings.bgStrong property string tooltip: "" @@ -63,8 +63,8 @@ Button { anchors.fill: parent color: "black" - opacity: 0.4 - visible: !enabled + opacity: 0.6 + visible: !parent.enabled } ToolTip diff --git a/qmlui/qml/KeyPad.qml b/qmlui/qml/KeyPad.qml index dad96470ea..1a703d6dde 100644 --- a/qmlui/qml/KeyPad.qml +++ b/qmlui/qml/KeyPad.qml @@ -26,6 +26,7 @@ Rectangle { id: keyPadRoot width: UISettings.bigItemHeight * 2.5 + implicitHeight: UISettings.iconSizeDefault * keyPadGrid.rows height: keyPadGrid.height color: "transparent" @@ -33,6 +34,7 @@ Rectangle property bool showTapButton: false property double tapTimeValue: 0 property alias commandString: commandBox.inputText + property real itemHeight: Math.max(UISettings.iconSizeDefault, keyPadRoot.height / keyPadGrid.rows) - 3 onVisibleChanged: if (visible) commandBox.selectAndFocus() @@ -60,7 +62,6 @@ Rectangle { id: keyPadGrid width: parent.width - height: UISettings.iconSizeDefault * rows columns: showDMXcontrol ? 4 : 3 rows: 6 rowSpacing: 3 @@ -73,7 +74,7 @@ Rectangle property int span: showTapButton ? keyPadGrid.columns - 1 : keyPadGrid.columns Layout.columnSpan: span Layout.fillWidth: true - height: UISettings.iconSizeDefault + implicitHeight: itemHeight color: UISettings.bgLight onEnterPressed: keyPadRoot.executeCommand(keyPadRoot.commandString) onEscapePressed: keyPadRoot.escapePressed() @@ -84,6 +85,7 @@ Rectangle id: tapButton visible: showTapButton Layout.fillWidth: true + implicitHeight: itemHeight label: qsTr("Tap") onClicked: @@ -113,18 +115,21 @@ Rectangle GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "7" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "8" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "9" onClicked: commandBox.appendText(label) } @@ -132,26 +137,30 @@ Rectangle { visible: showDMXcontrol Layout.fillWidth: true + implicitHeight: itemHeight label: "AT" - onClicked: commandBox.appendText(" AT") + onClicked: commandBox.appendText(" AT ") } // row 3 GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "4" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "5" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "6" onClicked: commandBox.appendText(label) } @@ -159,26 +168,30 @@ Rectangle { visible: showDMXcontrol Layout.fillWidth: true + implicitHeight: itemHeight label: "THRU" - onClicked: commandBox.appendText(" THRU") + onClicked: commandBox.appendText(" THRU ") } // row 4 GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "1" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "2" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "3" onClicked: commandBox.appendText(label) } @@ -186,14 +199,16 @@ Rectangle { visible: showDMXcontrol Layout.fillWidth: true + implicitHeight: itemHeight label: "FULL" - onClicked: commandBox.appendText(" FULL") + onClicked: commandBox.appendText(" FULL ") } // row 5 GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "-" repetition: true onClicked: @@ -205,12 +220,14 @@ Rectangle GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "0" onClicked: commandBox.appendText(label) } GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "+" repetition: true onClicked: @@ -223,7 +240,9 @@ Rectangle { visible: showDMXcontrol Layout.fillWidth: true + implicitHeight: itemHeight label: "ZERO" + onClicked: commandBox.appendText(" ZERO ") } // row 6 @@ -231,6 +250,7 @@ Rectangle { Layout.columnSpan: 2 Layout.fillWidth: true + implicitHeight: itemHeight label: "ENTER" bgColor: "#43B008" hoverColor: "#61FF0C" @@ -240,6 +260,7 @@ Rectangle GenericButton { Layout.fillWidth: true + implicitHeight: itemHeight label: "CLR" onClicked: keyPadRoot.commandString = "" } @@ -247,7 +268,9 @@ Rectangle { visible: showDMXcontrol Layout.fillWidth: true + implicitHeight: itemHeight label: "BY" + onClicked: commandBox.appendText(" BY ") } } } diff --git a/qmlui/qml/RobotoText.qml b/qmlui/qml/RobotoText.qml index d76d23ec40..972b1647ef 100644 --- a/qmlui/qml/RobotoText.qml +++ b/qmlui/qml/RobotoText.qml @@ -23,7 +23,7 @@ import "." Rectangle { id: rtRoot - width: wrapText ? 100 : textBox.paintedWidth + width: wrapText ? 100 : textBox.paintedWidth + rightMargin height: UISettings.iconSizeDefault color: "transparent" @@ -36,6 +36,8 @@ Rectangle property bool wrapText: false property int textHAlign: Text.AlignLeft property int textVAlign: wrapText ? Text.AlignVCenter : Text.AlignTop + property alias leftMargin: textBox.x + property real rightMargin: 0 Text { diff --git a/qmlui/qml/SectionBox.qml b/qmlui/qml/SectionBox.qml index 003f31bad9..babf5a8154 100644 --- a/qmlui/qml/SectionBox.qml +++ b/qmlui/qml/SectionBox.qml @@ -17,9 +17,7 @@ limitations under the License. */ -import QtQuick 2.4 -import QtQuick.Layouts 1.3 - +import QtQuick 2.0 import "." Rectangle diff --git a/qmlui/qml/SimpleDesk.qml b/qmlui/qml/SimpleDesk.qml new file mode 100644 index 0000000000..059eafb36b --- /dev/null +++ b/qmlui/qml/SimpleDesk.qml @@ -0,0 +1,451 @@ +/* + Q Light Controller Plus + SimpleDesk.qml + + Copyright (c) Massimo Callegari + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +import QtQuick 2.0 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.13 + +import org.qlcplus.classes 1.0 +import "." + +Rectangle +{ + id: sDeskContainer + anchors.fill: parent + color: "transparent" + + property string contextName: "SDESK" + property bool dmxValues: true + property real maxValue: 255 + + SplitView + { + anchors.fill: parent + orientation: Qt.Vertical + + // Top view (faders) + Rectangle + { + SplitView.minimumHeight: sDeskContainer.height * 0.2 + SplitView.preferredHeight: sDeskContainer.height * 0.6 + SplitView.maximumHeight: sDeskContainer.height * 0.8 + + color: "transparent" + + Rectangle + { + id: viewToolbar + width: parent.width + height: UISettings.iconSizeDefault + z: 10 + gradient: Gradient + { + GradientStop { position: 0; color: UISettings.toolbarStartSub } + GradientStop { position: 1; color: UISettings.toolbarEnd } + } + + RowLayout + { + anchors.fill: parent + spacing: 5 + + RobotoText + { + label: qsTr("Universe") + } + + CustomComboBox + { + id: viewUniverseCombo + implicitWidth: UISettings.bigItemHeight * 2 + padding: 0 + model: simpleDesk.universesListModel + currValue: simpleDesk.universeFilter + onValueChanged: simpleDesk.universeFilter = value + } + + // universe reset button + IconButton + { + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl + tooltip: qsTr("Reset the whole universe") + onClicked: + { + contextManager.resetDumpValues() + simpleDesk.resetUniverse(viewUniverseCombo.currentIndex) + } + } + + Rectangle { Layout.fillWidth: true; color: "transparent" } + + // Scene dump button + IconButton + { + id: sceneDump + z: 2 + imgSource: "qrc:/dmxdump.svg" + tooltip: qsTr("Dump on a new Scene") + counter: contextManager ? contextManager.dumpValuesCount && (qlcplus.accessMask & App.AC_FunctionEditing) : 0 + + onClicked: + { + if (dmxDumpDialog.show) + { + dmxDumpDialog.open() + dmxDumpDialog.focusEditItem() + } + } + + Rectangle + { + x: -3 + //y: -3 + width: sceneDump.width * 0.4 + height: width + color: "red" + border.width: 1 + border.color: UISettings.fgMain + radius: 3 + clip: true + + RobotoText + { + anchors.centerIn: parent + height: parent.height * 0.7 + label: contextManager ? contextManager.dumpValuesCount : "" + fontSize: height + } + } + + PopupDMXDump + { + id: dmxDumpDialog + implicitWidth: Math.min(UISettings.bigItemHeight * 4, mainView.width / 3) + + onAccepted: contextManager.dumpDmxChannels(sceneName, getChannelsMask()) + } + } + + // DMX/Percentage button + DMXPercentageButton + { + height: parent.height - 2 + dmxMode: dmxValues + onClicked: + { + if (dmxValues) + { + dmxValues = false + maxValue = 100 + } + else + { + maxValue = 255 + dmxValues = true + } + } + } + } + } + + // The actual channel list view + ListView + { + id: channelView + y: viewToolbar.height + height: parent.height - y + width: parent.width + orientation: ListView.Horizontal + model: simpleDesk.channelList + boundsBehavior: Flickable.StopAtBounds + highlightFollowsCurrentItem: false + currentIndex: -1 + + function scrollToItem(chIdx) + { + console.log("[scrollToItem] chIdx: " + chIdx) + positionViewAtIndex(chIdx, ListView.Beginning) + currentIndex = chIdx + } + + delegate: + Rectangle + { + id: chRoot + implicitWidth: UISettings.iconSizeDefault + height: parent.height - sbar.height + color: { + if (isOverride) + return "red"; + else + { + switch(chDisplay) + { + case SimpleDesk.None: return "transparent" + case SimpleDesk.Odd: return "#414b41" + case SimpleDesk.Even: return "#42444b" + } + } + } + border.width: 1 + border.color: UISettings.borderColorDark + + property Fixture fixtureObj: model.cRef + property int chDisplay: model.chDisplay + property bool isOverride: model.isOverride + + ColumnLayout + { + width: parent.width - 2 + height: parent.height + + // channel icon + IconButton + { + width: UISettings.iconSizeMedium + Layout.alignment: Qt.AlignHCenter + height: width + border.width: 0 + tooltip: fixtureObj ? fixtureManager.channelName(fixtureObj.id, model.chIndex) : "" + imgSource: fixtureObj ? fixtureManager.channelIcon(fixtureObj.id, model.chIndex) : "" + visible: fixtureObj ? true : false + + onClicked: + { + } + } + + // channel fader + QLCPlusFader + { + padding: 0 + width: parent.width * 0.95 + Layout.alignment: Qt.AlignHCenter + Layout.fillHeight: true + from: 0 + to: 255 + value: model.chValue + onMoved: { + model.isOverride = true + model.chValue = valueAt(position) + simpleDesk.setValue(fixtureObj ? fixtureObj.id : -1, index, model.chValue) + } + } + + // channel value + CustomSpinBox + { + id: chValueSpin + implicitWidth: UISettings.iconSizeDefault + height: UISettings.listItemHeight * 0.75 + from: 0 + to: maxValue + suffix: dmxValues ? "" : "%" + showControls: false + padding: 0 + horizontalAlignment: Qt.AlignHCenter + value: dmxValues ? model.chValue : (model.chValue / 255.0) * 100.0 + onValueModified: { + model.isOverride = true + model.chValue = value * (dmxValues ? 1.0 : 2.55) + simpleDesk.setValue(fixtureObj ? fixtureObj.id : -1, index, model.chValue) + } + } + + // DMX address + RobotoText + { + Layout.alignment: Qt.AlignHCenter + height: UISettings.listItemHeight * 0.75 + fontSize: UISettings.textSizeDefault + labelColor: UISettings.fgMain + fontBold: true + label: index + 1 + } + + // channel reset button + IconButton + { + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl + tooltip: qsTr("Reset the channel") + onClicked: + { + var channel = index - (fixtureObj ? fixtureObj.address : 0) + contextManager.unsetDumpValue(fixtureObj ? fixtureObj.id : -1, channel) + simpleDesk.resetChannel(index) + } + } + } + } + + ScrollBar.horizontal: + CustomScrollBar { + id: sbar + orientation: Qt.Horizontal + } + } + } // Rectangle + + // Bottom view (fixture list, keypad history, keypad) + Rectangle + { + color: "transparent" + SplitView.fillHeight: true + + Column + { + width: parent.width / 2 + height: parent.height + + RobotoText + { + id: fixtureHeader + z: 2 + width: parent.width + color: UISettings.sectionHeader + label: qsTr("Fixture List") + leftMargin: 5 + } + + ListView + { + id: fixtureList + z: 1 + height: parent.height - fixtureHeader.height + width: parent.width + boundsBehavior: Flickable.StopAtBounds + model: simpleDesk.fixtureList + + delegate: + Rectangle + { + id: fixtureDelegate + width: fixtureList.width + height: UISettings.listItemHeight + color: fxiMa.pressed ? UISettings.highlight : "transparent" + + property Fixture fixtureObj: modelData + + IconTextEntry + { + width: parent.width + height: UISettings.listItemHeight + + tLabel: fixtureObj.name + iSrc: fixtureObj.iconResource(true) + + MouseArea + { + id: fxiMa + anchors.fill: parent + + onClicked: channelView.scrollToItem(fixtureObj.address) + } + } + + RobotoText + { + x: parent.width - width + height: UISettings.listItemHeight + rightMargin: 5 + label: (fixtureObj.address + 1) + " - " + (fixtureObj.address + fixtureObj.channels + 1) + } + } + } + } + + Column + { + x: parent.width / 2 + width: parent.width / 2 + height: parent.height + + RobotoText + { + id: historyHeader + z: 2 + width: parent.width - keypad.width + leftMargin: 7 + color: UISettings.sectionHeader + label: qsTr("Commands history") + + Rectangle + { + width: 2 + height: parent.height + color: UISettings.bgLight + } + } + + ListView + { + id: keypadHistory + z: 1 + height: parent.height - historyHeader.height + width: parent.width - keypad.width + boundsBehavior: Flickable.StopAtBounds + model: simpleDesk.commandHistory + + delegate: + RobotoText + { + label: modelData + width: keypadHistory.width + + Rectangle + { + y: parent.height - 1 + width: parent.width + height: 1 + color: UISettings.bgLight + } + + MouseArea + { + anchors.fill: parent + onDoubleClicked: keypad.commandString = modelData + } + } + + Rectangle + { + width: 2 + height: parent.height + color: UISettings.bgLight + } + } + } + + KeyPad + { + id: keypad + x: parent.width - width + height: parent.height + + onExecuteCommand: + { + simpleDesk.sendKeypadCommand(cmd) + keypad.commandString = "" + } + } + } + } +} diff --git a/qmlui/qml/UISettings.qml b/qmlui/qml/UISettings.qml index a30761e399..e832c2bbec 100644 --- a/qmlui/qml/UISettings.qml +++ b/qmlui/qml/UISettings.qml @@ -44,6 +44,7 @@ QtObject property color hover: "#B6B6B6" property color selection: "yellow" property color activeDropArea: "#9DFF52" + property color borderColorDark: "#111" property color toolbarStartMain: "#1a1a1a" property color toolbarStartSub: "#222" diff --git a/qmlui/qml/fixturesfunctions/3DView/3DView.qml b/qmlui/qml/fixturesfunctions/3DView/3DView.qml index fc2b27fe4c..1a17106c20 100644 --- a/qmlui/qml/fixturesfunctions/3DView/3DView.qml +++ b/qmlui/qml/fixturesfunctions/3DView/3DView.qml @@ -33,7 +33,6 @@ Rectangle property string contextName: "3D" property alias contextItem: scene3d - property alias cameraZ: sceneEntity.cameraZ Component.onDestruction: if(contextManager) contextManager.enableContext("3D", false, scene3d) @@ -49,7 +48,7 @@ Rectangle function setZoom(amount) { - cameraZ -= amount + viewCamera.setZoom(-amount) } Scene3D @@ -324,6 +323,7 @@ Rectangle objectName: "scene3DEntity" Component.onCompleted: contextManager.enableContext("3D", true, scene3d) +/* OrbitCameraController { id: camController @@ -331,6 +331,149 @@ Rectangle linearSpeed: 40.0 lookSpeed: 300.0 } +*/ + + // Global elements + Camera + { + id: viewCamera + + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: viewSize.width / viewSize.height + nearPlane: 1.0 + farPlane: 1000.0 + position: Qt.vector3d(0.0, 3.0, 7.5) + upVector: Qt.vector3d(0.0, 1.0, 0.0) + viewCenter: Qt.vector3d(0.0, 1.0, 0.0) + + function setZoom(amount) + { + translate(Qt.vector3d(0, 0, -amount), Camera.DontTranslateViewCenter) + } + } + + MouseDevice + { + id: mDevice + } + + MouseHandler + { + property point startPoint + property int direction + property int directionCounter + property real dx + property real dy + + property int selFixturesCount: contextManager ? contextManager.selectedFixturesCount : 0 + property int selGenericCount: View3D.genericSelectedCount + + sourceDevice: mDevice + onPressed: + { + directionCounter = 0 + dx = 0 + dy = 0 + startPoint = Qt.point(mouse.x, mouse.y) + } + + onPositionChanged: + { + if (directionCounter < 3) + { + dx += (Math.abs(mouse.x - startPoint.x)) + dy += (Math.abs(mouse.y - startPoint.y)) + directionCounter++ + return + } + else + { + direction = dx > dy ? Qt.Horizontal : Qt.Vertical + } + + var newPos + var xDelta = mouse.x - startPoint.x + var yDelta = mouse.y - startPoint.y + + if (mouse.buttons === Qt.LeftButton) // move items + { + xDelta = xDelta * viewCamera.position.z + yDelta = yDelta * viewCamera.position.z + + if (selFixturesCount == 1 && selGenericCount == 0) + { + newPos = contextManager.fixturesPosition + + if (direction == Qt.Horizontal) + contextManager.fixturesPosition = Qt.vector3d(newPos.x + xDelta, newPos.y, newPos.z) + else + { + if (mouse.modifiers & Qt.ShiftModifier) + contextManager.fixturesPosition = Qt.vector3d(newPos.x, newPos.y, newPos.z + yDelta) + else + contextManager.fixturesPosition = Qt.vector3d(newPos.x, newPos.y - yDelta, newPos.z) + } + + threeDSettings.refreshPositionValues(false) + } + else if (selFixturesCount == 0 && selGenericCount == 1) + { + newPos = View3D.genericItemsPosition + + if (direction == Qt.Horizontal) + View3D.genericItemsPosition = Qt.vector3d(newPos.x + xDelta, newPos.y, newPos.z) + else + { + if (mouse.modifiers & Qt.ShiftModifier) + View3D.genericItemsPosition = Qt.vector3d(newPos.x, newPos.y, newPos.z + yDelta) + else + View3D.genericItemsPosition = Qt.vector3d(newPos.x, newPos.y - yDelta, newPos.z) + } + + threeDSettings.refreshPositionValues(true) + } + else + { + if (direction == Qt.Horizontal) + newPos = Qt.vector3d(xDelta, 0, 0) + else + { + if (mouse.modifiers & Qt.ShiftModifier) + newPos = Qt.vector3d(0, 0, yDelta) + else + newPos = Qt.vector3d(0, -yDelta, 0) + } + + contextManager.fixturesPosition = newPos + View3D.genericItemsPosition = newPos + } + } + else if (mouse.buttons === Qt.RightButton) // camera rotation + { + if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Horizontal)) + viewCamera.panAboutViewCenter(-xDelta, Qt.vector3d(0, 1, 0)) + if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Vertical)) + viewCamera.tiltAboutViewCenter(yDelta, Qt.vector3d(1, 0, 0)) + } + else if (mouse.buttons === Qt.MiddleButton) // camera translation + { + if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Horizontal)) + viewCamera.translate(Qt.vector3d(-xDelta / 100, 0, 0)) + if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Vertical)) + viewCamera.translate(Qt.vector3d(0, yDelta / 100, 0)) + } + startPoint = Qt.point(mouse.x, mouse.y) + } + + onWheel: + { + if (wheel.angleDelta.y > 0) + viewCamera.setZoom(-1) + else + viewCamera.setZoom(1) + } + } SceneEntity { @@ -640,7 +783,7 @@ Rectangle DeferredRenderer { id: frameGraph - camera: sceneEntity.camera + camera: viewCamera }, InputSettings {} ] diff --git a/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml index 00b7f72a7e..29791bb3ce 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml @@ -30,8 +30,6 @@ Entity objectName: "sceneRootEntity" property size viewSize - property real cameraZ: 7.5 - readonly property Camera camera: camera readonly property Layer deferredLayer: Layer { objectName: "sceneDeferredLayer" } readonly property Layer selectionLayer: Layer { objectName: "selectionLayer" } readonly property GeometryRenderer selectionMesh: SelectionGeometry { } @@ -51,18 +49,4 @@ Entity rings: 2 slices: 60 } - - // Global elements - Camera - { - id: camera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 45 - aspectRatio: viewSize.width / viewSize.height - nearPlane : 1.0 - farPlane : 1000.0 - position: Qt.vector3d(0.0, 3.0, cameraZ) - upVector: Qt.vector3d(0.0, 1.0, 0.0) - viewCenter: Qt.vector3d(0.0, 1.0, 0.0) - } } diff --git a/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml b/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml index b5481a7783..b7b610bbb5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml @@ -90,6 +90,13 @@ Rectangle onCurrentScaleChanged: console.log("Current scale " + currentScale) + function refreshPositionValues(generic) + { + isUpdating = true + currentPosition = generic ? View3D.genericItemsPosition : contextManager.fixturesPosition + isUpdating = false + } + Flickable { x: 5 diff --git a/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml b/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml index b61a74b901..1d673ff3f9 100644 --- a/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml +++ b/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml @@ -116,7 +116,8 @@ Rectangle IconButton { - imgSource: "qrc:/reset.svg" + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl tooltip: qsTr("Reset the entire group") onClicked: fixtureGroupEditor.resetGroup() } diff --git a/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml b/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml index c5d5cd44d4..36c50056e5 100644 --- a/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml +++ b/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml @@ -202,12 +202,50 @@ Rectangle ListElement { mLabel: qsTr("Subtractive"); } } model: blendModel - //currentIndex: rgbMatrixEditor.currentAlgo - //onCurrentIndexChanged: rgbMatrixEditor.currentAlgo = currentIndex + + currentIndex: rgbMatrixEditor.blendMode + onCurrentIndexChanged: rgbMatrixEditor.blendMode = currentIndex } } // row 5 + RowLayout + { + width: editorColumn.colWidth + + RobotoText + { + label: qsTr("Color mode") + height: editorColumn.itemsHeight + onWidthChanged: + { + editorColumn.checkLabelWidth(width) + width = Qt.binding(function() { return editorColumn.firstColumnWidth }) + } + } + CustomComboBox + { + Layout.fillWidth: true + height: editorColumn.itemsHeight + + ListModel + { + id: controlModel + ListElement { mLabel: qsTr("Default (RGB)"); } + ListElement { mLabel: qsTr("White"); } + ListElement { mLabel: qsTr("Amber"); } + ListElement { mLabel: qsTr("UV"); } + ListElement { mLabel: qsTr("Dimmer"); } + ListElement { mLabel: qsTr("Shutter"); } + } + model: controlModel + + currentIndex: rgbMatrixEditor.controlMode + onCurrentIndexChanged: rgbMatrixEditor.controlMode = currentIndex + } + } + + // row 6 Row { width: editorColumn.colWidth diff --git a/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml b/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml index 3b5ef4c658..c59f42ec55 100644 --- a/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml +++ b/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml @@ -37,6 +37,7 @@ Rectangle { console.log("[scrollToItem] fxIdx: " + fxIdx) fixtureList.positionViewAtIndex(fxIdx, ListView.Beginning) + fixtureList.currentIndex = fxIdx } ChannelToolLoader @@ -55,6 +56,7 @@ Rectangle model: sceneEditor.fixtureList boundsBehavior: Flickable.StopAtBounds highlightFollowsCurrentItem: false + currentIndex: -1 z: 1 delegate: @@ -62,7 +64,7 @@ Rectangle { height: parent.height width: fxConsole.width + 4 - color: "black" + color: UISettings.bgMain Component.onCompleted: sceneEditor.registerFixtureConsole(index, fxConsole) Component.onDestruction: sceneEditor.unRegisterFixtureConsole(index) @@ -88,7 +90,7 @@ Rectangle color: "transparent" radius: 3 border.width: 2 - border.color: model.isSelected ? UISettings.highlight : "transparent" + border.color: fixtureList.currentIndex == index ? UISettings.selection : "transparent" } } } diff --git a/qmlui/qml/fixturesfunctions/UniverseSummary.qml b/qmlui/qml/fixturesfunctions/UniverseSummary.qml index 27c54acf1d..6c80a58521 100644 --- a/qmlui/qml/fixturesfunctions/UniverseSummary.qml +++ b/qmlui/qml/fixturesfunctions/UniverseSummary.qml @@ -109,11 +109,13 @@ Rectangle GridLayout { id: gridBox - columns: 4 + (manufCheck.checked ? 1 : 0) + (modelCheck.checked ? 1 : 0) + + columns: 5 + (manufCheck.checked ? 1 : 0) + (modelCheck.checked ? 1 : 0) + (weightCheck.checked ? 1 : 0) + (powerCheck.checked ? 1 : 0) + (dipCheck.checked ? 1 : 0) columnSpacing: 5 rowSpacing: 0 + + RobotoText { label: "ID"; labelColor: flickView.textColor } Rectangle { width: UISettings.iconSizeDefault } RobotoText { label: qsTr("Name"); labelColor: flickView.textColor } RobotoText { visible: manufCheck.checked; label: qsTr("Manufacturer"); labelColor: flickView.textColor } @@ -163,6 +165,7 @@ Rectangle visible: powerCheck.checked label: modelData.power + "W" labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -176,6 +179,7 @@ Rectangle visible: weightCheck.checked label: modelData.weight + "Kg" labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -188,6 +192,7 @@ Rectangle parent: gridBox label: cRef ? cRef.channels : 0 labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -195,13 +200,13 @@ Rectangle Component.onCompleted: flickView.totalChannels += cRef.channels } - // address range RobotoText { parent: gridBox label: cRef ? "" + (cRef.address + 1) + "-" + (cRef.address + cRef.channels + 1) : "" labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -214,6 +219,7 @@ Rectangle visible: modelCheck.checked label: modelData.fmodel labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -226,6 +232,7 @@ Rectangle visible: manufCheck.checked label: modelData.manuf labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -237,6 +244,7 @@ Rectangle parent: gridBox label: cRef ? cRef.name : "" labelColor: flickView.textColor + rightMargin: 5 Layout.fillWidth: true Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } @@ -251,6 +259,17 @@ Rectangle height: width sourceSize: Qt.size(width, height) } + + // ID + RobotoText + { + parent: gridBox + label: cRef ? cRef.id : "" + labelColor: flickView.textColor + Layout.fillWidth: true + + Rectangle { anchors.right: parent.right; height: parent.height; width: 1; color: "black" } + } } // delegate } // Repeater } // GridLayout diff --git a/qmlui/qml/inputoutput/InputPatchItem.qml b/qmlui/qml/inputoutput/InputPatchItem.qml index 6b46f13122..515126f60f 100644 --- a/qmlui/qml/inputoutput/InputPatchItem.qml +++ b/qmlui/qml/inputoutput/InputPatchItem.qml @@ -97,13 +97,13 @@ Rectangle radius: height / 2 border.width: 2 border.color: "#333" - color: UISettings.fgMedium + color: "#666" ColorAnimation on color { id: cAnim from: "#00FF00" - to: UISettings.fgMedium + to: "#666" duration: 500 running: false } diff --git a/qmlui/qml/popup/CustomPopupDialog.qml b/qmlui/qml/popup/CustomPopupDialog.qml index d1edabcb51..a7d8d5cdc1 100644 --- a/qmlui/qml/popup/CustomPopupDialog.qml +++ b/qmlui/qml/popup/CustomPopupDialog.qml @@ -122,7 +122,7 @@ Dialog { id: buttonControl width: buttonBoxControl.count === 1 ? UISettings.bigItemHeight * 2 : undefined - implicitWidth: width + //implicitWidth: width hoverEnabled: true diff --git a/qmlui/qml/virtualconsole/VCButtonProperties.qml b/qmlui/qml/virtualconsole/VCButtonProperties.qml index b1498f5769..e7dc99df87 100644 --- a/qmlui/qml/virtualconsole/VCButtonProperties.qml +++ b/qmlui/qml/virtualconsole/VCButtonProperties.qml @@ -90,7 +90,8 @@ Rectangle { anchors.top: parent.top anchors.right: parent.right - imgSource: "qrc:/reset.svg" + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl tooltip: qsTr("Detach the current function") onClicked: widgetRef.functionID = -1 } diff --git a/qmlui/qml/virtualconsole/VCCueListProperties.qml b/qmlui/qml/virtualconsole/VCCueListProperties.qml index d59415efc3..cd8932a5ba 100644 --- a/qmlui/qml/virtualconsole/VCCueListProperties.qml +++ b/qmlui/qml/virtualconsole/VCCueListProperties.qml @@ -70,7 +70,8 @@ Rectangle { anchors.top: parent.top anchors.right: parent.right - imgSource: "qrc:/reset.svg" + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl tooltip: qsTr("Detach the current chaser") onClicked: widgetRef.chaserID = -1 } diff --git a/qmlui/qml/virtualconsole/VCSliderItem.qml b/qmlui/qml/virtualconsole/VCSliderItem.qml index e19cae6676..f08dedecc0 100644 --- a/qmlui/qml/virtualconsole/VCSliderItem.qml +++ b/qmlui/qml/virtualconsole/VCSliderItem.qml @@ -188,7 +188,8 @@ VCWidgetItem { visible: sliderObj ? sliderObj.monitorEnabled : false Layout.alignment: Qt.AlignHCenter - imgSource: "qrc:/reset.svg" + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl bgColor: sliderObj && sliderObj.isOverriding ? "red" : UISettings.bgLight onClicked: if (sliderObj) sliderObj.isOverriding = false } diff --git a/qmlui/qml/virtualconsole/VCSliderProperties.qml b/qmlui/qml/virtualconsole/VCSliderProperties.qml index 7c4a5ef6bb..cb7f00c1c9 100644 --- a/qmlui/qml/virtualconsole/VCSliderProperties.qml +++ b/qmlui/qml/virtualconsole/VCSliderProperties.qml @@ -235,7 +235,8 @@ Rectangle { anchors.top: parent.top anchors.right: parent.right - imgSource: "qrc:/reset.svg" + faSource: FontAwesome.fa_remove + faColor: UISettings.bgControl tooltip: qsTr("Detach the current function") onClicked: widgetRef.controlledFunction = -1 } diff --git a/qmlui/qml/virtualconsole/VirtualConsole.qml b/qmlui/qml/virtualconsole/VirtualConsole.qml index bcb1876813..85ac157b61 100644 --- a/qmlui/qml/virtualconsole/VirtualConsole.qml +++ b/qmlui/qml/virtualconsole/VirtualConsole.qml @@ -102,6 +102,7 @@ Rectangle RowLayout { + id: rowLayout1 anchors.fill: parent spacing: 5 ButtonGroup { id: vcToolbarGroup } diff --git a/qmlui/qmlui.pro b/qmlui/qmlui.pro index a2ff92154c..a65d267ad4 100644 --- a/qmlui/qmlui.pro +++ b/qmlui/qmlui.pro @@ -53,6 +53,7 @@ HEADERS += \ sceneeditor.h \ scripteditor.h \ showmanager.h \ + simpledesk.h \ treemodel.h \ treemodelitem.h \ videoeditor.h \ @@ -85,6 +86,7 @@ SOURCES += main.cpp \ sceneeditor.cpp \ scripteditor.cpp \ showmanager.cpp \ + simpledesk.cpp \ treemodel.cpp \ treemodelitem.cpp \ videoeditor.cpp \ diff --git a/qmlui/qmlui.qrc b/qmlui/qmlui.qrc index 50d0587509..56a9187d7c 100644 --- a/qmlui/qmlui.qrc +++ b/qmlui/qmlui.qrc @@ -48,6 +48,7 @@ qml/RobotoText.qml qml/SectionBox.qml qml/SidePanel.qml + qml/SimpleDesk.qml qml/SingleAxisTool.qml qml/TimeEditTool.qml qml/TreeNodeDelegate.qml diff --git a/qmlui/rgbmatrixeditor.cpp b/qmlui/rgbmatrixeditor.cpp index 29926ea433..6865f19678 100644 --- a/qmlui/rgbmatrixeditor.cpp +++ b/qmlui/rgbmatrixeditor.cpp @@ -487,6 +487,50 @@ void RGBMatrixEditor::setScriptIntProperty(QString paramName, int value) m_matrix->setProperty(paramName, QString::number(value)); } +/************************************************************************ + * Blend mode + ************************************************************************/ + +int RGBMatrixEditor::blendMode() const +{ + if (m_matrix == nullptr) + return 0; + + return m_matrix->blendMode(); +} + +void RGBMatrixEditor::setBlendMode(int mode) +{ + if (m_matrix == nullptr || mode == m_matrix->blendMode()) + return; + + m_matrix->setBlendMode(Universe::BlendMode(mode)); + + emit blendModeChanged(); +} + +/************************************************************************ + * Control mode + ************************************************************************/ + +int RGBMatrixEditor::controlMode() const +{ + if (m_matrix == nullptr) + return 0; + + return m_matrix->controlMode(); +} + +void RGBMatrixEditor::setControlMode(int mode) +{ + if (m_matrix == nullptr || mode == m_matrix->controlMode()) + return; + + m_matrix->setControlMode(RGBMatrix::ControlMode(mode)); + + emit controlModeChanged(); +} + /************************************************************************ * Preview ************************************************************************/ diff --git a/qmlui/rgbmatrixeditor.h b/qmlui/rgbmatrixeditor.h index 4804e819fd..f530a3e7a1 100644 --- a/qmlui/rgbmatrixeditor.h +++ b/qmlui/rgbmatrixeditor.h @@ -43,6 +43,9 @@ class RGBMatrixEditor : public FunctionEditor Q_PROPERTY(QColor endColor READ endColor WRITE setEndColor NOTIFY endColorChanged) Q_PROPERTY(bool hasEndColor READ hasEndColor WRITE setHasEndColor NOTIFY hasEndColorChanged) + Q_PROPERTY(int blendMode READ blendMode WRITE setBlendMode NOTIFY blendModeChanged) + Q_PROPERTY(int controlMode READ controlMode WRITE setControlMode NOTIFY controlModeChanged) + // Text Algorithm specific properties Q_PROPERTY(QString algoText READ algoText WRITE setAlgoText NOTIFY algoTextChanged) Q_PROPERTY(QFont algoTextFont READ algoTextFont WRITE setAlgoTextFont NOTIFY algoTextFontChanged) @@ -138,6 +141,26 @@ class RGBMatrixEditor : public FunctionEditor void algoOffsetChanged(QSize algoOffset); void animationStyleChanged(int style); + /************************************************************************ + * Blend mode + ************************************************************************/ +public: + int blendMode() const; + void setBlendMode(int mode); + +signals: + void blendModeChanged(); + + /************************************************************************ + * Control mode + ************************************************************************/ +public: + int controlMode() const; + void setControlMode(int mode); + +signals: + void controlModeChanged(); + /************************************************************************ * Preview ************************************************************************/ diff --git a/qmlui/sceneeditor.cpp b/qmlui/sceneeditor.cpp index 4954b715d2..045fb82dff 100644 --- a/qmlui/sceneeditor.cpp +++ b/qmlui/sceneeditor.cpp @@ -79,6 +79,8 @@ void SceneEditor::setFunctionID(quint32 id) connect(m_scene, &Scene::valueChanged, this, &SceneEditor::slotSceneValueChanged); updateLists(); + cacheChannelValues(); + if (bottomPanel != nullptr) { bottomPanel->setProperty("visible", true); @@ -134,6 +136,21 @@ void SceneEditor::registerFixtureConsole(int index, QQuickItem *item) { qDebug() << "[SceneEditor] Fixture console registered at index" << index; m_fxConsoleMap[index] = item; + + if (index >= m_fixtureIDs.count()) + { + qDebug() << "[SceneEditor] index out of bounds"; + return; + } + + quint32 fixtureID = m_fixtureIDs[index]; + QVariantList dmxValues; + QByteArray values = m_channelsCache[fixtureID]; + + for (int i = 0; i < values.count(); i++) + dmxValues.append(QString::number((uchar)values.at(i))); + + item->setProperty("values", QVariant::fromValue(dmxValues)); } void SceneEditor::unRegisterFixtureConsole(int index) @@ -182,7 +199,7 @@ void SceneEditor::slotSceneValueChanged(SceneValue scv) fxMap.insert("isSelected", false); m_fixtureList->addDataMap(fxMap); m_fixtureIDs.append(scv.fxi); - emit fixtureListChanged(); + updateLists(); } if (m_sceneConsole) @@ -424,3 +441,44 @@ void SceneEditor::updateLists() emit fixtureListChanged(); } +void SceneEditor::setCacheChannelValue(SceneValue scv) +{ + if (m_channelsCache.contains(scv.fxi)) + { + QByteArray values = m_channelsCache[scv.fxi]; + values[scv.channel] = scv.value; + m_channelsCache[scv.fxi] = values; + } + else + { + Fixture *fixture = m_doc->fixture(scv.fxi); + int chNumber = fixture->channels(); + QByteArray values; + + values.fill(0, chNumber); + values[scv.channel] = scv.value; + m_channelsCache[scv.fxi] = values; + } +} + +void SceneEditor::cacheChannelValues() +{ + m_channelsCache.clear(); + + for (quint32 pId : m_scene->palettes()) + { + QLCPalette *palette = m_doc->palette(pId); + if (palette == nullptr) + continue; + + for (SceneValue scv : palette->valuesFromFixtureGroups(m_doc, m_scene->fixtureGroups())) + setCacheChannelValue(scv); + + for (SceneValue scv : palette->valuesFromFixtures(m_doc, m_scene->fixtures())) + setCacheChannelValue(scv); + } + + for (SceneValue scv : m_scene->values()) + setCacheChannelValue(scv); +} + diff --git a/qmlui/sceneeditor.h b/qmlui/sceneeditor.h index 46a26cd688..8c18a43978 100644 --- a/qmlui/sceneeditor.h +++ b/qmlui/sceneeditor.h @@ -87,6 +87,8 @@ protected slots: private: void addFixtureToList(quint32 fid); void updateLists(); + void setCacheChannelValue(SceneValue scv); + void cacheChannelValues(); signals: void fixtureListChanged(); @@ -107,6 +109,9 @@ protected slots: /** Keep a track of the registered Fixture consoles in a Scene Console, * to rapidly set a channel value */ QMap m_fxConsoleMap; + /** Pre-cache initial channel values including palettes. + * arranged as */ + QMap m_channelsCache; /** Reference to a DMX source used to edit a Scene */ GenericDMXSource *m_source; }; diff --git a/qmlui/showmanager.cpp b/qmlui/showmanager.cpp index 36b51feef0..9fcb075fa1 100644 --- a/qmlui/showmanager.cpp +++ b/qmlui/showmanager.cpp @@ -104,13 +104,13 @@ void ShowManager::setShowName(QString showName) emit showNameChanged(showName); } -QQmlListProperty ShowManager::tracks() +QList ShowManager::tracks() { m_tracksList.clear(); if (m_currentShow) m_tracksList = m_currentShow->tracks(); - return QQmlListProperty(this, m_tracksList); + return m_tracksList; } int ShowManager::selectedTrack() const diff --git a/qmlui/showmanager.h b/qmlui/showmanager.h index 7edba8371b..743d480dc4 100644 --- a/qmlui/showmanager.h +++ b/qmlui/showmanager.h @@ -52,7 +52,7 @@ class ShowManager : public PreviewContext Q_PROPERTY(int currentTime READ currentTime WRITE setCurrentTime NOTIFY currentTimeChanged) Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged) Q_PROPERTY(int showDuration READ showDuration NOTIFY showDurationChanged) - Q_PROPERTY(QQmlListProperty tracks READ tracks NOTIFY tracksChanged) + Q_PROPERTY(QList tracks READ tracks NOTIFY tracksChanged) Q_PROPERTY(int selectedTrack READ selectedTrack WRITE setSelectedTrack NOTIFY selectedTrackChanged) Q_PROPERTY(int selectedItemsCount READ selectedItemsCount NOTIFY selectedItemsCountChanged) @@ -72,7 +72,7 @@ class ShowManager : public PreviewContext void setShowName(QString showName); /** Return a list of Track objects suitable for QML */ - QQmlListProperty tracks(); + QList tracks(); /** Get/Set the selected track index */ int selectedTrack() const; diff --git a/qmlui/simpledesk.cpp b/qmlui/simpledesk.cpp new file mode 100644 index 0000000000..ceba847ae9 --- /dev/null +++ b/qmlui/simpledesk.cpp @@ -0,0 +1,443 @@ +/* + Q Light Controller Plus + simpledesk.cpp + + Copyright (c) Massimo Callegari + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include + +#include "simpledesk.h" +#include "keypadparser.h" +#include "genericfader.h" +#include "fadechannel.h" +#include "scenevalue.h" +#include "listmodel.h" +#include "tardis.h" +#include "doc.h" + +#define UserRoleClassReference (Qt::UserRole + 1) +#define UserRoleChannelIndex (Qt::UserRole + 2) +#define UserRoleChannelValue (Qt::UserRole + 3) +#define UserRoleChannelStatus (Qt::UserRole + 4) +#define UserRoleChannelOverride (Qt::UserRole + 5) + +#define MAX_KEYPAD_HISTORY 10 + +SimpleDesk::SimpleDesk(QQuickView *view, Doc *doc, QObject *parent) + : PreviewContext(view, doc, "SDESK", parent) +{ + Q_ASSERT(m_doc != nullptr); + + setContextResource("qrc:/SimpleDesk.qml"); + setContextTitle(tr("Simple Desk")); + + view->rootContext()->setContextProperty("simpleDesk", this); + + m_doc->masterTimer()->registerDMXSource(this); + + m_channelList = new ListModel(this); + QStringList listRoles; + listRoles << "cRef" << "chIndex" << "chValue" << "chDisplay" << "isOverride"; + m_channelList->setRoleNames(listRoles); + + // initialize channel value data + for (quint32 i = 0; i < m_doc->inputOutputMap()->universesCount(); i++) + m_prevUniverseValues[i].fill(0, 512); + + updateChannelList(); + + connect(m_doc, SIGNAL(loaded()), this, SLOT(updateChannelList())); + connect(m_doc, SIGNAL(fixtureAdded(quint32)), this, SLOT(updateChannelList())); + connect(m_doc, SIGNAL(fixtureRemoved(quint32)), this, SLOT(updateChannelList())); + connect(m_doc->inputOutputMap(), SIGNAL(universeWritten(quint32,QByteArray)), + this, SLOT(slotUniverseWritten(quint32,QByteArray))); +} + +SimpleDesk::~SimpleDesk() +{ + m_doc->masterTimer()->unregisterDMXSource(this); +} + +void SimpleDesk::setUniverseFilter(quint32 universeFilter) +{ + PreviewContext::setUniverseFilter(universeFilter); + updateChannelList(); + emit fixtureListChanged(); +} + +QVariant SimpleDesk::channelList() const +{ + return QVariant::fromValue(m_channelList); +} + +QVariantList SimpleDesk::fixtureList() const +{ + QVariantList list; + + foreach (Fixture *fxi, m_doc->fixtures()) + { + if (fxi->universe() != m_universeFilter) + continue; + + list.append(QVariant::fromValue(fxi)); + } + + return list; +} + +void SimpleDesk::updateChannelList() +{ + QVariantList chList; + quint32 start = (m_universeFilter * 512); + quint32 prevID = Fixture::invalidId(); + int status = None; + + m_channelList->clear(); + + QByteArray currUni = m_prevUniverseValues.value(m_universeFilter); + + for (int i = 0; i < currUni.length(); i++) + { + quint32 chIndex = 0; + quint32 chValue = currUni.at(i); + bool override = false; + + Fixture *fxi = m_doc->fixture(m_doc->fixtureForAddress(start + i)); + if (fxi != nullptr) + { + if (fxi->id() != prevID) + { + status = (status == Odd) ? Even : Odd; + prevID = fxi->id(); + } + chIndex = i - fxi->address(); + if (hasChannel(i)) + { + chValue = value(i); + override = true; + } + else + { + chValue = fxi->channelValueAt(chIndex); + } + } + else + { + if (hasChannel(i)) + { + override = true; + chValue = value(i); + } + } + + QVariantMap chMap; + chMap.insert("cRef", QVariant::fromValue(fxi)); + chMap.insert("chIndex", chIndex); + chMap.insert("chValue", chValue); + chMap.insert("chDisplay", status); + chMap.insert("isOverride", override); + + m_channelList->addDataMap(chMap); + } + + emit channelListChanged(); +} + +QVariant SimpleDesk::universesListModel() const +{ + QVariantList universesList; + + for (Universe *uni : m_doc->inputOutputMap()->universes()) + { + QVariantMap uniMap; + uniMap.insert("mLabel", uni->name()); + uniMap.insert("mValue", uni->id()); + universesList.append(uniMap); + } + + return QVariant::fromValue(universesList); +} + +/************************************************************************ + * Universe Values + ************************************************************************/ + +void SimpleDesk::setValue(quint32 fixtureID, uint channel, uchar value) +{ + QMutexLocker locker(&m_mutex); + quint32 start = (m_universeFilter * 512); + QVariant currentVal, newVal; + SceneValue currScv; + + if (m_values.contains(start + channel)) + { + //currScv.fxi = fixtureID; + currScv.channel = channel; + currScv.value = m_values[start + channel]; + } + currentVal.setValue(currScv); + + m_values[start + channel] = value; + + QModelIndex mIndex = m_channelList->index(int(channel), 0, QModelIndex()); + m_channelList->setData(mIndex, value, UserRoleChannelValue); + m_channelList->setData(mIndex, true, UserRoleChannelOverride); + + newVal.setValue(SceneValue(Fixture::invalidId(), channel, value)); + Tardis::instance()->enqueueAction(Tardis::SimpleDeskSetChannel, 0, currentVal, newVal); + + if (fixtureID != Fixture::invalidId()) + { + Fixture *fixture = m_doc->fixture(fixtureID); + quint32 relCh = channel - fixture->address(); + emit channelValueChanged(fixtureID, relCh, value); + } + + setChanged(true); +} + +uchar SimpleDesk::value(uint channel) const +{ + QMutexLocker locker(&m_mutex); + quint32 start = (m_universeFilter * 512); + if (m_values.contains(start + channel) == true) + return m_values[start + channel]; + else + return 0; +} + +bool SimpleDesk::hasChannel(uint channel) +{ + QMutexLocker locker(&m_mutex); + quint32 start = (m_universeFilter * 512); + return m_values.contains(start + channel); +} + +void SimpleDesk::resetUniverse(int universe) +{ + // remove values previously set on universe + QMutexLocker locker(&m_mutex); + QHashIterator it(m_values); + while (it.hasNext() == true) + { + it.next(); + uint absChannel = it.key(); + int uni = absChannel >> 9; + if (uni == universe) + { + m_values.remove(absChannel); + + // remove the override flag from the displayed channel + QModelIndex mIndex = m_channelList->index(int(absChannel & 0x01FF), 0, QModelIndex()); + //uchar chValue = uchar(m_prevUniverseValues[uni].at(absChannel & 0x01FF)); + m_channelList->setData(mIndex, 0, UserRoleChannelValue); + m_channelList->setData(mIndex, false, UserRoleChannelOverride); + } + } + + // add command to queue. Will be taken care of at the next writeDMX call + m_commandQueue.append(QPair(ResetUniverse, universe)); + setChanged(true); +} + +void SimpleDesk::resetChannel(uint channel) +{ + QMutexLocker locker(&m_mutex); + quint32 start = (m_universeFilter * 512); + QVariant currentVal; + SceneValue currScv; + + if (m_values.contains(start + channel) == false) + return; + + currScv.channel = channel; + currScv.value = m_values[start + channel]; + currentVal.setValue(currScv); + m_values.remove(start + channel); + + // add command to queue. Will be taken care of at the next writeDMX call + m_commandQueue.append(QPair(ResetChannel, start + channel)); + + Tardis::instance()->enqueueAction(Tardis::SimpleDeskResetChannel, 0, currentVal, currentVal); + + setChanged(true); +} + +void SimpleDesk::slotUniverseWritten(quint32 idx, const QByteArray& ua) +{ + if (idx != m_universeFilter) // || isEnabled() == false) + return; + + QByteArray currUni = m_prevUniverseValues.value(idx); + + for (int i = 0; i < ua.length(); i++) + { + if (ua.at(i) == currUni.at(i)) + continue; + + //qDebug() << "Channel " << i << "changed to " << QString::number(uchar(ua.at(i))); + + // update displayed channel only if it is not overridden + if (hasChannel(i) == false) + { + QModelIndex mIndex = m_channelList->index(int(i), 0, QModelIndex()); + m_channelList->setData(mIndex, QVariant(uchar(ua.at(i))), UserRoleChannelValue); + } + } + + m_prevUniverseValues[idx].replace(0, ua.length(), ua); +} + +/************************************************************************ + * Keypad + ************************************************************************/ + +void SimpleDesk::sendKeypadCommand(QString command) +{ + QByteArray uniData = m_prevUniverseValues.value(m_universeFilter); + QList scvList = KeyPadParser::parseCommand(m_doc, command, uniData); + + for (SceneValue scv : scvList) + { + setValue(Fixture::invalidId(), scv.channel, scv.value); + QModelIndex mIndex = m_channelList->index(int(scv.channel), 0, QModelIndex()); + m_channelList->setData(mIndex, QVariant(scv.value), UserRoleChannelValue); + } + + m_keypadCommandHistory.prepend(command); + if (m_keypadCommandHistory.count() > MAX_KEYPAD_HISTORY) + m_keypadCommandHistory.removeLast(); + + emit commandHistoryChanged(); +} + +QStringList SimpleDesk::commandHistory() const +{ + return m_keypadCommandHistory; +} + +/************************************************************************ + * DMXSource + ************************************************************************/ + +FadeChannel *SimpleDesk::getFader(QList universes, quint32 universeID, quint32 fixtureID, quint32 channel) +{ + // get the universe Fader first. If doesn't exist, create it + QSharedPointer fader = m_fadersMap.value(universeID, QSharedPointer()); + if (fader.isNull()) + { + fader = universes[universeID]->requestFader(Universe::SimpleDesk); + m_fadersMap[universeID] = fader; + } + + return fader->getChannelFader(m_doc, universes[universeID], fixtureID, channel); +} + +void SimpleDesk::writeDMX(MasterTimer *timer, QList ua) +{ + Q_UNUSED(timer) + + QMutexLocker locker(&m_mutex); + + if (m_commandQueue.isEmpty() == false) + { + for (int i = 0; i < m_commandQueue.count(); i++) + { + QPair command = m_commandQueue.at(i); + if (command.first == ResetUniverse) + { + quint32 universe = command.second; + if (universe >= (quint32)ua.count()) + continue; + + ua[universe]->reset(0, 512); + + QSharedPointer fader = m_fadersMap.value(universe, QSharedPointer()); + if (!fader.isNull()) + { + // loop through all active fadechannels and restore default values + QHashIterator it(fader->channels()); + while (it.hasNext() == true) + { + it.next(); + FadeChannel fc = it.value(); + Fixture *fixture = m_doc->fixture(fc.fixture()); + quint32 chIndex = fc.channel(); + if (fixture != NULL) + { + const QLCChannel *ch = fixture->channel(chIndex); + if (ch != NULL) + { + //qDebug() << "Restoring default value of fixture" << fixture->id() + // << "channel" << chIndex << "value" << ch->defaultValue(); + ua[universe]->setChannelDefaultValue(fixture->address() + chIndex, ch->defaultValue()); + } + } + } + ua[universe]->dismissFader(fader); + m_fadersMap.remove(universe); + } + } + else if (command.first == ResetChannel) + { + quint32 channel = command.second; + quint32 universe = channel >> 9; + QSharedPointer fader = m_fadersMap.value(universe, QSharedPointer()); + if (!fader.isNull()) + { + FadeChannel fc(m_doc, Fixture::invalidId(), channel); + Fixture *fixture = m_doc->fixture(fc.fixture()); + quint32 chIndex = fc.channel(); + fader->remove(&fc); + ua[universe]->reset(channel & 0x01FF, 1); + if (fixture != NULL) + { + const QLCChannel *ch = fixture->channel(chIndex); + if (ch != NULL) + { + qDebug() << "Restoring default value of fixture" << fixture->id() + << "channel" << chIndex << "value" << ch->defaultValue(); + ua[universe]->setChannelDefaultValue(channel, ch->defaultValue()); + } + } + + // remove the override flag from the displayed channel + QModelIndex mIndex = m_channelList->index(int(channel & 0x01FF), 0, QModelIndex()); + m_channelList->setData(mIndex, false, UserRoleChannelOverride); + } + } + } + m_commandQueue.clear(); + } + + if (hasChanged()) + { + QHashIterator it(m_values); + while (it.hasNext() == true) + { + it.next(); + int uni = it.key() >> 9; + int address = it.key(); + uchar value = it.value(); + FadeChannel *fc = getFader(ua, uni, Fixture::invalidId(), address); + fc->setCurrent(value); + fc->setTarget(value); + fc->addFlag(FadeChannel::Override); + } + setChanged(false); + } +} + diff --git a/qmlui/simpledesk.h b/qmlui/simpledesk.h new file mode 100644 index 0000000000..9386fbd7ff --- /dev/null +++ b/qmlui/simpledesk.h @@ -0,0 +1,154 @@ +/* + Q Light Controller Plus + simpledesk.h + + Copyright (c) Massimo Callegari + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef SIMPLEDESK_H +#define SIMPLEDESK_H + +#include "previewcontext.h" +#include "dmxsource.h" + +#include + +class GenericFader; +class FadeChannel; +class ListModel; + +class SimpleDesk : public PreviewContext, public DMXSource +{ + Q_OBJECT + + Q_PROPERTY(QVariant universesListModel READ universesListModel CONSTANT) + Q_PROPERTY(QVariant channelList READ channelList NOTIFY channelListChanged) + Q_PROPERTY(QVariantList fixtureList READ fixtureList NOTIFY fixtureListChanged) + Q_PROPERTY(QStringList commandHistory READ commandHistory NOTIFY commandHistoryChanged) + +public: + SimpleDesk(QQuickView *view, Doc *doc, QObject *parent = 0); + ~SimpleDesk(); + + QVariant universesListModel() const; + + /** @reimp */ + void setUniverseFilter(quint32 universeFilter); + + /** Return the actual list of channels for + * the currently selected universe */ + QVariant channelList() const; + + /** Return the list of fixtures for + * the currently selected universe */ + QVariantList fixtureList() const; + +protected slots: + void updateChannelList(); + +signals: + void channelListChanged(); + void fixtureListChanged(); + +private: + /** QML ready model to hold channel values and changes */ + ListModel *m_channelList; + + /** Values array for comparison */ + QMap m_prevUniverseValues; + + /************************************************************************ + * Universe Values + ************************************************************************/ +public: + enum SimpleDeskCommand + { + ResetChannel, + ResetUniverse + }; + + enum ChannelStatus { None = 0, Odd, Even, Override }; + Q_ENUM(ChannelStatus) + + /** Set the value of a single channel */ + Q_INVOKABLE void setValue(quint32 fixtureID, uint channel, uchar value); + + /** Get the value of a single channel */ + uchar value(uint channel) const; + + /** Check if Simple desk is currently controlling a channel */ + bool hasChannel(uint channel); + + /** Reset the values of the given universe to zero */ + Q_INVOKABLE void resetUniverse(int universe); + + /** Reset the value of the specified channel */ + Q_INVOKABLE void resetChannel(uint channel); + +protected slots: + /** Invoked by the QLC+ engine to inform the UI that the + * Universe at $idx has changed */ + void slotUniverseWritten(quint32 idx, const QByteArray& ua); + +signals: + /** Informed the listeners that a channel value has changed. + * This is connected to ContextManager for Scene dump */ + void channelValueChanged(quint32 fixtureID, quint32 channelIndex, quint8 value); + +private: + /** A map of channel absolute addresses and their values. + * Note that only channels overridden by Simple Desk are here */ + QHash m_values; + + /** Mutex to sync data access */ + mutable QMutex m_mutex; + + /** A list of commands to be executed on writeDMX. + * This is used to sync reset requests with mastertimer ticks */ + QList< QPair > m_commandQueue; + + /************************************************************************ + * Keypad + ************************************************************************/ +public: + Q_INVOKABLE void sendKeypadCommand(QString command); + + /** Return a list of the last N commands + * entered on the keypad */ + QStringList commandHistory() const; + +signals: + void commandHistoryChanged(); + +private: + QStringList m_keypadCommandHistory; + + /************************************************************************ + * DMXSource + ************************************************************************/ +public: + /** @reimpl */ + void writeDMX(MasterTimer* timer, QList ua); + +private: + FadeChannel *getFader(QList universes, quint32 universeID, + quint32 fixtureID, quint32 channel); + +private: + /** Map used to lookup a GenericFader instance for a Universe ID */ + QMap > m_fadersMap; +}; + +#endif // SIMPLEDESK_H diff --git a/qmlui/tardis/networkmanager.cpp b/qmlui/tardis/networkmanager.cpp index 72566a4474..c72a7cfde5 100644 --- a/qmlui/tardis/networkmanager.cpp +++ b/qmlui/tardis/networkmanager.cpp @@ -18,6 +18,7 @@ */ #include +#include #include #include diff --git a/qmlui/tardis/networkmanager.h b/qmlui/tardis/networkmanager.h index 5b61fd9c56..4b52a8c9d6 100644 --- a/qmlui/tardis/networkmanager.h +++ b/qmlui/tardis/networkmanager.h @@ -23,7 +23,10 @@ #if defined(WIN32) || defined(Q_OS_WIN) #include #endif -#include + +#include +#include +#include #include #include diff --git a/qmlui/tardis/simplecrypt.cpp b/qmlui/tardis/simplecrypt.cpp index 5e7be16d27..44543c3eab 100755 --- a/qmlui/tardis/simplecrypt.cpp +++ b/qmlui/tardis/simplecrypt.cpp @@ -38,7 +38,7 @@ SimpleCrypt::SimpleCrypt(): m_protectionMode(ProtectionChecksum), m_lastError(ErrorNoError) { - qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); + m_rand.seed(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); } SimpleCrypt::SimpleCrypt(quint64 key): @@ -47,7 +47,7 @@ SimpleCrypt::SimpleCrypt(quint64 key): m_protectionMode(ProtectionChecksum), m_lastError(ErrorNoError) { - qsrand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); + m_rand.seed(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF)); splitKey(); } @@ -113,7 +113,7 @@ QByteArray SimpleCrypt::encryptToByteArray(QByteArray plaintext) } //prepend a random char to the string - char randomChar = char(qrand() & 0xFF); + char randomChar = char(m_rand.generate() & 0xFF); ba = randomChar + integrityProtection + ba; int pos(0); diff --git a/qmlui/tardis/simplecrypt.h b/qmlui/tardis/simplecrypt.h index 8534455ae7..469f72f4e4 100755 --- a/qmlui/tardis/simplecrypt.h +++ b/qmlui/tardis/simplecrypt.h @@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include /** @short Simple encryption and decryption of strings and byte arrays @@ -219,7 +220,8 @@ class SimpleCrypt CompressionMode m_compressionMode; IntegrityProtectionMode m_protectionMode; Error m_lastError; + QRandomGenerator m_rand; }; Q_DECLARE_OPERATORS_FOR_FLAGS(SimpleCrypt::CryptoFlags) -#endif // SimpleCrypt_H \ No newline at end of file +#endif // SimpleCrypt_H diff --git a/qmlui/tardis/tardis.cpp b/qmlui/tardis/tardis.cpp index 369e4895af..7d5e868425 100644 --- a/qmlui/tardis/tardis.cpp +++ b/qmlui/tardis/tardis.cpp @@ -29,6 +29,7 @@ #include "functionmanager.h" #include "contextmanager.h" #include "functioneditor.h" +#include "simpledesk.h" #include "collection.h" #include "rgbmatrix.h" #include "vccuelist.h" @@ -55,7 +56,7 @@ Tardis* Tardis::s_instance = nullptr; Tardis::Tardis(QQuickView *view, Doc *doc, NetworkManager *netMgr, - FixtureManager *fxMgr, FunctionManager *funcMgr, ContextManager *ctxMgr, + FixtureManager *fxMgr, FunctionManager *funcMgr, ContextManager *ctxMgr, SimpleDesk *sDesk, ShowManager *showMgr, VirtualConsole *vc, QObject *parent) : QThread(parent) , m_running(false) @@ -65,6 +66,7 @@ Tardis::Tardis(QQuickView *view, Doc *doc, NetworkManager *netMgr, , m_fixtureManager(fxMgr) , m_functionManager(funcMgr) , m_contextManager(ctxMgr) + , m_simpleDesk(sDesk) , m_showManager(showMgr) , m_virtualConsole(vc) , m_historyIndex(-1) @@ -639,8 +641,19 @@ int Tardis::processAction(TardisAction &action, bool undo) { SceneValue scv = value->value(); Scene *scene = qobject_cast(m_doc->function(action.m_objID)); + if (scene) - scene->setValue(scv.fxi, scv.channel, scv.value); + { + if (value->isNull()) + { + SceneValue otherValue = undo ? action.m_newValue.value() : action.m_oldValue.value(); + scene->unsetValue(otherValue.fxi, otherValue.channel); + } + else + { + scene->setValue(scv.fxi, scv.channel, scv.value); + } + } } break; @@ -944,6 +957,30 @@ int Tardis::processAction(TardisAction &action, bool undo) } break; + /* ************************* Simple Desk actions ************************** */ + + case SimpleDeskSetChannel: + { + SceneValue scv = value->value(); + if (scv.channel == QLCChannel::invalid()) + { + SceneValue newVal = action.m_newValue.value(); + m_simpleDesk->resetChannel(newVal.channel); + } + else + m_simpleDesk->setValue(scv.fxi, scv.channel, scv.value); + } + break; + case SimpleDeskResetChannel: + { + SceneValue scv = value->value(); + if (undo) + m_simpleDesk->setValue(scv.fxi, scv.channel, scv.value); + else + m_simpleDesk->resetChannel(scv.channel); + } + break; + /* ******************* Virtual console editing actions ******************** */ case VCWidgetCreate: diff --git a/qmlui/tardis/tardis.h b/qmlui/tardis/tardis.h index eb67e2f5b6..9b908c890e 100644 --- a/qmlui/tardis/tardis.h +++ b/qmlui/tardis/tardis.h @@ -34,6 +34,7 @@ class ContextManager; class VirtualConsole; class NetworkManager; class ShowManager; +class SimpleDesk; class Doc; typedef struct @@ -142,6 +143,10 @@ class Tardis : public QThread VideoSetRotation, VideoSetLayer, + /* Simple Desk actions */ + SimpleDeskSetChannel = 0xC000, + SimpleDeskResetChannel, + /* Virtual console editing actions */ VCWidgetCreate = 0xE000, VCWidgetDelete, @@ -189,7 +194,8 @@ class Tardis : public QThread explicit Tardis(QQuickView *view, Doc *doc, NetworkManager *netMgr, FixtureManager *fxMgr, FunctionManager *funcMgr, - ContextManager *ctxMgr, ShowManager *showMgr, VirtualConsole *vc, + ContextManager *ctxMgr, SimpleDesk *sDesk, + ShowManager *showMgr, VirtualConsole *vc, QObject *parent = 0); ~Tardis(); @@ -246,6 +252,8 @@ protected slots: FunctionManager *m_functionManager; /** Reference to the Context Manager */ ContextManager *m_contextManager; + /** Reference to the Simple Desk */ + SimpleDesk *m_simpleDesk; /** Reference to the Show Manager */ ShowManager *m_showManager; /** Reference to the Virtual Console */ diff --git a/resources/docs/html_en_EN/modeeditor.html b/resources/docs/html_en_EN/modeeditor.html index a4f259c682..c3f11ee802 100644 --- a/resources/docs/html_en_EN/modeeditor.html +++ b/resources/docs/html_en_EN/modeeditor.html @@ -33,7 +33,9 @@

Channels Tab

Channel list - Displays all channels present in the current mode in their proper order. + Displays all channels present in the current mode in their proper order.
+ The "Acts on" column is used to bind a channel to another. For example a channel that + controls the speed of a rotating gobo. diff --git a/resources/docs/html_en_EN/pdf_cover.html b/resources/docs/html_en_EN/pdf_cover.html index a2c9763d76..0005ad82bf 100644 --- a/resources/docs/html_en_EN/pdf_cover.html +++ b/resources/docs/html_en_EN/pdf_cover.html @@ -13,8 +13,8 @@

User Documentation
















-Updated to version 4.12.3
-December, 29th 2019 +Updated to version 4.12.4
+December, 20th 2020 diff --git a/resources/docs/html_en_EN/rgbmatrixeditor.html b/resources/docs/html_en_EN/rgbmatrixeditor.html index 98aec3e803..37eec95152 100644 --- a/resources/docs/html_en_EN/rgbmatrixeditor.html +++ b/resources/docs/html_en_EN/rgbmatrixeditor.html @@ -146,6 +146,16 @@

Controls

blending. + + + Pattern Color Mode + + The color mode is the mechanism select which color channels the RGB Matrices applies to.
+ Default setting is RGB mode, addressing RGB channels or CMY channels. If set otherwise, only the + selected channels (e.g. "White") whill be set in a grayscale of the selected color(s). Channels not + representing the selected color mode (e.g. R, G and B) will not be touched. + + Offset diff --git a/resources/docs/html_ja_JP/pdf_cover.html b/resources/docs/html_ja_JP/pdf_cover.html index 76de71bf71..a40549e443 100755 --- a/resources/docs/html_ja_JP/pdf_cover.html +++ b/resources/docs/html_ja_JP/pdf_cover.html @@ -13,8 +13,8 @@

日本語訳版
















-Updated to version 4.12.3
-December, 29th 2019 +Updated to version 4.12.4
+December, 20th 2020 diff --git a/resources/fixtures/AFX/AFX-Spot-180-LED.qxf b/resources/fixtures/AFX/AFX-Spot-180-LED.qxf index 01b57ec83e..e8f8cd0559 100644 --- a/resources/fixtures/AFX/AFX-Spot-180-LED.qxf +++ b/resources/fixtures/AFX/AFX-Spot-180-LED.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Aurelien AFX @@ -36,7 +36,7 @@ Gobo - Open + Open Gobo 1 Gobo 2 Gobo 3 @@ -53,9 +53,9 @@ Gobo 3 Shake speed from slow to fast Gobo 2 Shake speed from slow to fast Gobo 1 Shake speed from slow to fast - Open - Gobo Rotate CW slow to fast - Gobo Rotate CCW slow to fast + Open + Gobo Rotate CW slow to fast + Gobo Rotate CCW slow to fast Gobo @@ -66,18 +66,18 @@ Gobo 4 Gobo 5 Gobo 6 - Gobo Rotate CW slow to fast - Gobo Rotate CCW slow to fast + Gobo Rotate CW slow to fast + Gobo Rotate CCW slow to fast Gobo - Open - Gobo Fine 0-360 - Gobo Rotating 0-90 - Gobo Rotating 0-180 - Gobo Rotating 0-720 - Gobo self-rotating CW from slow to fast - Gobo self-rotating CCW rotating from slow to fast + Open + Gobo Fine 0-360 + Gobo Rotating 0-90 + Gobo Rotating 0-180 + Gobo Rotating 0-720 + Gobo self-rotating CW from slow to fast + Gobo self-rotating CCW rotating from slow to fast @@ -114,10 +114,10 @@ Colour Wheel Static Gobos Rotation Gobos - Gobo Rotation + Gobo Rotation Focus Prism - Prism Rotation + Prism Rotation Self-setting Program Reset diff --git a/resources/fixtures/American_DJ/American-DJ-12P-Hex-IP.qxf b/resources/fixtures/American_DJ/American-DJ-12P-Hex-IP.qxf new file mode 100644 index 0000000000..d75ab559ef --- /dev/null +++ b/resources/fixtures/American_DJ/American-DJ-12P-Hex-IP.qxf @@ -0,0 +1,179 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + István Király + + American DJ + 12P Hex IP + Color Changer + + + + + + + + + Shutter + LED Off + LED On + Strobe Slow - Fast + LED On + Strobe Pulse Slow - Fast + LED On + Random Strobe + LED On + + + Speed + From slow to fast + + + Maintenance + Standard + Stage + TV + Architectural + Theatre + Default to unit setting + + + Effect + From slow to fast + + + Effect + No Function + Program 1 + Program 2 + Program 3 + Program 4 + Program 5 + Program 6 + Program 7 + Program 8 + Program 9 + Program 10 + Program 11 + Program 12 + + + Colour + Color 1 + Color 2 + Color 3 + Color 4 + Color 5 + Color 6 + Color 7 + Color 8 + Color 9 + Color 10 + Color 11 + Color 12 + Color 13 + Color 14 + Color 15 + Color 16 + Color 17 + Color 18 + Color 19 + Color 20 + Color 21 + Color 22 + Color 23 + Color 24 + Color 25 + Color 26 + Color 27 + Color 28 + Color 29 + Color 30 + Color 31 + Color 32 + Color 33 + Color 34 + Color 35 + Color 36 + Color 37 + Color 38 + Color 39 + Color 40 + Color 41 + Color 42 + Color 43 + Color 44 + Color 45 + Color 46 + Color 47 + Color 48 + Color 49 + Color 50 + Color 51 + Color 52 + Color 53 + Color 54 + Color 55 + Color 56 + Color 57 + Color 58 + Red + Green + Blue + White + Amber + UV + + + Red + Green + Blue + White + Amber + UV + + + Red + Green + Blue + White + Amber + UV + Master Dimmer + + + Red + Green + Blue + White + Amber + UV + Master Dimmer + Strobe + + + Red + Green + Blue + White + Amber + UV + Master Dimmer + Strobe + Color Macro + Auto Programs + Auto Program Speed + Auto Program Fade + Dimmer Modes + + + + + + + + + diff --git a/resources/fixtures/American_DJ/American-DJ-Accu-Roller-250.qxf b/resources/fixtures/American_DJ/American-DJ-Accu-Roller-250.qxf index 09a4467184..8a5427d953 100644 --- a/resources/fixtures/American_DJ/American-DJ-Accu-Roller-250.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Accu-Roller-250.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Anders Thomsen American DJ @@ -41,13 +41,13 @@ Rotating 5 Rotating 6 Rotating 7 - Shake 1 - Shake 2 - Shake 3 - Shake 4 - Shake 5 - Shake 6 - Shake 7 + Shake 1 + Shake 2 + Shake 3 + Shake 4 + Shake 5 + Shake 6 + Shake 7 Gobo @@ -99,7 +99,7 @@ Barrel rotation Color Gobo - Gobo rotation + Gobo rotation Shutter/Strobe Reset/Internal programs Speed of pan/tilt movement diff --git a/resources/fixtures/American_DJ/American-DJ-Accu-Spot-250-II.qxf b/resources/fixtures/American_DJ/American-DJ-Accu-Spot-250-II.qxf index d661ee8111..a891f85203 100644 --- a/resources/fixtures/American_DJ/American-DJ-Accu-Spot-250-II.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Accu-Spot-250-II.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 + 4.12.4 GIT Lime Lounge American DJ @@ -37,21 +37,21 @@ Donut (Metal) Triangle (Metal) Dot Line (Metal) - Star Circle (Metal) Shake - Cross (Metal) Shake - Blue & White Web (Dichoric) Shake - Textured Glass (Glass) Shake - Donut (Metal) Shake - Triangle (Metal) Shake - Dot Line (Metal) Shake - Rotating Gobo Wheel (Slow -> Fast) + Star Circle (Metal) Shake + Cross (Metal) Shake + Blue & White Web (Dichoric) Shake + Textured Glass (Glass) Shake + Donut (Metal) Shake + Triangle (Metal) Shake + Dot Line (Metal) Shake + Rotating Gobo Wheel (Slow -> Fast) - Effect - No Rotation - Forward Gobo Rotation (Fast -> Slow) - No Rotation - Backward Gobo Rotation (Fast -> Slow) + Gobo + No Rotation + Forward Gobo Rotation (Fast -> Slow) + No Rotation + Backward Gobo Rotation (Fast -> Slow) Shutter @@ -98,7 +98,7 @@ Tilt Color Gobo - Gobo Rotation + Gobo Rotation Shutter/Strobe Lamp On/Off/Reset/Internal Programs Movement Speed @@ -108,7 +108,7 @@ Tilt Color Gobo - Gobo Rotation + Gobo Rotation Shutter/Strobe Dimmer Lamp On/Off/Reset/Internal Programs diff --git a/resources/fixtures/American_DJ/American-DJ-Accu-Spot-Pro.qxf b/resources/fixtures/American_DJ/American-DJ-Accu-Spot-Pro.qxf index ae7c596a7a..8b0c8865c6 100644 --- a/resources/fixtures/American_DJ/American-DJ-Accu-Spot-Pro.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Accu-Spot-Pro.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT laserandi American DJ @@ -37,20 +37,20 @@ Rotating Gobo 4 Rotating Gobo 5 Rotating Gobo 6 - Gobo 1 Shake Slow - Fast - Gobo 2 Shake Slow - Fast - Gobo 3 Shake Slow - Fast - Gobo 4 Shake Slow - Fast - Gobo 5 Shake Slow - Fast - Gobo 6 Shake Slow - Fast - Rot. Gobo Scroll Slow - Fast + Gobo 1 Shake Slow - Fast + Gobo 2 Shake Slow - Fast + Gobo 3 Shake Slow - Fast + Gobo 4 Shake Slow - Fast + Gobo 5 Shake Slow - Fast + Gobo 6 Shake Slow - Fast + Rot. Gobo Scroll Slow - Fast Gobo - Gobo Indexing - Forward Gobo Rot. Fast - Slow - No Rotation - Backward Gobo Rot. Slow - Fast + Gobo Indexing + Forward Gobo Rot. Fast - Slow + No Rotation + Backward Gobo Rot. Slow - Fast Gobo @@ -62,14 +62,14 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 Shake Slow - Fast - Gobo 2 Shake Slow - Fast - Gobo 3 Shake Slow - Fast - Gobo 4 Shake Slow - Fast - Gobo 5 Shake Slow - Fast - Gobo 6 Shake Slow - Fast - Gobo 7 Shake Slow - Fast - Gobo Wheel Rot. Slow - Fast + Gobo 1 Shake Slow - Fast + Gobo 2 Shake Slow - Fast + Gobo 3 Shake Slow - Fast + Gobo 4 Shake Slow - Fast + Gobo 5 Shake Slow - Fast + Gobo 6 Shake Slow - Fast + Gobo 7 Shake Slow - Fast + Gobo Wheel Rot. Slow - Fast Prism @@ -101,7 +101,7 @@ Shutter open Strobe Effect Slow - Fast Shutter open - Pulse Effect + Pulse Effect Shutter open Random Strobe Effect Slow - Fast Shutter open @@ -137,7 +137,7 @@ Tilt Fine Colour Rotating Gobos - Rotating Gobo Index + Rotating Gobo Index Fixed Gobos Rotating Prism Focus @@ -160,7 +160,7 @@ Tilt Fine Colour Rotating Gobos - Rotating Gobo Index + Rotating Gobo Index Fixed Gobos Rotating Prism Focus diff --git a/resources/fixtures/American_DJ/American-DJ-Auto-Spot-150.qxf b/resources/fixtures/American_DJ/American-DJ-Auto-Spot-150.qxf index 4d2b372920..ae9d99094b 100644 --- a/resources/fixtures/American_DJ/American-DJ-Auto-Spot-150.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Auto-Spot-150.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.3 GIT + 4.12.4 GIT Felix Edelmann American DJ @@ -21,15 +21,15 @@ Gobo 5 Gobo 6 Gobo 7 - Rotating slow-fast + Rotating slow-fast - Speed - Stop - Rotation CW fast-slow - Stop - Rotation CCW slow-fast - Stop + Gobo + Stop + Rotation CW fast-slow + Stop + Rotation CCW slow-fast + Stop Colour @@ -79,7 +79,7 @@ Pan Tilt Gobo - Gobo Rotation + Gobo Rotation Full Colors Shutter / Dimmer @@ -87,7 +87,7 @@ Pan Tilt Gobo - Gobo Rotation + Gobo Rotation Split Colors Shutter / Dimmer diff --git a/resources/fixtures/American_DJ/American-DJ-Comscan-LED.qxf b/resources/fixtures/American_DJ/American-DJ-Comscan-LED.qxf index 751dd44cdb..9d3a877492 100644 --- a/resources/fixtures/American_DJ/American-DJ-Comscan-LED.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Comscan-LED.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Chris American DJ @@ -44,7 +44,7 @@ Gobo 6 Shake Gobo 7 Shake Gobo 8 Shake - Gobo wheel rotation slow - fast + Gobo wheel rotation slow - fast diff --git a/resources/fixtures/American_DJ/American-DJ-DJ-Spot-250.qxf b/resources/fixtures/American_DJ/American-DJ-DJ-Spot-250.qxf index 0d39f53a66..8437678e66 100644 --- a/resources/fixtures/American_DJ/American-DJ-DJ-Spot-250.qxf +++ b/resources/fixtures/American_DJ/American-DJ-DJ-Spot-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 GIT + 4.12.4 GIT 007ghg7 American DJ @@ -13,31 +13,31 @@ Colour - White - Red - Yellow - Blue - Green - Purple - Orange - Pink - Rainbow Effect + White + Red + Yellow + Blue + Green + Purple + Orange + Pink + Rainbow Effect Gobo none - Spot - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Rainbow Effect + Spot + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Rainbow Effect Effect @@ -56,11 +56,11 @@ Special Functions Pan and tilt speed - - - - - - - + + + + + + + diff --git a/resources/fixtures/American_DJ/American-DJ-DJ-Spot-300.qxf b/resources/fixtures/American_DJ/American-DJ-DJ-Spot-300.qxf index 1816e28815..9dac32c824 100644 --- a/resources/fixtures/American_DJ/American-DJ-DJ-Spot-300.qxf +++ b/resources/fixtures/American_DJ/American-DJ-DJ-Spot-300.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT raymorris American DJ @@ -35,21 +35,21 @@ Gobo - Spot - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo scroll + Spot + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo scroll - - Speed - Fast -> slow - Slow -> fast - No rotation + + Gobo + Fast -> slow + Slow -> fast + No rotation Random rotation @@ -69,7 +69,7 @@ Tilt Color Gobo - Gobo spin + Gobo Rotation Shutter Gobo shake / reset Pan / tilt speed diff --git a/resources/fixtures/American_DJ/American-DJ-Focus-Spot-4Z.qxf b/resources/fixtures/American_DJ/American-DJ-Focus-Spot-4Z.qxf index 1c003e2991..d7282ba3df 100644 --- a/resources/fixtures/American_DJ/American-DJ-Focus-Spot-4Z.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Focus-Spot-4Z.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 GIT + 4.12.4 GIT Rico Hansen American DJ @@ -138,13 +138,13 @@ Tilt Movement Color Wheel Gobo Wheel - Gobo Rotation + Gobo Rotation Shutter & Strobing Master Dimmer Prism 1 - Prism 1 Indexing & Rotation + Prism 1 Indexing & Rotation Prism 2 - Prism 2 Indexing & Rotation + Prism 2 Indexing & Rotation Focus Zoom Dim curves @@ -158,13 +158,13 @@ Tilt Fine 16-bit Color Wheel Gobo Wheel - Gobo Rotation + Gobo Rotation Shutter & Strobing Master Dimmer Prism 1 - Prism 1 Indexing & Rotation + Prism 1 Indexing & Rotation Prism 2 - Prism 2 Indexing & Rotation + Prism 2 Indexing & Rotation Focus Zoom Dim curves @@ -178,15 +178,15 @@ Tilt Fine 16-bit Color Wheel Gobo Wheel - Gobo Rotation + Gobo Rotation Shutter & Strobing Master Dimmer Dimmer Fine 16-bit Prism 1 - Prism 1 Indexing & Rotation + Prism 1 Indexing & Rotation Prism 1 Indexing Fine 16-bit Prism 2 - Prism 2 Indexing & Rotation + Prism 2 Indexing & Rotation Prism 2 Indexing Fine 16-bit Focus Zoom diff --git a/resources/fixtures/American_DJ/American-DJ-Focus-Spot-Three-Z.qxf b/resources/fixtures/American_DJ/American-DJ-Focus-Spot-Three-Z.qxf index 93714ffbeb..51a5126313 100644 --- a/resources/fixtures/American_DJ/American-DJ-Focus-Spot-Three-Z.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Focus-Spot-Three-Z.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 + 4.12.4 GIT Robert Box American DJ @@ -23,9 +23,9 @@ Light blue Pink Color mixing - Counter clockwise rotation fast - slow - Stop - Clockwise rotation slow - fast + Counter clockwise rotation fast - slow + Stop + Clockwise rotation slow - fast Gobo @@ -37,16 +37,16 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Counter-clockwise rotation fast - slow - Stop - Clockwise rotation slow - fast + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Counter-clockwise rotation fast - slow + Stop + Clockwise rotation slow - fast Gobo @@ -58,22 +58,22 @@ Gobo 5 Gobo 6 Open - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Counter-clockwise rotation fast - slow - Stop - Clockwise rotation slow - fast + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Counter-clockwise rotation fast - slow + Stop + Clockwise rotation slow - fast Gobo - Indexing - Clockwise rotation slow - fast - No rotation - Counter-clockise rotation fast - slow + Indexing + Clockwise rotation slow - fast + No rotation + Counter-clockise rotation fast - slow Prism @@ -161,9 +161,9 @@ Color Gobos (Static) Gobos (Rotating) - Gobo Wheel 2 Gobo Rotation + Gobo Wheel 2 Gobo Rotation Prism - Prism Rotation + Prism Rotation Strobe/Shutter Master Dimmer Focus @@ -183,9 +183,9 @@ Color Gobos (Static) Gobos (Rotating) - Gobo Wheel 2 Gobo Rotation + Gobo Wheel 2 Gobo Rotation Prism - Prism Rotation + Prism Rotation Strobe/Shutter Master Dimmer Master Dimmer Fine diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Roll.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Roll.qxf index 79eef40c1c..01a4bd62e6 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Roll.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Roll.qxf @@ -42,12 +42,12 @@ Gobo 6 UV Gobo 7 light blue Gobo 8 UV & light blue - Open Shake + Open Shake Gobo 1 yellow shake Gobo 2 red shake Gobo 3 green shake Gobo 4 blue shake - Gobo 5 RGB shake + Gobo 5 RGB shake Gobo 6 UV shake Gobo 7 light blue shake Gobo 8 UV & light blue shake diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Scan.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Scan.qxf index cbaf481ed5..af4f126461 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Scan.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Scan.qxf @@ -35,12 +35,12 @@ Gobo 6 UV Gobo 7 light blue Gobo 8 UV & light blue - Open Shake + Open Shake Gobo 1 yellow shake Gobo 2 red shake Gobo 3 green shake Gobo 4 blue shake - Gobo 5 RGB shake + Gobo 5 RGB shake Gobo 6 UV shake Gobo 7 light blue shake Gobo 8 UV & light blue shake diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot-Twins.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot-Twins.qxf index b262be2d15..334817c412 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot-Twins.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot-Twins.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT MaBonzo American DJ @@ -14,24 +14,24 @@ Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Open shake - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Gobo scroll fast - slow - Stop - Gobo scroll slow - fast + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Open shake + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Gobo scroll fast - slow + Stop + Gobo scroll slow - fast @@ -128,24 +128,24 @@ Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Open shake - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Gobo scroll fast - slow - Stop - Gobo scroll slow - fast + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Open shake + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Gobo scroll fast - slow + Stop + Gobo scroll slow - fast Shutter diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot.qxf index 4e3850ae8d..9023e1bb8a 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Pocket-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Thierry Rodolfo American DJ @@ -38,17 +38,17 @@ Gobo 5 Gobo 6 Gobo 7 - Open Shake - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo Scroll Fast to Slow - Stop - Gobo Scroll Slow to Fast + Open Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo Scroll Fast to Slow + Stop + Gobo Scroll Slow to Fast Shutter diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Scan-LED.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Scan-LED.qxf index 3e6d02228a..a7ac35bd9f 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Scan-LED.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Scan-LED.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Thierry Rodolfo American DJ @@ -35,15 +35,15 @@ Gobo 4 Gobo 5 Gobo 6 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Clockwise rotation Fast to Slow - Stop - Counter - Clockwise rotation Slow to Fast + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Clockwise rotation Fast to Slow + Stop + Counter - Clockwise rotation Slow to Fast Colour @@ -84,10 +84,10 @@ Gobo - Gobo Indexing - Clockwise rotation Fast to Slow - Stop - Counter - Clockwise rotation Slow to Fast + Gobo Indexing + Clockwise rotation Fast to Slow + Stop + Counter - Clockwise rotation Slow to Fast @@ -96,7 +96,7 @@ Strobe Color Wheel Gobo Wheel - Gobo Rotation + Gobo Rotation Dimmer Reset / Blackout @@ -117,7 +117,7 @@ Strobe Color Wheel Gobo Wheel - Gobo Rotation + Gobo Rotation Reset / Blackout diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Elite.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Elite.qxf index 96fed4467c..68db6c5975 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Elite.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Elite.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Piotr Nowik American DJ @@ -30,31 +30,31 @@ Gobo - Spot - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Wheel rotation fast-slow - Stop - Wheel rotation slow-fast + Spot + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Wheel rotation fast-slow + Stop + Wheel rotation slow-fast Gobo - Counter-clockwise index 0° - 360° - Counter-clockwise fast - slow - Stop - Clockwise slow - fast + Counter-clockwise index 0° - 360° + Counter-clockwise fast - slow + Stop + Clockwise slow - fast Prism @@ -110,9 +110,9 @@ Tilt Fine Colors Gobo Wheel - Gobo Rotation + Gobo Rotation Prism - Prism Rotation + Prism Rotation Focus Iris Shutter/Strobe diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-LED.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-LED.qxf index 24b3fac323..474b3f3cf3 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-LED.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-LED.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT FX-8320 American DJ @@ -34,23 +34,23 @@ Gobo 4 Gobo 5 Gobo 6 - Open shake - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo wheel rotation slow - fast + Open shake + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo wheel rotation slow - fast Sound active - Effect - Stop - Clockwise fast - slow - Stop - Counter-clockwise slow - fast - Stop + Gobo + Stop + Clockwise fast - slow + Stop + Counter-clockwise slow - fast + Stop Shutter @@ -93,7 +93,7 @@ Tilt Colours Gobo wheel - Gobo rotation + Gobo rotation Shutter/strobe Dimmer Moving head movement diff --git a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Pro.qxf b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Pro.qxf index f00720e083..174ae39ee5 100644 --- a/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Pro.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Inno-Spot-Pro.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Thierry Rodolfo American DJ @@ -38,23 +38,23 @@ Gobo 4 Gobo 5 Gobo 6 - Open Shake - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Rotation Slow < Fast - Stop - Rotation Fast > Slow + Open Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Rotation Slow < Fast + Stop + Rotation Fast > Slow Gobo - Index - Fast > Slow - Stop - Slow < Fast + Index + Fast > Slow + Stop + Slow < Fast Prism @@ -103,9 +103,9 @@ Tilt Fine Colour Gobo - Gobo Rot + Gobo Rot Prism - Prism Rotation + Prism Rotation Focus Shutter/Strobe Dimmer diff --git a/resources/fixtures/American_DJ/American-DJ-Pocket-Pro.qxf b/resources/fixtures/American_DJ/American-DJ-Pocket-Pro.qxf index f6247f53a7..41c6e7688e 100644 --- a/resources/fixtures/American_DJ/American-DJ-Pocket-Pro.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Pocket-Pro.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Justin Hornsby American DJ @@ -52,9 +52,9 @@ Gobo 5 Shake Gobo 6 Shake Gobo 7 Shake - Gobo Scroll Fast to Slow - Gobo Stop - Gobo Scroll Slow to Fast + Gobo Scroll Fast to Slow + Gobo Stop + Gobo Scroll Slow to Fast Effect diff --git a/resources/fixtures/American_DJ/American-DJ-Stinger-Spot.qxf b/resources/fixtures/American_DJ/American-DJ-Stinger-Spot.qxf index 662a652f86..cc621a52c4 100644 --- a/resources/fixtures/American_DJ/American-DJ-Stinger-Spot.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Stinger-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Jason R. Johnston American DJ @@ -31,22 +31,22 @@ Open Gobo 1 Gobo 2 - Gobo 3 + Gobo 3 Gobo 4 Gobo 5 Gobo 6 Gobo 7 - Open Shake - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo Scroll - Fast To Slow - Stop - Gobo Scroll - Slow To Fast + Open Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo Scroll - Fast To Slow + Stop + Gobo Scroll - Slow To Fast Shutter diff --git a/resources/fixtures/American_DJ/American-DJ-Vizi-BSW-300.qxf b/resources/fixtures/American_DJ/American-DJ-Vizi-BSW-300.qxf index aee629ac7e..33f054d9b6 100644 --- a/resources/fixtures/American_DJ/American-DJ-Vizi-BSW-300.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Vizi-BSW-300.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT George Qualley IV American DJ @@ -84,27 +84,27 @@ Gobo 6 Gobo 7 Gobo Shake (Gobos 1-7) - Counter-Clockwise Rotation (Fast -> Slow) - No Rotation - Clockwise Rotation (Slow -> Fast) + Counter-Clockwise Rotation (Fast -> Slow) + No Rotation + Clockwise Rotation (Slow -> Fast) Gobo Open Aperture 1 - Aperture 2 + Aperture 2 Aperture 3 Gobo 1 Gobo 2 Gobo 3 Gobo 4 - Gobo 5 + Gobo 5 Gobo 6 Open Gobo Shake - Clockwise Rotation (Fast -> Slow) - No Rotation - Counter-Clockwise Rotation (Slow -> Fast) + Clockwise Rotation (Fast -> Slow) + No Rotation + Counter-Clockwise Rotation (Slow -> Fast) Shutter @@ -179,10 +179,10 @@ Gobo - Indexing - Clockwise Rotation (Fast -> Slow) - No Rotation - Counter-Clockwise Rotation (Slow -> Fast) + Indexing + Clockwise Rotation (Fast -> Slow) + No Rotation + Counter-Clockwise Rotation (Slow -> Fast) @@ -191,12 +191,12 @@ Color Wheel 1 Color Wheel 2 Gobo Wheel 1 (Glass Gobos) - Gobo Wheel 1 Rotation + Gobo Wheel 1 Rotation Gobo Wheel 2 Shutter Master Dimmer Prism (6 Facet) - Prism Rotation + Prism Rotation Frost Focus Shows @@ -212,13 +212,13 @@ Color Wheel 1 Color Wheel 2 Gobo Wheel 1 (Glass Gobos) - Gobo Wheel 1 Rotation + Gobo Wheel 1 Rotation Gobo Wheel 2 Shutter Master Dimmer Dimmer (Fine) Prism (6 Facet) - Prism Rotation + Prism Rotation Frost Focus Shows diff --git a/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-5R.qxf b/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-5R.qxf index 5467c3e0cb..b163beb952 100644 --- a/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-5R.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-5R.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT daniel American DJ @@ -34,23 +34,23 @@ Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 Shakes - Wheel Rotation Slow to Fast + Wheel Rotation Slow to Fast Prism @@ -66,7 +66,7 @@ Open Strobe Slow to Fast Open - Pulse Effect in Sequences + Pulse Effect in Sequences Open Random Slow to Fast Open diff --git a/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-RXONE.qxf b/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-RXONE.qxf index 9d62194175..77c1190903 100644 --- a/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-RXONE.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Vizi-Beam-RXONE.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Robert Box American DJ @@ -52,40 +52,40 @@ Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 15 - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Gobo 8 shake - Gobo 9 shake - Gobo 10 shake - Gobo 11 shake - Gobo 12 shake - Gobo 13 shake - Gobo 14 shake - Gobo 15 shake - Counterclockwise rotation fast - slow - No rotation - Clockwise rotation slow - fast + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 15 + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Gobo 8 shake + Gobo 9 shake + Gobo 10 shake + Gobo 11 shake + Gobo 12 shake + Gobo 13 shake + Gobo 14 shake + Gobo 15 shake + Counterclockwise rotation fast - slow + No rotation + Clockwise rotation slow - fast Prism @@ -220,12 +220,12 @@ Shutter & Strobe Master Dimmer Prism - Prism Rotation + Prism Rotation Frost Pan/Tilt Macros Pan/Tilt Macro Speed - Color Time - Gobo Time + Color Time + Gobo Time Pan/Tilt Speed Special Functions @@ -239,12 +239,12 @@ Shutter & Strobe Master Dimmer Prism - Prism Rotation + Prism Rotation Frost Pan/Tilt Macros Pan/Tilt Macro Speed - Color Time - Gobo Time + Color Time + Gobo Time Pan/Tilt Speed Special Functions diff --git a/resources/fixtures/American_DJ/American-DJ-Vizi-LED-Spot.qxf b/resources/fixtures/American_DJ/American-DJ-Vizi-LED-Spot.qxf index b914867010..4476b53948 100644 --- a/resources/fixtures/American_DJ/American-DJ-Vizi-LED-Spot.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Vizi-LED-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Heikki Junnila American DJ @@ -30,25 +30,25 @@ Gobo - Open - Rotating Gobo 1 - Rotating Gobo 2 - Rotating Gobo 3 - Rotating Gobo 4 - Rotating Gobo 5 - Rotating Gobo 6 - Rotating Gobo 7 - Rotating Gobo 1 Shake - Rotating Gobo 2 Shake - Rotating Gobo 3 Shake - Rotating Gobo 4 Shake - Rotating Gobo 5 Shake - Rotating Gobo 6 Shake - Rotating Gobo 7 Shake - Continious Rotation of Gobo Wheel (Slow - Fast) + Open + Rotating Gobo 1 + Rotating Gobo 2 + Rotating Gobo 3 + Rotating Gobo 4 + Rotating Gobo 5 + Rotating Gobo 6 + Rotating Gobo 7 + Rotating Gobo 1 Shake + Rotating Gobo 2 Shake + Rotating Gobo 3 Shake + Rotating Gobo 4 Shake + Rotating Gobo 5 Shake + Rotating Gobo 6 Shake + Rotating Gobo 7 Shake + Continious Rotation of Gobo Wheel (Slow - Fast) - - Maintenance + + Gobo Gobo Indexing Forwards Gobo Rotation (Fast - Slow) No Rotation @@ -83,7 +83,7 @@ LED on Strobing (Slow - Fast) LED on - Pulse Effect in Sequences + Pulse Effect in Sequences LED on Random Strobe (Slow - Fast) LED on @@ -120,7 +120,7 @@ Tilt fine Color Wheel Gobos - Gobo Indexing & Rotation + Gobo Rotation Rotating Prism/Gobo Macros Shutter & Strobe Dimmer @@ -132,7 +132,7 @@ Tilt Color Wheel Gobos - Gobo Indexing & Rotation + Gobo Rotation Rotating Prism/Gobo Macros Shutter & Strobe Dimmer @@ -153,7 +153,7 @@ Tilt fine Color Wheel Gobos - Gobo Indexing & Rotation + Gobo Rotation Rotating Prism/Gobo Macros Shutter & Strobe Dimmer @@ -172,7 +172,7 @@ Tilt Color Wheel Gobos - Gobo Indexing & Rotation + Gobo Rotation Rotating Prism/Gobo Macros Shutter & Strobe Dimmer diff --git a/resources/fixtures/American_DJ/American-DJ-Vizi-Roller-Beam-2R.qxf b/resources/fixtures/American_DJ/American-DJ-Vizi-Roller-Beam-2R.qxf index 2b147759f2..574a2ec777 100644 --- a/resources/fixtures/American_DJ/American-DJ-Vizi-Roller-Beam-2R.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Vizi-Roller-Beam-2R.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT MaBonzo American DJ @@ -36,41 +36,38 @@ Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo 8 Shake - Gobo 9 Shake - Gobo 10 Shake - Gobo 11 Shake - Gobo 12 Shake - Gobo 13 Shake - Gobo 14 Shake - Gobo Wheel Rotation Slow to Fast - - - Gobo - Gobo Indexing Slow - Fast + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo 8 Shake + Gobo 9 Shake + Gobo 10 Shake + Gobo 11 Shake + Gobo 12 Shake + Gobo 13 Shake + Gobo 14 Shake + Gobo Wheel Rotation Slow to Fast + Effect Barrel Indexing @@ -121,7 +118,7 @@ Shutter Open Strobing Slow to Fast Shutter Open - Pulse Effect in Sequences + Pulse Effect in Sequences Shutter Open Random Strobe Slow to Fast Shutter Open @@ -168,7 +165,7 @@ Rotating Barrel Rotating Barrel Indexing Prism/Gobo Macros - Prism Rotating 1 + Prism Rotating 1 Prism Rotation Indexing Shutter Master Dimmer @@ -185,7 +182,7 @@ Gobos Rotating Barrel Prism/Gobo Macros - Prism Rotating 1 + Prism Rotating 1 Shutter Master Dimmer Pan/Tilt Speed @@ -198,7 +195,7 @@ Gobos Rotating Barrel Prism/Gobo Macros - Prism Rotating 1 + Prism Rotating 1 Shutter Master Dimmer Pan/Tilt Speed diff --git a/resources/fixtures/American_DJ/American-DJ-Warlock.qxf b/resources/fixtures/American_DJ/American-DJ-Warlock.qxf index 15b3b0507f..16c48c1a79 100644 --- a/resources/fixtures/American_DJ/American-DJ-Warlock.qxf +++ b/resources/fixtures/American_DJ/American-DJ-Warlock.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Justin Hornsby American DJ @@ -37,21 +37,21 @@ Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 Gobo Animation - Gobo Wheel Rotation Slow-Fast + Gobo Wheel Rotation Slow-Fast Effect diff --git a/resources/fixtures/American_DJ/American-DJ-X-Scan-LED-Plus.qxf b/resources/fixtures/American_DJ/American-DJ-X-Scan-LED-Plus.qxf index b72601548d..6a7e2b9f07 100644 --- a/resources/fixtures/American_DJ/American-DJ-X-Scan-LED-Plus.qxf +++ b/resources/fixtures/American_DJ/American-DJ-X-Scan-LED-Plus.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT DjProWings American DJ @@ -36,16 +36,16 @@ Gobo 6 Gobo 7 Gobo 8 - Open shake - Gobo 1 shake - Gobo 2 shake - Gobo 3 shake - Gobo 4 shake - Gobo 5 shake - Gobo 6 shake - Gobo 7 shake - Gobo 8 shake - Rotation slow to fast + Open shake + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Gobo 8 shake + Rotation slow to fast Sound active @@ -53,11 +53,11 @@ Blackout Shutter open Strobe slow - fast - Shutter open + Shutter open Shutter slow open - fast close Shutter open Shutter fast open - slow close - Shutter open + Shutter open Random strobe Shutter open diff --git a/resources/fixtures/Ayra/Ayra-ERO-Microspot.qxf b/resources/fixtures/Ayra/Ayra-ERO-Microspot.qxf new file mode 100644 index 0000000000..67c8e885d0 --- /dev/null +++ b/resources/fixtures/Ayra/Ayra-ERO-Microspot.qxf @@ -0,0 +1,118 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + Bob + + Ayra + ERO Micro Spot + Moving Head + + + + Shutter + Blackout + Open + Stroboscope SlowFast + Open + Shutter slow open close fast + Open + Shutter slow close open fast + Open + Random strobe + Open + + + + Maintenance + No function + Reset after 3 sec + No function + Sound control + + + + Colour + Open white + SPL C1 + Red + SPL C2 + Orange + SPL C3 + Yellow + SPL C4 + Green + SPL C5 + Dark Blue + SPL C6 + Light Blue + SPL C7 + Magenta + Rainbow + + + Gobo + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Open shake + Gobo 1 shake + Gobo 2 shake + Gobo 3 shake + Gobo 4 shake + Gobo 5 shake + Gobo 6 shake + Gobo 7 shake + Gobo scroll sklow - fast + + + Effect + No function (blackout) + Show 1 + Show 2 + Show 3 + Show 4 + Random show + + + + + Pan + Tilt + Colour wheel + Gobo wheel + Shutter + Dimmer + Pan/Tilt speed + Various functions + + + Sound-controlled show modes + + + Pan + Pan fine + Tilt + Tilt fine + Colour wheel + Gobo wheel + Shutter + Dimmer + Pan/Tilt speed + Various functions + + + + + + + + + diff --git a/resources/fixtures/Blizzard_Lighting/Blizzard-Lighting-Lil-G.qxf b/resources/fixtures/Blizzard_Lighting/Blizzard-Lighting-Lil-G.qxf index 89637cc7ac..ff1960d390 100644 --- a/resources/fixtures/Blizzard_Lighting/Blizzard-Lighting-Lil-G.qxf +++ b/resources/fixtures/Blizzard_Lighting/Blizzard-Lighting-Lil-G.qxf @@ -32,27 +32,27 @@ Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 1 shake (slow <-> fast) - Gobo 2 shake (slow <-> fast) - Gobo 3 shake (slow <-> fast) - Gobo 4 shake (slow <-> fast) - Gobo 5 shake (slow <-> fast) - Gobo 6 shake (slow <-> fast) - Gobo 7 shake (slow <-> fast) - Gobo 8 shake (slow <-> fast) - Gobo 9 shake (slow <-> fast) - Gobo 10 shake (slow <-> fast) - Flow clockwise (slow <-> fast) - Flow counterclockwise (slow <-> fast) + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 1 shake (slow <-> fast) + Gobo 2 shake (slow <-> fast) + Gobo 3 shake (slow <-> fast) + Gobo 4 shake (slow <-> fast) + Gobo 5 shake (slow <-> fast) + Gobo 6 shake (slow <-> fast) + Gobo 7 shake (slow <-> fast) + Gobo 8 shake (slow <-> fast) + Gobo 9 shake (slow <-> fast) + Gobo 10 shake (slow <-> fast) + Flow clockwise (slow <-> fast) + Flow counterclockwise (slow <-> fast) Effect diff --git a/resources/fixtures/Briteq/Briteq-BT-575S.qxf b/resources/fixtures/Briteq/Briteq-BT-575S.qxf index 1c0eabe7fc..6e57620b31 100644 --- a/resources/fixtures/Briteq/Briteq-BT-575S.qxf +++ b/resources/fixtures/Briteq/Briteq-BT-575S.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Andres Robles Briteq @@ -41,7 +41,7 @@ Gobo - no gobo + no gobo gobo1 gobo 2 gobo 3 @@ -51,12 +51,12 @@ gobo 7 gobo 8 gobo 9 - rotating wheel fast to slow cw - rotating wheel slow to fast ccw + rotating wheel fast to slow cw + rotating wheel slow to fast ccw Gobo - no gobo + no gobo gobo 1 gobo 2 gobo 3 @@ -64,16 +64,16 @@ gobo 5 gobo 6 gobo 7 - rotating wheel gobo fast to slow cw - rotating wheel gobo slow to fast ccw + rotating wheel gobo fast to slow cw + rotating wheel gobo slow to fast ccw Gobo - Stopped - Clockwise rotation (fast to slow) - Stopped - Counterclockwise rotation (slow to fast) - Stopped + Stopped + Clockwise rotation (fast to slow) + Stopped + Counterclockwise rotation (slow to fast) + Stopped Prism @@ -124,10 +124,10 @@ G15+G5 G15+G7 G15+G9 - Gobo 1 rotation (fast to slow) - Gobo 1 rotation (slow to fast) - Gobo 2 rotation (fast to slow) - Gobo 2 rotation (slow to fast) + Gobo 1 rotation (fast to slow) + Gobo 1 rotation (slow to fast) + Gobo 2 rotation (fast to slow) + Gobo 2 rotation (slow to fast) Sound control @@ -166,9 +166,9 @@ No function Gobo 1 Gobo 2 - Gobo rotation + Gobo rotation Prism - Prism rotation + Prism rotation Focus Pan 16 bit Tilt 16 bit @@ -180,7 +180,7 @@ Shutter shaking Gobo Color 2 - Gobo rotation + Gobo rotation Prism/Prism rotation/Dimmer Focus diff --git a/resources/fixtures/Briteq/Briteq-BT-W07L12.qxf b/resources/fixtures/Briteq/Briteq-BT-W07L12.qxf index ce375b5cc5..f84eb13633 100644 --- a/resources/fixtures/Briteq/Briteq-BT-W07L12.qxf +++ b/resources/fixtures/Briteq/Briteq-BT-W07L12.qxf @@ -32,7 +32,7 @@ Strobe 8: random burst pulse (fast -> slow) Shutter open Strobe 9: sine wave (fast -> slow) - Shutter open + Shutter open Strobe 10: burst (fast -> slow) Shutter open diff --git a/resources/fixtures/Briteq/Briteq-BTX-180LS.qxf b/resources/fixtures/Briteq/Briteq-BTX-180LS.qxf index 1ae8665d53..206630ef3b 100644 --- a/resources/fixtures/Briteq/Briteq-BTX-180LS.qxf +++ b/resources/fixtures/Briteq/Briteq-BTX-180LS.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.3 GIT + 4.12.4 GIT Thierry Rodolfo Briteq @@ -60,7 +60,7 @@ Gobo - OPEN (no gobo) + OPEN (no gobo) Gobo 1 Gobo 2 Gobo 3 @@ -81,14 +81,14 @@ Gobo - Indexed positioning: 0° - 360° + Indexed positioning: 0° - 360° Gobo turning clockwise (fast to slow) Gobo stops turning Gobo turning counter clockwise (slow to fast) Gobo - OPEN (no gobo) + OPEN (no gobo) Gobo 1 Gobo 2 Gobo 3 @@ -155,10 +155,10 @@ Color wheel 1 Color wheel 2 Gobo wheel 1 - select (rotating gobos) - Gobo wheel 1 - rotation + Gobo wheel 1 - rotation Gobo wheel 2 - select (static gobos) Prism on/off - Prism - rotation + Prism - rotation Iris (maximum to minimum) Focus (close to distant) Special functions diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-300.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-300.qxf index ed414335db..ea078301f0 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-300.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-300.qxf @@ -54,13 +54,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, fast to slow - Gobo 6 shake, fast to slow - Gobo 5 shake, fast to slow - Gobo 4 shake, fast to slow - Gobo 3 shake, fast to slow - Gobo 2 shake, fast to slow - Gobo 1 shake, fast to slow + Gobo 7 shake, fast to slow + Gobo 6 shake, fast to slow + Gobo 5 shake, fast to slow + Gobo 4 shake, fast to slow + Gobo 3 shake, fast to slow + Gobo 2 shake, fast to slow + Gobo 1 shake, fast to slow Open Gobo scroll: counter-clockwise rotation Gobo scroll: clockwise rotation diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-305-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-305-IRC.qxf index cd4bdcd822..578985e2ef 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-305-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Barrel-305-IRC.qxf @@ -60,13 +60,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, fast to slow - Gobo 6 shake, fast to slow - Gobo 5 shake, fast to slow - Gobo 4 shake, fast to slow - Gobo 3 shake, fast to slow - Gobo 2 shake, fast to slow - Gobo 1 shake, fast to slow + Gobo 7 shake, fast to slow + Gobo 6 shake, fast to slow + Gobo 5 shake, fast to slow + Gobo 4 shake, fast to slow + Gobo 3 shake, fast to slow + Gobo 2 shake, fast to slow + Gobo 1 shake, fast to slow Open Gobo scroll: counter-clockwise rotation Gobo scroll: clockwise rotation diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Beam-LED-350.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Beam-LED-350.qxf index 0b96e7a29a..1428171496 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Beam-LED-350.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Beam-LED-350.qxf @@ -47,11 +47,11 @@ Gobo 5 Animation Effect (static) Animation Effect (slow to fast) - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Hybrid-140SR.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Hybrid-140SR.qxf index 11150e2829..1469a86d73 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Hybrid-140SR.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Hybrid-140SR.qxf @@ -157,14 +157,14 @@ Gobo 6 Gobo 7 Gobo 8 - Gobo 8 shake, slow to fast - Gobo 7 shake, slow to fast - Gobo 6 shake, slow to fast - Gobo 5 shake, slow to fast - Gobo 4 shake, slow to fast - Gobo 3 shake, slow to fast - Gobo 2 shake, slow to fast - Gobo 1 shake, slow to fast + Gobo 8 shake, slow to fast + Gobo 7 shake, slow to fast + Gobo 6 shake, slow to fast + Gobo 5 shake, slow to fast + Gobo 4 shake, slow to fast + Gobo 3 shake, slow to fast + Gobo 2 shake, slow to fast + Gobo 1 shake, slow to fast Open Cycle effect, fast to slow Stop diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-305-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-305-IRC.qxf index f1776abee7..9780b16a91 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-305-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-305-IRC.qxf @@ -54,13 +54,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, fast to slow - Gobo 6 shake, fast to slow - Gobo 5 shake, fast to slow - Gobo 4 shake, fast to slow - Gobo 3 shake, fast to slow - Gobo 2 shake, fast to slow - Gobo 1 shake, fast to slow + Gobo 7 shake, fast to slow + Gobo 6 shake, fast to slow + Gobo 5 shake, fast to slow + Gobo 4 shake, fast to slow + Gobo 3 shake, fast to slow + Gobo 2 shake, fast to slow + Gobo 1 shake, fast to slow Open Gobo scroll: counter-clockwise rotation Gobo scroll: clockwise rotation diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-200.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-200.qxf index 08f93ecc70..8577aee2e5 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-200.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-200.qxf @@ -50,13 +50,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, fast to slow - Gobo 6 shake, fast to slow - Gobo 5 shake, fast to slow - Gobo 4 shake, fast to slow - Gobo 3 shake, fast to slow - Gobo 2 Shake shake, fast to slow - Gobo 1 Shake shake, fast to slow + Gobo 7 shake, fast to slow + Gobo 6 shake, fast to slow + Gobo 5 shake, fast to slow + Gobo 4 shake, fast to slow + Gobo 3 shake, fast to slow + Gobo 2 Shake shake, fast to slow + Gobo 1 Shake shake, fast to slow Open Gobo ccroll: clockwise rotation Gobo scroll: Counterclockwise rotation diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-300.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-300.qxf index 155e25337f..bb79bfefb3 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-300.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Scan-LED-300.qxf @@ -52,13 +52,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake (fast to slow) - Gobo 6 shake (fast to slow) - Gobo 5 shake (fast to slow) - Gobo 4 shake (fast to slow) - Gobo 3 shake (fast to slow) - Gobo 2 shake (fast to slow) - Gobo 1 shake (fast to slow) + Gobo 7 shake (fast to slow) + Gobo 6 shake (fast to slow) + Gobo 5 shake (fast to slow) + Gobo 4 shake (fast to slow) + Gobo 3 shake (fast to slow) + Gobo 2 shake (fast to slow) + Gobo 1 shake (fast to slow) Open Gobo scroll clockwise Gobo scroll counter-clockwise diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-100-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-100-IRC.qxf index 992ef69613..90a1b069c3 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-100-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-100-IRC.qxf @@ -45,13 +45,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, slow to fast - Gobo 6 shake, slow to fast - Gobo 5 shake, slow to fast - Gobo 4 shake, slow to fast - Gobo 3 shake, slow to fast - Gobo 2 shake, slow to fast - Gobo 1 shake, slow to fast + Gobo 7 shake, slow to fast + Gobo 6 shake, slow to fast + Gobo 5 shake, slow to fast + Gobo 4 shake, slow to fast + Gobo 3 shake, slow to fast + Gobo 2 shake, slow to fast + Gobo 1 shake, slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-155.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-155.qxf index b03530d81a..ac3a551317 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-155.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-155.qxf @@ -51,15 +51,15 @@ Gobo 7 Gobo 8 Gobo 9 - Gobo 9 shake, from slow to fast - Gobo 8 shake, from slow to fast - Gobo 7 shake, from slow to fast - Gobo 6 shake, from slow to fast - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast + Gobo 9 shake, from slow to fast + Gobo 8 shake, from slow to fast + Gobo 7 shake, from slow to fast + Gobo 6 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-250.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-250.qxf index 1eef16645e..345145c1a6 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-250.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-250.qxf @@ -45,13 +45,13 @@ Gobo 5 Gobo 6 (Glass) Gobo 7 (Glass) - Gobo 1 Shake, Fast to Slow - Gobo 2 Shake, Fast to Slow - Gobo 3 Shake, Fast to Slow - Gobo 4 Shake, Fast to Slow - Gobo 5 Shake, Fast to Slow - Gobo 6 (Glass) Shake, Fast to Slow - Gobo 7 (Glass) Shake, Fast to Slow + Gobo 1 Shake, Fast to Slow + Gobo 2 Shake, Fast to Slow + Gobo 3 Shake, Fast to Slow + Gobo 4 Shake, Fast to Slow + Gobo 5 Shake, Fast to Slow + Gobo 6 (Glass) Shake, Fast to Slow + Gobo 7 (Glass) Shake, Fast to Slow Gobo Scroll: Bidirectional rotation diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-255-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-255-IRC.qxf index 9f5fdb1131..8f4c81ce01 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-255-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-255-IRC.qxf @@ -45,13 +45,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake (slow to fast) - Gobo 6 shake (slow to fast) - Gobo 5 shake (slow to fast) - Gobo 4 shake (slow to fast) - Gobo 3 shake (slow to fast) - Gobo 2 shake (slow to fast) - Gobo 1 shake (slow to fast) + Gobo 7 shake (slow to fast) + Gobo 6 shake (slow to fast) + Gobo 5 shake (slow to fast) + Gobo 4 shake (slow to fast) + Gobo 3 shake (slow to fast) + Gobo 2 shake (slow to fast) + Gobo 1 shake (slow to fast) Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-355Z-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-355Z-IRC.qxf index 6520f70773..b3eb77bc75 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-355Z-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-355Z-IRC.qxf @@ -47,13 +47,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, slow to fast - Gobo 6 shake, slow to fast - Gobo 5 shake, slow to fast - Gobo 4 shake, slow to fast - Gobo 3 shake, slow to fast - Gobo 2 shake, slow to fast - Gobo 1 shake, slow to fast + Gobo 7 shake, slow to fast + Gobo 6 shake, slow to fast + Gobo 5 shake, slow to fast + Gobo 4 shake, slow to fast + Gobo 3 shake, slow to fast + Gobo 2 shake, slow to fast + Gobo 1 shake, slow to fast Open Cycle gobos, slow to fast Reverse cycle gobos, slow to fast diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-400-IRC.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-400-IRC.qxf index c09fd5fca5..4b263b4928 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-400-IRC.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-400-IRC.qxf @@ -45,13 +45,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, from slow to fast - Gobo 6 shake, from slow to fast - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast + Gobo 7 shake, from slow to fast + Gobo 6 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-Duo.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-Duo.qxf index 7f8f917ef4..ec8ae9d503 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-Duo.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-Duo.qxf @@ -56,15 +56,15 @@ Wave 1 Fan Wave 1 Snowflake - Gobo 9 shake, increase speed - Gobo 8 shake, increase speed - Gobo 7 shake, increase speed - Gobo 6 shake, increase speed - Gobo 5 shake, increase speed - Gobo 4 shake, increase speed - Gobo 3 shake, increase speed - Gobo 2 shake, increase speed - Gobo 1 shake, increase speed + Gobo 9 shake, increase speed + Gobo 8 shake, increase speed + Gobo 7 shake, increase speed + Gobo 6 shake, increase speed + Gobo 5 shake, increase speed + Gobo 4 shake, increase speed + Gobo 3 shake, increase speed + Gobo 2 shake, increase speed + Gobo 1 shake, increase speed White Rainbow with increase speed Reverse rainbow with increase speed @@ -81,15 +81,15 @@ Wave 1 Fan Wave 1 Snowflake - Gobo 9 shake, increase speed - Gobo 8 shake, increase speed - Gobo 7 shake, increase speed - Gobo 6 shake, increase speed - Gobo 5 shake, increase speed - Gobo 4 shake, increase speed - Gobo 3 shake, increase speed - Gobo 2 shake, increase speed - Gobo 1 shake, increase speed + Gobo 9 shake, increase speed + Gobo 8 shake, increase speed + Gobo 7 shake, increase speed + Gobo 6 shake, increase speed + Gobo 5 shake, increase speed + Gobo 4 shake, increase speed + Gobo 3 shake, increase speed + Gobo 2 shake, increase speed + Gobo 1 shake, increase speed White Rainbow with increase speed Reverse rainbow with increase speed @@ -198,15 +198,15 @@ Wave 1 Fan Wave 1 Snowflake - Gobo 9 shake, increase speed - Gobo 8 shake, increase speed - Gobo 7 shake, increase speed - Gobo 6 shake, increase speed - Gobo 5 shake, increase speed - Gobo 4 shake, increase speed - Gobo 3 shake, increase speed - Gobo 2 shake, increase speed - Gobo 1 shake, increase speed + Gobo 9 shake, increase speed + Gobo 8 shake, increase speed + Gobo 7 shake, increase speed + Gobo 6 shake, increase speed + Gobo 5 shake, increase speed + Gobo 4 shake, increase speed + Gobo 3 shake, increase speed + Gobo 2 shake, increase speed + Gobo 1 shake, increase speed White Rainbow with increase speed Reverse rainbow with increase speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-150.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-150.qxf index 1f1ab1f72b..2e2b575e39 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-150.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-150.qxf @@ -59,15 +59,15 @@ Gobo 7 Gobo 8 Gobo 9 - Gobo 9 Shake (Slow -> Fast) - Gobo 8 Shake (Slow -> Fast) - Gobo 7 Shake (Slow -> Fast) - Gobo 6 Shake (Slow -> Fast) - Gobo 5 Shake (Slow -> Fast) - Gobo 4 Shake (Slow -> Fast) - Gobo 3 Shake (Slow -> Fast) - Gobo 2 Shake (Slow -> Fast) - Gobo 1 Shake (Slow -> Fast) + Gobo 9 Shake (Slow -> Fast) + Gobo 8 Shake (Slow -> Fast) + Gobo 7 Shake (Slow -> Fast) + Gobo 6 Shake (Slow -> Fast) + Gobo 5 Shake (Slow -> Fast) + Gobo 4 Shake (Slow -> Fast) + Gobo 3 Shake (Slow -> Fast) + Gobo 2 Shake (Slow -> Fast) + Gobo 1 Shake (Slow -> Fast) Open Gobo Cycle (Slow -> Fast) Reverse Gobo Cycle (Slow -> Fast) diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-250.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-250.qxf index b01bd164d6..365fa2ebe3 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-250.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-250.qxf @@ -47,13 +47,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, from slow to fast - Gobo 6 shake, from slow to fast - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast + Gobo 7 shake, from slow to fast + Gobo 6 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-350.qxf b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-350.qxf index bca7483378..37efb06aa5 100644 --- a/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-350.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Intimidator-Spot-LED-350.qxf @@ -47,13 +47,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake, from slow to fast + Gobo 7 shake, from slow to fast Gobo 6 shake, from slow to fast - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast Open Cycle effect with increasing speed Reverse cycle effect with increasing speed diff --git a/resources/fixtures/Chauvet/Chauvet-Legend-230SR-Beam.qxf b/resources/fixtures/Chauvet/Chauvet-Legend-230SR-Beam.qxf index ea112dd9fe..ac5ac0ffe2 100644 --- a/resources/fixtures/Chauvet/Chauvet-Legend-230SR-Beam.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Legend-230SR-Beam.qxf @@ -70,23 +70,23 @@ Gobo 16 Gobo 17 Open - Gobo 1 shaking - Gobo 2 shaking - Gobo 3 shaking - Gobo 4 shaking - Gobo 5 shaking - Gobo 6 shaking - Gobo 7 shaking - Gobo 8 shaking - Gobo 9 shaking - Gobo 10 shaking - Gobo 11 shaking - Gobo 12 shaking - Gobo 13 shaking - Gobo 14 shaking - Gobo 15 shaking - Gobo 16 shaking - Gobo 17 shaking + Gobo 1 shaking + Gobo 2 shaking + Gobo 3 shaking + Gobo 4 shaking + Gobo 5 shaking + Gobo 6 shaking + Gobo 7 shaking + Gobo 8 shaking + Gobo 9 shaking + Gobo 10 shaking + Gobo 11 shaking + Gobo 12 shaking + Gobo 13 shaking + Gobo 14 shaking + Gobo 15 shaking + Gobo 16 shaking + Gobo 17 shaking Counter-clockwise rotation, fast to slow Stop Clockwise rotation, slow to fast diff --git a/resources/fixtures/Chauvet/Chauvet-Q-Beam-260-LED.qxf b/resources/fixtures/Chauvet/Chauvet-Q-Beam-260-LED.qxf index 9f80d40aa0..b845e66c11 100644 --- a/resources/fixtures/Chauvet/Chauvet-Q-Beam-260-LED.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Q-Beam-260-LED.qxf @@ -37,13 +37,13 @@ Gobo 5 Gobo 6 Gobo 7 - Shaking Gobo 7 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 7 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow Effect diff --git a/resources/fixtures/Chauvet/Chauvet-Q-Spot-560-LED.qxf b/resources/fixtures/Chauvet/Chauvet-Q-Spot-560-LED.qxf index cd1daf3d31..4cdabebf99 100644 --- a/resources/fixtures/Chauvet/Chauvet-Q-Spot-560-LED.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Q-Spot-560-LED.qxf @@ -42,13 +42,13 @@ Gobo 5 Gobo 6 Gobo 7 - Shaking Gobo 7 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 7 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow effect @@ -60,12 +60,12 @@ Gobo 4 Gobo 5 Gobo 6 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow effect diff --git a/resources/fixtures/Chauvet/Chauvet-Rogue-RH1-Hybrid.qxf b/resources/fixtures/Chauvet/Chauvet-Rogue-RH1-Hybrid.qxf index 4503a37504..5b9188ab60 100644 --- a/resources/fixtures/Chauvet/Chauvet-Rogue-RH1-Hybrid.qxf +++ b/resources/fixtures/Chauvet/Chauvet-Rogue-RH1-Hybrid.qxf @@ -65,19 +65,19 @@ Gobo 12 Gobo 13 Open - Gobo shake 1, slow to fast - Gobo shake 2, slow to fast - Gobo shake 3, slow to fast - Gobo shake 4, slow to fast - Gobo shake 5, slow to fast - Gobo shake 6, slow to fast - Gobo shake 7, slow to fast - Gobo shake 8, slow to fast - Gobo shake 9, slow to fast - Gobo shake 10, slow to fast - Gobo shake 11, slow to fast - Gobo shake 12, slow to fast - Gobo shake 13, slow to fast + Gobo shake 1, slow to fast + Gobo shake 2, slow to fast + Gobo shake 3, slow to fast + Gobo shake 4, slow to fast + Gobo shake 5, slow to fast + Gobo shake 6, slow to fast + Gobo shake 7, slow to fast + Gobo shake 8, slow to fast + Gobo shake 9, slow to fast + Gobo shake 10, slow to fast + Gobo shake 11, slow to fast + Gobo shake 12, slow to fast + Gobo shake 13, slow to fast Open Clockwise gobo scroll, fast to slow Stop @@ -100,18 +100,18 @@ Gobo 4 Gobo 5 Gobo 6 - Gobo 7 + Gobo 7 Gobo 8 Gobo 9 - Gobo shake 1, slow to fast - Gobo shake 2, slow to fast - Gobo shake 3, slow to fast - Gobo shake 4, slow to fast - Gobo shake 5, slow to fast - Gobo shake 6, slow to fast - Gobo shake 7, slow to fast - Gobo shake 8, slow to fast - Gobo shake 9, slow to fast + Gobo shake 1, slow to fast + Gobo shake 2, slow to fast + Gobo shake 3, slow to fast + Gobo shake 4, slow to fast + Gobo shake 5, slow to fast + Gobo shake 6, slow to fast + Gobo shake 7, slow to fast + Gobo shake 8, slow to fast + Gobo shake 9, slow to fast Open Clockwise gobo scroll, fast to slow Counter-clockwise gobo scroll, slow to fast diff --git a/resources/fixtures/Clay_Paky/Clay-Paky-Alpha-Beam-300.qxf b/resources/fixtures/Clay_Paky/Clay-Paky-Alpha-Beam-300.qxf index 9b2f284e51..26337302e4 100644 --- a/resources/fixtures/Clay_Paky/Clay-Paky-Alpha-Beam-300.qxf +++ b/resources/fixtures/Clay_Paky/Clay-Paky-Alpha-Beam-300.qxf @@ -116,12 +116,12 @@ Rotation (Fast to Slow) Stop Rotation (Slow to Fast) - Gobo 2 Shake (Slow to Fast) - Gobo 3 Shake (Slow to Fast) - Gobo 4 Shake (Slow to Fast) - Gobo 5 Shake (Slow to Fast) - Gobo 6 Shake (Slow to Fast) - Gobo 7 Shake (Slow to Fast) + Gobo 2 Shake (Slow to Fast) + Gobo 3 Shake (Slow to Fast) + Gobo 4 Shake (Slow to Fast) + Gobo 5 Shake (Slow to Fast) + Gobo 6 Shake (Slow to Fast) + Gobo 7 Shake (Slow to Fast) Beam diff --git a/resources/fixtures/Clay_Paky/Clay-Paky-Mini-B.qxf b/resources/fixtures/Clay_Paky/Clay-Paky-Mini-B.qxf new file mode 100644 index 0000000000..406a9c5a8b --- /dev/null +++ b/resources/fixtures/Clay_Paky/Clay-Paky-Mini-B.qxf @@ -0,0 +1,284 @@ + + + + + Q Light Controller Plus + 4.12.4 + Massimo Callegari + + Clay Paky + Mini-B + Moving Head + + + + + + + + + + Colour + Not used + 8000K + 7000K + 6000K + 5600K + 5000K + 4000K + 3200K + 2500K + + + Colour + Macro Color OFF + Red + Green + Blue + Cyan + Yellow + Magenta + White 7000 K + White 3700 K + White 5000 K + Black + Medium Yellow + Straw Tint + Surprise Peach + Fire + Medium Amber + Gold Amber + Dark Amber + Sunrise Red + Light Pink + Medium Pink + Pink Carnation + Light Lavender + Lavender + Sky Blue + Just Blue + Dark Yellow Green + Spring Yellow + Light Amber + Straw + Deep Amber + Orange + Light Rose + English Rose + Light Salmon + Middle Rose + Dark Pink + Magenta2 + Peacock Blue + Med Blue Green + Steel Blue + Light Blue + Dark Blue + Leaf Green + Dark Green + Mauve + Bright Pink + Medium Blue + Deep Golden Amber + Pale Lavender + Special Lavender + Primary Green + Bright Blue + Apricot + Pale Gold + Deep Orange + Bastard Amber + Flame Red + Daylight Blue + Lilac Tint + Deep Lavender + Dark Steel Blue + Congo Blue + Alice Blue + Dirty White + White + + + Shutter + Light OFF + Strobe at linearly variable frequency from low (1Hz) to fast (25Hz) + Light ON + Pulsation at linearly variable speed from slow (0.5 Hz) to fast (25 Hz) + Light ON + Random Slow Strobe + Random Medium Strobe + Random Fast Strobe + Light ON + + + + + + + + + + Effect + Off + Pan tilt fast (default) + Pan tilt normal + Dimmer curve 1 + Dimmer curve 2 + Dimmer curve 3 + Dimmer curve 4 + Raw color channels gamma 1 + Raw color channels gamma 1.5 + Raw color channels gamma 2.2 (Default) + Free + Base frequency=600Hz + Base frequency=1200Hz (Default) + Base frequency=2000Hz + Base frequency=4000Hz + Base frequency=6000Hz + Base frequency=25000Hz + Default function recall + + + Maintenance + Unused Range + Zoom Reset + Pan Tilt Reset + Complete Reset + + + + + + + + + + + + + + + + + + + Red + Green + Blue + White + CTO + Macro Color + Strobe + Dimmer + Dimmer fine + Pan + Pan fine + Tilt + Tilt fine + Zoom + Function + Reset + + + Red + Red fine + Green + Green fine + Blue + Blue fine + White + White fine + CTO + Macro Color + Strobe + Dimmer + Dimmer fine + Pan + Pan fine + Tilt + Tilt fine + Zoom + Function + Reset + + + Red Circle + Green Circle + Blue Circle + White Circle + Red Centre + Green Centre + Blue Centre + White Centre + CTO + Macro Color + Strobe + Dimmer + Dimmer fine + Pan + Pan fine + Tilt + Tilt fine + Zoom + Function + Reset + + + Red Circle + Red Circle fine + Green Circle + Green Circle fine + Blue Circle + Blue Circle fine + White Circle + White Circle fine + Red Centre + Red Centre fine + Green Centre + Green Centre fine + Blue Centre + Blue Centre fine + White Centre + White Centre fine + CTO + Macro Color + Strobe + Dimmer + Dimmer fine + Pan + Pan fine + Tilt + Tilt fine + Zoom + Function + Reset + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + + + + + + + + + diff --git a/resources/fixtures/Clay_Paky/Clay-Paky-Mythos.qxf b/resources/fixtures/Clay_Paky/Clay-Paky-Mythos.qxf index 77da173dc8..6778393019 100644 --- a/resources/fixtures/Clay_Paky/Clay-Paky-Mythos.qxf +++ b/resources/fixtures/Clay_Paky/Clay-Paky-Mythos.qxf @@ -78,24 +78,24 @@ Gobo rotation Fast>Slow Stop Rotation Gobo rotation Slow>Fast - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo 8 Shake - Gobo 9 Shake - Gobo 10 Shake - Gobo 11 Shake - Gobo 12 Shake - Gobo 13 Shake - Gobo 14 Shake - Gobo 15 Shake - Gobo 16 Shake - Gobo 17 Shake - Gobo 18 Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo 8 Shake + Gobo 9 Shake + Gobo 10 Shake + Gobo 11 Shake + Gobo 12 Shake + Gobo 13 Shake + Gobo 14 Shake + Gobo 15 Shake + Gobo 16 Shake + Gobo 17 Shake + Gobo 18 Shake Effect @@ -116,12 +116,12 @@ Gobo 4 Gobo 5 Gobo 6 - Gobo Shake 1 - Gobo Shake 2 - Gobo Shake 3 - Gobo Shake 4 - Gobo Shake 5 - Gobo Shake 6 + Gobo Shake 1 + Gobo Shake 2 + Gobo Shake 3 + Gobo Shake 4 + Gobo Shake 5 + Gobo Shake 6 Gobo diff --git a/resources/fixtures/Clay_Paky/Clay-Paky-Sharpy.qxf b/resources/fixtures/Clay_Paky/Clay-Paky-Sharpy.qxf index e049dc1f7c..ffb64ccaab 100644 --- a/resources/fixtures/Clay_Paky/Clay-Paky-Sharpy.qxf +++ b/resources/fixtures/Clay_Paky/Clay-Paky-Sharpy.qxf @@ -79,21 +79,21 @@ Rotation (Fast 60rpm to slow 5rpm) Stop Rotation (Slow 5rpm to fast 60rpm) - Gobo 2 Shake (Slow to Fast) - Gobo 3 Shake (Slow to Fast) - Gobo 4 Shake (Slow to Fast) - Gobo 5 Shake (Slow to Fast) - Gobo 6 Shake (Slow to Fast) - Gobo 7 Shake (Slow to Fast) - Gobo 8 Shake (Slow to Fast) - Gobo 9 Shake (Slow to Fast) - Gobo 10 Shake (Slow to Fast) - Gobo 11 Shake (Slow to Fast) - Gobo 12 Shake (Slow to Fast) - Gobo 13 Shake (Slow to Fast) - Gobo 14 Shake (Slow to Fast) - Gobo 15 Shake (Slow to Fast) - Gobo 16 Shake (Slow 24bpm to Fast 600bpm) + Gobo 2 Shake (Slow to Fast) + Gobo 3 Shake (Slow to Fast) + Gobo 4 Shake (Slow to Fast) + Gobo 5 Shake (Slow to Fast) + Gobo 6 Shake (Slow to Fast) + Gobo 7 Shake (Slow to Fast) + Gobo 8 Shake (Slow to Fast) + Gobo 9 Shake (Slow to Fast) + Gobo 10 Shake (Slow to Fast) + Gobo 11 Shake (Slow to Fast) + Gobo 12 Shake (Slow to Fast) + Gobo 13 Shake (Slow to Fast) + Gobo 14 Shake (Slow to Fast) + Gobo 15 Shake (Slow to Fast) + Gobo 16 Shake (Slow 24bpm to Fast 600bpm) Prism diff --git a/resources/fixtures/Contest/Contest-EvoraB2R.qxf b/resources/fixtures/Contest/Contest-EvoraB2R.qxf index f5bc39ba98..7354bc9866 100644 --- a/resources/fixtures/Contest/Contest-EvoraB2R.qxf +++ b/resources/fixtures/Contest/Contest-EvoraB2R.qxf @@ -47,20 +47,20 @@ Vent Vent inv. Star - XS dot shake - S dot shake - M dot shake - L dot shake - XL dot shake - XXL dot shake - Triangle shake - Star shake - Spiral shake - Circular dots shake - Flower shake - Vent shake - Vent inv. shake - Star shake + XS dot shake + S dot shake + M dot shake + L dot shake + XL dot shake + XXL dot shake + Triangle shake + Star shake + Spiral shake + Circular dots shake + Flower shake + Vent shake + Vent inv. shake + Star shake Gobo scrol F>S diff --git a/resources/fixtures/Contest/Contest-PSC-930.qxf b/resources/fixtures/Contest/Contest-PSC-930.qxf index 4b2110a828..4041b18bea 100644 --- a/resources/fixtures/Contest/Contest-PSC-930.qxf +++ b/resources/fixtures/Contest/Contest-PSC-930.qxf @@ -33,12 +33,12 @@ Lines Triangle Cross - Dot Shake - Dots Shake - Turbine Shake - Lines Shake - Triangle Shake - Cross Shake + Dot Shake + Dots Shake + Turbine Shake + Lines Shake + Triangle Shake + Cross Shake Gobo rainbow diff --git a/resources/fixtures/Elation/Elation-Platinum-Beam-5R.qxf b/resources/fixtures/Elation/Elation-Platinum-Beam-5R.qxf index 85903fe0ac..32b46db407 100644 --- a/resources/fixtures/Elation/Elation-Platinum-Beam-5R.qxf +++ b/resources/fixtures/Elation/Elation-Platinum-Beam-5R.qxf @@ -44,14 +44,14 @@ Gobo 6 Gobo 7 Gobo 8 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo 8 Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo 8 Shake Gobo wheel cont. rotation slow to fast diff --git a/resources/fixtures/Elation/Elation-Platinum-Spot-5R.qxf b/resources/fixtures/Elation/Elation-Platinum-Spot-5R.qxf index 9230bda9c2..d4a2b4c512 100644 --- a/resources/fixtures/Elation/Elation-Platinum-Spot-5R.qxf +++ b/resources/fixtures/Elation/Elation-Platinum-Spot-5R.qxf @@ -40,14 +40,14 @@ Rot. Gobo 6 Rot. Gobo 7 Rot. Gobo 8 - Rot. Gobo 1 Shake - Rot. Gobo 2 Shake - Rot. Gobo 3 Shake - Rot. Gobo 4 Shake - Rot. Gobo 5 Shake - Rot. Gobo 6 Shake - Rot. Gobo 7 Shake - Rot. Gobo 8 Shake + Rot. Gobo 1 Shake + Rot. Gobo 2 Shake + Rot. Gobo 3 Shake + Rot. Gobo 4 Shake + Rot. Gobo 5 Shake + Rot. Gobo 6 Shake + Rot. Gobo 7 Shake + Rot. Gobo 8 Shake Rot. Gobo Wheel Rotate (Slow -> Fast) @@ -75,20 +75,20 @@ Gobo 12 Gobo 13 Gobo 14 - Gobo 1 Shake (Slow -> Fast) - Gobo 2 Shake (Slow -> Fast) - Gobo 3 Shake (Slow -> Fast) - Gobo 4 Shake (Slow -> Fast) - Gobo 5 Shake (Slow -> Fast) - Gobo 6 Shake (Slow -> Fast) - Gobo 7 Shake (Slow -> Fast) - Gobo 8 Shake (Slow -> Fast) - Gobo 9 Shake (Slow -> Fast) - Gobo 10 Shake (Slow -> Fast) - Gobo 11 Shake (Slow -> Fast) - Gobo 12 Shake (Slow -> Fast) - Gobo 13 Shake (Slow -> Fast) - Gobo 14 Shake (Slow -> Fast) + Gobo 1 Shake (Slow -> Fast) + Gobo 2 Shake (Slow -> Fast) + Gobo 3 Shake (Slow -> Fast) + Gobo 4 Shake (Slow -> Fast) + Gobo 5 Shake (Slow -> Fast) + Gobo 6 Shake (Slow -> Fast) + Gobo 7 Shake (Slow -> Fast) + Gobo 8 Shake (Slow -> Fast) + Gobo 9 Shake (Slow -> Fast) + Gobo 10 Shake (Slow -> Fast) + Gobo 11 Shake (Slow -> Fast) + Gobo 12 Shake (Slow -> Fast) + Gobo 13 Shake (Slow -> Fast) + Gobo 14 Shake (Slow -> Fast) Gobo Wheel Rotation (Slow -> Fast) diff --git a/resources/fixtures/Elation/Elation-Proteus-Beam.qxf b/resources/fixtures/Elation/Elation-Proteus-Beam.qxf index e0f0408ad8..53b23a902a 100644 --- a/resources/fixtures/Elation/Elation-Proteus-Beam.qxf +++ b/resources/fixtures/Elation/Elation-Proteus-Beam.qxf @@ -89,19 +89,19 @@ Static / Fixed Gobo 11 Static / Fixed Gobo 12 Static / Fixed Gobo 13 - Shake Slow to Fast Static / Fixed Gobo 1 - Shake Slow to Fast Static / Fixed Gobo 2 - Shake Slow to Fast Static / Fixed Gobo 3 - Shake Slow to Fast Static / Fixed Gobo 4 - Shake Slow to Fast Static / Fixed Gobo 5 - Shake Slow to Fast Static / Fixed Gobo 6 - Shake Slow to Fast Static / Fixed Gobo 7 - Shake Slow to Fast Static / Fixed Gobo 8 - Shake Slow to Fast Static / Fixed Gobo 9 - Shake Slow to Fast Static / Fixed Gobo 10 - Shake Slow to Fast Static / Fixed Gobo 11 - Shake Slow to Fast Static / Fixed Gobo 12 - Shake Slow to Fast Static / Fixed Gobo 13 + Shake Slow to Fast Static / Fixed Gobo 1 + Shake Slow to Fast Static / Fixed Gobo 2 + Shake Slow to Fast Static / Fixed Gobo 3 + Shake Slow to Fast Static / Fixed Gobo 4 + Shake Slow to Fast Static / Fixed Gobo 5 + Shake Slow to Fast Static / Fixed Gobo 6 + Shake Slow to Fast Static / Fixed Gobo 7 + Shake Slow to Fast Static / Fixed Gobo 8 + Shake Slow to Fast Static / Fixed Gobo 9 + Shake Slow to Fast Static / Fixed Gobo 10 + Shake Slow to Fast Static / Fixed Gobo 11 + Shake Slow to Fast Static / Fixed Gobo 12 + Shake Slow to Fast Static / Fixed Gobo 13 Clockwise Gobo Wheel Rotation from Fast to Slow No Rotation Counterclockwise Gobo Wheel Rotation from Slow to Fast diff --git a/resources/fixtures/Elumen8/Elumen8-MS-700PE.qxf b/resources/fixtures/Elumen8/Elumen8-MS-700PE.qxf index e864a03e1d..6672dbe1b5 100644 --- a/resources/fixtures/Elumen8/Elumen8-MS-700PE.qxf +++ b/resources/fixtures/Elumen8/Elumen8-MS-700PE.qxf @@ -57,13 +57,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 Shaking - Gobo 2 Shaking - Gobo 3 Shaking - Gobo 4 Shaking - Gobo 5 Shaking - Gobo 6 Shaking - Gobo 7 Shaking + Gobo 1 Shaking + Gobo 2 Shaking + Gobo 3 Shaking + Gobo 4 Shaking + Gobo 5 Shaking + Gobo 6 Shaking + Gobo 7 Shaking CW Fast - Slow Stop CCW Slow - Fast @@ -86,14 +86,14 @@ Gobo 6 Gobo 7 Gobo 8 - Gobo 1 Shaking - Gobo 2 Shaking - Gobo 3 Shaking - Gobo 4 Shaking - Gobo 5 Shaking + Gobo 1 Shaking + Gobo 2 Shaking + Gobo 3 Shaking + Gobo 4 Shaking + Gobo 5 Shaking Gobo 6 Shaking Gobo 7 Shaking - Gobo 8 Shaking + Gobo 8 Shaking CCW Fast - Slow Stop CW Slow - Fast diff --git a/resources/fixtures/Equinox/Equinox-Microbar-Quad-System.qxf b/resources/fixtures/Equinox/Equinox-Microbar-Quad-System.qxf new file mode 100644 index 0000000000..23bccf48cf --- /dev/null +++ b/resources/fixtures/Equinox/Equinox-Microbar-Quad-System.qxf @@ -0,0 +1,183 @@ + + + + + Q Light Controller Plus + 4.12.4 + Peter Crowther + + Equinox + Microbar Quad System + Color Changer + + + + + + + + + + + + + + Effect + Auto modes + Sound modes + + + Speed + Auto/sound mode speed (when using CH1) Strobe (slow-fast) (when using CH3-CH6) + + + + + + + + + + + + + + + + + + + + + Red + Green + Blue + White + + + Auto & Sound modes + Auto/sound mode speed (when using CH1) Strobe (slow-fast) (when using CH3-CH6) + Red + Green + Blue + White + + + Auto & Sound modes + Auto/sound mode speed (when using CH1) Strobe (slow-fast) (when using CH3-CH6) + Par 1 & 2 Red + Par 1 & 2 Green + Par 1 & 2 Blue + Par 1 & 2 White + Par 3 & 4 Red + Par 3 & 4 Green + Par 3 & 4 Blue + Par 3 & 4 White + + 2 + 3 + 4 + 5 + + + 6 + 7 + 8 + 9 + + + + Par 1 Red + Par 1 Green + Par 1 Blue + Par 1 White + Par 2 Red + Par 2 Green + Par 2 Blue + Par 2 White + Par 3 Red + Par 3 Green + Par 3 Blue + Par 3 White + Par 4 Red + Par 4 Green + Par 4 Blue + Par 4 White + + 0 + 3 + 2 + 1 + + + 4 + 5 + 6 + 7 + + + 8 + 9 + 10 + 11 + + + 12 + 13 + 14 + 15 + + + + Master dimmer + Strobe + Par 1 Red + Par 1 Green + Par 1 Blue + Par 1 White + Par 2 Red + Par 2 Green + Par 2 Blue + Par 2 White + Par 3 Red + Par 3 Green + Par 3 Blue + Par 3 White + Par 4 Red + Par 4 Green + Par 4 Blue + Par 4 White + + 2 + 3 + 4 + 5 + + + 6 + 7 + 8 + 9 + + + 10 + 11 + 12 + 13 + + + 14 + 15 + 16 + 17 + + + + + + + + + + + diff --git a/resources/fixtures/Eurolite/Eurolite-LED-PT-100-32-Pixel-DMX-Tube.qxf b/resources/fixtures/Eurolite/Eurolite-LED-PT-100-32-Pixel-DMX-Tube.qxf new file mode 100644 index 0000000000..6fb667050e --- /dev/null +++ b/resources/fixtures/Eurolite/Eurolite-LED-PT-100-32-Pixel-DMX-Tube.qxf @@ -0,0 +1,643 @@ + + + + + Q Light Controller Plus + 4.12.4 + Torsten Caninenberg + + Eurolite + LED PT-100/32 Pixel DMX Tube + LED Bar (Pixels) + + + + + + Maintenance + No function + Sound control + No function + Strobe with increasing speed + + + Shutter + No function + Strobe effect with increasing speed + + + Colour + No function + Red + Green + Blue + Yellow + Magenta + Cyan + Dark orange + Green yellow + Salmon + Turquoise + Light green + Orange + Lavender + Light blue + Dark blue + Pink + No function + + + Maintenance + Bo function + Auto program 1 + Auto program 2 + Auto program 3 + Auto program 4 + Auto program 5 + Auto program 6 + Auto program 7 + Auto program 8 + Auto program 9 + Auto program 10 + Auto program 11 + Auto program 12 + Sound program 1 + Sound program 2 + Sound program 3 + Sound program 4 + Sound program 5 + Sound program 6 + Sound program 7 + Sound program 8 + Sound program 9 + Sound program 10 + Sound program 11 + Sound program 12 + + + Speed + Auto and Sound program speed slow > fast + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Red + Green + Blue + + + Red + Green + Blue + Master dimmer + Function + + + Master dimmer + Strobe effect + Red + Green + Blue + Preset colors + Internal programs + Running speed for Auto - and Sound program + + + Pixel 1-2 Red + Pixel 1-2 Green + Pixel 1-2 Blue + Pixel 3-4 Red + Pixel 3-4 Green + Pixel 3-4 Blue + Pixel 5-6 Red + Pixel 5-6 Green + Pixel 5-6 Blue + Pixel 7-8 Red + Pixel 7-8 Green + Pixel 7-8 Blue + Pixel 9-10 Red + Pixel 9-10 Green + Pixel 9-10 Blue + Pixel 11-12 Red + Pixel 11-12 Green + Pixel 11-12 Blue + Pixel 13-14 Red + Pixel 13-14 Green + Pixel 13-14 Blue + Pixel 15-16 Red + Pixel 15-16 Green + Pixel 15-16 Blue + Pixel 17-18 Red + Pixel 17-18 Green + Pixel 17-18 Blue + Pixel 19-20 Red + Pixel 19-20 Green + Pixel 19-20 Blue + Pixel 21-22 Red + Pixel 21-22 Green + Pixel 21-22 Blue + Pixel 23-24 Red + Pixel 23-24 Green + Pixel 23-24 Blue + Pixel 25-26 Red + Pixel 25-26 Green + Pixel 25-26 Blue + Pixel 27-28 Red + Pixel 27-28 Green + Pixel 27-28 Blue + Pixel 29-30 Red + Pixel 29-30 Green + Pixel 29-30 Blue + Pixel 31-32 Red + Pixel 31-32 Green + Pixel 31-32 Blue + + 0 + 1 + 2 + + + 3 + 4 + 5 + + + 6 + 7 + 8 + + + 10 + 11 + 9 + + + 12 + 13 + 14 + + + 15 + 16 + 17 + + + 18 + 19 + 20 + + + 21 + 22 + 23 + + + 24 + 25 + 26 + + + 27 + 28 + 29 + + + 30 + 31 + 32 + + + 33 + 34 + 35 + + + 36 + 37 + 38 + + + 39 + 40 + 41 + + + 42 + 43 + 44 + + + 45 + 46 + 47 + + + + Pixel 1 Red + Pixel 1 Green + Pixel 1 Blue + Pixel 2 Red + Pixel 2 Green + Pixel 2 Blue + Pixel 3 Red + Pixel 3 Green + Pixel 3 Blue + Pixel 4 Red + Pixel 4 Green + Pixel 4 Blue + Pixel 5 Red + Pixel 5 Green + Pixel 5 Blue + Pixel 6 Red + Pixel 6 Green + Pixel 6 Blue + Pixel 7 Red + Pixel 7 Green + Pixel 7 Blue + Pixel 8 Red + Pixel 8 Green + Pixel 8 Blue + Pixel 9 Red + Pixel 9 Green + Pixel 9 Blue + Pixel 10 Red + Pixel 10 Green + Pixel 10 Blue + Pixel 11 Red + Pixel 11 Green + Pixel 11 Blue + Pixel 12 Red + Pixel 12 Green + Pixel 12 Blue + Pixel 13 Red + Pixel 13 Green + Pixel 13 Blue + Pixel 14 Red + Pixel 14 Green + Pixel 14 Blue + Pixel 15 Red + Pixel 15 Green + Pixel 15 Blue + Pixel 16 Red + Pixel 16 Green + Pixel 16 Blue + Pixel 17 Red + Pixel 17 Green + Pixel 17 Blue + Pixel 18 Red + Pixel 18 Green + Pixel 18 Blue + Pixel 19 Red + Pixel 19 Green + Pixel 19 Blue + Pixel 20 Red + Pixel 20 Green + Pixel 20 Blue + Pixel 21 Red + Pixel 21 Green + Pixel 21 Blue + Pixel 22 Red + Pixel 22 Green + Pixel 22 Blue + Pixel 23 Red + Pixel 23 Green + Pixel 23 Blue + Pixel 24 Red + Pixel 24 Green + Pixel 24 Blue + Pixel 25 Red + Pixel 25 Green + Pixel 25 Blue + Pixel 26 Red + Pixel 26 Green + Pixel 26 Blue + Pixel 27 Red + Pixel 27 Green + Pixel 27 Blue + Pixel 28 Red + Pixel 28 Green + Pixel 28 Blue + Pixel 29 Red + Pixel 29 Green + Pixel 29 Blue + Pixel 30 Red + Pixel 30 Green + Pixel 30 Blue + Pixel 31 Red + Pixel 31 Green + Pixel 31 Blue + Pixel 32 Red + Pixel 32 Green + Pixel 32 Blue + + 0 + 1 + 2 + + + 3 + 4 + 5 + + + 6 + 7 + 8 + + + 9 + 10 + 11 + + + 12 + 13 + 14 + + + 15 + 16 + 17 + + + 18 + 19 + 20 + + + 21 + 22 + 23 + + + 24 + 25 + 26 + + + 27 + 28 + 29 + + + 30 + 31 + 32 + + + 33 + 34 + 35 + + + 36 + 37 + 38 + + + 39 + 40 + 41 + + + 42 + 43 + 44 + + + 45 + 46 + 47 + + + 48 + 49 + 50 + + + 51 + 52 + 53 + + + 54 + 55 + 56 + + + 57 + 58 + 59 + + + 60 + 61 + 62 + + + 63 + 64 + 65 + + + 66 + 67 + 68 + + + 69 + 70 + 71 + + + 72 + 73 + 74 + + + 75 + 76 + 77 + + + 78 + 79 + 80 + + + 81 + 82 + 83 + + + 84 + 85 + 86 + + + 87 + 88 + 89 + + + 90 + 91 + 92 + + + 93 + 94 + 95 + + + + + + + + + + + diff --git a/resources/fixtures/Eurolite/Eurolite-TSL-100.qxf b/resources/fixtures/Eurolite/Eurolite-TSL-100.qxf index f5648a3fbf..5ed4e47acb 100644 --- a/resources/fixtures/Eurolite/Eurolite-TSL-100.qxf +++ b/resources/fixtures/Eurolite/Eurolite-TSL-100.qxf @@ -35,7 +35,7 @@ Gobo 6 Gobo 7 Gobo 8 - Open shake + Open shake Gobo 1 shake Gobo 2 shake Gobo 3 shake diff --git a/resources/fixtures/Eurolite/Eurolite-TSL-200.qxf b/resources/fixtures/Eurolite/Eurolite-TSL-200.qxf index 99a87847e9..1d171da0b1 100644 --- a/resources/fixtures/Eurolite/Eurolite-TSL-200.qxf +++ b/resources/fixtures/Eurolite/Eurolite-TSL-200.qxf @@ -54,7 +54,7 @@ Blackout Shutter open Strobe-effect with increasing speed - Shutter open + Shutter open Pulse closing with increasing speed Shutter open Pulse closing with decreasing speed diff --git a/resources/fixtures/FixturesMap.xml b/resources/fixtures/FixturesMap.xml index 1b05cbe8f3..93cca38e81 100644 --- a/resources/fixtures/FixturesMap.xml +++ b/resources/fixtures/FixturesMap.xml @@ -18,6 +18,7 @@ + @@ -185,6 +186,7 @@ + @@ -469,6 +471,7 @@ + @@ -568,6 +571,7 @@ + @@ -613,6 +617,7 @@ + @@ -893,6 +898,7 @@ + @@ -1184,6 +1190,9 @@ + + + @@ -1223,6 +1232,7 @@ + @@ -1386,6 +1396,7 @@ + @@ -1418,6 +1429,9 @@ + + + @@ -1434,6 +1448,7 @@ + diff --git a/resources/fixtures/Futurelight/Futurelight-PHS-260.qxf b/resources/fixtures/Futurelight/Futurelight-PHS-260.qxf index 7f1969533c..3f24416bf6 100644 --- a/resources/fixtures/Futurelight/Futurelight-PHS-260.qxf +++ b/resources/fixtures/Futurelight/Futurelight-PHS-260.qxf @@ -43,13 +43,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 shake speed - Gobo 2 shake speed - Gobo 3 shake speed - Gobo 4 shake speed - Gobo 5 shake speed - Gobo 6 shake speed - Gobo 7 shake speed + Gobo 1 shake speed + Gobo 2 shake speed + Gobo 3 shake speed + Gobo 4 shake speed + Gobo 5 shake speed + Gobo 6 shake speed + Gobo 7 shake speed Gobo rainbow speed @@ -62,13 +62,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 shake increasing speed - Gobo 2 shake increasing speed - Gobo 3 shake increasing speed - Gobo 4 shake increasing speed - Gobo 5 shake increasing speed - Gobo 6 shake increasing speed - Gobo 7 shake increasing speed + Gobo 1 shake increasing speed + Gobo 2 shake increasing speed + Gobo 3 shake increasing speed + Gobo 4 shake increasing speed + Gobo 5 shake increasing speed + Gobo 6 shake increasing speed + Gobo 7 shake increasing speed Roto gobo rainbow increasing speed diff --git a/resources/fixtures/Involight/Involight-LED-CC60S.qxf b/resources/fixtures/Involight/Involight-LED-CC60S.qxf index 3025c177a3..40e670b3ab 100644 --- a/resources/fixtures/Involight/Involight-LED-CC60S.qxf +++ b/resources/fixtures/Involight/Involight-LED-CC60S.qxf @@ -52,13 +52,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 shake from slow to fast - Gobo 6 shake from slow to fast - Gobo 5 shake from slow to fast - Gobo 4 shake from slow to fast - Gobo 3 shake from slow to fast - Gobo 2 shake from slow to fast - Gobo 1 shake from slow to fast + Gobo 7 shake from slow to fast + Gobo 6 shake from slow to fast + Gobo 5 shake from slow to fast + Gobo 4 shake from slow to fast + Gobo 3 shake from slow to fast + Gobo 2 shake from slow to fast + Gobo 1 shake from slow to fast Open Positive rainbow effect with increasing speed Negative rainbow effect with increasing speed diff --git a/resources/fixtures/Involight/Involight-LED-MH50S.qxf b/resources/fixtures/Involight/Involight-LED-MH50S.qxf index cf8a71b3a0..d055563a41 100644 --- a/resources/fixtures/Involight/Involight-LED-MH50S.qxf +++ b/resources/fixtures/Involight/Involight-LED-MH50S.qxf @@ -58,13 +58,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 Shake - Gobo 6 Shake - Gobo 5 Shake - Gobo 4 Shake - Gobo 3 Shake - Gobo 2 Shake - Gobo 1 Shake + Gobo 7 Shake + Gobo 6 Shake + Gobo 5 Shake + Gobo 4 Shake + Gobo 3 Shake + Gobo 2 Shake + Gobo 1 Shake Open Positive rainbow effect with increasing speed Negative rainbow effect with increasing speed diff --git a/resources/fixtures/Involight/Involight-LED-MH60S.qxf b/resources/fixtures/Involight/Involight-LED-MH60S.qxf index 5dff3c8ebc..80ed266311 100644 --- a/resources/fixtures/Involight/Involight-LED-MH60S.qxf +++ b/resources/fixtures/Involight/Involight-LED-MH60S.qxf @@ -58,13 +58,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 Shake < - Gobo 6 Shake < - Gobo 5 Shake < - Gobo 4 Shake < - Gobo 3 Shake < - Gobo 2 Shake < - Gobo 1 Shake < + Gobo 7 Shake < + Gobo 6 Shake < + Gobo 5 Shake < + Gobo 4 Shake < + Gobo 3 Shake < + Gobo 2 Shake < + Gobo 1 Shake < Open Positive rainbow effect with increasing speed Negative rainbow effect with increasing speed diff --git a/resources/fixtures/Involight/Involight-LED-MH77S.qxf b/resources/fixtures/Involight/Involight-LED-MH77S.qxf index 03ff8aad1c..fa121f2b1c 100644 --- a/resources/fixtures/Involight/Involight-LED-MH77S.qxf +++ b/resources/fixtures/Involight/Involight-LED-MH77S.qxf @@ -56,13 +56,13 @@ Gobo Change, speed descending Open Gobo Change, speed ascending - Gobo 1 Shake, speed controll - Gobo 2 Shake, speed controll - Gobo 3 Shake, speed controll - Gobo 4 Shake, speed controll - Gobo 5 Shake, speed controll - Gobo 6 Shake, speed controll - Gobo 7 Shake, speed controll + Gobo 1 Shake, speed control + Gobo 2 Shake, speed control + Gobo 3 Shake, speed control + Gobo 4 Shake, speed control + Gobo 5 Shake, speed control + Gobo 6 Shake, speed control + Gobo 7 Shake, speed control Gobo diff --git a/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P3.qxf b/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P3.qxf index 0a82c45006..9f7a670f88 100644 --- a/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P3.qxf +++ b/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P3.qxf @@ -170,7 +170,7 @@ Gobo 3 Gobo 4 Gobo 5 - Open shake + Open shake Gobo 1 shake (fast - slow) Gobo 2 shake (fast - slow) Gobo 3 shake (fast - slow) diff --git a/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P6.qxf b/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P6.qxf index 6228a7b775..6be0e53040 100644 --- a/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P6.qxf +++ b/resources/fixtures/JB-Lighting/JB-Lighting-Varyscan-P6.qxf @@ -69,13 +69,13 @@ Gobo - Open + Open Gobo 1 Gobo 2 Gobo 3 Gobo 4 Gobo 5 - Open shake + Open shake Gobo 1 shake Gobo 2 shake Gobo 3 shake @@ -92,7 +92,7 @@ Gobo 2 Gobo 3 Gobo 4 - Gobo open shake + Gobo open shake Gobo 1 shake Gobo 2 shake Gobo 3 shake diff --git a/resources/fixtures/Ledj/Ledj-Stage-Color-Quad.qxf b/resources/fixtures/Ledj/Ledj-Stage-Color-Quad.qxf new file mode 100644 index 0000000000..305c5c9804 --- /dev/null +++ b/resources/fixtures/Ledj/Ledj-Stage-Color-Quad.qxf @@ -0,0 +1,159 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + Peter Crowther + + Ledj + Stage Color Quad + Color Changer + + + + + + + + + + + + + + + + + + + + Effect + Blackout + Sound active (15 colours) + No function + Strobe (slow to fast) + + + Effect + Blank in manual + R + G + B + W + RG + GB + BW + WR + GW + RB + RGB + GBW + RGW + RBW + RGBW + Programme: 4 colour change + Programme: 15 colour change + Programme: Fade + Programme: One way flow + Programme: Two way flow + Programme: Dream + 7 colour sound active + 15 colour sound active + + + Effect + Dimmer + Speed + Sensitivity + + + Red + Green + Blue + White + + + Red 1 + Green 1 + Blue 1 + White 1 + Red 2 + Green 2 + Blue 2 + White 2 + Red 3 + Green 3 + Blue 3 + White 3 + + 0 + 3 + 1 + 2 + + + 4 + 5 + 7 + 6 + + + 8 + 9 + 10 + 11 + + + + Red + Green + Blue + White + Master dimmer + Strobe/Sound + + + Color programs + Dimmer/Speed/Sensitivity + Strobe + Red 1 + Green 1 + Blue 1 + White 1 + Red 2 + Green 2 + Blue 2 + White 2 + Red 3 + Green 3 + Blue 3 + White 3 + + 3 + 4 + 5 + 6 + + + 7 + 8 + 9 + 10 + + + 11 + 12 + 13 + 14 + + + + + + + + + + + diff --git a/resources/fixtures/MFL/MFL-Spot-G60.qxf b/resources/fixtures/MFL/MFL-Spot-G60.qxf index 298a989567..2f85f8f7d9 100644 --- a/resources/fixtures/MFL/MFL-Spot-G60.qxf +++ b/resources/fixtures/MFL/MFL-Spot-G60.qxf @@ -56,13 +56,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 7 Shake - Gobo 6 Shake - Gobo 5 Shake - Gobo 4 Shake - Gobo 3 Shake - Gobo 2 Shake - Gobo 1 Shake + Gobo 7 Shake + Gobo 6 Shake + Gobo 5 Shake + Gobo 4 Shake + Gobo 3 Shake + Gobo 2 Shake + Gobo 1 Shake From Fast to Slow Clockwise Rotation From Slow to Fast Counter Clockwise Rotation diff --git a/resources/fixtures/Martin/Martin-MAC-101.qxf b/resources/fixtures/Martin/Martin-MAC-101.qxf index 66ffd2757c..37cca3aec3 100644 --- a/resources/fixtures/Martin/Martin-MAC-101.qxf +++ b/resources/fixtures/Martin/Martin-MAC-101.qxf @@ -24,7 +24,7 @@ Strobe 5: random opening pulse (Fast -> Slow) Shutter open Strobe 6: random closing pulse (fast -> Slow) - Shutter open + Shutter open Strobe 7: burst pulse (Fast -> Slow) Shutter open Strobe 8: random burst pulse (Fast -> Slow) diff --git a/resources/fixtures/Martin/Martin-MAC-2000-Performance-II.qxf b/resources/fixtures/Martin/Martin-MAC-2000-Performance-II.qxf index ef3ea2b55a..08f555fcf5 100644 --- a/resources/fixtures/Martin/Martin-MAC-2000-Performance-II.qxf +++ b/resources/fixtures/Martin/Martin-MAC-2000-Performance-II.qxf @@ -55,16 +55,16 @@ Continuous rotation Gobo 3 Continuous rotation Gobo 4 Continuous rotation Gobo 5 - Indexed shake Gobo 1 (slow > fast) - Indexed shake Gobo 2 (slow > fast) - Indexed shake Gobo 3 (slow > fast) - Indexed shake Gobo 4 (slow > fast) - Indexed shake Gobo 5 (slow > fast) - Rotating shake Gobo 1 (slow > fast) - Rotating shake Gobo 2 (slow > fast) - Rotating shake Gobo 3 (slow > fast) - Rotating shake Gobo 4 (slow > fast) - Rotating shake Gobo 5 (slow > fast) + Indexed shake Gobo 1 (slow > fast) + Indexed shake Gobo 2 (slow > fast) + Indexed shake Gobo 3 (slow > fast) + Indexed shake Gobo 4 (slow > fast) + Indexed shake Gobo 5 (slow > fast) + Rotating shake Gobo 1 (slow > fast) + Rotating shake Gobo 2 (slow > fast) + Rotating shake Gobo 3 (slow > fast) + Rotating shake Gobo 4 (slow > fast) + Rotating shake Gobo 5 (slow > fast) Gobo wheel rotation CW (slow > fast) Gobo wheel rotation CCW (fast > slow) diff --git a/resources/fixtures/Martin/Martin-MAC-2000-Profile-II.qxf b/resources/fixtures/Martin/Martin-MAC-2000-Profile-II.qxf index 66616ce32e..a8818659f0 100644 --- a/resources/fixtures/Martin/Martin-MAC-2000-Profile-II.qxf +++ b/resources/fixtures/Martin/Martin-MAC-2000-Profile-II.qxf @@ -79,16 +79,16 @@ Continuous rotation Gobo 3 Continuous rotation Gobo 4 Continuous rotation Gobo 5 - Indexed shake Gobo 1 (slow > fast) - Indexed shake Gobo 2 (slow > fast) - Indexed shake Gobo 3 (slow > fast) - Indexed shake Gobo 4 (slow > fast) - Indexed shake Gobo 5 (slow > fast) - Rotating shake Gobo 1 (slow > fast) - Rotating shake Gobo 2 (slow > fast) - Rotating shake Gobo 3 (slow > fast) - Rotating shake Gobo 4 (slow > fast) - Rotating shake Gobo 5 (slow > fast) + Indexed shake Gobo 1 (slow > fast) + Indexed shake Gobo 2 (slow > fast) + Indexed shake Gobo 3 (slow > fast) + Indexed shake Gobo 4 (slow > fast) + Indexed shake Gobo 5 (slow > fast) + Rotating shake Gobo 1 (slow > fast) + Rotating shake Gobo 2 (slow > fast) + Rotating shake Gobo 3 (slow > fast) + Rotating shake Gobo 4 (slow > fast) + Rotating shake Gobo 5 (slow > fast) Gobo wheel rotation CW (slow > fast) Gobo wheel rotation CCW (fast > slow) @@ -115,16 +115,16 @@ Continuous rotation Gobo 3 Continuous rotation Gobo 4 Continuous rotation Gobo 5 - Indexed shake Gobo 1 (slow > fast) - Indexed shake Gobo 2 (slow > fast) - Indexed shake Gobo 3 (slow > fast) - Indexed shake Gobo 4 (slow > fast) - Indexed shake Gobo 5 (slow > fast) - Rotating shake Gobo 1 (slow > fast) - Rotating shake Gobo 2 (slow > fast) - Rotating shake Gobo 3 (slow > fast) - Rotating shake Gobo 4 (slow > fast) - Rotating shake Gobo 5 (slow > fast) + Indexed shake Gobo 1 (slow > fast) + Indexed shake Gobo 2 (slow > fast) + Indexed shake Gobo 3 (slow > fast) + Indexed shake Gobo 4 (slow > fast) + Indexed shake Gobo 5 (slow > fast) + Rotating shake Gobo 1 (slow > fast) + Rotating shake Gobo 2 (slow > fast) + Rotating shake Gobo 3 (slow > fast) + Rotating shake Gobo 4 (slow > fast) + Rotating shake Gobo 5 (slow > fast) Gobo wheel rotation CW (slow > fast) Gobo wheel rotation CCW (fast > slow) diff --git a/resources/fixtures/Martin/Martin-MAC-700-Profile.qxf b/resources/fixtures/Martin/Martin-MAC-700-Profile.qxf index 2e875909c6..99d2db7f21 100644 --- a/resources/fixtures/Martin/Martin-MAC-700-Profile.qxf +++ b/resources/fixtures/Martin/Martin-MAC-700-Profile.qxf @@ -94,18 +94,18 @@ Gobo 4 (Milky Way) - Continuous Rotation Gobo 5 (Water) - Continuous Rotation Gobo 6 (Flames) - Continuous Rotation - Gobo 1, slow -> fast - Indexed Shake - Gobo 2, slow -> fast - Indexed Shake - Gobo 3, slow -> fast - Indexed Shake - Gobo 4, slow -> fast - Indexed Shake - Gobo 5, slow -> fast - Indexed Shake - Gobo 6, slow -> fast - Indexed Shake - Gobo 6, slow -> fast - Cont. Rotate and Shake - Gobo 5, slow -> fast - Cont. Rotate and Shake - Gobo 4, slow -> fast - Cont. Rotate and Shake - Gobo 3, slow ->fast - Cont. Rotate and Shake - Gobo 2, slow -> fast - Cont. Rotate and Shake - Gobo 1, slow -> fast - Cont. Rotate and Shake + Gobo 1, slow -> fast - Indexed Shake + Gobo 2, slow -> fast - Indexed Shake + Gobo 3, slow -> fast - Indexed Shake + Gobo 4, slow -> fast - Indexed Shake + Gobo 5, slow -> fast - Indexed Shake + Gobo 6, slow -> fast - Indexed Shake + Gobo 6, slow -> fast - Cont. Rotate and Shake + Gobo 5, slow -> fast - Cont. Rotate and Shake + Gobo 4, slow -> fast - Cont. Rotate and Shake + Gobo 3, slow ->fast - Cont. Rotate and Shake + Gobo 2, slow -> fast - Cont. Rotate and Shake + Gobo 1, slow -> fast - Cont. Rotate and Shake CW scroll, slow -> fast CCW scroll, fast-> slow diff --git a/resources/fixtures/Martin/Martin-MAC-Aura.qxf b/resources/fixtures/Martin/Martin-MAC-Aura.qxf index c376b2e7e8..82cac16be7 100644 --- a/resources/fixtures/Martin/Martin-MAC-Aura.qxf +++ b/resources/fixtures/Martin/Martin-MAC-Aura.qxf @@ -22,7 +22,7 @@ Strobe 4: random strobe (fast → slow) Shutter open Strobe 5: random opening pulse (fast → slow) - Shutter open + Shutter open Strobe 6: random closing pulse (fast → slow) Shutter open Strobe 7: burst pulse (fast → slow) diff --git a/resources/fixtures/Martin/Martin-MAC-Quantum-Profile.qxf b/resources/fixtures/Martin/Martin-MAC-Quantum-Profile.qxf index bd42a65e6b..554bf52ec2 100644 --- a/resources/fixtures/Martin/Martin-MAC-Quantum-Profile.qxf +++ b/resources/fixtures/Martin/Martin-MAC-Quantum-Profile.qxf @@ -12,7 +12,7 @@ Shutter Shutter closed - Shutter open + Shutter open Strobe, slow → fast Shutter open Random strobe, slow → fast @@ -68,12 +68,12 @@ Gobo Rot 4 Gobo Rot 5 Gobo Rot 6 - Gobo 1 Shake, 360° slow → 10° fast - Gobo 2 Shake, 360° slow → 10° fast - Gobo 3 Shake, 360° slow → 10° fast - Gobo 4 Shake, 360° slow → 10° fast - Gobo 5 Shake, 360° slow → 10° fast - Gobo 6 Shake, 360° slow → 10° fast + Gobo 1 Shake, 360° slow → 10° fast + Gobo 2 Shake, 360° slow → 10° fast + Gobo 3 Shake, 360° slow → 10° fast + Gobo 4 Shake, 360° slow → 10° fast + Gobo 5 Shake, 360° slow → 10° fast + Gobo 6 Shake, 360° slow → 10° fast CW gobo wheel scroll, fast → slow CCW gobo wheel scroll, slow* → fast diff --git a/resources/fixtures/Martin/Martin-MAC-Viper-Performance.qxf b/resources/fixtures/Martin/Martin-MAC-Viper-Performance.qxf index 01012b1842..e3068ee8f2 100644 --- a/resources/fixtures/Martin/Martin-MAC-Viper-Performance.qxf +++ b/resources/fixtures/Martin/Martin-MAC-Viper-Performance.qxf @@ -74,11 +74,11 @@ Continuous Gobo 3 Continuous Gobo 4 Continuous Gobo 5 - Shake Gobo 1 - Shake Gobo 2 - Shake Gobo 3 - Shake Gobo 4 - Shake Gobo 5 + Shake Gobo 1 + Shake Gobo 2 + Shake Gobo 3 + Shake Gobo 4 + Shake Gobo 5 CW gobo wheel scroll, fast → slow CCW gobo wheel scroll, slow* → fast diff --git a/resources/fixtures/Martin/Martin-MAC-Viper-Wash-DX.qxf b/resources/fixtures/Martin/Martin-MAC-Viper-Wash-DX.qxf index b9edfc7148..22e9efb117 100644 --- a/resources/fixtures/Martin/Martin-MAC-Viper-Wash-DX.qxf +++ b/resources/fixtures/Martin/Martin-MAC-Viper-Wash-DX.qxf @@ -74,11 +74,11 @@ Continuous Gobo 3 Continuous Gobo 4 Continuous Gobo 5 - Shake Gobo 1 - Shake Gobo 2 - Shake Gobo 3 - Shake Gobo 4 - Shake Gobo 5 + Shake Gobo 1 + Shake Gobo 2 + Shake Gobo 3 + Shake Gobo 4 + Shake Gobo 5 CW gobo wheel scroll, fast → slow CCW gobo wheel scroll, slow* → fast diff --git a/resources/fixtures/Martin/Martin-MAC250-Entour.qxf b/resources/fixtures/Martin/Martin-MAC250-Entour.qxf index 0dc5b8e98d..e95b628d27 100644 --- a/resources/fixtures/Martin/Martin-MAC250-Entour.qxf +++ b/resources/fixtures/Martin/Martin-MAC250-Entour.qxf @@ -24,7 +24,7 @@ Random opening pulse, slow Random closing pulse, fast Random closing pulse, slow - Shutter open + Shutter open Reset Shutter open Lamp on @@ -85,13 +85,13 @@ Rotate gobo 5 Rotate gobo 6 Rotate gobo 7 - Gobo 7, shake slow -> fast - Gobo 6, shake slow -> fast - Gobo 5, shake slow -> fast - Gobo 4, shake slow -> fast - Gobo 3, shake slow -> fast - Gobo 2, shake slow -> fast - Gobo 1. shake slow -> fast + Gobo 7, shake slow -> fast + Gobo 6, shake slow -> fast + Gobo 5, shake slow -> fast + Gobo 4, shake slow -> fast + Gobo 3, shake slow -> fast + Gobo 2, shake slow -> fast + Gobo 1. shake slow -> fast Scroll CW, slow -> fast Scroll CCW, fast -> slow diff --git a/resources/fixtures/Martin/Martin-MH2-Wash.qxf b/resources/fixtures/Martin/Martin-MH2-Wash.qxf index f09ffc6ed5..4261bbe600 100644 --- a/resources/fixtures/Martin/Martin-MH2-Wash.qxf +++ b/resources/fixtures/Martin/Martin-MH2-Wash.qxf @@ -26,9 +26,9 @@ Strobe 6: random closing pulse (fast to slow) Shutter open Strobe 7: burst pulse (fast to slow) - Shutter open + Shutter open Strobe 8: random burst pulse (fast to slow) - Shutter open + Shutter open Strobe 9: sine wave (fast to slow) Shutter open Strobe 10: burst (fast to slow) diff --git a/resources/fixtures/Martin/Martin-MX-10.qxf b/resources/fixtures/Martin/Martin-MX-10.qxf index e420a95612..e498e764df 100644 --- a/resources/fixtures/Martin/Martin-MX-10.qxf +++ b/resources/fixtures/Martin/Martin-MX-10.qxf @@ -12,7 +12,7 @@ Shutter Shutter closed - Shutter open + Shutter open Strobe fast -> slow Shutter open Opening pulse, fast -> slow @@ -22,11 +22,11 @@ Shutter open Random opening pulse, fast -> slow Random closing pulse, fast -> slow - Shutter open + Shutter open Reset Shutter open Lamp on - Shutter open + Shutter open Lamp off diff --git a/resources/fixtures/Martin/Martin-MiniMAC-Maestro.qxf b/resources/fixtures/Martin/Martin-MiniMAC-Maestro.qxf index 6329fe7b23..8d26709e87 100644 --- a/resources/fixtures/Martin/Martin-MiniMAC-Maestro.qxf +++ b/resources/fixtures/Martin/Martin-MiniMAC-Maestro.qxf @@ -12,7 +12,7 @@ Shutter Shutter closed - Shutter open + Shutter open Strobe, fast to slow Shutter open Random strobe speed diff --git a/resources/fixtures/Martin/Martin-Roboscan-Pro-918.qxf b/resources/fixtures/Martin/Martin-Roboscan-Pro-918.qxf index 7f10fd7084..83d43c07c8 100644 --- a/resources/fixtures/Martin/Martin-Roboscan-Pro-918.qxf +++ b/resources/fixtures/Martin/Martin-Roboscan-Pro-918.qxf @@ -129,15 +129,15 @@ Gobo 7 Gobo 8 Gobo 9 - Gobo Shake 9 - Gobo Shake 8 - Gobo Shake 7 - Gobo Shake 6 - Gobo Shake 5 - Gobo Shake 4 - Gobo Shake 3 - Gobo Shake 2 - Gobo Shake 1 + Gobo Shake 9 + Gobo Shake 8 + Gobo Shake 7 + Gobo Shake 6 + Gobo Shake 5 + Gobo Shake 4 + Gobo Shake 3 + Gobo Shake 2 + Gobo Shake 1 diff --git a/resources/fixtures/Martin/Martin-Rush-MH1-Profile.qxf b/resources/fixtures/Martin/Martin-Rush-MH1-Profile.qxf index 2d6c2abace..d9eb804584 100644 --- a/resources/fixtures/Martin/Martin-Rush-MH1-Profile.qxf +++ b/resources/fixtures/Martin/Martin-Rush-MH1-Profile.qxf @@ -71,13 +71,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake Scroll CW Stop Scroll CCW @@ -100,14 +100,14 @@ Gobo 6 Gobo 7 Gobo 8 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake - Gobo 8 Shake + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake + Gobo 8 Shake Wheel rotation, counter clockwise, fast-slow Stop Wheel rotation, clockwise, slow-fast diff --git a/resources/fixtures/Martin/Martin-Rush-MH3.qxf b/resources/fixtures/Martin/Martin-Rush-MH3.qxf index 460d4fb2be..e8834af9ca 100644 --- a/resources/fixtures/Martin/Martin-Rush-MH3.qxf +++ b/resources/fixtures/Martin/Martin-Rush-MH3.qxf @@ -136,24 +136,24 @@ Gobo 15 Gobo 16 Gobo 17 - Open gobo shake - Gobo Shake 1 - Gobo Shake 2 - Gobo Shake 3 - Gobo Shake 4 - Gobo Shake 5 - Gobo Shake 6 - Gobo Shake 7 - Gobo Shake 8 - Gobo Shake 9 - Gobo Shake 10 - Gobo Shake 11 + Open gobo shake + Gobo Shake 1 + Gobo Shake 2 + Gobo Shake 3 + Gobo Shake 4 + Gobo Shake 5 + Gobo Shake 6 + Gobo Shake 7 + Gobo Shake 8 + Gobo Shake 9 + Gobo Shake 10 + Gobo Shake 11 Gobo Shake 12 - Gobo Shake 13 - Gobo Shake 14 - Gobo Shake 15 + Gobo Shake 13 + Gobo Shake 14 + Gobo Shake 15 Gobo Shake 16 - Gobo Shake 17 + Gobo Shake 17 Wheel rotation, counter-clockwise, fast-slow Stop Wheel rotation, clockwise, slow-fast diff --git a/resources/fixtures/Martin/Martin-Rush-MH5-Profile.qxf b/resources/fixtures/Martin/Martin-Rush-MH5-Profile.qxf index 159baf5d5a..ddd961dc05 100644 --- a/resources/fixtures/Martin/Martin-Rush-MH5-Profile.qxf +++ b/resources/fixtures/Martin/Martin-Rush-MH5-Profile.qxf @@ -111,12 +111,12 @@ Gobo 4 - Gobo rotation Gobo 5 - Gobo rotation Gobo 6 - Gobo rotation - Gobo 1 - shake - Gobo 2 - shake - Gobo 3 - shake - Gobo 4 - shake - Gobo 5 - shake - Gobo 6 - shake + Gobo 1 - shake + Gobo 2 - shake + Gobo 3 - shake + Gobo 4 - shake + Gobo 5 - shake + Gobo 6 - shake No function Continuous wheel rotation, clockwise, fast to slow Continuous wheel rotation, counter-clockwise, slow to fast diff --git a/resources/fixtures/Martin/Martin-Viper-AirFX.qxf b/resources/fixtures/Martin/Martin-Viper-AirFX.qxf index 40f0f0bc87..dc771d481b 100644 --- a/resources/fixtures/Martin/Martin-Viper-AirFX.qxf +++ b/resources/fixtures/Martin/Martin-Viper-AirFX.qxf @@ -73,11 +73,11 @@ Gobo 3 Gobo 4 Gobo 5 - Gobo 1 Shake, 360° slow -> 10° fast - Gobo 2 Shake, 360° slow -> 10° fast - Gobo 3 Shake, 360° slow -> 10° fast - Gobo 4 Shake, 360° slow -> 10° fast - Gobo 5 Shake, 360° slow -> 10° fast + Gobo 1 Shake, 360° slow -> 10° fast + Gobo 2 Shake, 360° slow -> 10° fast + Gobo 3 Shake, 360° slow -> 10° fast + Gobo 4 Shake, 360° slow -> 10° fast + Gobo 5 Shake, 360° slow -> 10° fast CW gobo wheel scroll, fast -> slow CCW gobo wheel scroll, slow -> fast diff --git a/resources/fixtures/PR_Lighting/PR-Lighting-PR-5000-Spot.qxf b/resources/fixtures/PR_Lighting/PR-Lighting-PR-5000-Spot.qxf index 7ac49ce6fa..fd5f62bc49 100644 --- a/resources/fixtures/PR_Lighting/PR-Lighting-PR-5000-Spot.qxf +++ b/resources/fixtures/PR_Lighting/PR-Lighting-PR-5000-Spot.qxf @@ -103,13 +103,13 @@ Gobo 7 Rotation speed from slow to fast Reverse rotation from slow to fast - Gobo 1 Shake (slow > fast) - Gobo 2 Shake (slow > fast) - Gobo 3 Shake (slow > fast) - Gobo 4 Shake (slow > fast) - Gobo 5 Shake (slow > fast) - Gobo 6 Shake (slow > fast) - Gobo 7 Shake (slow > fast) + Gobo 1 Shake (slow > fast) + Gobo 2 Shake (slow > fast) + Gobo 3 Shake (slow > fast) + Gobo 4 Shake (slow > fast) + Gobo 5 Shake (slow > fast) + Gobo 6 Shake (slow > fast) + Gobo 7 Shake (slow > fast) Gobo @@ -122,12 +122,12 @@ Gobo 6 Rotation speed from slow to fast Reverse rotation from slow to fast - Gobo 1 Shake (slow > fast) - Gobo 2 Shake (slow > fast) - Gobo 3 Shake (slow > fast) - Gobo 4 Shake (slow > fast) - Gobo 5 Shake (slow > fast) - Gobo 6 Shake (slow > fast) + Gobo 1 Shake (slow > fast) + Gobo 2 Shake (slow > fast) + Gobo 3 Shake (slow > fast) + Gobo 4 Shake (slow > fast) + Gobo 5 Shake (slow > fast) + Gobo 6 Shake (slow > fast) Gobo @@ -152,12 +152,12 @@ Gobo 6 Rotation speed from slow to fast Reverse rotation from slow to fast - Gobo 1 Shake (slow > fast) - Gobo 2 Shake (slow > fast) - Gobo 3 Shake (slow > fast) - Gobo 4 Shake (slow > fast) - Gobo 5 Shake (slow > fast) - Gobo 6 Shake (slow > fast) + Gobo 1 Shake (slow > fast) + Gobo 2 Shake (slow > fast) + Gobo 3 Shake (slow > fast) + Gobo 4 Shake (slow > fast) + Gobo 5 Shake (slow > fast) + Gobo 6 Shake (slow > fast) Gobo diff --git a/resources/fixtures/PR_Lighting/PR-Lighting-XR-230-Spot.qxf b/resources/fixtures/PR_Lighting/PR-Lighting-XR-230-Spot.qxf index c1b2bbd34d..d881f6ce93 100644 --- a/resources/fixtures/PR_Lighting/PR-Lighting-XR-230-Spot.qxf +++ b/resources/fixtures/PR_Lighting/PR-Lighting-XR-230-Spot.qxf @@ -97,23 +97,23 @@ Gobo 17 Forward rotation from slow to fast Reverse rotation from slow to fast - Shake 1 from fast to slow - Shake 2 from fast to slow - Shake 3 from fast to slow - Shake 4 from fast to slow - Shake 5 from fast to slow - Shake 6 from fast to slow - Shake 7 from fast to slow - Shake 8 from fast to slow - Shake 9 from fast to slow - Shake 10 from fast to slow - Shake 11 from fast to slow - Shake 12 from fast to slow - Shake 13 from fast to slow - Shake 14 from fast to slow - Shake 15 from fast to slow - Shake 16 from fast to slow - Shake 17 from fast to slow + Shake 1 from fast to slow + Shake 2 from fast to slow + Shake 3 from fast to slow + Shake 4 from fast to slow + Shake 5 from fast to slow + Shake 6 from fast to slow + Shake 7 from fast to slow + Shake 8 from fast to slow + Shake 9 from fast to slow + Shake 10 from fast to slow + Shake 11 from fast to slow + Shake 12 from fast to slow + Shake 13 from fast to slow + Shake 14 from fast to slow + Shake 15 from fast to slow + Shake 16 from fast to slow + Shake 17 from fast to slow Gobo @@ -129,15 +129,15 @@ Gobo 9 Forward rotation from slow to fast Reverse rotation from slow to fast - Shake 1 from fast to slow - Shake 2 from fast to slow - Shake 3 from fast to slow - Shake 4 from fast to slow - Shake 5 from fast to slow - Shake 6 from fast to slow - Shake 7 from fast to slow - Shake 8 from fast to slow - Shake 9 from fast to slow + Shake 1 from fast to slow + Shake 2 from fast to slow + Shake 3 from fast to slow + Shake 4 from fast to slow + Shake 5 from fast to slow + Shake 6 from fast to slow + Shake 7 from fast to slow + Shake 8 from fast to slow + Shake 9 from fast to slow Gobo diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot150.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot150.qxf index c2b9ba617c..20a90abf19 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot150.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot150.qxf @@ -38,13 +38,13 @@ Gobo 5 Gobo 6 Gobo 7 - Shaking Gobo 7 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 7 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow Effect diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot300.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot300.qxf index 121ee66651..7e1126955b 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot300.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-CromoSpot300.qxf @@ -44,14 +44,14 @@ Gobo 6 Gobo 7 Gobo 8 - Shaking Gobo 8 - Shaking Gobo 7 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 8 + Shaking Gobo 7 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow Effect @@ -114,13 +114,13 @@ Gobo 5 Gobo 6 Gobo 7 - Shaking Gobo 7 - Shaking Gobo 6 - Shaking Gobo 5 - Shaking Gobo 4 - Shaking Gobo 3 - Shaking Gobo 2 - Shaking Gobo 1 + Shaking Gobo 7 + Shaking Gobo 6 + Shaking Gobo 5 + Shaking Gobo 4 + Shaking Gobo 3 + Shaking Gobo 2 + Shaking Gobo 1 Flow Effect diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-Fury-FY250S.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-Fury-FY250S.qxf index 41b51c440f..3718097849 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-Fury-FY250S.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-Fury-FY250S.qxf @@ -55,13 +55,13 @@ Gobo 5 Gobo 6 Gobo 7 - Gobo 1 Shake Slow > Fast - Gobo 2 Shake Slow > Fast - Gobo 3 Shake Slow > Fast - Gobo 4 Shake Slow > Fast - Gobo 5 Shake Slow > Fast - Gobo 6 Shake Slow > Fast - Gobo 7 Shake Slow > Fast + Gobo 1 Shake Slow > Fast + Gobo 2 Shake Slow > Fast + Gobo 3 Shake Slow > Fast + Gobo 4 Shake Slow > Fast + Gobo 5 Shake Slow > Fast + Gobo 6 Shake Slow > Fast + Gobo 7 Shake Slow > Fast Open Forwards Rainbow Effect Slow > Fast Backwards Rainbow Effect Slow > Fast diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-Moonstone.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-Moonstone.qxf index ea0e1a826b..828006eb72 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-Moonstone.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-Moonstone.qxf @@ -145,13 +145,13 @@ Position 6 - indexed with backout Position 7 - indexed with backout Position 8 - indexed with backout - Position 2 - indexed with shake - Position 3 - indexed with shake - Position 4 - indexed with shake - Position 5 - indexed with shake - Position 6 - indexed with shake - Position 7 - indexed with shake - Position 8 - indexed with shake + Position 2 - indexed with shake + Position 3 - indexed with shake + Position 4 - indexed with shake + Position 5 - indexed with shake + Position 6 - indexed with shake + Position 7 - indexed with shake + Position 8 - indexed with shake Forward wheel spin (stop to fastest) Reverse wheel spin (stop to fastest) @@ -188,13 +188,13 @@ Position 6 - indexed with backout Position 7 - indexed with backout Position 8 - indexed with backout - Position 2 - indexed with shake - Position 3 - indexed with shake - Position 4 - indexed with shake - Position 5 - indexed with shake - Position 6 - indexed with shake - Position 7 - indexed with shake - Position 8 - indexed with shake + Position 2 - indexed with shake + Position 3 - indexed with shake + Position 4 - indexed with shake + Position 5 - indexed with shake + Position 6 - indexed with shake + Position 7 - indexed with shake + Position 8 - indexed with shake Forward wheel spin - stop to fastest Reverse wheel spin - stop to fastest diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-Onyx.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-Onyx.qxf index 2d7791ba78..d5bfe08810 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-Onyx.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-Onyx.qxf @@ -82,17 +82,17 @@ Indexed with backout gobo 9 Indexed with backout gobo 10 Indexed with backout gobo 11 - Indexed with shake gobo 1 - Indexed with shake gobo 2 - Indexed with shake gobo 3 - Indexed with shake gobo 4 - Indexed with shake gobo 5 - Indexed with shake gobo 6 - Indexed with shake gobo 7 - Indexed with shake gobo 8 - Indexed with shake gobo 9 - Indexed with shake gobo 10 - Indexed with shake gobo 11 + Indexed with shake gobo 1 + Indexed with shake gobo 2 + Indexed with shake gobo 3 + Indexed with shake gobo 4 + Indexed with shake gobo 5 + Indexed with shake gobo 6 + Indexed with shake gobo 7 + Indexed with shake gobo 8 + Indexed with shake gobo 9 + Indexed with shake gobo 10 + Indexed with shake gobo 11 Forward wheel spind stop to fast Reverse wheel spin stop to fast diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-StudioCOBFC.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-StudioCOBFC.qxf index 711b926e7b..8cc58815f6 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-StudioCOBFC.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-StudioCOBFC.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.0 GIT + 4.12.3 GIT Andrea Ugolini Pro-Lights @@ -15,13 +15,13 @@ Shutter - No function - Slow to Fast + No function + Slow to Fast Shutter - Strobe: No function / Speed: Slow to Fast - Strobe: Slow to Fast / Speed: Slow to Fast + Strobe: No function / Speed: Slow to Fast + Strobe: Slow to Fast / Speed: Slow to Fast Colour @@ -68,11 +68,11 @@ Mode Dimmer Speed - - - - - - - + + + + + + + diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-V200.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-V200.qxf index cdca32d9fb..fc77da971c 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-V200.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-V200.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.2 + 4.12.3 GIT Heikki Junnila Pro-Lights @@ -13,13 +13,13 @@ Shutter - Blackout - Open + Blackout + Open Strobe speed - Open + Open Gobo shake - Random strobe - Shutter open + Random strobe + Shutter open Gobo @@ -37,25 +37,25 @@ Colour - White - Green - Green + magenta - Magenta - Light blue - Yellow - Red - Blue + red - Blue - UV purple - Deep green - Green + orange - Orange - Yellow + orange - Yellow 2 - Yellow + pink - Pink - Rainbow CW speed - Rainbow CCW speed + White + Green + Green + magenta + Magenta + Light blue + Yellow + Red + Blue + red + Blue + UV purple + Deep green + Green + orange + Orange + Yellow + orange + Yellow 2 + Yellow + pink + Pink + Rainbow CW speed + Rainbow CCW speed Speed @@ -128,11 +128,11 @@ Gobo rotation Colour - - - - - - - + + + + + + + diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-XP250.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-XP250.qxf index 70df168c24..ec4833ae35 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-XP250.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-XP250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Tolmino Muccitelli Pro-Lights @@ -12,8 +12,8 @@ Shutter - Shutter Closed - Strobe Slow-Fast + Shutter Closed + Strobe Slow-Fast Colour diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Spot.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Spot.qxf index 256c23f4bc..2d7ec16f5f 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Spot.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Tolmino Muccitelli Pro-Lights @@ -12,8 +12,8 @@ Shutter - Shutter closed - Strobe from slow to fast + Shutter closed + Strobe from slow to fast Colour diff --git a/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Wash.qxf b/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Wash.qxf index 1403a3911b..f1913c78ab 100644 --- a/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Wash.qxf +++ b/resources/fixtures/Pro-Lights/Pro-Lights-XP575-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Tolmino TC Concerti Pro-Lights @@ -12,29 +12,29 @@ Shutter - Closed - Open - Shutter Slow-Fast - Open - Fade Out Fast-Slow - Open - Fade In Slow Fast - Open - Random Shutter Slow Fast - Open + Closed + Open + Shutter Slow-Fast + Open + Fade Out Fast-Slow + Open + Fade In Slow Fast + Open + Random Shutter Slow Fast + Open Colour - White - Red - Blue - Green - Purple + White + Red + Blue + Green + Purple 5000K 3200K - Forward Rotate Fast Slow + Forward Rotate Fast Slow Stop - Backward Rotate Slow-Fast + Backward Rotate Slow-Fast @@ -111,11 +111,11 @@ Controls LampSwitch - - - - - - - + + + + + + + diff --git a/resources/fixtures/Pulse/Pulse-Impstar-40.qxf b/resources/fixtures/Pulse/Pulse-Impstar-40.qxf index b656039221..d75c10afbe 100644 --- a/resources/fixtures/Pulse/Pulse-Impstar-40.qxf +++ b/resources/fixtures/Pulse/Pulse-Impstar-40.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Paul Wilton Pulse @@ -19,29 +19,29 @@ Shutter - Off - Increasing speed + Off + Increasing speed Maintenance No function - Reset + Reset No Function Maintenance No function - Reset + Reset No Function Automatic sound-to-light-show Shutter - Off - Increasing speed + Off + Increasing speed diff --git a/resources/fixtures/Pulse/Pulse-SlimLite-56.qxf b/resources/fixtures/Pulse/Pulse-SlimLite-56.qxf index ea36d6f28d..7612b57561 100644 --- a/resources/fixtures/Pulse/Pulse-SlimLite-56.qxf +++ b/resources/fixtures/Pulse/Pulse-SlimLite-56.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Jimmy Traylor Pulse @@ -14,53 +14,53 @@ Shutter - No function - Slow-fast + No function + Slow-fast Effect - Red intensity/R (255)/Slow-fast/Sensitivity - Red intensity/R (255) G (50)/Slow-fast/Sensitivity - Red intensity/R (255) G (150)/Slow-fast/Sensitivity - Red intensity/R (255) G (255)/Slow-fast/Sensitivity - Red intensity/R (200) G (255)/Slow-fast/Sensitivity - Red intensity/R (100) G (255)/Slow-fast/Sensitivity - Red intensity/R (40) G (255)/Slow-fast/Sensitivity - Red intensity/G (255)/Slow-fast/Sensitivity - Red intensity/G (255) B (50)/Slow-fast/Sensitivity - Red intensity/G (255) B (150)/Slow-fast/Sensitivity - Red intensity/G (255) B (255)/Slow-fast/Sensitivity - Red intensity/G (150) B (255)/Slow-fast/Sensitivity - Red intensity/G (50) B (255)/Slow-fast/Sensitivity - Red intensity/B (255)/Slow-fast/Sensitivity - Red intensity/R (50) B (255)/Slow-fast/Sensitivity - Red intensity/R (150) B (255)/Slow-fast/Sensitivity - Red intensity/R (255) B (255)/Slow-fast/Sensitivity - Red intensity/R (220) B (50)/Slow-fast/Sensitivity - Red intensity/R (150) G (50 B (100)/Slow-fast/Sensitivity - Red intensity/R (50) G (150) B (220)/Slow-fast/Sensitivity - Red intensity/R (50) G (220) B (220)/Slow-fast/Sensitivity - Red intensity/R (150) G (220)/Slow-fast/Sensitivity - Red intensity/R (150) B (220)/Slow-fast/Sensitivity - Red intensity/G (180) B (220)/Slow-fast/Sensitivity - Red intensity/G (220) B (50)/Slow-fast/Sensitivity - Red intensity/R (220) G (100) B (50)/Slow-fast/Sensitivity - Red intensity/R (220) G (200) B (100)/Slow-fast/Sensitivity - Red intensity/R (255) G (200) B (150)/Slow-fast/Sensitivity - Red intensity/R (255) G (255) B (255)/Slow-fast/Sensitivity + Red intensity/R (255)/Slow-fast/Sensitivity + Red intensity/R (255) G (50)/Slow-fast/Sensitivity + Red intensity/R (255) G (150)/Slow-fast/Sensitivity + Red intensity/R (255) G (255)/Slow-fast/Sensitivity + Red intensity/R (200) G (255)/Slow-fast/Sensitivity + Red intensity/R (100) G (255)/Slow-fast/Sensitivity + Red intensity/R (40) G (255)/Slow-fast/Sensitivity + Red intensity/G (255)/Slow-fast/Sensitivity + Red intensity/G (255) B (50)/Slow-fast/Sensitivity + Red intensity/G (255) B (150)/Slow-fast/Sensitivity + Red intensity/G (255) B (255)/Slow-fast/Sensitivity + Red intensity/G (150) B (255)/Slow-fast/Sensitivity + Red intensity/G (50) B (255)/Slow-fast/Sensitivity + Red intensity/B (255)/Slow-fast/Sensitivity + Red intensity/R (50) B (255)/Slow-fast/Sensitivity + Red intensity/R (150) B (255)/Slow-fast/Sensitivity + Red intensity/R (255) B (255)/Slow-fast/Sensitivity + Red intensity/R (220) B (50)/Slow-fast/Sensitivity + Red intensity/R (150) G (50 B (100)/Slow-fast/Sensitivity + Red intensity/R (50) G (150) B (220)/Slow-fast/Sensitivity + Red intensity/R (50) G (220) B (220)/Slow-fast/Sensitivity + Red intensity/R (150) G (220)/Slow-fast/Sensitivity + Red intensity/R (150) B (220)/Slow-fast/Sensitivity + Red intensity/G (180) B (220)/Slow-fast/Sensitivity + Red intensity/G (220) B (50)/Slow-fast/Sensitivity + Red intensity/R (220) G (100) B (50)/Slow-fast/Sensitivity + Red intensity/R (220) G (200) B (100)/Slow-fast/Sensitivity + Red intensity/R (255) G (200) B (150)/Slow-fast/Sensitivity + Red intensity/R (255) G (255) B (255)/Slow-fast/Sensitivity Effect - Channel 2 static colours - Pr02 (7 colour fading) - Pr03 (3 colour fading) - Pr04 (7 colour jump) - Pr05 (3 colour jump) - Pr06 (colour dreaming 1) - Pr07 (colour dreaming 2) - Pr08 (red fading) - Pr09 (green fading) - Pr10 (blue fading) + Channel 2 static colours + Pr02 (7 colour fading) + Pr03 (3 colour fading) + Pr04 (7 colour jump) + Pr05 (3 colour jump) + Pr06 (colour dreaming 1) + Pr07 (colour dreaming 2) + Pr08 (red fading) + Pr09 (green fading) + Pr10 (blue fading) Sound active @@ -159,11 +159,11 @@ ID Address Fader Response - - - - - - - + + + + + + + diff --git a/resources/fixtures/QTX/QTX-MHS-60.qxf b/resources/fixtures/QTX/QTX-MHS-60.qxf index d8f91b44b7..bd6da09926 100644 --- a/resources/fixtures/QTX/QTX-MHS-60.qxf +++ b/resources/fixtures/QTX/QTX-MHS-60.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Nerijus Mongirdas QTX @@ -11,20 +11,20 @@ Moving Head Colour - Open - Fire red - Yellow - Light blue - Green - Orange - Purple - Dark blue - Scrolling colour wheel, fast to slow - Reverse scrolling colour wheel, slow to fast + Open + Fire red + Yellow + Light blue + Green + Orange + Purple + Dark blue + Scrolling colour wheel, fast to slow + Reverse scrolling colour wheel, slow to fast Gobo - Open + Open Gobo 1 Gobo 2 Gobo 3 @@ -42,9 +42,9 @@ Shutter - Open - Strobe from slow to fast - Open + Open + Strobe from slow to fast + Open @@ -77,11 +77,11 @@ Prism Reset - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubSpot-150CT.qxf b/resources/fixtures/Robe/Robe-ClubSpot-150CT.qxf index 6ca0cb1994..19d61bb074 100644 --- a/resources/fixtures/Robe/Robe-ClubSpot-150CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubSpot-150CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila Robe @@ -67,16 +67,16 @@ Shutter - Closed + Closed Dimmer - Open + Open Strobe Speed Reset - Closed + Closed Open Pulse Close Pulse - Random Strobe - Open + Random Strobe + Open @@ -105,11 +105,11 @@ Reserved Shutter - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubSpot-160CT.qxf b/resources/fixtures/Robe/Robe-ClubSpot-160CT.qxf index aeea31aeec..abfeb73c9d 100644 --- a/resources/fixtures/Robe/Robe-ClubSpot-160CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubSpot-160CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila Robe @@ -59,16 +59,16 @@ Shutter - Closed + Closed Dimmer - Open + Open Strobe Speed Reset - Closed + Closed Open Pulse Close Pulse - Random Strobe - Open + Random Strobe + Open Gobo @@ -105,11 +105,11 @@ Gobo Rotation Shutter - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubSpot-250CT.qxf b/resources/fixtures/Robe/Robe-ClubSpot-250CT.qxf index 06b84f24a6..9a7c1ec435 100644 --- a/resources/fixtures/Robe/Robe-ClubSpot-250CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubSpot-250CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila Robe @@ -30,25 +30,25 @@ Colour - Open/white - Turquoise - Deep Red - Cyan - UV - Magenta - Light Blue - Yellow - Green - Pink - Blue - Red - Forwards rainbow effecr from slow to fast + Open/white + Turquoise + Deep Red + Cyan + UV + Magenta + Light Blue + Yellow + Green + Pink + Blue + Red + Forwards rainbow effecr from slow to fast No rotation - Backwards rainbow effect from slow to fast + Backwards rainbow effect from slow to fast Gobo - Open + Open Gobo 1 Gobo 2 Gobo 3 @@ -73,15 +73,15 @@ Shutter - Closed - Open - Strobe effect from slow to fast - Open - Closing pulses from slow to fast - Opening pulses from fast to slow - Open - Random Strobe effects from slow to fast - Open + Closed + Open + Strobe effect from slow to fast + Open + Closing pulses from slow to fast + Opening pulses from fast to slow + Open + Random Strobe effects from slow to fast + Open @@ -106,11 +106,11 @@ Shutter, Strobe Dimmer Intensity - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubSpot-300-CT.qxf b/resources/fixtures/Robe/Robe-ClubSpot-300-CT.qxf index 29cad41ec2..5648024781 100644 --- a/resources/fixtures/Robe/Robe-ClubSpot-300-CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubSpot-300-CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.5.1 + 4.12.3 GIT Massimo Callegari Robe @@ -17,8 +17,7 @@ Speed Max. speed (tracking mode) From max.speed to min.speed (vector mode) - Max.speed (tracking mode),black-out while colour -changing or pan/tilt moving + Max.speed (tracking mode),black-out while colour changing or pan/tilt moving Effect @@ -30,29 +29,27 @@ changing or pan/tilt moving Colour - Open/White - Turquoise - Deep red - Cyan - UV filter - Magenta - - Light blue - Yellow - Green - Pink - Blue - Red - Forwards rainbow effect from fast to slow + Open/White + Turquoise + Deep red + Cyan + UV filter + Magenta + Light blue + Yellow + Green + Pink + Blue + Red + Forwards rainbow effect from fast to slow No rotation - Backwards rainbow effect from slow to fast + Backwards rainbow effect from slow to fast Effect - Open position (hole) - 3-facet rotating prism - + Open position (hole) + 3-facet rotating prism Macro 1 Macro 2 Macro 3 @@ -75,13 +72,13 @@ changing or pan/tilt moving Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 Forward gobo wheel rotation from slow to fast @@ -95,16 +92,15 @@ changing or pan/tilt moving Shutter - Shutter closed - - Shutter open - Strobe-effect from slow to fast - Shutter open - Closing pulses from slow to fast - Opening pulses from fast to slow - Shutter open - Random strobe effects from slow to fast - Shutter open + Shutter closed + Shutter open + Strobe-effect from slow to fast + Shutter open + Closing pulses from slow to fast + Opening pulses from fast to slow + Shutter open + Random strobe effects from slow to fast + Shutter open @@ -159,11 +155,11 @@ changing or pan/tilt moving Shutter, Strobe Dimmer intensity - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubSpot-500-CT.qxf b/resources/fixtures/Robe/Robe-ClubSpot-500-CT.qxf index cbf0612fbe..b08ee1b1d2 100644 --- a/resources/fixtures/Robe/Robe-ClubSpot-500-CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubSpot-500-CT.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.1.0 + Q Light Controller Plus + 4.12.3 GIT Heikki Junnila Robe @@ -88,15 +88,15 @@ Shutter - Shutter closed - Shutter open - Strobe slow to fast - Shutter open - Closing pulse slow to fast - Opening pulse fast to slow - No function - Random strobe slow to fast - Shutter open + Shutter closed + Shutter open + Strobe slow to fast + Shutter open + Closing pulse slow to fast + Opening pulse fast to slow + No function + Random strobe slow to fast + Shutter open @@ -142,11 +142,11 @@ Shutter, strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubWash-250CT.qxf b/resources/fixtures/Robe/Robe-ClubWash-250CT.qxf index 44a28b607a..c437a4151b 100644 --- a/resources/fixtures/Robe/Robe-ClubWash-250CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubWash-250CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila Robe @@ -47,12 +47,12 @@ Shutter - Closed - Open + Closed + Open Strobe Speed Close Pulse Open Pulse - Random Strobe + Random Strobe @@ -77,11 +77,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubWash-300CT.qxf b/resources/fixtures/Robe/Robe-ClubWash-300CT.qxf index 4698c65ad8..2ad4200a8b 100644 --- a/resources/fixtures/Robe/Robe-ClubWash-300CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubWash-300CT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila Robe @@ -29,16 +29,16 @@ Colour - Open - Red - Blue - Green + Open + Red + Blue + Green 3200K 5600K - UV - Scroll CW + UV + Scroll CW No Scroll - Scroll CCW + Scroll CCW @@ -91,15 +91,15 @@ Shutter - Closed - Open + Closed + Open Strobe Speed - Open + Open Close Pulse Open Pulse - Open - Random Strobe - Open + Open + Random Strobe + Open @@ -136,11 +136,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ClubWash-500-CT.qxf b/resources/fixtures/Robe/Robe-ClubWash-500-CT.qxf index 5d9a818f12..79b0aafb41 100644 --- a/resources/fixtures/Robe/Robe-ClubWash-500-CT.qxf +++ b/resources/fixtures/Robe/Robe-ClubWash-500-CT.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.1.0 + Q Light Controller Plus + 4.12.3 GIT Heikki Junnila Robe @@ -71,15 +71,15 @@ Shutter - Shutter closed - Shutter open - Strobe slow to fast - Shutter open - Closing pulse slow to fast - Opening pulse fast to slow - No function - Random strobe slow to fast - Shutter open + Shutter closed + Shutter open + Strobe slow to fast + Shutter open + Closing pulse slow to fast + Opening pulse fast to slow + No function + Random strobe slow to fast + Shutter open @@ -125,11 +125,11 @@ Shutter, strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ColorSpot-170-AT.qxf b/resources/fixtures/Robe/Robe-ColorSpot-170-AT.qxf index 486fa34c7f..d34e55664c 100644 --- a/resources/fixtures/Robe/Robe-ColorSpot-170-AT.qxf +++ b/resources/fixtures/Robe/Robe-ColorSpot-170-AT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.4 + 4.12.3 GIT Heikki Junnila Robe @@ -56,31 +56,31 @@ Colour - White - Dark Green - Red - Cyan - Magenta - Yellow - Green - Pink - Dark Blue - Orange - Forwards rainbow fast to slow + White + Dark Green + Red + Cyan + Magenta + Yellow + Green + Pink + Dark Blue + Orange + Forwards rainbow fast to slow No rotation - Backwards rainbow slow to fast + Backwards rainbow slow to fast Shutter - Shutter closed - Shutter open - Strobe speed slow to fast - Shutter open + Shutter closed + Shutter open + Strobe speed slow to fast + Shutter open Pulse - Shutter open - Random strobe slow to fast - Shutter open + Shutter open + Random strobe slow to fast + Shutter open @@ -145,11 +145,11 @@ Shutter, strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ColorSpot-250-AT.qxf b/resources/fixtures/Robe/Robe-ColorSpot-250-AT.qxf index 8a20f66c03..506d1959eb 100644 --- a/resources/fixtures/Robe/Robe-ColorSpot-250-AT.qxf +++ b/resources/fixtures/Robe/Robe-ColorSpot-250-AT.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 + 4.12.3 GIT Dmitry Eremin-Solenikov Robe @@ -30,15 +30,15 @@ Blackout while gobo wheel moving Disabled blackout while gobo wheel moving Lamp On, reset (total reset except pan/tilt reset) - Pan/Tilt reset - Colour wheel reset - Gobo wheel reset + Pan/Tilt reset + Colour wheel reset + Gobo wheel reset Dimmer/Strobe reset Focus reset - Prism reset - Total reset + Prism reset + Total reset Reserved - Lamp Off + Lamp Off Reserved @@ -115,13 +115,13 @@ Gobo shaking 5 Gobo shaking 6 Gobo shaking 7 - Gobo shaking rotation 1 - Gobo shaking rotation 2 - Gobo shaking rotation 3 - Gobo shaking rotation 4 - Gobo shaking rotation 5 - Gobo shaking rotation 6 - Gobo shaking rotation 7 + Gobo shaking rotation 1 + Gobo shaking rotation 2 + Gobo shaking rotation 3 + Gobo shaking rotation 4 + Gobo shaking rotation 5 + Gobo shaking rotation 6 + Gobo shaking rotation 7 Open Forwards rotation Fast to Slow No Rotation diff --git a/resources/fixtures/Robe/Robe-ColorSpot-575-AT.qxf b/resources/fixtures/Robe/Robe-ColorSpot-575-AT.qxf index ae3c28c023..22a41798ed 100644 --- a/resources/fixtures/Robe/Robe-ColorSpot-575-AT.qxf +++ b/resources/fixtures/Robe/Robe-ColorSpot-575-AT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.1 + 4.12.3 GIT Robert Box Robe @@ -30,39 +30,39 @@ Blackout while gobo wheel moving Disabled blackout while gobo wheel moving Lamp on, reset (total reset except pan/tilt reset) - Pan/tilt reset - Colour system reset - Gobo wheels reset + Pan/tilt reset + Colour system reset + Gobo wheels reset Dimmer/strobe reset Focus/zoom/frost reset Iris/prism reset - Total reset + Total reset Reserved - Lamp off + Lamp off Reserved Colour - Open/white - continual positioning - Light blue - continual positioning - Red - continual positioning - Blue - continual positioning - Light green - continual positioning - Yellow - continual positioning - Magenta - continual positioning - Cyan - continual positioning - Green - continual positioning - Orange - continual positioning - White - continual positioning - Light blue - positioning - Red - positioning - Blue - positioning - Light green - positioning - Yellow - positioning - Magenta - positioning - Cyan - positioning - Green - positioning - Orange - positioning + Open/white - continual positioning + Light blue - continual positioning + Red - continual positioning + Blue - continual positioning + Light green - continual positioning + Yellow - continual positioning + Magenta - continual positioning + Cyan - continual positioning + Green - continual positioning + Orange - continual positioning + White - continual positioning + Light blue - positioning + Red - positioning + Blue - positioning + Light green - positioning + Yellow - positioning + Magenta - positioning + Cyan - positioning + Green - positioning + Orange - positioning Forwards rainbow effect from fast to slow No rotation Backwards rainbow effect from slow to fast @@ -73,33 +73,33 @@ Gobo Continual positioning open/hole - Continual positioning 1 - Continual positioning 2 - Continual positioning 3 - Continual positioning 4 + Continual positioning 1 + Continual positioning 2 + Continual positioning 3 + Continual positioning 4 Continual positioning 5 Continual positioning 6 Continual positioning 7 - Continual positioning 8 - Continual positioning 9 + Continual positioning 8 + Continual positioning 9 Continual positioning open/hole - Positioning 1 + Positioning 1 Positioning 2 - Positioning 3 - Positioning 4 - Positioning 5 - Positioning 6 - Positioning 7 - Positioning 8 - Positioning 9 + Positioning 3 + Positioning 4 + Positioning 5 + Positioning 6 + Positioning 7 + Positioning 8 + Positioning 9 Shaking 1 from slow to fast - Shaking 2 from slow to fast - Shaking 3 from slow to fast - Shaking 4 from slow to fast - Shaking 5 from slow to fast - Shaking 6 from slow to fast - Shaking 7 from slow to fast - Shaking 8 from slow to fast + Shaking 2 from slow to fast + Shaking 3 from slow to fast + Shaking 4 from slow to fast + Shaking 5 from slow to fast + Shaking 6 from slow to fast + Shaking 7 from slow to fast + Shaking 8 from slow to fast Shaking 9 from slow to fast Shaking open/hole from slow to fast Forwards rotation from fast to slow @@ -112,34 +112,34 @@ Gobo Indexed open/hole - Indexed 1 - Indexed 2 - Indexed 3 - Indexed 4 - Indexed 5 - Indexed 6 - Indexed 7 - Rotation 1 - Rotation 2 - Rotation 3 - Rotation 4 - Rotation 5 - Rotation 6 - Rotation 7 - Shaking, indexed, 1 from slow to fast - Shaking, indexed, 2 from slow to fast - Shaking, indexed, 3 from slow to fast - Shaking, indexed, 4 from slow to fast - Shaking, indexed, 5 from slow to fast - Shaking, indexed, 6 from slow to fast - Shaking, indexed, 7 from slow to fast - Shaking, rotation, 1 from slow to fast - Shaking, rotation, 2 from slow to fast - Shaking, rotation, 3 from slow to fast - Shaking, rotation, 4 from slow to fast - Shaking, rotation, 5 from slow to fast - Shaking, rotation, 6 from slow to fast - Shaking, rotation, 7 from slow to fast + Indexed 1 + Indexed 2 + Indexed 3 + Indexed 4 + Indexed 5 + Indexed 6 + Indexed 7 + Rotation 1 + Rotation 2 + Rotation 3 + Rotation 4 + Rotation 5 + Rotation 6 + Rotation 7 + Shaking, indexed, 1 from slow to fast + Shaking, indexed, 2 from slow to fast + Shaking, indexed, 3 from slow to fast + Shaking, indexed, 4 from slow to fast + Shaking, indexed, 5 from slow to fast + Shaking, indexed, 6 from slow to fast + Shaking, indexed, 7 from slow to fast + Shaking, rotation, 1 from slow to fast + Shaking, rotation, 2 from slow to fast + Shaking, rotation, 3 from slow to fast + Shaking, rotation, 4 from slow to fast + Shaking, rotation, 5 from slow to fast + Shaking, rotation, 6 from slow to fast + Shaking, rotation, 7 from slow to fast Shaking open/hole Forwards rotation from fast to slow No rotation @@ -156,15 +156,15 @@ Shutter - Closed - No function (shutter open) - Effect from slow to fast - No function (shutter open) - Opening pulse in sequences from slow to fast - Closing pulse in sequences from fast to slow - No function (shutter open) - Random effect from slow to fast - No function (shutter open) + Closed + No function (shutter open) + Effect from slow to fast + No function (shutter open) + Opening pulse in sequences from slow to fast + Closing pulse in sequences from fast to slow + No function (shutter open) + Random effect from slow to fast + No function (shutter open) @@ -240,24 +240,24 @@ Colour - Open/white - continual positioning - Deep red - continual positioning - Deep blue - continual positioning - Pink - continual positioning - Cyan - continual positioning - Magenta - continual positioning - Yellow - continual positioning - 3200°K correction filter - continual positioning - UV filter - continual positioning - White - continual positioning - Deep red - positioning - Deep blue - positioning - Pink - positioning - Cyan - positioning - Magenta - positioning - Yellow - positioning - 3200°K correction filter - positioning - UV filter - positioning + Open/white - continual positioning + Deep red - continual positioning + Deep blue - continual positioning + Pink - continual positioning + Cyan - continual positioning + Magenta - continual positioning + Yellow - continual positioning + 3200°K correction filter - continual positioning + UV filter - continual positioning + White - continual positioning + Deep red - positioning + Deep blue - positioning + Pink - positioning + Cyan - positioning + Magenta - positioning + Yellow - positioning + 3200°K correction filter - positioning + UV filter - positioning Forwards rainbow effect from fast to slow No rotation Backwards rainbow effect from slow to fast @@ -387,11 +387,11 @@ Shutter, Strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-ColorSpot-700E-AT.qxf b/resources/fixtures/Robe/Robe-ColorSpot-700E-AT.qxf index 3e3e9625fc..426ddc0963 100644 --- a/resources/fixtures/Robe/Robe-ColorSpot-700E-AT.qxf +++ b/resources/fixtures/Robe/Robe-ColorSpot-700E-AT.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT NiKoyes Robe @@ -30,15 +30,15 @@ BO gobo wheel moving Disable BO gobo wheel moving Lamp ON / reset (except P/T) - P/T Reset - Colour Reset - Gobo Reset + P/T Reset + Colour Reset + Gobo Reset Dimmer/Shutter/HotSpot Reset Zoom/Focus/Frost/Prism Reset Iris/Prism Reset - Total Reset + Total Reset Reserved - Lamp Off + Lamp Off Disable "Silent" Mode fans Silent mode Fans min to max @@ -160,20 +160,20 @@ Gobo 5 > Gobo 6 > Gobo 7 > - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 - Shaking Gobo 1 > - Shaking Gobo 2 > - Shaking Gobo 3 > - Shaking Gobo 4 > - Shaking Gobo 5 > - Shaking Gobo 6 > - Shaking Gobo 7 > + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 + Shaking Gobo 1 > + Shaking Gobo 2 > + Shaking Gobo 3 > + Shaking Gobo 4 > + Shaking Gobo 5 > + Shaking Gobo 6 > + Shaking Gobo 7 > Open Fwd Wheel << No Rotation diff --git a/resources/fixtures/Robe/Robe-ColorWash-1200E-AT.qxf b/resources/fixtures/Robe/Robe-ColorWash-1200E-AT.qxf index e63a86034a..2abc27618a 100644 --- a/resources/fixtures/Robe/Robe-ColorWash-1200E-AT.qxf +++ b/resources/fixtures/Robe/Robe-ColorWash-1200E-AT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Robert Box Robe @@ -15,51 +15,51 @@ Speed - Max. speed (tracking mode) - Speed from max. to min. (vector mode)/Time from 0.1sec to 25.5sec. + Max. speed (tracking mode) + Speed from max. to min. (vector mode)/Time from 0.1sec to 25.5sec. Maintenance - Reserved - Pan/tilt speed mode - Pan/tilt time mode - Blackout while pan/tilt moving - Disabled blackout while pan/tilt moving - Blackout while colour wheel moving - Disabled blackout while colour wheel moving - Reserved - Lamp on, reset (total reset except pan/tilt reset) - Pan/tilt reset - Colour system reset - Zoom/Fresnel reset - Dimmer/strobe reset - Reserved - Total reset - Reserved - Lamp off - Reserved + Reserved + Pan/tilt speed mode + Pan/tilt time mode + Blackout while pan/tilt moving + Disabled blackout while pan/tilt moving + Blackout while colour wheel moving + Disabled blackout while colour wheel moving + Reserved + Lamp on, reset (total reset except pan/tilt reset) + Pan/tilt reset + Colour system reset + Zoom/Fresnel reset + Dimmer/strobe reset + Reserved + Total reset + Reserved + Lamp off + Reserved Colour - Open/white - proportional - Deep red - proportional - Deep blue - proportional - Green - proportional - Orange - proportional - 6000K temperature filter - proportional - UV filter - proportional - White - proportional - Deep red - step - Deep blue - step - Green - step - Orange - step - 6000K temperature filter - step - UV filter - step - Forwards rainbow effect from fast to slow - No rotation - Backwards rainbow effect from slow to fast - Random colour selection by audio control - Auto random colour selection from fast to slow + Open/white - proportional + Deep red - proportional + Deep blue - proportional + Green - proportional + Orange - proportional + 6000K temperature filter - proportional + UV filter - proportional + White - proportional + Deep red - step + Deep blue - step + Green - step + Orange - step + 6000K temperature filter - step + UV filter - step + Forwards rainbow effect from fast to slow + No rotation + Backwards rainbow effect from slow to fast + Random colour selection by audio control + Auto random colour selection from fast to slow @@ -67,175 +67,175 @@ Colour - No function - Macro 1 - Macro 2 - Macro 3 - Macro 4 - Macro 5 - Macro 6 - Macro 7 - Macro 8 - Macro 9 - Macro 10 - Macro 11 - Macro 12 - Macro 13 - Macro 14 - Macro 15 - Macro 16 - Macro 17 - Macro 18 - Macro 19 - Macro 20 - Macro 21 - Macro 22 - Macro 23 - Macro 24 - Macro 25 - Macro 26 - Macro 27 - Macro 28 - Macro 29 - Macro 30 - Macro 31 - Macro 32 - Macro 33 - Macro 34 - Macro 35 - Macro 36 - Macro 37 - Macro 38 - Macro 39 - Macro 40 - Macro 41 - Macro 42 - Macro 43 - Macro 44 - Macro 45 - Macro 46 - Macro 47 - Macro 48 - Macro 49 - Macro 50 - Macro 51 - Macro 52 - Macro 53 - Macro 54 - Macro 55 - Macro 56 - Macro 57 - Macro 58 - Macro 59 - Macro 60 - Macro 61 - Macro 62 - Macro 63 + No function + Macro 1 + Macro 2 + Macro 3 + Macro 4 + Macro 5 + Macro 6 + Macro 7 + Macro 8 + Macro 9 + Macro 10 + Macro 11 + Macro 12 + Macro 13 + Macro 14 + Macro 15 + Macro 16 + Macro 17 + Macro 18 + Macro 19 + Macro 20 + Macro 21 + Macro 22 + Macro 23 + Macro 24 + Macro 25 + Macro 26 + Macro 27 + Macro 28 + Macro 29 + Macro 30 + Macro 31 + Macro 32 + Macro 33 + Macro 34 + Macro 35 + Macro 36 + Macro 37 + Macro 38 + Macro 39 + Macro 40 + Macro 41 + Macro 42 + Macro 43 + Macro 44 + Macro 45 + Macro 46 + Macro 47 + Macro 48 + Macro 49 + Macro 50 + Macro 51 + Macro 52 + Macro 53 + Macro 54 + Macro 55 + Macro 56 + Macro 57 + Macro 58 + Macro 59 + Macro 60 + Macro 61 + Macro 62 + Macro 63 Speed - From max. to min. + From max. to min. Shutter - Closed, lamp power reduced after 10s to 700W - Open, full lamp power - Effect from slow to fast (max. 15 flashes/s) - Open, lamp power reduced to 700W - Opening pulse in sequences from slow to fast - Closing pulse in sequences from fast to slow - Open, electronic strobing "ZAP" from slow to fast (from 7 to 33 flashes/s) - Random effect from slow to fast - Open, full lamp power + Closed, lamp power reduced after 10s to 700W + Open, full lamp power + Effect from slow to fast (max. 15 flashes/s) + Open, lamp power reduced to 700W + Opening pulse in sequences from slow to fast + Closing pulse in sequences from fast to slow + Open, electronic strobing "ZAP" from slow to fast (from 7 to 33 flashes/s) + Random effect from slow to fast + Open, full lamp power Beam - Fine positioning + Fine positioning Speed - No macro generation - Macro generation from fast to slow-forwards - No macro generation - Macro generation from slow to fast-backwards + No macro generation + Macro generation from fast to slow-forwards + No macro generation + Macro generation from slow to fast-backwards Effect - Disabled pan/tilt macro - Reserved - Figure of circle (from small to large) - Figure of horizontal eight (from small to large) - Figure of vertical eight (from small to large) - Figure of rectangle (from small to large) - Figure of triangle (from small to large) - Figure of star (from small to large) - Figure of cross (from small to large) + Disabled pan/tilt macro + Reserved + Figure of circle (from small to large) + Figure of horizontal eight (from small to large) + Figure of vertical eight (from small to large) + Figure of rectangle (from small to large) + Figure of triangle (from small to large) + Figure of star (from small to large) + Figure of cross (from small to large) Colour - Open/white - proportional - Red ring - proportional - Blue dot - proportional - Yellow ring - proportional - Blue/red - proportional - Green/orange - proportional - Yellow/blue/orange/magenta - proportional - White - proportional - Red ring - step - Blue dot - step - Yellow ring - step - Blue/red - step - Green/orange - step - Yellow/blue/orange/magenta - step - Forwards rainbow effect from fast to slow - No rotation - Backwards rainbow effect from slow to fast - Random colour selection by audio control - Auto random colour selection from fast to slow + Open/white - proportional + Red ring - proportional + Blue dot - proportional + Yellow ring - proportional + Blue/red - proportional + Green/orange - proportional + Yellow/blue/orange/magenta - proportional + White - proportional + Red ring - step + Blue dot - step + Yellow ring - step + Blue/red - step + Green/orange - step + Yellow/blue/orange/magenta - step + Forwards rainbow effect from fast to slow + No rotation + Backwards rainbow effect from slow to fast + Random colour selection by audio control + Auto random colour selection from fast to slow Colour - 0-5600K, 255-3200K + 0-5600K, 255-3200K Effect - Dimmer + CMY filters + correction filter - Dimmer - CMY filters + correction filter - No function + Dimmer + CMY filters + correction filter + Dimmer + CMY filters + correction filter + No function Beam - From open to close + From open to close Beam - From open to close + From open to close Beam - From open to close + From open to close Beam - From open to close + From open to close Beam - From right to left + From right to left Beam - Internal Fresnels opening (from closed to open - LightMax mode) - Left closed, right open - Left opening, right closing - Both ramping (parallel) from slow to fast - Both ramping (alternately) from fast to slow + Internal Fresnels opening (from closed to open - LightMax mode) + Left closed, right open + Left opening, right closing + Both ramping (parallel) from slow to fast + Both ramping (alternately) from fast to slow Pan @@ -362,11 +362,11 @@ Pan/Tilt Speed, Pan/Tilt Time Power/Special Functions - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Colorwash-250-AT.qxf b/resources/fixtures/Robe/Robe-Colorwash-250-AT.qxf index 3d67e3f7d4..74b6c2ed7a 100644 --- a/resources/fixtures/Robe/Robe-Colorwash-250-AT.qxf +++ b/resources/fixtures/Robe/Robe-Colorwash-250-AT.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Niklas Larsson Robe @@ -24,16 +24,16 @@ Blackout while colorwheel moving Disable Blackout while colorwheel moving Reserved - Lamp On - Pan/Tilt Reset - Color System Reset + Lamp On + Pan/Tilt Reset + Color System Reset Reserved Dimmer Reset Zoom/Effect Wheel Reset Reserved - Total Reset + Total Reset Reserved - Lamp Off + Lamp Off Reserved diff --git a/resources/fixtures/Robe/Robe-LED-Blinder-196LT.qxf b/resources/fixtures/Robe/Robe-LED-Blinder-196LT.qxf index 262c48d414..34eba2a81a 100644 --- a/resources/fixtures/Robe/Robe-LED-Blinder-196LT.qxf +++ b/resources/fixtures/Robe/Robe-LED-Blinder-196LT.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Tim Cullingworth Robe @@ -61,15 +61,15 @@ Shutter - Shutter Closed - Shutter Open - Strobe (Slow - Fast) - Shutter Open - Opening Pulses in sequences (Slow - Fast) - Closing Pulses in sequences (Fast - Slow) - Shutter Open - Random Strobe effect (Slow - Fast) - Shutter Open + Shutter Closed + Shutter Open + Strobe (Slow - Fast) + Shutter Open + Opening Pulses in sequences (Slow - Fast) + Closing Pulses in sequences (Fast - Slow) + Shutter Open + Random Strobe effect (Slow - Fast) + Shutter Open diff --git a/resources/fixtures/Robe/Robe-ParFect-150.qxf b/resources/fixtures/Robe/Robe-ParFect-150.qxf index 287bd4b910..7215aaa9f7 100644 --- a/resources/fixtures/Robe/Robe-ParFect-150.qxf +++ b/resources/fixtures/Robe/Robe-ParFect-150.qxf @@ -26,7 +26,7 @@ FAN MODE QUIET reserved reserved - Zoom reset + Zoom reset reserved 750W simulation 1000W simulation @@ -142,15 +142,15 @@ Shutter - closed - open - strobe slow to fast - open - pulse slow to fast - pulse fast to slow - open - random strobe slow to fast - open + closed + open + strobe slow to fast + open + pulse slow to fast + pulse fast to slow + open + random strobe slow to fast + open diff --git a/resources/fixtures/Robe/Robe-Pointe.qxf b/resources/fixtures/Robe/Robe-Pointe.qxf index 0fd84096b3..0241c3d5ef 100644 --- a/resources/fixtures/Robe/Robe-Pointe.qxf +++ b/resources/fixtures/Robe/Robe-Pointe.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Moehritz Robe @@ -35,15 +35,15 @@ Blackout while Gobo wheel moving Disable Blackout while Gobo wheel moving Lamp On, reset - Pan/Tilt Reset - Colour System reset - Gobo wheels reset + Pan/Tilt Reset + Colour System reset + Gobo wheels reset Dimmer/Shutter reset Zoom/Focus/Prism reset Reserved - Total reset + Total reset Reserved - Lamp Off + Lamp Off Reserved @@ -207,15 +207,15 @@ Shutter - Closed (Lamp power reduced to 230W) - Shutter open (Full Lamp power) - Strobe effect from slow to fast - Shutter open - Opening pulse from slow to fast - Closing pulse from fast to slow - Shutter open - Random strobe effect from slow to fast - Shutter open, Full lamp power + Closed (Lamp power reduced to 230W) + Shutter open (Full Lamp power) + Strobe effect from slow to fast + Shutter open + Opening pulse from slow to fast + Closing pulse from fast to slow + Shutter open + Random strobe effect from slow to fast + Shutter open, Full lamp power diff --git a/resources/fixtures/Robe/Robe-Robin-100-LEDBeam.qxf b/resources/fixtures/Robe/Robe-Robin-100-LEDBeam.qxf index 4e8f00ec2a..4de8536fde 100644 --- a/resources/fixtures/Robe/Robe-Robin-100-LEDBeam.qxf +++ b/resources/fixtures/Robe/Robe-Robin-100-LEDBeam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Thierry Rodolfo Robe @@ -32,9 +32,9 @@ Colour calibration mode Off Tilt movement reduction On Tilt movement reduction Off - Pan/Tilt reset + Pan/Tilt reset Reserved - Total reset + Total reset Reserved @@ -72,34 +72,33 @@ Colour No function - Colour temperature correction from 19000K to -2700K + Colour temperature correction from 19000K to 2700K Colour - No function - White 2700 K - White 2700 K (Halogen lamp mode*) - White 3200 K - White 3200 K (Halogen lamp mode*) - White 4200 K - White 5600 K - White 8000 K - Blue (Blue=full, Red+Green+White=0) - Red=0, Green->up,Blue =full, White=0 - Light Blue (Red=0, Green=full, Blue =full, White=0) - Red=0, Green=full, Blue->down, White=0 - Green (Red=0, Green=full, Blue =0, White=0) - Red->up, Green=full, Blue=0, White=0 - Yellow (Red=full, Green=full, Blue=0, White=0) - Red=full, Green->down, Blue=0, White=0 - Red(Red=full, Green=0, Blue=0, White=0) - Red=full, Green=0, Blue->up, White=0 - Magenta (Red=full, Green=0, Blue=full, White=0) - Red -> down, Green=0, Blue=full, White=0 - Blue (Red=0, Green=0, Blue=full, White=0) - Rainbow effect (with fade time) - Rainbow effect + No function + White 2700 K + White 2700 K (Halogen lamp mode*) + White 3200 K + White 3200 K (Halogen lamp mode*) + White 4200 K + White 5600 K + White 8000 K + Blue (Blue=full, Red+Green+White=0) + Red=0, Green->up,Blue =full, White=0 + Light Blue (Red=0, Green=full, Blue =full, White=0) + Red=0, Green=full, Blue->down, White=0 + Green (Red=0, Green=full, Blue =0, White=0) + Red->up, Green=full, Blue=0, White=0 + Yellow (Red=full, Green=full, Blue=0, White=0) + Red=full, Green->down, Blue=0, White=0 + Red(Red=full, Green=0, Blue=0, White=0) + Red=full, Green=0, Blue->up, White=0 + Magenta (Red=full, Green=0, Blue=full, White=0) + Red -> down, Green=0, Blue=full, White=0 + Blue (Red=0, Green=0, Blue=full, White=0) + Rainbow effect (with fade time) + Rainbow effect Zone effect 1 Zone effect 2 Zone effect 3 @@ -111,20 +110,17 @@ Shutter - Shutter closed - Strobe effect from slow--> fast (zones 2,3 only) - Strobe effect from slow--> fast (All zones together) - Zone effects+rainbow effects speed control, slow--> fast + Shutter closed + Strobe effect from slow--> fast (zones 2,3 only) + Strobe effect from slow--> fast (All zones together) + Zone effects+rainbow effects speed control, slow--> fast Zone effects+rainbow effects speed control, fast--> slow - Opening pulses in sequences from slow--> fast -(All zones together) - Closing pulses in sequences from fast--> slow -(All zones together) - Random strobe effect from slow--> fast (random zone) - Random strobe effect from slow--> fast (random zone + -random strobe) - Random strobe effect from slow --> fast (All zones together) - Shutter open + Opening pulses in sequences from slow--> fast (All zones together) + Closing pulses in sequences from fast--> slow (All zones together) + Random strobe effect from slow--> fast (random zone) + Random strobe effect from slow--> fast (random zone + random strobe) + Random strobe effect from slow --> fast (All zones together) + Shutter open @@ -651,11 +647,11 @@ random strobe) 23 - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-150-LEDBeam.qxf b/resources/fixtures/Robe/Robe-Robin-150-LEDBeam.qxf index ba221e6485..24e9684694 100644 --- a/resources/fixtures/Robe/Robe-Robin-150-LEDBeam.qxf +++ b/resources/fixtures/Robe/Robe-Robin-150-LEDBeam.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 GIT + 4.12.3 GIT Toby G Robe @@ -39,8 +39,8 @@ Fans mode: Quiet Reserved Reserved - Pan/Tilt reset - Zoom reset + Pan/Tilt reset + Zoom reset Reserved Tungsten effect simulation (750W) On Tungsten effect simulation (1000W) On @@ -64,7 +64,7 @@ LED Frequency (step +4) LED Frequency (step +5) LED Frequency (step +6) - Total Fixture Reset + Total Fixture Reset Reserved diff --git a/resources/fixtures/Robe/Robe-Robin-300E-Beam.qxf b/resources/fixtures/Robe/Robe-Robin-300E-Beam.qxf index 2f0708ba4b..71efa7db04 100644 --- a/resources/fixtures/Robe/Robe-Robin-300E-Beam.qxf +++ b/resources/fixtures/Robe/Robe-Robin-300E-Beam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.1 + 4.12.3 GIT Mihai Robe @@ -30,35 +30,35 @@ Blackout while gobo wheel moving Disabled blackout while gobo wheel moving Lamp on, reset (total reset except pan/tilt reset) - Pan/tilt reset - Colour system reset - Gobo wheels reset + Pan/tilt reset + Colour system reset + Gobo wheels reset Dimmer/shutter reset Focus/frost reset Reserved - Total reset + Total reset Reserved - Lamp off + Lamp off Reserved Colour - Open/white - continual positioning - Deep red - continual positioning - Deep blue - continual positioning - Orange - continual positioning - Green - continual positioning - 3200°K temperature filter - continual positioning - Amber - continual positioning - UV filter - continual positioning - White - positioning - Deep red - positioning - Deep blue - positioning - Orange - positioning - Green - positioning - 3200°K temperature filter - positioning - Amber - positioning - UV filter - positioning + Open/white - continual positioning + Deep red - continual positioning + Deep blue - continual positioning + Orange - continual positioning + Green - continual positioning + 3200°K temperature filter - continual positioning + Amber - continual positioning + UV filter - continual positioning + White - positioning + Deep red - positioning + Deep blue - positioning + Orange - positioning + Green - positioning + 3200°K temperature filter - positioning + Amber - positioning + UV filter - positioning Forwards rainbow effect from fast to slow No rotation Backwards rainbow effect from slow to fast @@ -111,33 +111,33 @@ Gobo - Continual positioning open/hole (6.5°) - Continual positioning beam reducer (5.5) - Continual positioning beam reducer (4.5) - Continual positioning beam reducer (3) - Continual positioning beam reducer (1.5) - Continual positioning 1 - Continual positioning 2 - Continual positioning 3 - Continual positioning 4 - Continual positioning open/hole - Positioning beam reducer (5.5°) - Positioning beam reducer (4.5°) - Positioning beam reducer (3°) - Positioning beam reducer (1.5°) - Positioning 1 - Positioning 2 - Positioning 3 - Positioning 4 - Shaking beam reducer (5.5°) from slow to fast - Shaking beam reducer (4.5°) from slow to fast - Shaking beam reducer (3°) from slow to fast - Shaking beam reducer (1.5°) from slow to fast - Shaking 1 from slow to fast - Shaking 2 from slow to fast - Shaking 3 from slow to fast - Shaking 4 from slow to fast - Shaking open/hole + Continual positioning open/hole (6.5°) + Continual positioning beam reducer (5.5) + Continual positioning beam reducer (4.5) + Continual positioning beam reducer (3) + Continual positioning beam reducer (1.5) + Continual positioning 1 + Continual positioning 2 + Continual positioning 3 + Continual positioning 4 + Continual positioning open/hole + Positioning beam reducer (5.5°) + Positioning beam reducer (4.5°) + Positioning beam reducer (3°) + Positioning beam reducer (1.5°) + Positioning 1 + Positioning 2 + Positioning 3 + Positioning 4 + Shaking beam reducer (5.5°) from slow to fast + Shaking beam reducer (4.5°) from slow to fast + Shaking beam reducer (3°) from slow to fast + Shaking beam reducer (1.5°) from slow to fast + Shaking 1 from slow to fast + Shaking 2 from slow to fast + Shaking 3 from slow to fast + Shaking 4 from slow to fast + Shaking open/hole Forwards rotation from fast to slow No rotation Backwards rotation from slow to fast @@ -147,36 +147,36 @@ Gobo - Indexed open/hole - Indexed 1 - Indexed 2 - Indexed 3 - Indexed 4 - Indexed 5 - Indexed 6 - Indexed 7 - Rotation 1 - Rotation 2 - Rotation 3 - Rotation 4 - Rotation 5 - Rotation 6 - Rotation 7 - Shaking, indexed, 1 from slow to fast - Shaking, indexed, 2 from slow to fast - Shaking, indexed, 3 from slow to fast - Shaking, indexed, 4 from slow to fast - Shaking, indexed, 5 from slow to fast - Shaking, indexed, 6 from slow to fast - Shaking, indexed, 7 from slow to fast - Shaking, rotated, 1 from slow to fast - Shaking, rotated, 2 from slow to fast - Shaking, rotated, 3 from slow to fast - Shaking, rotated, 4 from slow to fast - Shaking, rotated, 5 from slow to fast - Shaking, rotated, 6 from slow to fast - Shaking, rotated, 7 from slow to fast - Shaking open/hole + Indexed open/hole + Indexed 1 + Indexed 2 + Indexed 3 + Indexed 4 + Indexed 5 + Indexed 6 + Indexed 7 + Rotation 1 + Rotation 2 + Rotation 3 + Rotation 4 + Rotation 5 + Rotation 6 + Rotation 7 + Shaking, indexed, 1 from slow to fast + Shaking, indexed, 2 from slow to fast + Shaking, indexed, 3 from slow to fast + Shaking, indexed, 4 from slow to fast + Shaking, indexed, 5 from slow to fast + Shaking, indexed, 6 from slow to fast + Shaking, indexed, 7 from slow to fast + Shaking, rotated, 1 from slow to fast + Shaking, rotated, 2 from slow to fast + Shaking, rotated, 3 from slow to fast + Shaking, rotated, 4 from slow to fast + Shaking, rotated, 5 from slow to fast + Shaking, rotated, 6 from slow to fast + Shaking, rotated, 7 from slow to fast + Shaking open/hole Forwards rotation from fast to slow No rotation Backwards rotation from slow to fast @@ -192,15 +192,15 @@ Shutter - Closed, lamp power reduced to 180W - Open, full lamp power - Effect from slow to fast - Open, lamp power reduced to 180W - Opening pulse in sequences from slow to fast - Closing pulse in sequences from fast to slow - Open, electronic strobing "ZAP" from slow to fast - Random effect from slow to fast - Open, full lamp power + Closed, lamp power reduced to 180W + Open, full lamp power + Effect from slow to fast + Open, lamp power reduced to 180W + Opening pulse in sequences from slow to fast + Closing pulse in sequences from fast to slow + Open, electronic strobing "ZAP" from slow to fast + Random effect from slow to fast + Open, full lamp power @@ -285,11 +285,11 @@ Shutter/Strobe Dimmer Intensity - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-600-LED-Wash.qxf b/resources/fixtures/Robe/Robe-Robin-600-LED-Wash.qxf index 0e2eaa94a8..6100add3f1 100644 --- a/resources/fixtures/Robe/Robe-Robin-600-LED-Wash.qxf +++ b/resources/fixtures/Robe/Robe-Robin-600-LED-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.0 GIT + 4.12.3 GIT NiKoyes Robe @@ -28,11 +28,11 @@ Theatre Mode ON Theatre Mode OFF Reserved - P/T Reset + P/T Reset Reseved - Zoom Reset + Zoom Reset Reserved - Total Reset + Total Reset Reserved @@ -44,27 +44,27 @@ Colour - No Function - 2700K White - 2700K White (Halogen) - 3200K White - 3200K White (Halogen) - 4200K White - 5600K White - 8000K White - Blue - Blue -> Cyan - Cyan - Cyan -> Green - Green - Green -> Yellow - Yellow - Yellow -> Red - Red - Red -> Magenta - Magenta - Magenta -> Blue - Blue + No Function + 2700K White + 2700K White (Halogen) + 3200K White + 3200K White (Halogen) + 4200K White + 5600K White + 8000K White + Blue + Blue -> Cyan + Cyan + Cyan -> Green + Green + Green -> Yellow + Yellow + Yellow -> Red + Red + Red -> Magenta + Magenta + Magenta -> Blue + Blue Rainbow (Fade) Rainbow Zone Effect @@ -76,17 +76,17 @@ Shutter - Closed - Strobe >> (Z3) - Strobe >> (All Zones) + Closed + Strobe >> (Z3) + Strobe >> (All Zones) Effects >> Effects << - Opening Pulse > - Closing Pulse < - Rnd Strobe >> (Rndm Zone) - Random Strobe >> (Rndm Strb+Zone) - Random Strobe >> (All Zones) - Open + Opening Pulse > + Closing Pulse < + Rnd Strobe >> (Rndm Zone) + Random Strobe >> (Rndm Strb+Zone) + Random Strobe >> (All Zones) + Open @@ -309,11 +309,11 @@ 36 - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-600E-Beam.qxf b/resources/fixtures/Robe/Robe-Robin-600E-Beam.qxf index 0795ff75d2..a081bc713b 100644 --- a/resources/fixtures/Robe/Robe-Robin-600E-Beam.qxf +++ b/resources/fixtures/Robe/Robe-Robin-600E-Beam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.2 + 4.12.3 GIT NiKoyes Robe @@ -30,36 +30,36 @@ BO gobo wheel moving Disable BO gobo wheel moving Lamp ON / reset (except P/T) - P/T Reset - Colour Reset - Gobo Reset + P/T Reset + Colour Reset + Gobo Reset Dimmer/Shutter Reset Focus/Frost Reset - Iris Reset - Total Reset + Iris Reset + Total Reset Reserved - Lamp Off - Disable "Silent" Mode fans + Lamp Off + Disable "Silent" Mode fans Silent mode Fans min to max Colour - White - Deep Red - Deep Blue - Orange - Green - 3200°K - Amber - UV Filter - White - Deep Red - Deep Blue - Orange - Green - 3200°K - Amber - UV Filter + White + Deep Red + Deep Blue + Orange + Green + 3200°K + Amber + UV Filter + White + Deep Red + Deep Blue + Orange + Green + 3200°K + Amber + UV Filter Fwd Rainbow <<< No Rotation Bwd Rinbow >>> @@ -113,28 +113,28 @@ Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 Open Fw Wheel <<< No Rotation @@ -146,34 +146,34 @@ Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 1 > - Gobo 2 > - Gobo 3 > - Gobo 4 > - Gobo 5 > - Gobo 6 > - Gobo 7 > - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 - Shaking Gobo 1 > - Shaking Gobo 2 > - Shaking Gobo 3 > - Shaking Gobo 4 > - Shaking Gobo 5 > - Shaking Gobo 6 > - Shaking Gobo 7 > + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 1 > + Gobo 2 > + Gobo 3 > + Gobo 4 > + Gobo 5 > + Gobo 6 > + Gobo 7 > + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 + Shaking Gobo 1 > + Shaking Gobo 2 > + Shaking Gobo 3 > + Shaking Gobo 4 > + Shaking Gobo 5 > + Shaking Gobo 6 > + Shaking Gobo 7 > Open Fwd Wheel << No Rotation @@ -202,15 +202,15 @@ Shutter - Closed 260W - Open - Strobe >>> - Open 260W - Opening Pulse > - Closing Pulse < + Closed 260W + Open + Strobe >>> + Open 260W + Opening Pulse > + Closing Pulse < Zap >>> - Random Strobe > - Open + Random Strobe > + Open @@ -300,11 +300,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-600E-Spot.qxf b/resources/fixtures/Robe/Robe-Robin-600E-Spot.qxf index c381c6f5eb..6d5b57941b 100644 --- a/resources/fixtures/Robe/Robe-Robin-600E-Spot.qxf +++ b/resources/fixtures/Robe/Robe-Robin-600E-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.0 GIT + 4.12.3 GIT NiKoyes Robe @@ -30,15 +30,15 @@ BO gobo wheel moving Disable BO gobo wheel moving Lamp ON / reset (except P/T) - P/T Reset - Colour Reset - Gobo Reset + P/T Reset + Colour Reset + Gobo Reset Dimmer/Shutter/HotSpot Reset Zoom/Focus/Frost/Prism Reset - Iris Reset - Total Reset + Iris Reset + Total Reset Reserved - Lamp Off + Lamp Off Disable "Silent" Mode fans Silent mode Fans min to max @@ -126,15 +126,15 @@ Gobo 7 Gobo 8 Gobo 9 - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 - Shaking Gobo 8 - Shaking Gobo 9 + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 + Shaking Gobo 8 + Shaking Gobo 9 Open Fw Wheel <<< No Rotation @@ -160,20 +160,20 @@ Gobo 5 > Gobo 6 > Gobo 7 > - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 - Shaking Gobo 1 > - Shaking Gobo 2 > - Shaking Gobo 3 > - Shaking Gobo 4 > - Shaking Gobo 5 > - Shaking Gobo 6 > - Shaking Gobo 7 > + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 + Shaking Gobo 1 > + Shaking Gobo 2 > + Shaking Gobo 3 > + Shaking Gobo 4 > + Shaking Gobo 5 > + Shaking Gobo 6 > + Shaking Gobo 7 > Open Fwd Wheel << No Rotation diff --git a/resources/fixtures/Robe/Robe-Robin-600E-Wash.qxf b/resources/fixtures/Robe/Robe-Robin-600E-Wash.qxf index 7dcb7fb0d5..f5f0092f90 100644 --- a/resources/fixtures/Robe/Robe-Robin-600E-Wash.qxf +++ b/resources/fixtures/Robe/Robe-Robin-600E-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.2 + 4.12.3 GIT NiKoyes Robe @@ -29,36 +29,36 @@ Disable BO colour wheel moving Reserved Lamp ON / reset (except P/T) - P/T Reset - Colour Reset + P/T Reset + Colour Reset Reseved Dimmer/Shutter/HotSpot Reset - Zoom Reset + Zoom Reset Reserved - Total Reset + Total Reset Reserved - Lamp Off - Disable "Silent" Mode fans + Lamp Off + Disable "Silent" Mode fans Silent mode Fans min to max Colour - White - Deep Red - Deep Blue - Orange - Green - Light Red - Amber - UV Filter - White - Deep Red - Deep Blue - Orange - Green - Light Red - Amber - UV Filter + White + Deep Red + Deep Blue + Orange + Green + Light Red + Amber + UV Filter + White + Deep Red + Deep Blue + Orange + Green + Light Red + Amber + UV Filter Fwd Rainbow <<< No Rotation Bwd Rinbow >>> @@ -111,7 +111,7 @@ Speed - CMY/CTO Select max to min + CMY/CTO Select max to min @@ -120,15 +120,15 @@ Shutter - Closed 260W - Open - Strobe >>> - Open 260W - Opening Pulse > - Closing Pulse < + Closed 260W + Open + Strobe >>> + Open 260W + Opening Pulse > + Closing Pulse < Zap >>> - Random Strobe > - Open + Random Strobe > + Open @@ -187,11 +187,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-800-LEDWash.qxf b/resources/fixtures/Robe/Robe-Robin-800-LEDWash.qxf index a31c4067e7..5a688293df 100644 --- a/resources/fixtures/Robe/Robe-Robin-800-LEDWash.qxf +++ b/resources/fixtures/Robe/Robe-Robin-800-LEDWash.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Jasper Zevering Robe @@ -35,11 +35,11 @@ Zoom mode: Wash Zoom mode:Beam Reserved - Pan/Tilt Reset + Pan/Tilt Reset Reseved Zoom/beam shaper Reset Reserved - Total Reset + Total Reset Reserved Disable "Silent mode" of fan "Silent mode of fans":fans noise from min. to max. diff --git a/resources/fixtures/Robe/Robe-Robin-DLX-Spot.qxf b/resources/fixtures/Robe/Robe-Robin-DLX-Spot.qxf index a070394ecc..17fbfa4bf2 100644 --- a/resources/fixtures/Robe/Robe-Robin-DLX-Spot.qxf +++ b/resources/fixtures/Robe/Robe-Robin-DLX-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Robert Box Robe @@ -35,50 +35,50 @@ Blackout while gobo wheel moving Disable blackout while gobo wheel moving Fixture reset (except pan/tilt) - Pan/tilt reset + Pan/tilt reset Reserved - Gobo wheels reset + Gobo wheels reset Reserved Zoom/focus/frost/prism reset - Iris reset - Total fixture reset + Iris reset + Total fixture reset Reserved Disable 'theatre mode' - 'Theatre mode' - automatic control of fan noise + 'Theatre mode' - automatic control of fan noise 'Theatre mode' - fan noise control from min. to max. Colour No function - White 2700K - White 2700K (halogen lamp mode) - White 3200K - White 3200K (halogen lamp mode) - White 4200K - White 5600K - White 8000K - Blue (blue=full, red+green+white=0) - Red=0, green->up, blue=full, white=0 - Light blue (red=0, green=full, blue=full, white=0) - Red=0, green=full, blue->down, white=0 - Green (red=0, green=full, blue+white=0) - Red->up, green=full, blue+white=0 - Yellow (red+green=full, blue+white=0) - Red=full, green->down, blue+white=0 - Red (Red=full, green+blue+white=0) - Red=full, green=0, blue->up, white=0 - Magenta (red=full, green=0, blue=full, white=0) - Red>down, green=0, blue=full, white=0 - Blue (Red+green=0, blue=full, white=0) - Rainbow effect (with fade time) from slow->fast - Rainbow effect from slow->fast + White 2700K + White 2700K (halogen lamp mode) + White 3200K + White 3200K (halogen lamp mode) + White 4200K + White 5600K + White 8000K + Blue (blue=full, red+green+white=0) + Red=0, green->up, blue=full, white=0 + Light blue (red=0, green=full, blue=full, white=0) + Red=0, green=full, blue->down, white=0 + Green (red=0, green=full, blue+white=0) + Red->up, green=full, blue+white=0 + Yellow (red+green=full, blue+white=0) + Red=full, green->down, blue+white=0 + Red (Red=full, green+blue+white=0) + Red=full, green=0, blue->up, white=0 + Magenta (red=full, green=0, blue=full, white=0) + Red>down, green=0, blue=full, white=0 + Blue (Red+green=0, blue=full, white=0) + Rainbow effect (with fade time) from slow->fast + Rainbow effect from slow->fast Colour - Colour temperature correction + Colour temperature correction Speed @@ -86,7 +86,7 @@ Gobo - Open/hole + Open/hole Gobo 1 - continual positioning Gobo 2 - continual positioning Gobo 3 - continual positioning @@ -96,26 +96,26 @@ Gobo 7 - continual positioning Gobo 8 - continual positioning Gobo 9 - continual positioning - Open/hole - Gobo 1 - positioning - Gobo 2 - positioning - Gobo 3 - positioning - Gobo 4 - positioning - Gobo 5 - positioning - Gobo 6 - positioning - Gobo 7 - positioning - Gobo 8 - positioning - Gobo 9 - positioning - Shaking Gobo 1 - Shaking Gobo 2 - Shaking Gobo 3 - Shaking Gobo 4 - Shaking Gobo 5 - Shaking Gobo 6 - Shaking Gobo 7 - Shaking Gobo 8 - Shaking Gobo 9 - Open/hole + Open/hole + Gobo 1 - positioning + Gobo 2 - positioning + Gobo 3 - positioning + Gobo 4 - positioning + Gobo 5 - positioning + Gobo 6 - positioning + Gobo 7 - positioning + Gobo 8 - positioning + Gobo 9 - positioning + Shaking Gobo 1 + Shaking Gobo 2 + Shaking Gobo 3 + Shaking Gobo 4 + Shaking Gobo 5 + Shaking Gobo 6 + Shaking Gobo 7 + Shaking Gobo 8 + Shaking Gobo 9 + Open/hole Forwards gobo wheel rotation from fast to slow No rotation Backwards gobo wheel rotation from slow to fast @@ -125,36 +125,36 @@ Gobo - Open/hole - Gobo 1 - index - Gobo 2 - index - Gobo 3 - index - Gobo 4 - index - Gobo 5 - index - Gobo 6 - index - Gobo 7 - index - Gobo 1 - rotation - Gobo 2 - rotation - Gobo 3 - rotation - Gobo 4 - rotation - Gobo 5 - rotation - Gobo 6 - rotation - Gobo 7 - rotation - Shaking Gobo 1 - index - Shaking Gobo 2 - index - Shaking Gobo 3 - index - Shaking Gobo 4 - index - Shaking Gobo 5 - index - Shaking Gobo 6 - index - Shaking Gobo 7 - index - Shaking Gobo 1 - rotation - Shaking Gobo 2 - rotation - Shaking Gobo 3 - rotation - Shaking Gobo 4 - rotation - Shaking Gobo 5 - rotation - Shaking Gobo 6 - rotation - Shaking Gobo 7 - rotation - Open/hole + Open/hole + Gobo 1 - index + Gobo 2 - index + Gobo 3 - index + Gobo 4 - index + Gobo 5 - index + Gobo 6 - index + Gobo 7 - index + Gobo 1 - rotation + Gobo 2 - rotation + Gobo 3 - rotation + Gobo 4 - rotation + Gobo 5 - rotation + Gobo 6 - rotation + Gobo 7 - rotation + Shaking Gobo 1 - index + Shaking Gobo 2 - index + Shaking Gobo 3 - index + Shaking Gobo 4 - index + Shaking Gobo 5 - index + Shaking Gobo 6 - index + Shaking Gobo 7 - index + Shaking Gobo 1 - rotation + Shaking Gobo 2 - rotation + Shaking Gobo 3 - rotation + Shaking Gobo 4 - rotation + Shaking Gobo 5 - rotation + Shaking Gobo 6 - rotation + Shaking Gobo 7 - rotation + Open/hole Forwards gobo wheel rotation from fast to slow No rotation Bacwards gobo wheel rotation from slow to fast @@ -215,15 +215,15 @@ Shutter - Closed - Open - Strobe effect from slow to fast - Open - Opening pulse in sequences from slow to fast - Closing pulse in sequences from fast to slow - Open - Random strobe effect from slow to fast - Open + Closed + Open + Strobe effect from slow to fast + Open + Opening pulse in sequences from slow to fast + Closing pulse in sequences from fast to slow + Open + Random strobe effect from slow to fast + Open @@ -367,11 +367,11 @@ Shutter/Strobe Dimmer Intensity - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-MiniMe.qxf b/resources/fixtures/Robe/Robe-Robin-MiniMe.qxf index f6ddc1c0df..2a01aa66ed 100644 --- a/resources/fixtures/Robe/Robe-Robin-MiniMe.qxf +++ b/resources/fixtures/Robe/Robe-Robin-MiniMe.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.1 + 4.12.3 GIT Robert Box Robe @@ -33,11 +33,11 @@ Reserved Keep aspect ratio on Keep aspect ratio off - Pan/tilt reset + Pan/tilt reset Reserved Focus reset Graphic engine reset (software update executing) - Total reset + Total reset Internal HDMI External HDMI Save AutoKeystoning @@ -63,20 +63,20 @@ Colour - White (8000K) - Blue - Blue --> cyan - Cyan - Cyan --> green - Green - Green --> yellow - Yellow - Yellow --> red - Red - Red --> magenta - Magenta - Magenta --> blue - Blue + White (8000K) + Blue + Blue --> cyan + Cyan + Cyan --> green + Green + Green --> yellow + Yellow + Yellow --> red + Red + Red --> magenta + Magenta + Magenta --> blue + Blue Reserved @@ -142,7 +142,7 @@ Colour changing magenta --> white, fast Colour changing cyan --> white, slowly Colour changing cyan --> white, fast - Colour changing (slow) red --> green --> blue --> yellow + Colour changing (slow) red --> green --> blue --> yellow Colour changing (fast) red --> green --> blue --> yellow Colour changing (fastest) red --> green --> blue --> yellow Reserved @@ -311,7 +311,7 @@ Transition 2 from left --> right, vertically (diffusion edge) Transition 2 from right --> left, horizontally (diffusion edge) Transition 2 up --> down, vertically (diffusion edge) - Transition 2 down --> up, vertically (diffusion edge) + Transition 2 down --> up, vertically (diffusion edge) Iris transition out -->in Iris transition in --> out Iris transition out --> in (diffusion edge) @@ -385,15 +385,15 @@ Shutter - Closed - Open - Strobe effect from slow to fast - Open - Opening pulse in sequences from slow to fast - Closing pulse in sequences from fast to slow - Open - Random strobe effect from slow to fast - Open + Closed + Open + Strobe effect from slow to fast + Open + Opening pulse in sequences from slow to fast + Closing pulse in sequences from fast to slow + Open + Random strobe effect from slow to fast + Open @@ -422,11 +422,11 @@ Shutter/Strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Robin-Viva-CMY.qxf b/resources/fixtures/Robe/Robe-Robin-Viva-CMY.qxf index 4e6416836e..84599382c1 100644 --- a/resources/fixtures/Robe/Robe-Robin-Viva-CMY.qxf +++ b/resources/fixtures/Robe/Robe-Robin-Viva-CMY.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Jasper Zevering Robe @@ -39,13 +39,13 @@ Blackout while colour wheels moving Disabled blackout while colour wheels moving Reserved - Pan/Tilt reset - Colour system reset + Pan/Tilt reset + Colour system reset Gobo wheels + iris reset Reserved Zoom/focus/frost/prism reset Reserved - Total reset + Total reset Reserved Disable "Quiet mode" "Quiet mode" - fan noise control from min. to max. diff --git a/resources/fixtures/Robe/Robe-Scan-575-XT.qxf b/resources/fixtures/Robe/Robe-Scan-575-XT.qxf index 816897d369..612dcae364 100644 --- a/resources/fixtures/Robe/Robe-Scan-575-XT.qxf +++ b/resources/fixtures/Robe/Robe-Scan-575-XT.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT NiKoyes Robe @@ -23,44 +23,44 @@ Fan speed Max to Min Lamp ON Reset No Function - Lamp OFF + Lamp OFF No Function Colour - White - Turquoise - Red - Cyan - Green - Magenta - Light Blue - Yellow - Green - Pink - Blue - Orange - Rainbow Fast to Slow + White + Turquoise + Red + Cyan + Green + Magenta + Light Blue + Yellow + Green + Pink + Blue + Orange + Rainbow Fast to Slow No Function - CCW Rainbow Slow to Fast + CCW Rainbow Slow to Fast Gobo - Open + Open Wheel Fast to Slow No Rotation CCW Wheel Slow to Fast - MultiColor - Dichro 1 - Dichro 2 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 + MultiColor + Dichro 1 + Dichro 2 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 Beam @@ -107,14 +107,14 @@ Shutter - Shutter Closed - Open - Strobe >> - Open - Pulse - Open - Strobe Random >> - Open + Shutter Closed + Open + Strobe >> + Open + Pulse + Open + Strobe Random >> + Open @@ -151,11 +151,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Spot-160-XT.qxf b/resources/fixtures/Robe/Robe-Spot-160-XT.qxf index b9b81afdd5..f93c3170e7 100644 --- a/resources/fixtures/Robe/Robe-Spot-160-XT.qxf +++ b/resources/fixtures/Robe/Robe-Spot-160-XT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Thierry Rodolfo Robe @@ -22,50 +22,50 @@ Colour - Open - White-Turquoise - Turquoise - Turquoise-Red - Red - Red-Cyan - Cyan - Cyan-Light green - Light green - Light green-Magenta - Magenta - Magenta-Light blue - Light blue - Light blue-Yellow - Yellow - Yellow-Green - Green - Green-Pink - Pink - Pink-Blue - Blue - Blue-Orange - Orange - Forwards rainbow effect from fast to slow + Open + White-Turquoise + Turquoise + Turquoise-Red + Red + Red-Cyan + Cyan + Cyan-Light green + Light green + Light green-Magenta + Magenta + Magenta-Light blue + Light blue + Light blue-Yellow + Yellow + Yellow-Green + Green + Green-Pink + Pink + Pink-Blue + Blue + Blue-Orange + Orange + Forwards rainbow effect from fast to slow No rotation - Backwards rainbow effect from slow to fast + Backwards rainbow effect from slow to fast Gobo - Open position (hole) - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo shake 1 - Gobo shake 2 - Gobo shake 3 - Gobo shake 4 - Gobo shake 5 - Gobo shake 6 - Gobo shake 7 + Open position (hole) + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo shake 1 + Gobo shake 2 + Gobo shake 3 + Gobo shake 4 + Gobo shake 5 + Gobo shake 6 + Gobo shake 7 Gobo wheel rotation from slow to fast @@ -77,16 +77,16 @@ Shutter - Shutter closed + Shutter closed Light intensity from 0 to 100% - Shutter open - Strobe effect from slow to fast (max. 8 flashes/s) + Shutter open + Strobe effect from slow to fast (max. 8 flashes/s) Reset, shutter closed - Shutter closed - Pulse effect in sequences with increasing speed - Pulse effect in sequences with decreasing speed - Random strobe effect with increasing speed - Shutter open + Shutter closed + Pulse effect in sequences with increasing speed + Pulse effect in sequences with decreasing speed + Random strobe effect with increasing speed + Shutter open Pan @@ -126,11 +126,11 @@ Gobo Rotation Shutter, Strobe, Reset - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Spot-575-XT.qxf b/resources/fixtures/Robe/Robe-Spot-575-XT.qxf index 3e10186bc4..58794a6f44 100644 --- a/resources/fixtures/Robe/Robe-Spot-575-XT.qxf +++ b/resources/fixtures/Robe/Robe-Spot-575-XT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT DJ_Ladonin Robe @@ -30,33 +30,33 @@ Colour - Open/white - Light blue - Red - Blue - Light green - Yellow - Magenta - Cyan - Green - Orange - Forwards rainbow effest from fast to slow + Open/white + Light blue + Red + Blue + Light green + Yellow + Magenta + Cyan + Green + Orange + Forwards rainbow effest from fast to slow No rotation - Backwards rainbow effect from slow to fast + Backwards rainbow effect from slow to fast Colour - White - Deep red - Deep blue - Pink - Cyan - Magenta - Yellow - 5600K filter - 3200K filter - UV filter - White + White + Deep red + Deep blue + Pink + Cyan + Magenta + Yellow + 5600K filter + 3200K filter + UV filter + White Enable macro color function on channel 7 @@ -84,7 +84,7 @@ Gobo - Open/hole + Open/hole Static 1 Static 2 Static 3 @@ -107,7 +107,7 @@ Gobo - Open/hole + Open/hole Gobo 1 (metal) Gobo 2 (metal) Gobo 3 (metal) @@ -139,14 +139,14 @@ Shutter - Closed - No function (open) - Strobe effect from slow to fast (max. 10 flashes/s) - No function (open) - Pulse effect in sequences from slow to fast - No function (open) - Random strobe effect from slow to fast - No function (open) + Closed + No function (open) + Strobe effect from slow to fast (max. 10 flashes/s) + No function (open) + Pulse effect in sequences from slow to fast + No function (open) + Random strobe effect from slow to fast + No function (open) @@ -201,11 +201,11 @@ Shutter, Strobe Dimmer Intensity - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe-Wash-575-XT.qxf b/resources/fixtures/Robe/Robe-Wash-575-XT.qxf index 3f2dc14e69..95ae0812b8 100644 --- a/resources/fixtures/Robe/Robe-Wash-575-XT.qxf +++ b/resources/fixtures/Robe/Robe-Wash-575-XT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.2 + 4.12.3 GIT NiKoyes Robe @@ -24,33 +24,33 @@ Fan speed Max to Min Lamp ON Reset No Function - Lamp OFF + Lamp OFF No Function Colour - White - Deep Red - Blue - Green - Orange - 3200 K - 5600 K - UV Filter + White + Deep Red + Blue + Green + Orange + 3200 K + 5600 K + UV Filter Rainbow Fast to Slow No Function CCW Rainbow Slow to Fast Shutter - Shutter Closed - Open - Strobe >> - Open - Pulse - Open - Strobe Random >> - Open + Shutter Closed + Open + Strobe >> + Open + Pulse + Open + Strobe Random >> + Open @@ -140,11 +140,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Robe/Robe_ColorMix_240_AT.qxf b/resources/fixtures/Robe/Robe_ColorMix_240_AT.qxf index 77a0550d00..246525425a 100644 --- a/resources/fixtures/Robe/Robe_ColorMix_240_AT.qxf +++ b/resources/fixtures/Robe/Robe_ColorMix_240_AT.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.5.1 + 4.12.3 GIT Lorenzo Andreani Robe @@ -64,14 +64,14 @@ Shutter - Shutter Closed - Shutter Open - Slow > Fast Strobe Effect (max 10 flases to sec) - Shutter Closed - Pulse Effect in sequence with increasing speed - Pulse Effect in sequence with decreasing speed - Random Strobe Effect with increasing speed - Shutter Open + Shutter Closed + Shutter Open + Slow > Fast Strobe Effect (max 10 flases to sec) + Shutter Closed + Pulse Effect in sequence with increasing speed + Pulse Effect in sequence with decreasing speed + Random Strobe Effect with increasing speed + Shutter Open @@ -97,11 +97,11 @@ Shutter Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Rockville/Rockville-Motionstrip-RGBW.qxf b/resources/fixtures/Rockville/Rockville-Motionstrip-RGBW.qxf new file mode 100644 index 0000000000..c3acee3139 --- /dev/null +++ b/resources/fixtures/Rockville/Rockville-Motionstrip-RGBW.qxf @@ -0,0 +1,186 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + Donny Lockart + + Rockville + Motionstrip RGBW + LED Bar (Beams) + + + + Effect + Ch5-Ch38 + Built-in 1 + Built-in 2 + Built-in 3 + Built-in 4 + Built-in 5 + Built-in 6 + Built-in 7 + Built-in 8 + Built-in 9 + Built-in 10 + Built-in 11 + Built-in 12 + Built-in 13 + Built-in 14 + Built-in 15 + Built-in 16 + Built-in 17 + Built-in 18 + Built-in 19 + Built-in 20 + Built-in 21 + Built-in 22 + Sound Active + + + Speed + Built-in Prog Speed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pan + Pan speed + Built-in LED Programs + LED Prog. Speed + Master dimmer + Strobe + Red 1 + Green 1 + Blue 1 + White 1 + Red 2 + Green 2 + Blue 2 + White 2 + Red 3 + Green 3 + Blue 3 + White 3 + Red 4 + Green 4 + Blue 4 + White 4 + Red 5 + Green 5 + Blue 5 + White 5 + Red 6 + Green 6 + Blue 6 + White 6 + Red 7 + Green 7 + Blue 7 + White 7 + Red 8 + Green 8 + Blue 8 + White 8 + + 6 + 7 + 8 + 9 + + + 10 + 11 + 12 + 13 + + + 14 + 15 + 16 + 17 + + + 18 + 19 + 20 + 21 + + + 22 + 23 + 24 + 25 + + + 26 + 27 + 28 + 29 + + + 30 + 31 + 32 + 33 + + + 34 + 35 + 36 + 37 + + + + Pan + Pan speed + Built-in LED Programs + LED Prog. Speed + Master dimmer + Red 1 + Green 1 + Blue 1 + White 1 + + + + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Colorlab-250.qxf b/resources/fixtures/SGM/SGM-Colorlab-250.qxf index 1fd99e5f0d..af6c6f1759 100644 --- a/resources/fixtures/SGM/SGM-Colorlab-250.qxf +++ b/resources/fixtures/SGM/SGM-Colorlab-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.1 + 4.12.3 GIT Heikki Junnila SGM @@ -12,37 +12,37 @@ Colour - White - Amber - Pale green - Magenta - Light blue - Pink - Pale lavender - Fire red - Medium yellow - Lee green - Flame red - Dark green - Deep golden amber - Dark red - Cyan - Fern green - Brilliant green - Lavender - True blue - Violet + White + Amber + Pale green + Magenta + Light blue + Pink + Pale lavender + Fire red + Medium yellow + Lee green + Flame red + Dark green + Deep golden amber + Dark red + Cyan + Fern green + Brilliant green + Lavender + True blue + Violet Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Rotagobo - speed 1 Rotagobo - speed 2 Rotagobo - speed 3 @@ -51,21 +51,21 @@ Shutter - Closed - Strobe 1.00 Hz - Strobe 1.39 Hz - Strobe 1.65 Hz - Strobe 1.94 Hz - Strobe 2.34 Hz - Strobe 2.78 Hz - Strobe 3.29 Hz - Strobe 3.91 Hz - Strobe 4.56 Hz - Strobe 5.45 Hz - Strobe 5.98 Hz - Strobe 6.98 Hz - Strobe 7.85 Hz - Strobe 9.00 Hz + Closed + Strobe 1.00 Hz + Strobe 1.39 Hz + Strobe 1.65 Hz + Strobe 1.94 Hz + Strobe 2.34 Hz + Strobe 2.78 Hz + Strobe 3.29 Hz + Strobe 3.91 Hz + Strobe 4.56 Hz + Strobe 5.45 Hz + Strobe 5.98 Hz + Strobe 6.98 Hz + Strobe 7.85 Hz + Strobe 9.00 Hz Shutter sync: audio low freq Flash sync: audio low freq Flash sync: audio high freq @@ -73,7 +73,7 @@ Open, auto shade colours Open, auto shade gobos and colours Open, slow gobo change - Open + Open Effect @@ -99,11 +99,11 @@ Palette Colour mode - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Giotto-Spot-250.qxf b/resources/fixtures/SGM/SGM-Giotto-Spot-250.qxf index 7665aa9b8d..ad491d5054 100644 --- a/resources/fixtures/SGM/SGM-Giotto-Spot-250.qxf +++ b/resources/fixtures/SGM/SGM-Giotto-Spot-250.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Heikki Junnila SGM @@ -113,7 +113,7 @@ Hysteresis On Hysteresis - Reset + Reset Gobo diff --git a/resources/fixtures/SGM/SGM-Giotto-Spot-400-CMY.qxf b/resources/fixtures/SGM/SGM-Giotto-Spot-400-CMY.qxf index 71103750ac..946575f4cc 100644 --- a/resources/fixtures/SGM/SGM-Giotto-Spot-400-CMY.qxf +++ b/resources/fixtures/SGM/SGM-Giotto-Spot-400-CMY.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Willy SGM @@ -102,7 +102,7 @@ Hysteresis On Hysteresis - Reset + Reset Gobo diff --git a/resources/fixtures/SGM/SGM-Giotto-Spot-400.qxf b/resources/fixtures/SGM/SGM-Giotto-Spot-400.qxf index 8bad0536b8..4571406271 100644 --- a/resources/fixtures/SGM/SGM-Giotto-Spot-400.qxf +++ b/resources/fixtures/SGM/SGM-Giotto-Spot-400.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Mihai Andrei SGM @@ -110,7 +110,7 @@ Hysteresis On Hysteresis - Reset + Reset Gobo diff --git a/resources/fixtures/SGM/SGM-Giotto-Wash-400.qxf b/resources/fixtures/SGM/SGM-Giotto-Wash-400.qxf index d6fa84ee00..e384649221 100644 --- a/resources/fixtures/SGM/SGM-Giotto-Wash-400.qxf +++ b/resources/fixtures/SGM/SGM-Giotto-Wash-400.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Heikki Junnila SGM @@ -73,7 +73,7 @@ Hysteresis On Hysteresis - Reset + Reset diff --git a/resources/fixtures/SGM/SGM-Idea-Beam-300.qxf b/resources/fixtures/SGM/SGM-Idea-Beam-300.qxf index de35583478..bd13c654b8 100644 --- a/resources/fixtures/SGM/SGM-Idea-Beam-300.qxf +++ b/resources/fixtures/SGM/SGM-Idea-Beam-300.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.5 GIT + 4.12.3 GIT Oscar Cervesato SGM @@ -22,7 +22,7 @@ Colour - Open / white + Open / white Color 1 Color 2 Color 3 @@ -31,9 +31,9 @@ Color 6 Color 7 Color 8 - Forwards rainbow effect (fast to slow) + Forwards rainbow effect (fast to slow) No rotation - Backwards rainbow effect (slow to fast) + Backwards rainbow effect (slow to fast) Gobo @@ -54,14 +54,14 @@ Shutter - Shutter closed - No function (shutter open) - Strobe effect slow to fast - No function (shutter open) + Shutter closed + No function (shutter open) + Strobe effect slow to fast + No function (shutter open) Pulse-effect in sequences - No function (shutter open) - Random strobe effect slow to fast - No function (shutter open) + No function (shutter open) + Random strobe effect slow to fast + No function (shutter open) @@ -111,12 +111,12 @@ colour & gobo change normal colour change to any position colour & gobo change to any position - Lamp ON - Lamp switch OFF - All Motor reset + Lamp ON + Lamp switch OFF + All Motor reset Scan Motor reset - Color Motor reset - Gobo motor reset + Color Motor reset + Gobo motor reset Shutter & Dimmer motor reset Other motor reset Internal program 1 @@ -302,11 +302,11 @@ Colour macros - CMY and colour wheel Lamp on/off, Reset, Internal programs - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Idea-Led-Bar-100.qxf b/resources/fixtures/SGM/SGM-Idea-Led-Bar-100.qxf index 4b53e21c80..1f04aca7ff 100644 --- a/resources/fixtures/SGM/SGM-Idea-Led-Bar-100.qxf +++ b/resources/fixtures/SGM/SGM-Idea-Led-Bar-100.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Oscar Cervesato SGM @@ -12,13 +12,13 @@ Shutter - No function (shutter open) - Strobe effect slow to fast - No function (shutter open) + No function (shutter open) + Strobe effect slow to fast + No function (shutter open) Pulse-effect in sequences - No function (shutter open) - Random strobe effect show to fast - No function (shutter open) + No function (shutter open) + Random strobe effect show to fast + No function (shutter open) Effect diff --git a/resources/fixtures/SGM/SGM-Idea-Spot-250.qxf b/resources/fixtures/SGM/SGM-Idea-Spot-250.qxf index 167ccbdc0c..63ff6c46bb 100644 --- a/resources/fixtures/SGM/SGM-Idea-Spot-250.qxf +++ b/resources/fixtures/SGM/SGM-Idea-Spot-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Adrian Kapka SGM @@ -43,7 +43,7 @@ Colour - Open /white + Open /white Color 1 Color 2 Color 3 @@ -52,9 +52,9 @@ Color 6 Color 7 Color 8 - Forwards rainbow effect from fast to slow + Forwards rainbow effect from fast to slow No rotation - Backwards rainbow effect from slow to fast + Backwards rainbow effect from slow to fast Gobo @@ -75,14 +75,14 @@ Shutter - Shutter closed - Dimmer control (shutter open) - Strobe effect slow to fast - No function (shutter open) + Shutter closed + Dimmer control (shutter open) + Strobe effect slow to fast + No function (shutter open) Pulse-effect in sequences - No function (shutter open) - Random strobe effect slow to fast - No function (shutter open) + No function (shutter open) + Random strobe effect slow to fast + No function (shutter open) @@ -139,9 +139,9 @@ Maintenance colour change normal colour change to any position - Lamp on - Lamp switch off - Motor reset + Lamp on + Lamp switch off + Motor reset Internal program 1 Internal program 2 Internal program 3 @@ -181,11 +181,11 @@ Focus Lamp on/off, reset, internal programs - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Idea-Spot-575.qxf b/resources/fixtures/SGM/SGM-Idea-Spot-575.qxf index 3ff1ab1210..96b822a346 100644 --- a/resources/fixtures/SGM/SGM-Idea-Spot-575.qxf +++ b/resources/fixtures/SGM/SGM-Idea-Spot-575.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.0 + 4.12.3 GIT Massimo Callegari SGM @@ -22,7 +22,7 @@ Colour - Open / white + Open / white Color 1 Color 2 Color 3 @@ -54,14 +54,14 @@ Shutter - Shutter closed - Dimmer control (shutter open) - Strobe effect slow to fast - No function (shutter open) + Shutter closed + Dimmer control (shutter open) + Strobe effect slow to fast + No function (shutter open) Pulse-effect in sequences - No function (shutter open) - Random strobe effect slow to fast - No function (shutter open) + No function (shutter open) + Random strobe effect slow to fast + No function (shutter open) @@ -129,9 +129,9 @@ Maintenance Colour change normal Colour change to any position - Lamp ON - Lamp switch OFF - Motor reset + Lamp ON + Lamp switch OFF + Motor reset Internal program 1 Internal program 2 Internal program 3 @@ -168,10 +168,10 @@ - - - - + + + + Pan @@ -189,11 +189,11 @@ Lamp on/off, Reset, Internal programs Frost - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Idea-Spot-700.qxf b/resources/fixtures/SGM/SGM-Idea-Spot-700.qxf index 07f6655daf..0cd34c4253 100644 --- a/resources/fixtures/SGM/SGM-Idea-Spot-700.qxf +++ b/resources/fixtures/SGM/SGM-Idea-Spot-700.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Oscar Cervesato SGM @@ -54,14 +54,14 @@ Shutter - Shutter closed - No function (shutter open) - Strobe effect slow to fast - No function (shutter open) + Shutter closed + No function (shutter open) + Strobe effect slow to fast + No function (shutter open) Pulse-effect in sequences - No function (shutter open) - Random strobe effect slow to fast - No function (shutter open) + No function (shutter open) + Random strobe effect slow to fast + No function (shutter open) @@ -118,12 +118,12 @@ colour & gobo change normal colour change to any position colour & gobo change to any position - Lamp ON - Lamp switch OFF - All Motor reset + Lamp ON + Lamp switch OFF + All Motor reset Scan Motor reset - Color Motor reset - Gobo motor reset + Color Motor reset + Gobo motor reset Shutter & Dimmer motor reset Other motor reset Internal program 1 diff --git a/resources/fixtures/SGM/SGM-Newton-1200.qxf b/resources/fixtures/SGM/SGM-Newton-1200.qxf index 349d42f134..68878d0580 100644 --- a/resources/fixtures/SGM/SGM-Newton-1200.qxf +++ b/resources/fixtures/SGM/SGM-Newton-1200.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Oscar Cervesato SGM @@ -12,22 +12,22 @@ Shutter - Shutter closed - Strobe - 0.5 fps - Strobe - 1.42 fps - Strobe - 1.7 fps - Strobe - 2.0 fps - Strobe - 2.42 fps - Strobe - 2.9 fps - Strobe - 3.46 fps - Strobe - 4.15 fps - Strobe - 4.89 fps - Strobe - 5.93 fps - Strobe - 6.91 fps - Strobe - 8.29 fps - Strobe - 9.95 fps - Strobe - 11.83 fps - Shutter open + Shutter closed + Strobe - 0.5 fps + Strobe - 1.42 fps + Strobe - 1.7 fps + Strobe - 2.0 fps + Strobe - 2.42 fps + Strobe - 2.9 fps + Strobe - 3.46 fps + Strobe - 4.15 fps + Strobe - 4.89 fps + Strobe - 5.93 fps + Strobe - 6.91 fps + Strobe - 8.29 fps + Strobe - 9.95 fps + Strobe - 11.83 fps + Shutter open Beam diff --git a/resources/fixtures/SGM/SGM-Victory-250.qxf b/resources/fixtures/SGM/SGM-Victory-250.qxf index a6c785c8a9..e333a4a360 100644 --- a/resources/fixtures/SGM/SGM-Victory-250.qxf +++ b/resources/fixtures/SGM/SGM-Victory-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila SGM @@ -12,35 +12,35 @@ Colour - White - White + yellow - Yellow - Yellow + magenta - Magenta - Magenta + cyan - Cyan - Cyan + orange - Orange - Orange + green - Green - Green + blue - Blue - Blue + red - Red - Red + white - Rainbow speed + White + White + yellow + Yellow + Yellow + magenta + Magenta + Magenta + cyan + Cyan + Cyan + orange + Orange + Orange + green + Green + Green + blue + Blue + Blue + red + Red + Red + white + Rainbow speed Music hard change Gobo - No gobo - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + No gobo + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Rotagobo - speed 1 Rotagobo - speed 2 Rotagobo - speed 3 @@ -49,21 +49,21 @@ Shutter - Closed - Strobe 1.00 Hz - Strobe 1.39 Hz - Strobe 1.65 Hz - Strobe 1.94 Hz - Strobe 2.34 Hz - Strobe 2.78 Hz - Strobe 3.29 Hz - Strobe 3.91 Hz - Strobe 4.56 Hz - Strobe 5.45 Hz - Strobe 5.98 Hz - Strobe 6.98 Hz - Strobe 7.85 Hz - Strobe 9.00 Hz + Closed + Strobe 1.00 Hz + Strobe 1.39 Hz + Strobe 1.65 Hz + Strobe 1.94 Hz + Strobe 2.34 Hz + Strobe 2.78 Hz + Strobe 3.29 Hz + Strobe 3.91 Hz + Strobe 4.56 Hz + Strobe 5.45 Hz + Strobe 5.98 Hz + Strobe 6.98 Hz + Strobe 7.85 Hz + Strobe 9.00 Hz Shutter sync: audio low freq Flash sync: audio low freq Flash sync: audio high freq @@ -71,7 +71,7 @@ Open, auto shade colours Open, auto shade gobos and colours Open, slow gobo change - Open + Open @@ -79,7 +79,7 @@ Maintenance Off Lamp hysteresis - Reset + Reset @@ -94,11 +94,11 @@ Pan fine Tilt fine - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Victory-II-250.qxf b/resources/fixtures/SGM/SGM-Victory-II-250.qxf index 3cc6f6c233..cb34ef6ca0 100644 --- a/resources/fixtures/SGM/SGM-Victory-II-250.qxf +++ b/resources/fixtures/SGM/SGM-Victory-II-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila & Marco Palmisano SGM @@ -12,35 +12,35 @@ Colour - White - White + yellow - Yellow - Yellow + magenta - Magenta - Magenta + cyan - Cyan - Cyan + orange - Orange - Orange + green - Green - Green + blue - Blue - Blue + red - Red - Red + white - Rainbow speed + White + White + yellow + Yellow + Yellow + magenta + Magenta + Magenta + cyan + Cyan + Cyan + orange + Orange + Orange + green + Green + Green + blue + Blue + Blue + red + Red + Red + white + Rainbow speed Music hard change Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Rotagobo - speed 1 Rotagobo - speed 2 Rotagobo - speed 3 @@ -49,21 +49,21 @@ Shutter - Closed - Strobe 1.00 Hz - Strobe 1.39 Hz - Strobe 1.65 Hz - Strobe 1.94 Hz - Strobe 2.34 Hz - Strobe 2.78 Hz - Strobe 3.29 Hz - Strobe 3.91 Hz - Strobe 4.56 Hz - Strobe 5.45 Hz - Strobe 5.98 Hz - Strobe 6.98 Hz - Strobe 7.85 Hz - Strobe 9.00 Hz + Closed + Strobe 1.00 Hz + Strobe 1.39 Hz + Strobe 1.65 Hz + Strobe 1.94 Hz + Strobe 2.34 Hz + Strobe 2.78 Hz + Strobe 3.29 Hz + Strobe 3.91 Hz + Strobe 4.56 Hz + Strobe 5.45 Hz + Strobe 5.98 Hz + Strobe 6.98 Hz + Strobe 7.85 Hz + Strobe 9.00 Hz Shutter sync: audio low freq Flash sync: audio low freq Flash sync: audio high freq @@ -71,7 +71,7 @@ Open, auto shade colours Open, auto shade gobos and colours Open, slow gobo change - Open + Open @@ -98,7 +98,7 @@ Maintenance Off Lamp hysteresis - Reset + Reset @@ -128,11 +128,11 @@ Prism Reset - - - - - - - + + + + + + + diff --git a/resources/fixtures/SGM/SGM-Victory-II-Pro150.qxf b/resources/fixtures/SGM/SGM-Victory-II-Pro150.qxf index 3704fdd6d4..ac76367601 100644 --- a/resources/fixtures/SGM/SGM-Victory-II-Pro150.qxf +++ b/resources/fixtures/SGM/SGM-Victory-II-Pro150.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Heikki Junnila SGM @@ -12,21 +12,21 @@ Shutter - Closed - Strobe 1.00 Hz - Strobe 1.39 Hz - Strobe 1.65 Hz - Strobe 1.94 Hz - Strobe 2.34 Hz - Strobe 2.78 Hz - Strobe 3.29 Hz - Strobe 3.91 Hz - Strobe 4.56 Hz - Strobe 5.45 Hz - Strobe 5.98 Hz - Strobe 6.98 Hz - Strobe 7.85 Hz - Strobe 9.00 Hz + Closed + Strobe 1.00 Hz + Strobe 1.39 Hz + Strobe 1.65 Hz + Strobe 1.94 Hz + Strobe 2.34 Hz + Strobe 2.78 Hz + Strobe 3.29 Hz + Strobe 3.91 Hz + Strobe 4.56 Hz + Strobe 5.45 Hz + Strobe 5.98 Hz + Strobe 6.98 Hz + Strobe 7.85 Hz + Strobe 9.00 Hz Shutter sync: audio low freq Flash sync: audio low freq Flash sync: audio high freq @@ -34,7 +34,7 @@ Open, auto shade colours Open, auto shade gobos and colours Open, slow gobo change - Open + Open @@ -61,41 +61,41 @@ Maintenance Off Lamp hysteresis - Reset + Reset Colour - White - White + Yellow - Yellow - Yellow + Magenta - Magenta - Magenta + Cyan - Cyan - Cyan + Orange - Orange - Orange + Green - Green - Green + Blue - Blue - Blue + Red - Red - Red + White - Rainbow speed + White + White + Yellow + Yellow + Yellow + Magenta + Magenta + Magenta + Cyan + Cyan + Cyan + Orange + Orange + Orange + Green + Green + Green + Blue + Blue + Blue + Red + Red + Red + White + Rainbow speed Music hard change Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Rotagobo - speed 1 Rotagobo - speed 2 Rotagobo - speed 3 @@ -116,11 +116,11 @@ Pan fine Tilt fine - - - - - - - + + + + + + + diff --git a/resources/fixtures/Sagitter/Sagitter-Miniscan-2001.qxf b/resources/fixtures/Sagitter/Sagitter-Miniscan-2001.qxf index 444ff0e1d4..316436aaa9 100644 --- a/resources/fixtures/Sagitter/Sagitter-Miniscan-2001.qxf +++ b/resources/fixtures/Sagitter/Sagitter-Miniscan-2001.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.3.0-r2968 + Q Light Controller Plus + 4.12.3 GIT Stefan Schürmann Sagitter @@ -54,10 +54,10 @@ Shutter Shutter Closed -> Open - Strobe + Strobe Pulse fast -> Slow -> Fast Strobe Patterns - Full + Full Pan @@ -67,11 +67,11 @@ Gobo Rotation Shutter - - - - - - - + + + + + + + diff --git a/resources/fixtures/Sagitter/Sagitter-Slimpar-18-RGB.qxf b/resources/fixtures/Sagitter/Sagitter-Slimpar-18-RGB.qxf index 79781df867..415ca922d8 100644 --- a/resources/fixtures/Sagitter/Sagitter-Slimpar-18-RGB.qxf +++ b/resources/fixtures/Sagitter/Sagitter-Slimpar-18-RGB.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Daniele Fogale Sagitter @@ -26,8 +26,8 @@ Shutter - No Strobe - Strobe from min to max + No Strobe + Strobe from min to max @@ -53,11 +53,11 @@ Color Macro - - - - - - - + + + + + + + diff --git a/resources/fixtures/Sagitter/Sagitter-Slimpar-7DL.qxf b/resources/fixtures/Sagitter/Sagitter-Slimpar-7DL.qxf index 6a8eed48fd..eafbecbead 100644 --- a/resources/fixtures/Sagitter/Sagitter-Slimpar-7DL.qxf +++ b/resources/fixtures/Sagitter/Sagitter-Slimpar-7DL.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.1 GIT + 4.12.3 GIT Damiano Mologni Sagitter @@ -29,8 +29,8 @@ Shutter - No Strobe - Strobe from min to max + No Strobe + Strobe from min to max @@ -65,11 +65,11 @@ Color Macro Speed - Microphone Sensitivity Strobe - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Acrobat.qxf b/resources/fixtures/Showtec/Showtec-Acrobat.qxf index b12bade941..3096904a33 100644 --- a/resources/fixtures/Showtec/Showtec-Acrobat.qxf +++ b/resources/fixtures/Showtec/Showtec-Acrobat.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.6.0 + 4.12.3 GIT User Showtec @@ -18,51 +18,51 @@ Colour - Open / White - Blue - Yellow - Peachblow - Green - Pink - Cyan - Orange - White + Blue - Blue + Yellow - Yellow + Peachblow - Peachblow + Green - Green + Pink - Pink + Cyan - Cyan + Orange - Orange + White - Forwards (CW) Rainbow, Slow - Fast - Bacwards (CCW) Rainbow, Slow - Fast + Open / White + Blue + Yellow + Peachblow + Green + Pink + Cyan + Orange + White + Blue + Blue + Yellow + Yellow + Peachblow + Peachblow + Green + Green + Pink + Pink + Cyan + Cyan + Orange + Orange + White + Forwards (CW) Rainbow, Slow - Fast + Bacwards (CCW) Rainbow, Slow - Fast Shutter - Closed / Blackout - Shutter Open - Strobe, Slow - Fast ( 0-10 Flash / Sec ) - Shutter Open + Closed / Blackout + Shutter Open + Strobe, Slow - Fast ( 0-10 Flash / Sec ) + Shutter Open Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 7 shake, Slow - Fast - Gobo 6 shake, Slow - Fast - Gobo 5 shake, Slow - Fast - Gobo 4 shake, Slow - Fast - Gobo 3 shake, Slow - Fast - Gobo 2 shake, Slow - Fast - Gobo 1 shake, Slow - Fast - open + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 7 shake, Slow - Fast + Gobo 6 shake, Slow - Fast + Gobo 5 shake, Slow - Fast + Gobo 4 shake, Slow - Fast + Gobo 3 shake, Slow - Fast + Gobo 2 shake, Slow - Fast + Gobo 1 shake, Slow - Fast + open Forwards (CW) Gobo, Slow - Fast Backwards (CCW) Gobo, Slow - Fast @@ -151,11 +151,11 @@ Prism Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Club-Par-12x6-RGBWAUV.qxf b/resources/fixtures/Showtec/Showtec-Club-Par-12x6-RGBWAUV.qxf new file mode 100644 index 0000000000..92e7ca3a76 --- /dev/null +++ b/resources/fixtures/Showtec/Showtec-Club-Par-12x6-RGBWAUV.qxf @@ -0,0 +1,78 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + Santiago Benejam Torres + + Showtec + Club Par 12-6 RGBWAUV + Color Changer + + + + + + + + + Shutter + Closed + Strobe flash frequancy, from slow to fast + + + Effect + Not Functional + Program 1 + Program 2 + Program 3 + Program 4 + Program 5 + Program 6 + Program 7 + Program 8 + Program 9 + Program 10 + Program 11 + Program 12 + Program 13 + Sound Controlled + + + Speed + Gradual speed adjustment, from slow to fast + + + Speed + Gradual speed adjustment, from color jump to color fade + + + Red + Green + Blue + Amber + White + UV + + + Dimmer Intensity + Red + Green + Blue + Amber + White + UV + Strobe + Built-in Programs + Speed + Fade Time + + + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Compact-Par-18-MKII.qxf b/resources/fixtures/Showtec/Showtec-Compact-Par-18-MKII.qxf index 4f0cb65aa2..502a4dc55e 100644 --- a/resources/fixtures/Showtec/Showtec-Compact-Par-18-MKII.qxf +++ b/resources/fixtures/Showtec/Showtec-Compact-Par-18-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Nicolò Zanon Showtec @@ -15,8 +15,8 @@ Shutter - No effect - Strobo effect + No effect + Strobo effect Effect @@ -35,18 +35,18 @@ Colour No Function - Red - Green - Blue - Green - Yellow - Orange - Pink - Purple - Dark Blue - Light Green - White - Warm White + Red + Green + Blue + Green + Yellow + Orange + Pink + Purple + Dark Blue + Light Green + White + Warm White Master Dimmer @@ -70,11 +70,11 @@ Color Macros - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Compact-Par-18-Tri-MKII.qxf b/resources/fixtures/Showtec/Showtec-Compact-Par-18-Tri-MKII.qxf index 984447604b..5857f2b4b5 100644 --- a/resources/fixtures/Showtec/Showtec-Compact-Par-18-Tri-MKII.qxf +++ b/resources/fixtures/Showtec/Showtec-Compact-Par-18-Tri-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.1 GIT + 4.12.3 GIT Thierry Rodolfo Showtec @@ -13,35 +13,35 @@ Colour - Macro 1 - Macro 2 - Macro 3 - Macro 4 - Macro 5 - Macro 6 - Macro 7 - Macro 8 - Macro 9 - Macro 10 - Macro 11 - Macro 12 - Macro 13 - Macro 14 - Macro 15 - Macro 16 - Macro 17 - Macro 18 - Macro 19 - Macro 20 - Macro 21 - Macro 22 - Macro 23 - Macro 24 - Macro 25 - Macro 26 - Macro 27 - Macro 28 - Macro 29 + Macro 1 + Macro 2 + Macro 3 + Macro 4 + Macro 5 + Macro 6 + Macro 7 + Macro 8 + Macro 9 + Macro 10 + Macro 11 + Macro 12 + Macro 13 + Macro 14 + Macro 15 + Macro 16 + Macro 17 + Macro 18 + Macro 19 + Macro 20 + Macro 21 + Macro 22 + Macro 23 + Macro 24 + Macro 25 + Macro 26 + Macro 27 + Macro 28 + Macro 29 Speed @@ -55,8 +55,8 @@ Shutter - No Function - Strobe slow to fast + No Function + Strobe slow to fast Effect @@ -97,11 +97,11 @@ RGB Macro - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Compact-Par-7-Q4.qxf b/resources/fixtures/Showtec/Showtec-Compact-Par-7-Q4.qxf index c6f5d81d8a..9072a0e786 100644 --- a/resources/fixtures/Showtec/Showtec-Compact-Par-7-Q4.qxf +++ b/resources/fixtures/Showtec/Showtec-Compact-Par-7-Q4.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Alexander Showtec @@ -16,13 +16,13 @@ Shutter - No Strobe - Strobe 0-20 Hz + No Strobe + Strobe 0-20 Hz Shutter - No Strobe - Random Strobe + No Strobe + Random Strobe Colour diff --git a/resources/fixtures/Showtec/Showtec-Explorer-250-Pro-MKII.qxf b/resources/fixtures/Showtec/Showtec-Explorer-250-Pro-MKII.qxf index da1f3bd9ff..5a72b5b98b 100644 --- a/resources/fixtures/Showtec/Showtec-Explorer-250-Pro-MKII.qxf +++ b/resources/fixtures/Showtec/Showtec-Explorer-250-Pro-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Henk de Gunst Showtec @@ -24,15 +24,15 @@ Colour - Open / white - Red - Yellow - Magenta - Green - Orange - Blue - Pink - Forwards rainbow effect from fast to slow + Open / white + Red + Yellow + Magenta + Green + Orange + Blue + Pink + Forwards rainbow effect from fast to slow Effect @@ -49,33 +49,33 @@ Gobo - Open / white - 1 (metal) - Shaking 1 - 2 (metal) - Shaking 2 - 3 (glass) - Shaking 3 - 4 (glass) - Shaking 4 - 5 (glass) - Shaking 5 - 6 (glass) - Shaking 6 + Open / white + 1 (metal) + Shaking 1 + 2 (metal) + Shaking 2 + 3 (glass) + Shaking 3 + 4 (glass) + Shaking 4 + 5 (glass) + Shaking 5 + 6 (glass) + Shaking 6 Gobo - Open / white - 1 (glass) - Shaking 1 - 2 (glass) - Shaking 2 - 3 (glass) - Shaking 3 - 4 (metal) - Shaking 4 - 5 (metal) - Shaking 5 + Open / white + 1 (glass) + Shaking 1 + 2 (glass) + Shaking 2 + 3 (glass) + Shaking 3 + 4 (metal) + Shaking 4 + 5 (metal) + Shaking 5 No Continuous rotation from slow to fast @@ -105,14 +105,14 @@ Shutter - Shutter closed / blackout - Shutter open - Strobe effect, from slow to fast (0-10 flashes/sec.) - Shutter open + Shutter closed / blackout + Shutter open + Strobe effect, from slow to fast (0-10 flashes/sec.) + Shutter open Pulse-effect 1, in sequences from slow to fast - Shutter open - Random strobe effect, from slow to fast - Shutter open + Shutter open + Random strobe effect, from slow to fast + Shutter open @@ -133,11 +133,11 @@ Shutter / Strobe Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Expression-5000.qxf b/resources/fixtures/Showtec/Showtec-Expression-5000.qxf index 177fb6c0ce..afff1bcd50 100644 --- a/resources/fixtures/Showtec/Showtec-Expression-5000.qxf +++ b/resources/fixtures/Showtec/Showtec-Expression-5000.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 GIT + 4.12.3 GIT Joep Admiraal Showtec @@ -44,8 +44,8 @@ Shutter - Open - Strobe effect, from slot to fast (0-10 fashes/sec) + Open + Strobe effect, from slot to fast (0-10 fashes/sec) Maintenance @@ -95,11 +95,11 @@ Shutter / strobe Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Giant-XL-LED.qxf b/resources/fixtures/Showtec/Showtec-Giant-XL-LED.qxf index 1a75e24cab..36b55c608f 100644 --- a/resources/fixtures/Showtec/Showtec-Giant-XL-LED.qxf +++ b/resources/fixtures/Showtec/Showtec-Giant-XL-LED.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.5 GIT + 4.12.3 GIT Samuel Hofmann Showtec @@ -16,55 +16,55 @@ Colour - Open / White - Yellow - Pink - Green - Peach - Light Blue - Light Green - Orange - Dark Blue - White->Yellow - Yellow->Pink - Pink->Green - Green->Peach - Peach->Light Blue - Light Blue->Light Green - Light Green->Orange - Orange->Dark Blue - Dark Blue->White - Rainbow Fast->Slow - Rainbow Backwards Fast->Slow + Open / White + Yellow + Pink + Green + Peach + Light Blue + Light Green + Orange + Dark Blue + White->Yellow + Yellow->Pink + Pink->Green + Green->Peach + Peach->Light Blue + Light Blue->Light Green + Light Green->Orange + Orange->Dark Blue + Dark Blue->White + Rainbow Fast->Slow + Rainbow Backwards Fast->Slow Shutter - Closed - Open - Strobe Slow->Fast - Open + Closed + Open + Strobe Slow->Fast + Open Gobo - Open - Glass Gobo 1 - Glass Gobo 2 - Metal Gobo 3 - Metal Gobo 4 - Metal Gobo 5 - Metal Gobo 6 - Metal Gobo 7 - Gobo Shake 7 Slow->Fast - Gobo Shake 6 Slow->Fast - Gobo Shake 5 Slow->Fast - Gobo Shake 4 Slow->Fast - Gobo Shake 3 Slow->Fast - Gobo Shake 2 Slow->Fast - Gobo Shake 1 Slow->Fast - Open - Rainbow Slow->Fast - Rainbow Backwards Slow->Fast + Open + Glass Gobo 1 + Glass Gobo 2 + Metal Gobo 3 + Metal Gobo 4 + Metal Gobo 5 + Metal Gobo 6 + Metal Gobo 7 + Gobo Shake 7 Slow->Fast + Gobo Shake 6 Slow->Fast + Gobo Shake 5 Slow->Fast + Gobo Shake 4 Slow->Fast + Gobo Shake 3 Slow->Fast + Gobo Shake 2 Slow->Fast + Gobo Shake 1 Slow->Fast + Open + Rainbow Slow->Fast + Rainbow Backwards Slow->Fast Gobo @@ -84,14 +84,14 @@ Blackout during Rotating Gobowheel Movement deactivated No Function No Function - Reset Pan (activated after 5 seconds) - Reset Tilt (activated after 5 seconds) - Reset Colorwheel (activated after 5 seconds) + Reset Pan (activated after 5 seconds) + Reset Tilt (activated after 5 seconds) + Reset Colorwheel (activated after 5 seconds) Reset Rotating Gobowheel (activated after 5 seconds) Reset Gobowheel Roatation (activated after 5 seconds) - Reset Prism (activated after 5 seconds) + Reset Prism (activated after 5 seconds) Reset Focus (activated after 5 seconds) - Reset All Channels + Reset All Channels No Function @@ -154,11 +154,11 @@ Rotating Prism Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Indigo-4600.qxf b/resources/fixtures/Showtec/Showtec-Indigo-4600.qxf index c18a456d03..8b874daba7 100644 --- a/resources/fixtures/Showtec/Showtec-Indigo-4600.qxf +++ b/resources/fixtures/Showtec/Showtec-Indigo-4600.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.7.0 + 4.12.3 GIT Jano Svitok Showtec @@ -17,21 +17,21 @@ Colour Open/White - Red - Green - Yellow - Blue - Orange - Magenta - Light Blue - Light Blue -> Magenta - Magenta -> Orange - Orange -> Blue - Blue -> Yellow - Yellow -> Green - Green -> Red - Red -> Open/White - Forwards (CW) Rainbow slow to fast + Red + Green + Yellow + Blue + Orange + Magenta + Light Blue + Light Blue -> Magenta + Magenta -> Orange + Orange -> Blue + Blue -> Yellow + Yellow -> Green + Green -> Red + Red -> Open/White + Forwards (CW) Rainbow slow to fast Gobo @@ -92,14 +92,14 @@ Shutter - Close - Shutter open - Strobe slow to fast (0-10 flashes/sec.) - Shutter open - Pulse slow to fast - Shutter open - Random strobe slow to fast - Shutter open + Close + Shutter open + Strobe slow to fast (0-10 flashes/sec.) + Shutter open + Pulse slow to fast + Shutter open + Random strobe slow to fast + Shutter open Maintenance @@ -153,11 +153,11 @@ Shutter/Strobe Channel Functions - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Indigo-6500.qxf b/resources/fixtures/Showtec/Showtec-Indigo-6500.qxf index 0ac2e9ad57..98fb9051d7 100644 --- a/resources/fixtures/Showtec/Showtec-Indigo-6500.qxf +++ b/resources/fixtures/Showtec/Showtec-Indigo-6500.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 + 4.12.3 GIT Jochen Becker Showtec @@ -16,57 +16,57 @@ Colour - Open/White - Red - Green - Yellow - Blue - Orange - Magenta - Light Blue - Light Blue->Magenta - Magenta->Orange - Orange->Blue - Blue->Yellow - Yellow->Green - Green->Red - Red->Open/White - Rainbow effect from slow to fast + Open/White + Red + Green + Yellow + Blue + Orange + Magenta + Light Blue + Light Blue->Magenta + Magenta->Orange + Orange->Blue + Blue->Yellow + Yellow->Green + Green->Red + Red->Open/White + Rainbow effect from slow to fast Gobo Open/White - Metal Gobo 1 - Metal Gobo 2 - Metal Gobo 3 - Metal Gobo 4 - Metal Gobo 5 - Metal Gobo 6 - Metal Gobo 7 - Shake 7 Slow->Fast - Shake 6 Slow->Fast - Shake 5 Slow->Fast - Shake 4 Slow->Fast - Shake 3 Slow->Fast - Shake 2 Slow->Fast - Shake 1 Slow->Fast + Metal Gobo 1 + Metal Gobo 2 + Metal Gobo 3 + Metal Gobo 4 + Metal Gobo 5 + Metal Gobo 6 + Metal Gobo 7 + Shake 7 Slow->Fast + Shake 6 Slow->Fast + Shake 5 Slow->Fast + Shake 4 Slow->Fast + Shake 3 Slow->Fast + Shake 2 Slow->Fast + Shake 1 Slow->Fast Backwards (CCW) Rotation Slow->Fast Gobo Open/White - Metal Gobo 1 - Metal Gobo 2 - Metal Gobo 3 - Glass Gobo 4 - Metal Gobo 5 - Glass Gobo 6 - Shake 6 Slow->Fast - Shake 5 Slow->Fast - Shake 4 Slow->Fast - Shake 3 Slow->Fast - Shake 2 Slow->Fast - Shake 1 Slow->Fast + Metal Gobo 1 + Metal Gobo 2 + Metal Gobo 3 + Glass Gobo 4 + Metal Gobo 5 + Glass Gobo 6 + Shake 6 Slow->Fast + Shake 5 Slow->Fast + Shake 4 Slow->Fast + Shake 3 Slow->Fast + Shake 2 Slow->Fast + Shake 1 Slow->Fast Gobo-Wheel Rotation Slow->Fast @@ -125,14 +125,14 @@ Shutter - Close - Shutter open - Strobe Slow->Fast - Shutter open - Pulse Effect Slow->Fast - Shutter open - Random Strobe Slow->Fast - Shutter open + Close + Shutter open + Strobe Slow->Fast + Shutter open + Pulse Effect Slow->Fast + Shutter open + Random Strobe Slow->Fast + Shutter open Maintenance @@ -198,11 +198,11 @@ Shutter/Strobe Channel Functions - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Infinity-iB-5R.qxf b/resources/fixtures/Showtec/Showtec-Infinity-iB-5R.qxf index d6af6305c5..341a4a8cc9 100644 --- a/resources/fixtures/Showtec/Showtec-Infinity-iB-5R.qxf +++ b/resources/fixtures/Showtec/Showtec-Infinity-iB-5R.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Nicolò Zanon Showtec @@ -18,75 +18,75 @@ Shutter - Close - Shutter open - Strobe effect, from slow to fast (0-10 flashes/sec.) - Fast close/shutter and slow opening, from slow to fast (0-10 flashes/sec.) - Slow close/shutter and fast opening, from slow to fast (0-10 flashes/sec.) - Pulse strobe effect, from slow to fast (0-10 flashes/sec.) - Random strobe effect, from slow to fast (0-10 flashes/sec.) - Open + Close + Shutter open + Strobe effect, from slow to fast (0-10 flashes/sec.) + Fast close/shutter and slow opening, from slow to fast (0-10 flashes/sec.) + Slow close/shutter and fast opening, from slow to fast (0-10 flashes/sec.) + Pulse strobe effect, from slow to fast (0-10 flashes/sec.) + Random strobe effect, from slow to fast (0-10 flashes/sec.) + Open Colour - Open - Red - Deep Yellow/Orange - Turquoise - Green - Light Green/Yellow - Light Blue/Purple - Rose Red - Light Yellow - Pink - Blue - Warm White - ½ CTO - Cool White - UV + Open + Red + Deep Yellow/Orange + Turquoise + Green + Light Green/Yellow + Light Blue/Purple + Rose Red + Light Yellow + Pink + Blue + Warm White + ½ CTO + Cool White + UV Split Color - Clockwise rotation (CW) rainbow effect from fast to slow + Clockwise rotation (CW) rainbow effect from fast to slow Stop - Counter-clockwise rotation (CCW) rainbow effect from slow to fast + Counter-clockwise rotation (CCW) rainbow effect from slow to fast Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 15 - Gobo 16 - Gobo 17 - Open / White - Gobo Shake 1 from slow to fast - Gobo Shake 2 from slow to fast - Gobo Shake 3 from slow to fast - Gobo Shake 4 from slow to fast - Gobo Shake 5 from slow to fast - Gobo Shake 6 from slow to fast - Gobo Shake 7 from slow to fast - Gobo Shake 8 from slow to fast - Gobo Shake 9 from slow to fast - Gobo Shake 10 from slow to fast - Gobo Shake 11 from slow to fast - Gobo Shake 12 from slow to fast - Gobo Shake 13 from slow to fast - Gobo Shake 14 from slow to fast - Gobo Shake 15 from slow to fast - Gobo Shake 16 from slow to fast - Gobo Shake 17 from slow to fast + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 15 + Gobo 16 + Gobo 17 + Open / White + Gobo Shake 1 from slow to fast + Gobo Shake 2 from slow to fast + Gobo Shake 3 from slow to fast + Gobo Shake 4 from slow to fast + Gobo Shake 5 from slow to fast + Gobo Shake 6 from slow to fast + Gobo Shake 7 from slow to fast + Gobo Shake 8 from slow to fast + Gobo Shake 9 from slow to fast + Gobo Shake 10 from slow to fast + Gobo Shake 11 from slow to fast + Gobo Shake 12 from slow to fast + Gobo Shake 13 from slow to fast + Gobo Shake 14 from slow to fast + Gobo Shake 15 from slow to fast + Gobo Shake 16 from slow to fast + Gobo Shake 17 from slow to fast Clockwise rotation (CW) rainbow effect from fast to slow Stop Counter-clockwise rotation (CCW) rainbow effect from slow to fast @@ -164,17 +164,17 @@ Interrupt disabling shade Design interruption allows Interrupt disabling pattern - Lamp On + Lamp On Reset Pan/Tilt after 3 seconds Reset Color wheel rotation after 3 seconds Reset Gobo rotation after 3 seconds Reset Shutter/Prism after 3 seconds No Function Reset Frost Effect / Focus - Reset all + Reset all Allows all interrupt All interrupt disabling - Lamp off + Lamp off XY Smoothing model open XY Smoothing model to shut down @@ -215,11 +215,11 @@ Built-in Programs Built-in Speed - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Infinity-iW-1915.qxf b/resources/fixtures/Showtec/Showtec-Infinity-iW-1915.qxf index e060b33750..56745a5ebb 100644 --- a/resources/fixtures/Showtec/Showtec-Infinity-iW-1915.qxf +++ b/resources/fixtures/Showtec/Showtec-Infinity-iW-1915.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Daniele Fogale Showtec @@ -173,28 +173,28 @@ Shutter - Close - Shutter open - Strobe effect 1 - from fast to slow - Shutter open - Strobe effect 2 - (fast on and slow off), from fast to slow - Shutter open - Strobe effect 3 - (slow on and fast off), from fast to slow - Shutter open - Strobe effect 4 - (random strobe), from fast to slow - Shutter open + Close + Shutter open + Strobe effect 1 - from fast to slow + Shutter open + Strobe effect 2 - (fast on and slow off), from fast to slow + Shutter open + Strobe effect 3 - (slow on and fast off), from fast to slow + Shutter open + Strobe effect 4 - (random strobe), from fast to slow + Shutter open Strobe effect 5 - (random strobe fast on and slow off), from fast to slow - Shutter open + Shutter open Strobe effect 6 - (random strobe slow on fast off), from fast to slow - Shutter open - Strobe effect 7 - (pulse strobe), from fast to slow - Shutter open - Strobe effect 8 - (random pulse frequency strobe), from fast to slow - Shutter open + Shutter open + Strobe effect 7 - (pulse strobe), from fast to slow + Shutter open + Strobe effect 8 - (random pulse frequency strobe), from fast to slow + Shutter open Strobe effect 9 - (strobe light, gradually destroy), from fast to slow - Shutter open - Strobe effect 10 - (pulse strobe), from fast to slow - Shutter open + Shutter open + Strobe effect 10 - (pulse strobe), from fast to slow + Shutter open diff --git a/resources/fixtures/Showtec/Showtec-Infinity-iW-715.qxf b/resources/fixtures/Showtec/Showtec-Infinity-iW-715.qxf index 49a8fbc227..42b8c297a7 100644 --- a/resources/fixtures/Showtec/Showtec-Infinity-iW-715.qxf +++ b/resources/fixtures/Showtec/Showtec-Infinity-iW-715.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT uchris Showtec @@ -66,28 +66,28 @@ Shutter - Close - Shutter Open - Shutter effect 1, from fast to slow - Shutter Open - Strobe effect 2 (fast on and slow off), from fast to slow - Shutter open - Strobe effect 3 (slow on and fast off), from fast to slow - Shutter open - Strobe effect 4 (random strobe), from fast to slow - Shutter open + Close + Shutter Open + Shutter effect 1, from fast to slow + Shutter Open + Strobe effect 2 (fast on and slow off), from fast to slow + Shutter open + Strobe effect 3 (slow on and fast off), from fast to slow + Shutter open + Strobe effect 4 (random strobe), from fast to slow + Shutter open Strobe effect 5 (random strobe fast on and slow off), from fast to slow - Shutter open + Shutter open Strobe effect 6 (random strobe slow on and fast off), from fast to slow - Shutter open + Shutter open Strobe effect 7 (pulse strobe), from fast to slow - Shutter open + Shutter open Strobe effect 8 (random pulse frequency strobe), from fast to slow - Shutter open + Shutter open Strobe effect 9 (strobe light, gradually destroy), from fast to slow - Shutter open + Shutter open Strobe effect 10 (pulse strobe), from fast to slow - Shutter open + Shutter open Effect diff --git a/resources/fixtures/Showtec/Showtec-Infinity-iW-720.qxf b/resources/fixtures/Showtec/Showtec-Infinity-iW-720.qxf index 981e5bd86f..cad10d1992 100644 --- a/resources/fixtures/Showtec/Showtec-Infinity-iW-720.qxf +++ b/resources/fixtures/Showtec/Showtec-Infinity-iW-720.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT uchris Showtec @@ -101,28 +101,28 @@ Shutter - Close - Shutter Open - Shutter effect 1, from fast to slow - Shutter Open - Strobe effect 2 (fast on and slow off), from fast to slow - Shutter open - Strobe effect 3 (slow on and fast off), from fast to slow - Shutter open - Strobe effect 4 (random strobe), from fast to slow - Shutter open + Close + Shutter Open + Shutter effect 1, from fast to slow + Shutter Open + Strobe effect 2 (fast on and slow off), from fast to slow + Shutter open + Strobe effect 3 (slow on and fast off), from fast to slow + Shutter open + Strobe effect 4 (random strobe), from fast to slow + Shutter open Strobe effect 5 (random strobe fast on and slow off), from fast to slow - Shutter open + Shutter open Strobe effect 6 (random strobe slow on and fast off), from fast to slow - Shutter open - Strobe effect 7 (pulse strobe), from fast to slow - Shutter open + Shutter open + Strobe effect 7 (pulse strobe), from fast to slow + Shutter open Strobe effect 8 (random pulse frequency strobe), from fast to slow - Shutter open + Shutter open Strobe effect 9 (strobe light, gradually destroy), from fast to slow - Shutter open + Shutter open Strobe effect 10 (pulse strobe), from fast to slow - Shutter open + Shutter open diff --git a/resources/fixtures/Showtec/Showtec-Kanjo-Spot-60.qxf b/resources/fixtures/Showtec/Showtec-Kanjo-Spot-60.qxf index f34c25140f..a542722641 100644 --- a/resources/fixtures/Showtec/Showtec-Kanjo-Spot-60.qxf +++ b/resources/fixtures/Showtec/Showtec-Kanjo-Spot-60.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.1 GIT + 4.12.3 GIT Flo Edelmann Showtec @@ -16,41 +16,41 @@ Colour - White - Red - Green - Blue - Yellow - Magenta - Cyan - Orange - Color rotation slow - fast + White + Red + Green + Blue + Yellow + Magenta + Cyan + Orange + Color rotation slow - fast Gobo - Off - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 + Off + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 Gobo 5 - Gobo 6 - Gobo 7 + Gobo 6 + Gobo 7 Gobo rotation slow - fast No function - Gobo 1 shake slow - fast - Gobo 2 shake slow - fast - Gobo 3 shake slow - fast - Gobo 4 shake slow - fast + Gobo 1 shake slow - fast + Gobo 2 shake slow - fast + Gobo 3 shake slow - fast + Gobo 4 shake slow - fast Gobo 5 shake slow - fast - Gobo 6 shake slow - fast - Gobo 7 shake slow - fast + Gobo 6 shake slow - fast + Gobo 7 shake slow - fast Shutter - Off - Strobe 0 - 20Hz + Off + Strobe 0 - 20Hz Random strobe 0 - 20Hz @@ -82,11 +82,11 @@ Strobe / Shutter Functions - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Mini-Max-LED-RGB.qxf b/resources/fixtures/Showtec/Showtec-Mini-Max-LED-RGB.qxf index df80100416..66086052d0 100644 --- a/resources/fixtures/Showtec/Showtec-Mini-Max-LED-RGB.qxf +++ b/resources/fixtures/Showtec/Showtec-Mini-Max-LED-RGB.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.4.2 + 4.12.3 GIT laserandi Showtec @@ -31,8 +31,8 @@ Shutter - Full on - Strobe, from slow to fast + Full on + Strobe, from slow to fast @@ -49,11 +49,11 @@ Pan Fine Tilt Fine - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-MiniMax-250.qxf b/resources/fixtures/Showtec/Showtec-MiniMax-250.qxf index 587f804fcc..4316177a6a 100644 --- a/resources/fixtures/Showtec/Showtec-MiniMax-250.qxf +++ b/resources/fixtures/Showtec/Showtec-MiniMax-250.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.0.4 + Q Light Controller Plus + 4.12.3 GIT Klaus Weidenbach Showtec @@ -54,9 +54,9 @@ Maintenance - Lamp ON - Reset after 5 seconds - Lamp OFF + Lamp ON + Reset after 5 seconds + Lamp OFF Lamp OFF after 10 seconds @@ -76,11 +76,11 @@ Strobe / Dimmer Lamp Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-130-LED-Spot.qxf b/resources/fixtures/Showtec/Showtec-Phantom-130-LED-Spot.qxf index 7256d5491c..67267699e9 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-130-LED-Spot.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-130-LED-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.0 GIT + 4.12.3 GIT Piotr Nowik Showtec @@ -66,14 +66,14 @@ Blackout during Pan/Tilt/Gobo Blackout during Pan/Tilt/Color/Gobo No function - Reset Pan - Reset Tilt - Reset Color wheel - Reset Gobo wheel + Reset Pan + Reset Tilt + Reset Color wheel + Reset Gobo wheel No function - Reset Prism - Reset Focus/zoom - Reset All + Reset Prism + Reset Focus/zoom + Reset All No function diff --git a/resources/fixtures/Showtec/Showtec-Phantom-20-LED-Beam.qxf b/resources/fixtures/Showtec/Showtec-Phantom-20-LED-Beam.qxf index 83f1558d85..e3ee07d2df 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-20-LED-Beam.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-20-LED-Beam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Nicolò Zanon Showtec @@ -16,25 +16,25 @@ Colour - Open / White - Blue - Yellow - Pink - Green - Red - Light Blue - Orange - Clockwise rotation (CW) rainbow effect from slow to fast - Counter-clockwise rotation (CCW) rainbow effect from slow to fast + Open / White + Blue + Yellow + Pink + Green + Red + Light Blue + Orange + Clockwise rotation (CW) rainbow effect from slow to fast + Counter-clockwise rotation (CCW) rainbow effect from slow to fast Shutter - Shutter closed - Shutter open - Strobe effect, from slow to fast (0-10 flashes/sec.) - Pulse strobe effect from slow to fast - Random strobe effect, from slow to fast (0-10 flashes/sec.) - Shutter open + Shutter closed + Shutter open + Strobe effect, from slow to fast (0-10 flashes/sec.) + Pulse strobe effect from slow to fast + Random strobe effect, from slow to fast (0-10 flashes/sec.) + Shutter open @@ -134,11 +134,11 @@ Built-In Programs + Sound-controlled Program Speed - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-250-Wash.qxf b/resources/fixtures/Showtec/Showtec-Phantom-250-Wash.qxf index c26f97c96d..1b58b52537 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-250-Wash.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-250-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.7.0 + 4.12.3 GIT Veljko Stankov Showtec @@ -27,15 +27,15 @@ Shutter - Shutter closed / Blackout + Shutter closed / Blackout Dimmer 0-100% - Shutter open - Strobe, slow-fast - Shutter open - Pulse, slow-fast - Shutter open - Random strobe, slow-fast - Shutter open + Shutter open + Strobe, slow-fast + Shutter open + Pulse, slow-fast + Shutter open + Random strobe, slow-fast + Shutter open Effect @@ -97,11 +97,11 @@ Lamp Effect Effect - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-250.qxf b/resources/fixtures/Showtec/Showtec-Phantom-250.qxf index bc95be5058..c114863a3e 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-250.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.4.2 + 4.12.3 GIT laserandi Showtec @@ -17,31 +17,31 @@ Colour open - blue - red - pink - green - yellow - magenta - UV - Forward Rainbow fast - slow + blue + red + pink + green + yellow + magenta + UV + Forward Rainbow fast - slow Gobo - open - Gobo 1 + open + Gobo 1 Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 Gobo 7 - shaking Gobo 1 + shaking Gobo 1 shaking Gobo 2 - shaking Gobo 3 - shaking Gobo 4 - shaking Gobo 5 - shaking Gobo 6 + shaking Gobo 3 + shaking Gobo 4 + shaking Gobo 5 + shaking Gobo 6 shaking Gobo 7 Clockwise Rotation slow - fast @@ -53,14 +53,14 @@ Shutter - closed - open - strobe effect slow - fast - open - pulse effect slow - fast - open - random effect slow - fast - open + closed + open + strobe effect slow - fast + open + pulse effect slow - fast + open + random effect slow - fast + open @@ -131,11 +131,11 @@ Prism Rotation Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-50.qxf b/resources/fixtures/Showtec/Showtec-Phantom-50.qxf index 3369a92400..e6b0790251 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-50.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-50.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Petja Touru Showtec @@ -39,10 +39,10 @@ Shutter - Shutter closed - Shutter open - Strobe (slow -> fast) - Shutter open + Shutter closed + Shutter open + Strobe (slow -> fast) + Shutter open @@ -142,10 +142,10 @@ Prism - - - - + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-65.qxf b/resources/fixtures/Showtec/Showtec-Phantom-65.qxf index b6e72f0866..fd279868f0 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-65.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-65.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Piotr Nowik Showtec @@ -16,34 +16,34 @@ Shutter - No function - Open - Synchronized strobe slow to fast - Fast close/slow open slow to fast - Slow close/fast open slow to fast - Pulse slow to fast - Random slow to fast - Open + No function + Open + Synchronized strobe slow to fast + Fast close/slow open slow to fast + Slow close/fast open slow to fast + Pulse slow to fast + Random slow to fast + Open Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 7 with Shake - Gobo 6 with Shake - Gobo 5 with Shake - Gobo 4 with Shake - Gobo 3 with Shake - Gobo 2 with Shake - Gobo 1 with Shake - Open + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 7 with Shake + Gobo 6 with Shake + Gobo 5 with Shake + Gobo 4 with Shake + Gobo 3 with Shake + Gobo 2 with Shake + Gobo 1 with Shake + Open Rotate wheel CW slow to fast Rotate wheel CCW slow to fast @@ -98,26 +98,26 @@ Colour - Open/white - Red - Yellow - Green - Light blue - Orange - Pink - Light green - UV - White/red - Red/yellow - Yellow/green - Green/light blue - Light blue/orange - Orange/pink - Pink/light green - Light green/UV - UV/white - CW rainbow slow to fast - CCW rainbow slow to fast + Open/white + Red + Yellow + Green + Light blue + Orange + Pink + Light green + UV + White/red + Red/yellow + Yellow/green + Green/light blue + Light blue/orange + Orange/pink + Pink/light green + Light green/UV + UV/white + CW rainbow slow to fast + CCW rainbow slow to fast Pan @@ -144,11 +144,11 @@ Gobo Rotation Prism - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-75-LED-Spot-V2.qxf b/resources/fixtures/Showtec/Showtec-Phantom-75-LED-Spot-V2.qxf index 4557290493..ed40f01c46 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-75-LED-Spot-V2.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-75-LED-Spot-V2.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Thierry Rodolfo Showtec @@ -16,54 +16,54 @@ Colour - Open / White - Yellow - Pink - Green - Red - Light Blue - Light Green - Orange - Dark Blue - White/Yellow - Yellow/Pink - Pink/Green - Green/Red - Red/Light Blue - Light Blue/Light Green - Light Green/Orange - Orange/Dark Blue + Open / White + Yellow + Pink + Green + Red + Light Blue + Light Green + Orange + Dark Blue + White/Yellow + Yellow/Pink + Pink/Green + Green/Red + Red/Light Blue + Light Blue/Light Green + Light Green/Orange + Orange/Dark Blue Dark Blue/White - Scroll CW slow to fast - Scroll CCW fast to slow + Scroll CW slow to fast + Scroll CCW fast to slow Shutter - Close - Shutter Open - Strobe slow to fast - Pulse strobe effect - Random Strobe - Shutter Open + Close + Shutter Open + Strobe slow to fast + Pulse strobe effect + Random Strobe + Shutter Open Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 7 Shake - Gobo 6 Shake - Gobo 5 Shake - Gobo 4 Shake - Gobo 3 Shake - Gobo 2 Shake - Gobo 1 Shake + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 7 Shake + Gobo 6 Shake + Gobo 5 Shake + Gobo 4 Shake + Gobo 3 Shake + Gobo 2 Shake + Gobo 1 Shake Open Scroll CW slow to fast Scroll CCW fast to slow @@ -73,7 +73,7 @@ Index CW slow to fast CCW fast to slow - Gobo Bouncing + Gobo Bouncing Maintenance @@ -86,14 +86,14 @@ Blackout during Pan/Tilt/Gobo/Color No function No function - Reset Pan - Reset Tilt - Reset Color wheel - Reset Gobo wheel + Reset Pan + Reset Tilt + Reset Color wheel + Reset Gobo wheel Reset Gobo Rotation - Reset Prism + Reset Prism Reset Focus - Reset All + Reset All No function @@ -151,11 +151,11 @@ Prism Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Phantom-95-LED-Spot.qxf b/resources/fixtures/Showtec/Showtec-Phantom-95-LED-Spot.qxf index bacbce4073..d09d9f694c 100644 --- a/resources/fixtures/Showtec/Showtec-Phantom-95-LED-Spot.qxf +++ b/resources/fixtures/Showtec/Showtec-Phantom-95-LED-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Piotr Nowik Showtec @@ -16,55 +16,55 @@ Colour - Open / White - Yellow - Pink - Green - Red - Light Blue - Light Green - Orange - Dark Blue - White/yellow - Yellow/pink - Pink/green - Green/red - Red/light blue - Light blue/light green - Light green/orange - Orange/Dark blue - Dark Blue/White - Clockwise rotation rainbow effect, from slow to fast - Counterclockwise rotation rainbow effect, from slow to fast + Open / White + Yellow + Pink + Green + Red + Light Blue + Light Green + Orange + Dark Blue + White/yellow + Yellow/pink + Pink/green + Green/red + Red/light blue + Light blue/light green + Light green/orange + Orange/Dark blue + Dark Blue/White + Clockwise rotation rainbow effect, from slow to fast + Counterclockwise rotation rainbow effect, from slow to fast Shutter - Closed - Open - Strobe effect, from slow to fast (0-10 flashes/sec.) - Pulse effect, from slow to fast - Random - Open + Closed + Open + Strobe effect, from slow to fast (0-10 flashes/sec.) + Pulse effect, from slow to fast + Random + Open Gobo - Open/white - Gobo 1 (glass) - Gobo 2 (glass) - Gobo 3 (metal) - Gobo 4 (metal) - Gobo 5 (metal) - Gobo 6 (metal) - Gobo 7 (metal) - Gobo 7 shake, from slow to fast - Gobo 6 shake, from slow to fast - Gobo 5 shake, from slow to fast - Gobo 4 shake, from slow to fast - Gobo 3 shake, from slow to fast - Gobo 2 shake, from slow to fast - Gobo 1 shake, from slow to fast - Open/white + Open/white + Gobo 1 (glass) + Gobo 2 (glass) + Gobo 3 (metal) + Gobo 4 (metal) + Gobo 5 (metal) + Gobo 6 (metal) + Gobo 7 (metal) + Gobo 7 shake, from slow to fast + Gobo 6 shake, from slow to fast + Gobo 5 shake, from slow to fast + Gobo 4 shake, from slow to fast + Gobo 3 shake, from slow to fast + Gobo 2 shake, from slow to fast + Gobo 1 shake, from slow to fast + Open/white Clockwise rotation effect, from slow to fast Counterclockwise rotation effect, from slow to fast @@ -86,14 +86,14 @@ Disabled blackout during pan/tilt/gobo wheel/color wheel movement Not functional Not functional - Reset pan - Reset tilt - Color wheel reset - Gobo wheel reset + Reset pan + Reset tilt + Color wheel reset + Gobo wheel reset Reset gobo rotation - Reset prism + Reset prism Reset focus - Reset all channels + Reset all channels Not functional @@ -154,11 +154,11 @@ Focus Zoom - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Pixel-Bar-12-RGBW.qxf b/resources/fixtures/Showtec/Showtec-Pixel-Bar-12-RGBW.qxf index 3bd1a39e70..43c86c943b 100644 --- a/resources/fixtures/Showtec/Showtec-Pixel-Bar-12-RGBW.qxf +++ b/resources/fixtures/Showtec/Showtec-Pixel-Bar-12-RGBW.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 GIT + 4.12.3 GIT Paul Misset Showtec @@ -129,8 +129,8 @@ Shutter - Strobe off - Strobe from slow to fast + Strobe off + Strobe from slow to fast Shutter diff --git a/resources/fixtures/Showtec/Showtec-Power-Spot-Q5.qxf b/resources/fixtures/Showtec/Showtec-Power-Spot-Q5.qxf index 387ccfaaf1..0cf5e11e66 100644 --- a/resources/fixtures/Showtec/Showtec-Power-Spot-Q5.qxf +++ b/resources/fixtures/Showtec/Showtec-Power-Spot-Q5.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.6 GIT + 4.12.3 GIT Lukas Jähn Showtec @@ -34,17 +34,17 @@ Effect No function - R+G+B/Slow to fast/Less sensitive to highly sensitive - R/Slow to fast/Less sensitive to highly sensitive - G/Slow to fast/Less sensitive to highly sensitive - B/Slow to fast/Less sensitive to highly sensitive - W/Slow to fast/Less sensitive to highly sensitive + R+G+B/Slow to fast/Less sensitive to highly sensitive + R/Slow to fast/Less sensitive to highly sensitive + G/Slow to fast/Less sensitive to highly sensitive + B/Slow to fast/Less sensitive to highly sensitive + W/Slow to fast/Less sensitive to highly sensitive A/Slow to fast/Less sensitive to highly sensitive - R+G/Slow to fast/Less sensitive to highly sensitive + R+G/Slow to fast/Less sensitive to highly sensitive R+A/Slow to fast/Less sensitive to highly sensitive - R+B/Slow to fast/Less sensitive to highly sensitive + R+B/Slow to fast/Less sensitive to highly sensitive Purple/Slow to fast/Less sensitive to highly sensitive - G+B/Slow to fast/Less sensitive to highly sensitive + G+B/Slow to fast/Less sensitive to highly sensitive R+W/Slow to fast/Less sensitive to highly sensitive G+W/Slow to fast/Less sensitive to highly sensitive B+W/Slow to fast/Less sensitive to highly sensitive @@ -56,8 +56,8 @@ Shutter - No function - Frequency, from slow to fast + No function + Frequency, from slow to fast Red @@ -86,11 +86,11 @@ Static Colors/Program Speed/Sound Sensitivity Strobe - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Shark-Beam-FX-One.qxf b/resources/fixtures/Showtec/Showtec-Shark-Beam-FX-One.qxf index 18f94136b9..cf9b5aee9d 100644 --- a/resources/fixtures/Showtec/Showtec-Shark-Beam-FX-One.qxf +++ b/resources/fixtures/Showtec/Showtec-Shark-Beam-FX-One.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Mats Lourenco Showtec @@ -13,28 +13,28 @@ Shutter - Open - Strobe - Open + Open + Strobe + Open Colour Not functional - Red - Green - Blue - White - Red + White - Green + White - Blue + White - Red + Green - Green + Blue - Red + Blue - Red + Green + Blue - Green + Blue + White - Red + Blue + White - Red + Green + Blue + White + Red + Green + Blue + White + Red + White + Green + White + Blue + White + Red + Green + Green + Blue + Red + Blue + Red + Green + Blue + Green + Blue + White + Red + Blue + White + Red + Green + Blue + White Switch, Slow to Fast Flow, Slow to Fast @@ -71,7 +71,7 @@ Intensity White - Color temperature + Color temperature Pan @@ -101,11 +101,11 @@ Beam Functions - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Shark-Wash-One.qxf b/resources/fixtures/Showtec/Showtec-Shark-Wash-One.qxf index 9ee75da44d..87097c6a87 100644 --- a/resources/fixtures/Showtec/Showtec-Shark-Wash-One.qxf +++ b/resources/fixtures/Showtec/Showtec-Shark-Wash-One.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Georg Müller Showtec @@ -17,9 +17,9 @@ Shutter - Shutter open - Linear strobe intensity, from slow to fast (0-20Hz) - Shutter open + Shutter open + Linear strobe intensity, from slow to fast (0-20Hz) + Shutter open @@ -34,30 +34,30 @@ Colour No function - Red + 50% White - Red - Red+Amber - Amber + Red + 50% White + Red + Red+Amber + Amber Red + 75% Green + Amber - Red+Green - Green - Green + White - Green + UV - Green + Blue - Blue + UV - Blue - UV - UV + 50% Red - UV + Amber + Red+Green + Green + Green + White + Green + UV + Green + Blue + Blue + UV + Blue + UV + UV + 50% Red + UV + Amber UV + Amber + Red - UV + Red + UV + Red Red + White + Amber - White + Amber - White - White + Blue + White + Amber + White + White + Blue Red + Green + Blue + White + Amber + UV - Color step program increasing from slow to fast - Color fade program increasing from slow to fast + Color step program increasing from slow to fast + Color fade program increasing from slow to fast Effect @@ -101,11 +101,11 @@ Color Macros Built-in programs - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-Spectral-CYC650.qxf b/resources/fixtures/Showtec/Showtec-Spectral-CYC650.qxf index 53f07c6d66..ec2769c627 100644 --- a/resources/fixtures/Showtec/Showtec-Spectral-CYC650.qxf +++ b/resources/fixtures/Showtec/Showtec-Spectral-CYC650.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT NiKoyes Showtec @@ -63,8 +63,8 @@ Shutter - No Function - 1 - 20 Hz + No Function + 1 - 20 Hz Maintenance diff --git a/resources/fixtures/Showtec/Showtec-Spectral-ZP-5.qxf b/resources/fixtures/Showtec/Showtec-Spectral-ZP-5.qxf index 497b5fbae4..011e548c95 100644 --- a/resources/fixtures/Showtec/Showtec-Spectral-ZP-5.qxf +++ b/resources/fixtures/Showtec/Showtec-Spectral-ZP-5.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.0 GIT + 4.12.3 GIT JP Showtec @@ -171,7 +171,7 @@ Maintenance Not functional - Zoom reset + Zoom reset Not functional diff --git a/resources/fixtures/Showtec/Showtec-XB-Wave.qxf b/resources/fixtures/Showtec/Showtec-XB-Wave.qxf index ad16c97407..0389ad4fc5 100644 --- a/resources/fixtures/Showtec/Showtec-XB-Wave.qxf +++ b/resources/fixtures/Showtec/Showtec-XB-Wave.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.5 GIT + 4.12.3 GIT webdb22 Showtec @@ -11,34 +11,34 @@ Flower Colour - Blackout - Red - Green - Blue - Green+Blue - Red+Blue - Red+Green - Red+Green+Blue - 3 Color Chase + Rotation - 7 Color Chase + Rotation + Blackout + Red + Green + Blue + Green+Blue + Red+Blue + Red+Green + Red+Green+Blue + 3 Color Chase + Rotation + 7 Color Chase + Rotation Colour - Blackout - Red - Green - Blue - Green+Blue - Red+Blue - Red+Green - Red+Green+Blue - 3 Color Chase + Rotation - 7 Color Chase + Rotation + Blackout + Red + Green + Blue + Green+Blue + Red+Blue + Red+Green + Red+Green+Blue + 3 Color Chase + Rotation + 7 Color Chase + Rotation Shutter - Static - Strobe slow to fast + Static + Strobe slow to fast Effect @@ -51,11 +51,11 @@ Strobe Rotation - - - - - - - + + + + + + + diff --git a/resources/fixtures/Showtec/Showtec-XS-1W-Mini-Moving-Beam.qxf b/resources/fixtures/Showtec/Showtec-XS-1W-Mini-Moving-Beam.qxf index c39d335bc3..9351583c79 100644 --- a/resources/fixtures/Showtec/Showtec-XS-1W-Mini-Moving-Beam.qxf +++ b/resources/fixtures/Showtec/Showtec-XS-1W-Mini-Moving-Beam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.5 GIT + 4.12.3 GIT AxelOtl Showtec @@ -14,16 +14,16 @@ Shutter - Shutter closed - Shutter open - Strobe effect, from slow to fast - Shutter open - Fast Close to slow Open, from slow to fast - Shutter open - Slow Close to Fast Open, slow Open, from slow to fast - Shutter open - Random shutters are on or off, from long to short intervals - Shutter open + Shutter closed + Shutter open + Strobe effect, from slow to fast + Shutter open + Fast Close to slow Open, from slow to fast + Shutter open + Slow Close to Fast Open, slow Open, from slow to fast + Shutter open + Random shutters are on or off, from long to short intervals + Shutter open Maintenance @@ -74,11 +74,11 @@ Dimmer Shutter/Strobe - - - - - - - + + + + + + + diff --git a/resources/fixtures/Solena/Solena-Mini-Par-12.qxf b/resources/fixtures/Solena/Solena-Mini-Par-12.qxf index efe1db85fb..14f2415dbe 100644 --- a/resources/fixtures/Solena/Solena-Mini-Par-12.qxf +++ b/resources/fixtures/Solena/Solena-Mini-Par-12.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Nathan Durnan Solena @@ -15,8 +15,8 @@ Shutter - No strobe - AUTO strobe, speed from slow to fast + No strobe + AUTO strobe, speed from slow to fast Sound strobe @@ -50,11 +50,11 @@ Static Color Selection and Speed Control Strobe/Flashing - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/StageTech/StageTech-LeaderScan-Roto.qxf b/resources/fixtures/StageTech/StageTech-LeaderScan-Roto.qxf index bce4c343a6..575d227aa3 100644 --- a/resources/fixtures/StageTech/StageTech-LeaderScan-Roto.qxf +++ b/resources/fixtures/StageTech/StageTech-LeaderScan-Roto.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.0 GIT + 4.12.3 GIT Noel Utter StageTech @@ -11,9 +11,9 @@ Scanner Shutter - Closed - Opened - Strobe + Closed + Opened + Strobe Gobo diff --git a/resources/fixtures/Stairville/StairVille-MH-z720.qxf b/resources/fixtures/Stairville/StairVille-MH-z720.qxf index 634182774b..58182e7aea 100644 --- a/resources/fixtures/Stairville/StairVille-MH-z720.qxf +++ b/resources/fixtures/Stairville/StairVille-MH-z720.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Tim Cullingworth Stairville @@ -44,28 +44,28 @@ Shutter - Closed - Open - Strobe effect 1 Fast to Slow - Open - Strobe effect 2 (fast o,n slow off) Fast to Slow consecutively - Open - Strobe effect 3 (slow on, fast off) Fast to Slow consecutively - Open - Strobe effect 4 (random) Fast to Slow consecutively - Open + Closed + Open + Strobe effect 1 Fast to Slow + Open + Strobe effect 2 (fast o,n slow off) Fast to Slow consecutively + Open + Strobe effect 3 (slow on, fast off) Fast to Slow consecutively + Open + Strobe effect 4 (random) Fast to Slow consecutively + Open Strobe effect 5 (random, fast on, slow off) Fast to Slow consecutively - Open + Open Strobe effect 6 (random, slow on, fast off) Fast to Slow consecutively - Open - Strobe effect 7 (pulse series) Pulse interval increasing - Open - Strobe effect 8 (pulse series with random frequency) Fast to Slow consecutively - Open - Strobe effect 9 (single pulses) Fast to Slow consecutively - Open - Strobe effect 10 (inverted pulse series) Pulse interval increasing - Open + Open + Strobe effect 7 (pulse series) Pulse interval increasing + Open + Strobe effect 8 (pulse series with random frequency) Fast to Slow consecutively + Open + Strobe effect 9 (single pulses) Fast to Slow consecutively + Open + Strobe effect 10 (inverted pulse series) Pulse interval increasing + Open @@ -75,9 +75,9 @@ Without function Rotation position reset Inclination position reset - Optical zoom reset + Optical zoom reset Without function - All functions reset + All functions reset Without function Inversion of rotation and inclination direction Inversion of rotation direction diff --git a/resources/fixtures/Stairville/Stairville-Beam-Moving-Head-B5R.qxf b/resources/fixtures/Stairville/Stairville-Beam-Moving-Head-B5R.qxf index d4d4100b99..408d12844a 100644 --- a/resources/fixtures/Stairville/Stairville-Beam-Moving-Head-B5R.qxf +++ b/resources/fixtures/Stairville/Stairville-Beam-Moving-Head-B5R.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.5 GIT + 4.12.3 GIT Massimo Callegari, Thierry Rodolfo Stairville @@ -11,97 +11,97 @@ Moving Head Colour - White - White + Red - Red - Red + Orange - Orange - Orange + Cyan - Cyan - Cyan + Green - Green - Green + Light Green - Light Green - Light Green + Lavender - Lavender - Lavender + light yellow - Light yellow - Light yellow + Yellow - Yellow - Yellow + pink - Pink - Pink + Blue - Blue - Blue + CTO 260 - CTO 260 - CTO 260 + CTO 190 - CTO 190 - CTO 190 + CTB 8000 - CTB 8000 - CTB 8000 + UV - UV - UV + White - Rotation clockwise, decreasing speed - Rotation counterclockwise, decreasing speed + White + White + Red + Red + Red + Orange + Orange + Orange + Cyan + Cyan + Cyan + Green + Green + Green + Light Green + Light Green + Light Green + Lavender + Lavender + Lavender + light yellow + Light yellow + Light yellow + Yellow + Yellow + Yellow + pink + Pink + Pink + Blue + Blue + Blue + CTO 260 + CTO 260 + CTO 260 + CTO 190 + CTO 190 + CTO 190 + CTB 8000 + CTB 8000 + CTB 8000 + UV + UV + UV + White + Rotation clockwise, decreasing speed + Rotation counterclockwise, decreasing speed Shutter - No strobe effect, lamp off - No strobe effect, lamp on - Strobe effect (standard), increasing speed - No strobe effect, lamp on - Strobe effect (symmetrical), increasing speed - No strobe effect, lamp on - Strobe effect (fast shutter), increasing speed - No strobe effect, lamp on - Strobe effect, increasing speed - No strobe effect, lamp on + No strobe effect, lamp off + No strobe effect, lamp on + Strobe effect (standard), increasing speed + No strobe effect, lamp on + Strobe effect (symmetrical), increasing speed + No strobe effect, lamp on + Strobe effect (fast shutter), increasing speed + No strobe effect, lamp on + Strobe effect, increasing speed + No strobe effect, lamp on Effect 1 Effect 2 - Random slow strobe effect + Random slow strobe effect Random strobe effect with medium speed - Random strobe effect with decreasing speed - No strobe effect, lamp on + Random strobe effect with decreasing speed + No strobe effect, lamp on Gobo - White - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 15 - Gobo 16 - Gobo 17 + White + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 15 + Gobo 16 + Gobo 17 Rotation (Fast 60rpm to slow 5rpm) Stop Rotation (Slow 5rpm to fast 60rpm) - Gobo 2 Shake (Slow to Fast) - Gobo 3 Shake (Slow to Fast) - Gobo 4 Shake (Slow to Fast) - Gobo 5 Shake (Slow to Fast) - Gobo 6 Shake (Slow to Fast) - Gobo 7 Shake (Slow to Fast) - Gobo 8 Shake (Slow to Fast) - Gobo 9 Shake (Slow to Fast) - Gobo 10 Shake (Slow to Fast) - Gobo 11 Shake (Slow to Fast) - Gobo 12 Shake (Slow to Fast) - Gobo 13 Shake (Slow to Fast) - Gobo 14 Shake (Slow to Fast) - Gobo 15 Shake (Slow to Fast) - Gobo 16 Shake (Slow 24bpm to Fast 600bpm) + Gobo 2 Shake (Slow to Fast) + Gobo 3 Shake (Slow to Fast) + Gobo 4 Shake (Slow to Fast) + Gobo 5 Shake (Slow to Fast) + Gobo 6 Shake (Slow to Fast) + Gobo 7 Shake (Slow to Fast) + Gobo 8 Shake (Slow to Fast) + Gobo 9 Shake (Slow to Fast) + Gobo 10 Shake (Slow to Fast) + Gobo 11 Shake (Slow to Fast) + Gobo 12 Shake (Slow to Fast) + Gobo 13 Shake (Slow to Fast) + Gobo 14 Shake (Slow to Fast) + Gobo 15 Shake (Slow to Fast) + Gobo 16 Shake (Slow 24bpm to Fast 600bpm) Prism @@ -141,8 +141,8 @@ Maintenance Unused Effects Reset - Pan/Tilt Reset - Total Reset + Pan/Tilt Reset + Total Reset Maintenance @@ -210,11 +210,11 @@ Reset Lamp Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-Crown-FX-PAR77.qxf b/resources/fixtures/Stairville/Stairville-Crown-FX-PAR77.qxf index bac25a5e73..162f79cfce 100644 --- a/resources/fixtures/Stairville/Stairville-Crown-FX-PAR77.qxf +++ b/resources/fixtures/Stairville/Stairville-Crown-FX-PAR77.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Andres Robles Stairville @@ -40,7 +40,7 @@ Shutter - Strobe effect off + Strobe effect off Strobe effect, increasing speed, all colour LEDs Strobe effect sound mode, all colour LEDs @@ -48,7 +48,7 @@ Shutter No function - Strobe LED ring constantly on + Strobe LED ring constantly on Strobe effect, increasing speed, strobe LED ring Strobe effect sound mode, strobe LED ring @@ -61,14 +61,14 @@ Shutter - Strobe effect off + Strobe effect off Strobe effect, increasing speed, all colour LEDs Strobe effect sound mode, all colour LEDs Shutter No function - Strobe LED ring constantly on + Strobe LED ring constantly on Strobe effect, increasing speed, strobe LED ring Strobe effect sound mode, strobe LED ring @@ -78,7 +78,7 @@ Shutter - Strobe effect off, zone 1 + Strobe effect off, zone 1 Strobe effect, increasing speed, zone 1 Strobe effect sound mode, zone 1 @@ -98,20 +98,20 @@ Shutter - Strobe effect off, zone 3 + Strobe effect off, zone 3 Strobe effect, increasing speed, zone 3 Strobe effect sound mode, zone 3 Shutter - Strobe effect off + Strobe effect off Strobe effect, increasing speed, COB LED Strobe effect sound mode, COB LED Shutter - No function - Strobe LED ring constantly on + No function + Strobe LED ring constantly on Strobe effect, increasing speed, strobe LED ring Strobe effect sound mode, strobe LED ring diff --git a/resources/fixtures/Stairville/Stairville-DJ-Lase-GR-140-RGY-MKII.qxf b/resources/fixtures/Stairville/Stairville-DJ-Lase-GR-140-RGY-MKII.qxf index 36a61f2256..60195fd8f8 100644 --- a/resources/fixtures/Stairville/Stairville-DJ-Lase-GR-140-RGY-MKII.qxf +++ b/resources/fixtures/Stairville/Stairville-DJ-Lase-GR-140-RGY-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 + 4.12.3 GIT Hadley Denton Stairville @@ -57,8 +57,8 @@ Shutter - No function - Strobing (strobe effect), slow to fast + No function + Strobing (strobe effect), slow to fast Sound-controlled strobe effect @@ -75,11 +75,11 @@ Colour selection Strobing (strobe effect) - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-HL-x9-Quad-Color-Flood-9x8W.qxf b/resources/fixtures/Stairville/Stairville-HL-x9-Quad-Color-Flood-9x8W.qxf index ddb4e3d647..1205d0a6f3 100644 --- a/resources/fixtures/Stairville/Stairville-HL-x9-Quad-Color-Flood-9x8W.qxf +++ b/resources/fixtures/Stairville/Stairville-HL-x9-Quad-Color-Flood-9x8W.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.1 GIT + 4.12.3 GIT Janosch Frank Stairville @@ -34,8 +34,8 @@ Shutter - No strobe - Strobe (slow to fast), Channel 5 has to be 0-15 + No strobe + Strobe (slow to fast), Channel 5 has to be 0-15 Effect @@ -73,11 +73,11 @@ Extended Mode Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-JunoScan-MKII.qxf b/resources/fixtures/Stairville/Stairville-JunoScan-MKII.qxf index 7fd4debf76..e94339ec0d 100644 --- a/resources/fixtures/Stairville/Stairville-JunoScan-MKII.qxf +++ b/resources/fixtures/Stairville/Stairville-JunoScan-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Alexander Grözinger Stairville @@ -13,57 +13,57 @@ Colour - White - Yellow - Pink - Green - Red - Blue - Orange - Dark blue - Kelly-Green - Orangered - White + Yellow - Yellow + Pink - Pink + Green - Green + Red - Red + Blue - Blue + Orange - Orange + Dark blue - Dark Blue + Kelly-Green - Kelly-Green + Orangered - Orangered + White - Rainbow-Effect with positive direction of rotation, speed increasing - Rainbow-Effect with negative direction of rotation, speed increasing + White + Yellow + Pink + Green + Red + Blue + Orange + Dark blue + Kelly-Green + Orangered + White + Yellow + Yellow + Pink + Pink + Green + Green + Red + Red + Blue + Blue + Orange + Orange + Dark blue + Dark Blue + Kelly-Green + Kelly-Green + Orangered + Orangered + White + Rainbow-Effect with positive direction of rotation, speed increasing + Rainbow-Effect with negative direction of rotation, speed increasing Shutter - Closed (blackout) - Open - Strobe effect, speed increasing - Open + Closed (blackout) + Open + Strobe effect, speed increasing + Open Gobo - Open - Gobo 01 - Gobo 02 - Gobo 03 - Gobo 04 - Gobo 05 - Gobo 06 - Gobo 07 - Gobo 08 - Gobo 09 - Gobo 09 shake, speed increasing - Gobo 08 shake, speed increasing - Gobo 07 shake, speed increasing - Gobo 06 shake, speed increasing - Gobo 05 shake, speed increasing - Gobo 04 shake, speed increasing - Gobo 03 shake, speed increasing - Gobo 02 shake, speed increasing - Gobo 01 shake, speed increasing + Open + Gobo 01 + Gobo 02 + Gobo 03 + Gobo 04 + Gobo 05 + Gobo 06 + Gobo 07 + Gobo 08 + Gobo 09 + Gobo 09 shake, speed increasing + Gobo 08 shake, speed increasing + Gobo 07 shake, speed increasing + Gobo 06 shake, speed increasing + Gobo 05 shake, speed increasing + Gobo 04 shake, speed increasing + Gobo 03 shake, speed increasing + Gobo 02 shake, speed increasing + Gobo 01 shake, speed increasing Open Rainbow-Effect with positive direction of rotation, speed increasing Rainbow-Effect with negative direction of rotation, speed increasing @@ -79,12 +79,12 @@ No Blackout during rotation of gobo-wheel and pan/tilt No Blackout during rotation of color/gobo-wheel and pan/tilt Not used - Reset pan - Reset tilt - Reset color-wheel - Reset gobo-wheel + Reset pan + Reset tilt + Reset color-wheel + Reset gobo-wheel Not Used - Reset all + Reset all Not Used @@ -124,11 +124,11 @@ Settings Included Shows - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-LED-Blinder-2-COB-2x65W.qxf b/resources/fixtures/Stairville/Stairville-LED-Blinder-2-COB-2x65W.qxf index 532511f1d2..7c91308047 100644 --- a/resources/fixtures/Stairville/Stairville-LED-Blinder-2-COB-2x65W.qxf +++ b/resources/fixtures/Stairville/Stairville-LED-Blinder-2-COB-2x65W.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT chritoep Stairville @@ -14,13 +14,13 @@ Shutter - Open - Strobe effect, increasing frequency - Open + Open + Strobe effect, increasing frequency + Open Strobe effect, random frequency, LED 1 and 2 synchronous - Open + Open Strobe effect, random frequency, LED 1 and 2 asynchronous - Open + Open LED Dimmer @@ -38,11 +38,11 @@ LED 2 Dimmer Strobe - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-LED-Flood-Panel-7x3W.qxf b/resources/fixtures/Stairville/Stairville-LED-Flood-Panel-7x3W.qxf index 624d192872..569a8307ac 100644 --- a/resources/fixtures/Stairville/Stairville-LED-Flood-Panel-7x3W.qxf +++ b/resources/fixtures/Stairville/Stairville-LED-Flood-Panel-7x3W.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT boxr Stairville @@ -13,42 +13,42 @@ Intensity Red - Red: 255 - Red: 255, Green: 50 - Red: 255, Green: 150 - Red: 255, Green: 255 - Red: 200, Green: 255 - Red: 100, Green: 255 - Red: 40, Green: 255 - Green: 255 - Green: 255, Blue:50 - Green: 255, Blue: 150 - Green: 255, Blue: 255 - Green: 150, Blue: 255 - Green: 50, Blue: 255 - Blue: 255 - Red: 50, Blue: 255 - Red: 150, Blue: 255 - Red: 255, Blue: 255 - Red: 220, Blue: 255 - Red: 150, Green: 50, Blue: 100 - Red: 50, Green: 180, Blue: 220 - Red: 50, Green: 220, Blue: 100 - Red: 150, Green: 220 - Red: 150, Blue: 220 - Green: 180, Blue: 220 - Green: 220, Blue: 50 - Red: 220, Green 180, Blue: 220 - Red: 220, Green: 200, Blue: 100 - Red: 255, Green: 200, Blue: 150 - Red: 255, Green: 255, Blue: 255 + Red: 255 + Red: 255, Green: 50 + Red: 255, Green: 150 + Red: 255, Green: 255 + Red: 200, Green: 255 + Red: 100, Green: 255 + Red: 40, Green: 255 + Green: 255 + Green: 255, Blue:50 + Green: 255, Blue: 150 + Green: 255, Blue: 255 + Green: 150, Blue: 255 + Green: 50, Blue: 255 + Blue: 255 + Red: 50, Blue: 255 + Red: 150, Blue: 255 + Red: 255, Blue: 255 + Red: 220, Blue: 255 + Red: 150, Green: 50, Blue: 100 + Red: 50, Green: 180, Blue: 220 + Red: 50, Green: 220, Blue: 100 + Red: 150, Green: 220 + Red: 150, Blue: 220 + Green: 180, Blue: 220 + Green: 220, Blue: 50 + Red: 220, Green 180, Blue: 220 + Red: 220, Green: 200, Blue: 100 + Red: 255, Green: 200, Blue: 150 + Red: 255, Green: 255, Blue: 255 Shutter - No function - Strobe (slow to fast) + No function + Strobe (slow to fast) Effect @@ -60,9 +60,9 @@ Sets Pr05 (3-colour jumping change) Sets Pr06 (fantasy change 1) Sets Pr07 (fantasy change 2) - Sets Pr08 (red gradual change) - Sets Pr09 (green gradual change) - Sets Pr10 (blue gradual change) + Sets Pr08 (red gradual change) + Sets Pr09 (green gradual change) + Sets Pr10 (blue gradual change) Sets the sound active mode @@ -116,11 +116,11 @@ ID control Fader response - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-100-Beam-36x3-LED.qxf b/resources/fixtures/Stairville/Stairville-MH-100-Beam-36x3-LED.qxf index 6f8482f2a3..11a05491d9 100644 --- a/resources/fixtures/Stairville/Stairville-MH-100-Beam-36x3-LED.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-100-Beam-36x3-LED.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Antoni J. Canos Stairville @@ -19,60 +19,60 @@ Shutter - Off - Increasing speed - Random speed + Off + Increasing speed + Random speed Colour - All LEDs off - 3200 K - 3400 K - 4200 K - 4900 K - 5600 K - 6500 K - 7200 K - 8000 K - 8500 K - 10000 K + All LEDs off + 3200 K + 3400 K + 4200 K + 4900 K + 5600 K + 6500 K + 7200 K + 8000 K + 8500 K + 10000 K Colour - All LEDs off - Red (255,0,0) - Scarlet (255,51,0) + 10% white LEDs - Safety Orange (255,102,0) - Orange Peel (255,153,0) - Tangerine Yellow (255,204,0) + 20% white LEDs - Yellow (255,255,0) - Electric Lime (204,255,0) - Spring Bud (153,255,0) + 10% white LEDs - Bright Green (102,255,0) - Harlequin (51,255,0) + 20% white LEDs - Green (Lime) (0,255,0) - Free Speech Green (0,255,51) + 10% white LEDs - Spring Green (0,255,102) - Medium Spring Green (0,255,153) - Bright Turquoise (0,255,204) + 10% white LEDs - Cyan (0,255,255) - Deep Sky Blue (0,204,255) - Dodger Blue (0,153,255) + 10% white LEDs - Navy Blue (0,102,255) - Neon Blue (0,51,255) + 20% white LEDs - Blue (0,0,255) - Han Purple (Ultramarine) (51,0,255) - Electric Indigo (102,0,255) - Vivid Violet (153,0,255) + 20% white LEDs - Electric Purple (204,0,255) - Magenta (255,0,255) - Hot Magenta (255,0,204) - Hollywood Cerise (255,0,153) - Razzmatazz Rose (255,0,102) - Torch Red (255,0,51) + 20% white LEDs - Red (255,0,0) + 100% white LEDs - White (255,255,255) + 100% white LEDs + All LEDs off + Red (255,0,0) + Scarlet (255,51,0) + 10% white LEDs + Safety Orange (255,102,0) + Orange Peel (255,153,0) + Tangerine Yellow (255,204,0) + 20% white LEDs + Yellow (255,255,0) + Electric Lime (204,255,0) + Spring Bud (153,255,0) + 10% white LEDs + Bright Green (102,255,0) + Harlequin (51,255,0) + 20% white LEDs + Green (Lime) (0,255,0) + Free Speech Green (0,255,51) + 10% white LEDs + Spring Green (0,255,102) + Medium Spring Green (0,255,153) + Bright Turquoise (0,255,204) + 10% white LEDs + Cyan (0,255,255) + Deep Sky Blue (0,204,255) + Dodger Blue (0,153,255) + 10% white LEDs + Navy Blue (0,102,255) + Neon Blue (0,51,255) + 20% white LEDs + Blue (0,0,255) + Han Purple (Ultramarine) (51,0,255) + Electric Indigo (102,0,255) + Vivid Violet (153,0,255) + 20% white LEDs + Electric Purple (204,0,255) + Magenta (255,0,255) + Hot Magenta (255,0,204) + Hollywood Cerise (255,0,153) + Razzmatazz Rose (255,0,102) + Torch Red (255,0,51) + 20% white LEDs + Red (255,0,0) + 100% white LEDs + White (255,255,255) + 100% white LEDs Maintenance @@ -108,11 +108,11 @@ Strobe Special Functions - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-110-Wash.qxf b/resources/fixtures/Stairville/Stairville-MH-110-Wash.qxf index abbdacdfdf..98b6db402a 100644 --- a/resources/fixtures/Stairville/Stairville-MH-110-Wash.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-110-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.6 GIT + 4.12.3 GIT Thierry Rodolfo Stairville @@ -40,15 +40,15 @@ Shutter - No Function - Strobe, Increasing speed - Strobe, Random speed + No Function + Strobe, Increasing speed + Strobe, Random speed Maintenance - Without function + Without function Automatic sound - Reset + Reset Pan @@ -77,11 +77,11 @@ White Strobe effect - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-250-S.qxf b/resources/fixtures/Stairville/Stairville-MH-250-S.qxf index 5f2bb6800f..4f9b00039c 100644 --- a/resources/fixtures/Stairville/Stairville-MH-250-S.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-250-S.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.1 GIT + 4.12.3 GIT Freasy Stairville @@ -13,58 +13,58 @@ Shutter - Blackout - Open - Shutter speed slow to fast + Blackout + Open + Shutter speed slow to fast Shaking speed slow to fast - Open + Open Gobo Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 Gobo change from slow to fast Colour - White - Green - Magenta - Light blue - Yellow - Orange - Blue - UV purple - Light green - Pink - Rainbow effect slow to fast + White + Green + Magenta + Light blue + Yellow + Orange + Blue + UV purple + Light green + Pink + Rainbow effect slow to fast Colour - White - Green - Green + Magenta - Magenta - Magenta + Light blue - Light blue - Light blue + Yellow - Yellow - Yellow + Orange - Orange - Orange + Blue - Blue - Blue + UV purple - UV purple - UV purple + Light green - Light green - Pink - Rainbow effect slow to fast + White + Green + Green + Magenta + Magenta + Magenta + Light blue + Light blue + Light blue + Yellow + Yellow + Yellow + Orange + Orange + Orange + Blue + Blue + Blue + UV purple + UV purple + UV purple + Light green + Light green + Pink + Rainbow effect slow to fast Effect @@ -96,11 +96,11 @@ Dimmer Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-360.qxf b/resources/fixtures/Stairville/Stairville-MH-360.qxf index 8ee245039a..bc4e51595f 100644 --- a/resources/fixtures/Stairville/Stairville-MH-360.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-360.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.3.0 + 4.12.3 GIT Jannis Achstetter Stairville @@ -20,20 +20,20 @@ Enable BlackOut while Pan or Tilt move Disable BlackOut while Pan or Tilt move No function - Reset + Reset Stand-Alone Shutter - No function - Fast strobe -> Slow strobe - No function - Fast close -> Slow open - No function - Slow close -> Fast open - Strobe - No function + No function + Fast strobe -> Slow strobe + No function + Fast close -> Slow open + No function + Slow close -> Fast open + Strobe + No function @@ -64,11 +64,11 @@ Color/Chase/Fade Chase/Fade Speed - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-X20.qxf b/resources/fixtures/Stairville/Stairville-MH-X20.qxf index 588843d661..bbdfdb5cdb 100644 --- a/resources/fixtures/Stairville/Stairville-MH-X20.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-X20.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Kristo Stairville @@ -19,47 +19,47 @@ Colour - White - Yellow - Pink - Green - Red - Light Blue - Orange - Blue - Rainbow effect in positive roration (speed) - Rainbow effect in négative roration (speed) + White + Yellow + Pink + Green + Red + Light Blue + Orange + Blue + Rainbow effect in positive roration (speed) + Rainbow effect in négative roration (speed) Shutter - Closed (blackout) - Open - Strobe Light, increasing speed + Closed (blackout) + Open + Strobe Light, increasing speed Triple strobe Light, increasing speed - Strobe Light, increasing speed - Open + Strobe Light, increasing speed + Open Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 8 shake (speed) - Gobo 7 shake (speed) - Gobo 6 shake (speed) - Gobo 5 shake (speed) - Gobo 4 shake (speed) - Gobo 3 shake (speed) - Gobo 2 shake (speed) - Open - Rainbow effect in positive rotation direction (speed) - Rainbow effect in negative rotation direction (speed) + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 8 shake (speed) + Gobo 7 shake (speed) + Gobo 6 shake (speed) + Gobo 5 shake (speed) + Gobo 4 shake (speed) + Gobo 3 shake (speed) + Gobo 2 shake (speed) + Open + Rainbow effect in positive rotation direction (speed) + Rainbow effect in negative rotation direction (speed) Speed @@ -78,11 +78,11 @@ Blackout during pan, tilt, gobo or color wheel movement Blackout during Color or Gobo Blackout during movement - Reset pan - Reset tilt - Reset colour wheel - Reset gobo wheel - Reset all channels + Reset pan + Reset tilt + Reset colour wheel + Reset gobo wheel + Reset all channels Unused @@ -126,11 +126,11 @@ Gobo Wheel Gobo rotation - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-X25.qxf b/resources/fixtures/Stairville/Stairville-MH-X25.qxf index b8bb2144d4..65d44e2a13 100644 --- a/resources/fixtures/Stairville/Stairville-MH-X25.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-X25.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.4.1 + 4.12.3 GIT Veljko Stankov Stairville @@ -19,54 +19,54 @@ Colour - White - Yellow - Pink - Green - Violet - Blue - Kelly-green - Red - Dark blue - White+Yellow - Yellow+Pink - Pink+Green - Green+Violet - Violet+Blue - Blue+Kelly-green - Kelly-green+Red - Dark blue+White - Rainbow effect in positive roration (speed) - Rainbow effect in négative roration (speed) + White + Yellow + Pink + Green + Violet + Blue + Kelly-green + Red + Dark blue + White+Yellow + Yellow+Pink + Pink+Green + Green+Violet + Violet+Blue + Blue+Kelly-green + Kelly-green+Red + Dark blue+White + Rainbow effect in positive roration (speed) + Rainbow effect in négative roration (speed) Shutter - Closed (blackout) - Open - Strobe (speed) - Open + Closed (blackout) + Open + Strobe (speed) + Open Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 8 shake (speed) - Gobo 7 shake (speed) - Gobo 6 shake (speed) - Gobo 5 shake (speed) - Gobo 4 shake (speed) - Gobo 3 shake (speed) - Gobo 2 shake (speed) - Open + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 8 shake (speed) + Gobo 7 shake (speed) + Gobo 6 shake (speed) + Gobo 5 shake (speed) + Gobo 4 shake (speed) + Gobo 3 shake (speed) + Gobo 2 shake (speed) + Open Rainbow effect in positive rotation direction (speed) - Rainbow effect in négative rotation direction (speed) + Rainbow effect in negative rotation direction (speed) Speed @@ -86,14 +86,14 @@ No blackout during gobo wheel movement Unused Blackout during movement - Reset pan - Reset tilt - Reset colour wheel - Reset gobo wheel + Reset pan + Reset tilt + Reset colour wheel + Reset gobo wheel Reset gobo rotation - Reset prism + Reset prism Reset focus - Reset all channels + Reset all channels Unused @@ -138,11 +138,11 @@ Gobo Wheel Gobo rotation - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-X50.qxf b/resources/fixtures/Stairville/Stairville-MH-X50.qxf index 0b3f0ee1a5..c2b01ee1d6 100644 --- a/resources/fixtures/Stairville/Stairville-MH-X50.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-X50.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.4.0 beta2 + 4.12.3 GIT Guillaume Rousseau Stairville @@ -19,53 +19,53 @@ Colour - White - Yellow - Pink - Green - Peachblow - Blue - Kelly-green - Red - Dark blue - White+Yellow - Yellow+Pink - Pink+Green - Green+Peachblow - Peachblow+Blue - Blue+Kelly-green - Kelly-green+Red - Red+Dark blue - Dark blue+White - Rainbow effect in positive roration (speed) - Rainbow effect in négative roration (speed) + White + Yellow + Pink + Green + Peachblow + Blue + Kelly-green + Red + Dark blue + White+Yellow + Yellow+Pink + Pink+Green + Green+Peachblow + Peachblow+Blue + Blue+Kelly-green + Kelly-green+Red + Red+Dark blue + Dark blue+White + Rainbow effect in positive roration (speed) + Rainbow effect in négative roration (speed) Shutter - Closed (blackout) - Open - Strobe (speed) - Open + Closed (blackout) + Open + Strobe (speed) + Open Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 8 shake (speed) - Gobo 7 shake (speed) - Gobo 6 shake (speed) - Gobo 5 shake (speed) - Gobo 4 shake (speed) - Gobo 3 shake (speed) - Gobo 2 shake (speed) - Open + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 8 shake (speed) + Gobo 7 shake (speed) + Gobo 6 shake (speed) + Gobo 5 shake (speed) + Gobo 4 shake (speed) + Gobo 3 shake (speed) + Gobo 2 shake (speed) + Open Rainbow effect in positive rotation direction (speed) Rainbow effect in négative rotation direction (speed) @@ -87,14 +87,14 @@ No blackout during gobo wheel movement Unused Blackout during movement - Reset pan - Reset tilt - Reset colour wheel - Reset gobo wheel + Reset pan + Reset tilt + Reset colour wheel + Reset gobo wheel Reset gobo rotation - Reset prism + Reset prism Reset focus - Reset all channels + Reset all channels Unused @@ -150,11 +150,11 @@ Prism Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-X60th-LED-Spot.qxf b/resources/fixtures/Stairville/Stairville-MH-X60th-LED-Spot.qxf index 235ff87a42..e283d2755a 100644 --- a/resources/fixtures/Stairville/Stairville-MH-X60th-LED-Spot.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-X60th-LED-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Jasper Zevering Stairville @@ -31,55 +31,55 @@ Colour - White - Yellow - Pink - Green - Peachblow - Blue - Kelly-green - Red - Dark blue - White + yellow - Yellow + pink - Pink + green - Green + peachblow - Peachblow + blue - Blue + kelly-green - Kelly-green + red - Red + dark blue - Dark blue + white - Rainbow effect in positive sense of direction, increasing speed - Rainbow effect in negative sense direction, increasing speed + White + Yellow + Pink + Green + Peachblow + Blue + Kelly-green + Red + Dark blue + White + yellow + Yellow + pink + Pink + green + Green + peachblow + Peachblow + blue + Blue + kelly-green + Kelly-green + red + Red + dark blue + Dark blue + white + Rainbow effect in positive sense of direction, increasing speed + Rainbow effect in negative sense direction, increasing speed Shutter - Closed (black out) - Open - Strobe light, increasing speed + Closed (black out) + Open + Strobe light, increasing speed Triple strobe, increasing speed - Random strobe light, incresing speed - Open + Random strobe light, incresing speed + Open Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 8 shake, increasing speed - Gobo 7 shake, increasing speed - Gobo 6 shake, increasing speed - Gobo 5 shake, increasing speed - Gobo 4 shake, increasing speed - Gobo 3 shake, increasing speed - Gobo 2 shake, increasing speed - Open + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 8 shake, increasing speed + Gobo 7 shake, increasing speed + Gobo 6 shake, increasing speed + Gobo 5 shake, increasing speed + Gobo 4 shake, increasing speed + Gobo 3 shake, increasing speed + Gobo 2 shake, increasing speed + Open Rotation of the gobo wheel counterclockwise, increasing speed Rotation of the gobo wheel clockwise, increasing speed @@ -100,14 +100,14 @@ No blackout during pan or tilt movement and gobo wheel movement No blackout during pan or tilt movement, colour wheel movement and Gobo wheel movement Unused - Pan reset - Tilt reset - Colour wheel reset - Gobo wheel reset + Pan reset + Tilt reset + Colour wheel reset + Gobo wheel reset Gobo rotation reset - Prism reset + Prism reset Sharpness reset - All channels reset + All channels reset Unused @@ -168,11 +168,11 @@ Prism Sharpness - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-x200-Pro-Spot.qxf b/resources/fixtures/Stairville/Stairville-MH-x200-Pro-Spot.qxf index db7aa9e1fb..428aee2cdd 100644 --- a/resources/fixtures/Stairville/Stairville-MH-x200-Pro-Spot.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-x200-Pro-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.2 GIT + 4.12.3 GIT Mirek Škop Stairville @@ -16,54 +16,54 @@ Colour - White - Blue - Yellow - Pink - Green - Red - Light blue - Orange Red - White - Stepwise transition from white to blue - Stepwise transition from blue to yellow - Stepwise transition from yellow to pink - Stepwise transition from pink to green - Stepwise transition from green to red - Stepwise transition from red to light blue - Stepwise transition from light blue to orange red + White + Blue + Yellow + Pink + Green + Red + Light blue + Orange Red + White + Stepwise transition from white to blue + Stepwise transition from blue to yellow + Stepwise transition from yellow to pink + Stepwise transition from pink to green + Stepwise transition from green to red + Stepwise transition from red to light blue + Stepwise transition from light blue to orange red Rotation clockwise, increasing speed Rotation counter-clockwise, increasing speed Shutter - Closed - Open - Strobe light, increasing speed - Open + Closed + Open + Strobe light, increasing speed + Open Triple strobe, increasing speed - Open + Open Irregular strobe, increasing speed - Open + Open Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 2 shake, increasing speed - Gobo 3 shake, increasing speed - Gobo 4 shake, increasing speed - Gobo 5 shake, increasing speed - Gobo 6 shake, increasing speed - Gobo 7 shake, increasing speed - Gobo 8 shake, increasing speed + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 2 shake, increasing speed + Gobo 3 shake, increasing speed + Gobo 4 shake, increasing speed + Gobo 5 shake, increasing speed + Gobo 6 shake, increasing speed + Gobo 7 shake, increasing speed + Gobo 8 shake, increasing speed Rotation clockwise, increasing speed Rotation counter-clockwise, increasing speed @@ -76,24 +76,24 @@ Gobo - Open - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Open - Gobo 2 shake, increasing speed - Gobo 3 shake, increasing speed - Gobo 4 shake, increasing speed - Gobo 5 shake, increasing speed - Gobo 6 shake, increasing speed - Gobo 7 shake, increasing speed - Gobo 8 shake, increasing speed - Gobo 9 shake, increasing speed + Open + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Open + Gobo 2 shake, increasing speed + Gobo 3 shake, increasing speed + Gobo 4 shake, increasing speed + Gobo 5 shake, increasing speed + Gobo 6 shake, increasing speed + Gobo 7 shake, increasing speed + Gobo 8 shake, increasing speed + Gobo 9 shake, increasing speed Rotation clockwise, increasing speed Rotation counter-clockwise, increasing speed @@ -125,14 +125,14 @@ No blackout during colour wheel or gobo wheel movement and during rotation and inclination Reset rotation Reset inclination - Reset colour wheel + Reset colour wheel Reset aperture - Reset gobo 1 + Reset gobo 1 Reset gobo rotation Reset gobo 2 Reset focus - Reset prism - Reset channels + Reset prism + Reset channels Free Random programme sequence Sound-control @@ -197,11 +197,11 @@ Functions Effects - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-x30-LED-Beam.qxf b/resources/fixtures/Stairville/Stairville-MH-x30-LED-Beam.qxf index 2e5696ce61..fdfe910f70 100644 --- a/resources/fixtures/Stairville/Stairville-MH-x30-LED-Beam.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-x30-LED-Beam.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Andres Robles Stairville @@ -17,65 +17,65 @@ Shutter - Strobe effect off - Random Strobe effect, increasing speed - Strobe effect, decreasing speed + Strobe effect off + Random Strobe effect, increasing speed + Strobe effect, decreasing speed Colour - White - Red - Green - Light blue - Purple - Yellow - Blue - Orange - White + red - Red + green - Green + light blue - Light blue + purple - Purple + yellow - Yellow + blue - Blue + orange - Orange + white - Rainbow effect (gobo wheel rotation) in positive rotation direction, decreasing speed - Rainbow effect (gobo wheel rotation) in negative rotation direction, increasing speed + White + Red + Green + Light blue + Purple + Yellow + Blue + Orange + White + red + Red + green + Green + light blue + Light blue + purple + Purple + yellow + Yellow + blue + Blue + orange + Orange + white + Rainbow effect (gobo wheel rotation) in positive rotation direction, decreasing speed + Rainbow effect (gobo wheel rotation) in negative rotation direction, increasing speed Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 14 shake, increasing speed - Gobo 13 shake, increasing speed - Gobo 12 shake, increasing speed - Gobo 11 shake, increasing speed - Gobo 10 shake, increasing speed - Gobo 9 shake, increasing speed - Gobo 8 shake, increasing speed - Gobo 7 shake, increasing speed - Gobo 6 shake, increasing speed - Gobo 5 shake, increasing speed - Gobo 4 shake, increasing speed - Gobo 3 shake, increasing speed - Gobo 2 shake, increasing speed - Gobo 1 shake, increasing speed - Open - Rainbow effect (gobo wheel rotation) in positive rotation direction, decreasing speed - Rainbow effect (gobo wheel rotation) in negative rotation direction, increasing speed + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 14 shake, increasing speed + Gobo 13 shake, increasing speed + Gobo 12 shake, increasing speed + Gobo 11 shake, increasing speed + Gobo 10 shake, increasing speed + Gobo 9 shake, increasing speed + Gobo 8 shake, increasing speed + Gobo 7 shake, increasing speed + Gobo 6 shake, increasing speed + Gobo 5 shake, increasing speed + Gobo 4 shake, increasing speed + Gobo 3 shake, increasing speed + Gobo 2 shake, increasing speed + Gobo 1 shake, increasing speed + Open + Rainbow effect (gobo wheel rotation) in positive rotation direction, decreasing speed + Rainbow effect (gobo wheel rotation) in negative rotation direction, increasing speed Maintenance @@ -104,11 +104,11 @@ Colour wheel Gobo wheel - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-MH-z1915.qxf b/resources/fixtures/Stairville/Stairville-MH-z1915.qxf index a93037ed87..32018c968e 100644 --- a/resources/fixtures/Stairville/Stairville-MH-z1915.qxf +++ b/resources/fixtures/Stairville/Stairville-MH-z1915.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Thorben / Fredje Stairville @@ -173,28 +173,28 @@ Shutter - Closed - Open - Strobe Effect 1, fast to slow - Open + Closed + Open + Strobe Effect 1, fast to slow + Open Strobe Effect 2, fast on, slow off, from fast to slow follow-ups - Open + Open Strobe Effect 3, slow on, fast off, from fast to slow follow-ups - Open - Strobe Effect 4, random, from fast to slow follow-ups - Open + Open + Strobe Effect 4, random, from fast to slow follow-ups + Open Strobe Effect 5, random, fast on, slow off, from fast to slow follow-ups - Open + Open Strobe Effect 6, random, slow on, fast off, from fast to slow follow-ups - Open - Strobe Effect 7, pulse series, increasing time between pulses - Open - Strobe Effect 8, pulse series with random frequency, from fast to slow follow-ups - Open - Strobe Effect 9, single pulses, from fast to slow follow-ups - Open + Open + Strobe Effect 7, pulse series, increasing time between pulses + Open + Strobe Effect 8, pulse series with random frequency, from fast to slow follow-ups + Open + Strobe Effect 9, single pulses, from fast to slow follow-ups + Open Strobe Effect 10, inverted pulse series, increasing time between pulses - Open + Open @@ -202,11 +202,11 @@ No function Stop of current movement No function - Pan reset - Tilt reset - Zoom reset + Pan reset + Tilt reset + Zoom reset No function - Reset of all functions + Reset of all functions No function Inversion of Pan and tilt Inversion of Pan diff --git a/resources/fixtures/Stairville/Stairville-PAR64-CX-3-RGBW.qxf b/resources/fixtures/Stairville/Stairville-PAR64-CX-3-RGBW.qxf index 19180866ee..d01d8cb540 100644 --- a/resources/fixtures/Stairville/Stairville-PAR64-CX-3-RGBW.qxf +++ b/resources/fixtures/Stairville/Stairville-PAR64-CX-3-RGBW.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.5.1 + 4.12.3 GIT Lars Kildholt Stairville @@ -20,8 +20,8 @@ Shutter - No Effect - Strobe Speed + No Effect + Strobe Speed Effect @@ -66,11 +66,11 @@ White Strobe - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-SC-100.qxf b/resources/fixtures/Stairville/Stairville-SC-100.qxf index d1c167db02..669886a769 100644 --- a/resources/fixtures/Stairville/Stairville-SC-100.qxf +++ b/resources/fixtures/Stairville/Stairville-SC-100.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.1 + 4.12.3 GIT Lars Kildholt Stairville @@ -19,8 +19,8 @@ Shutter - No Strobe - Strobe Speed + No Strobe + Strobe Speed Stand Alone @@ -29,11 +29,11 @@ Patterne/Chase Strobe - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-SC-X50-MKII.qxf b/resources/fixtures/Stairville/Stairville-SC-X50-MKII.qxf index e833f6707c..def10dc13f 100644 --- a/resources/fixtures/Stairville/Stairville-SC-X50-MKII.qxf +++ b/resources/fixtures/Stairville/Stairville-SC-X50-MKII.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.7.5 GIT + 4.12.3 GIT Johan Förberg Stairville @@ -13,55 +13,55 @@ Colour - White - Yellow - Pink - Green - Red - Blue - Kelly green - Salmon orange - Dark blue - White + Yellow - Yellow + Pink - Pink + Green - Green + Red - Red + Blue - Blue + Kelly green - Kelly green + Salmon orange - Salmon orange + Dark blue - Dark blue + White - Rainbow effect, positive rotation, increasing speed - Rainbow effect, negative rotation, increasing speed + White + Yellow + Pink + Green + Red + Blue + Kelly green + Salmon orange + Dark blue + White + Yellow + Yellow + Pink + Pink + Green + Green + Red + Red + Blue + Blue + Kelly green + Kelly green + Salmon orange + Salmon orange + Dark blue + Dark blue + White + Rainbow effect, positive rotation, increasing speed + Rainbow effect, negative rotation, increasing speed Shutter - Closed - Open - Strobe effect, increasing speed - Open + Closed + Open + Strobe effect, increasing speed + Open Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 7 shake, inc. speed - Gobo 6 shake, inc. speed - Gobo 5 shake, inc. speed - Gobo 4 shake, inc. speed - Gobo 3 shake, inc. speed - Gobo 2 shake, inc. speed - Gobo 1 shake, inc. speed - Open - Rainbow effect, positive rotation, inc. speed - Rainbow effect, negative rotation, inc. speed + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 7 shake, inc. speed + Gobo 6 shake, inc. speed + Gobo 5 shake, inc. speed + Gobo 4 shake, inc. speed + Gobo 3 shake, inc. speed + Gobo 2 shake, inc. speed + Gobo 1 shake, inc. speed + Open + Rainbow effect, positive rotation, inc. speed + Rainbow effect, negative rotation, inc. speed Speed @@ -88,14 +88,14 @@ No blackout during pan, tilt, or gobo wheel movement No blackout during pan, tilt, colour or gobo wheel movement Reserved - Reset pan angle - Reset tilt angle - Reset colour wheel - Reset gobo wheel + Reset pan angle + Reset tilt angle + Reset colour wheel + Reset gobo wheel Reset gobo rotation - Reset prism + Reset prism Reset focus - Reset all channels + Reset all channels Reserved @@ -141,11 +141,11 @@ Prism Focus - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-SC250H.qxf b/resources/fixtures/Stairville/Stairville-SC250H.qxf index c6c0aab613..da125b35c7 100644 --- a/resources/fixtures/Stairville/Stairville-SC250H.qxf +++ b/resources/fixtures/Stairville/Stairville-SC250H.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.1.0 + Q Light Controller Plus + 4.12.3 GIT david Stairville @@ -13,9 +13,9 @@ Shutter - Shutter on - Shutter off - Strobe + Shutter on + Shutter off + Strobe Shake @@ -69,11 +69,11 @@ No function Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-SF-1500.qxf b/resources/fixtures/Stairville/Stairville-SF-1500.qxf index 511dfc0785..f4db78cfcc 100644 --- a/resources/fixtures/Stairville/Stairville-SF-1500.qxf +++ b/resources/fixtures/Stairville/Stairville-SF-1500.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.4.1 + 4.12.3 GIT Veljko Stankov Stairville @@ -11,7 +11,7 @@ Smoke Shutter - Off + Off Continuos CH2 Timer-Controlled CH2,3,4 Continuos to MAX @@ -53,11 +53,11 @@ Fog Duration Time interval - - - - - - - + + + + + + + diff --git a/resources/fixtures/Stairville/Stairville-TRI-LED-Bundle-Complete.qxf b/resources/fixtures/Stairville/Stairville-TRI-LED-Bundle-Complete.qxf index fa20ac072c..658a54d221 100644 --- a/resources/fixtures/Stairville/Stairville-TRI-LED-Bundle-Complete.qxf +++ b/resources/fixtures/Stairville/Stairville-TRI-LED-Bundle-Complete.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Lars Kildholt Stairville @@ -18,8 +18,8 @@ Shutter - No effect - Strobe (inc speed) + No effect + Strobe (inc speed) diff --git a/resources/fixtures/Stairville/Stairville-Wild-Wash-132-RGB-LED.qxf b/resources/fixtures/Stairville/Stairville-Wild-Wash-132-RGB-LED.qxf index bb5488c097..ad9751fe67 100644 --- a/resources/fixtures/Stairville/Stairville-Wild-Wash-132-RGB-LED.qxf +++ b/resources/fixtures/Stairville/Stairville-Wild-Wash-132-RGB-LED.qxf @@ -12,15 +12,15 @@ Shutter - LEDs on, brightness controlled by ch1 - Blackout - Random impulses, increasing speed - Randomly increasing brightness, increasing speed - Randomly decreasing brightness, increasing speed - Random strobe effect, increasing speed + LEDs on, brightness controlled by ch1 + Blackout + Random impulses, increasing speed + Randomly increasing brightness, increasing speed + Randomly decreasing brightness, increasing speed + Random strobe effect, increasing speed Interrupt effect, 5s to 1s - Strobe effect, speed increasing from approximately 0Hz to 30Hz - LEDs on, brightness controlled by ch1 + Strobe effect, speed increasing from approximately 0Hz to 30Hz + LEDs on, brightness controlled by ch1 @@ -54,10 +54,10 @@ Shutter - LEDs on - Blackout - Strobe effect, speed increasing from approximately 0Hz to 30Hz - LEDs On + LEDs on + Blackout + Strobe effect, speed increasing from approximately 0Hz to 30Hz + LEDs On Shutter diff --git a/resources/fixtures/Stairville/Stairville-Z100M.qxf b/resources/fixtures/Stairville/Stairville-Z100M.qxf index c8f26d8335..b101e09ab8 100644 --- a/resources/fixtures/Stairville/Stairville-Z100M.qxf +++ b/resources/fixtures/Stairville/Stairville-Z100M.qxf @@ -12,10 +12,10 @@ Shutter - Strobe Effect - Stroboscope Effect, Speed increasing (1 Hz ... 25 Hz) - Stroboscope Effect, Speed increasing (1 Hz) - Stroboscope Effect, random speed + Strobe Effect + Stroboscope Effect, Speed increasing (1 Hz ... 25 Hz) + Stroboscope Effect, Speed increasing (1 Hz) + Stroboscope Effect, random speed diff --git a/resources/fixtures/Stairville/Stairville-novaWash-Quad-LED.qxf b/resources/fixtures/Stairville/Stairville-novaWash-Quad-LED.qxf index a33762553d..fa90db38f4 100644 --- a/resources/fixtures/Stairville/Stairville-novaWash-Quad-LED.qxf +++ b/resources/fixtures/Stairville/Stairville-novaWash-Quad-LED.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Luke Bonett Stairville @@ -13,15 +13,15 @@ Shutter - Open - Strobe Increasing Speed - Open - Slow Open to Fast Close - Open - Slow Close to Fast Open - Open - Random Strobe - Open + Open + Strobe Increasing Speed + Open + Slow Open to Fast Close + Open + Slow Close to Fast Open + Open + Random Strobe + Open @@ -101,11 +101,11 @@ Colour Fade Speed - - - - - - - - + + + + + + + + diff --git a/resources/fixtures/Star-Lights/Star-Lights-mini-Wash-Moving-Head.qxf b/resources/fixtures/Star-Lights/Star-Lights-mini-Wash-Moving-Head.qxf index e7275861dc..37dd6c1461 100644 --- a/resources/fixtures/Star-Lights/Star-Lights-mini-Wash-Moving-Head.qxf +++ b/resources/fixtures/Star-Lights/Star-Lights-mini-Wash-Moving-Head.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.7.2 GIT + 4.12.3 GIT Tolmino Star-Lights @@ -16,20 +16,20 @@ Shutter - Off - Flash from Fast to Slow - Off + Off + Flash from Fast to Slow + Off Semi On - On + On Effect - R. G. B. color mixing + R. G. B. color mixing Effect - Speed Adjustable from Fast to Slow + Speed Adjustable from Fast to Slow @@ -54,11 +54,11 @@ Blue Reset Channel - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-Axis-250.qxf b/resources/fixtures/Starway/Starway-Axis-250.qxf index 02070cd713..db8ae35144 100644 --- a/resources/fixtures/Starway/Starway-Axis-250.qxf +++ b/resources/fixtures/Starway/Starway-Axis-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Thierry Rodolfo Starway @@ -24,37 +24,37 @@ Colour - White - Light Blue - Pink - Green - Yellow - Magenta - Light Yellow - Dark Green - Dark Blue - Red - Loop Color Fast>Slow + White + Light Blue + Pink + Green + Yellow + Magenta + Light Yellow + Dark Green + Dark Blue + Red + Loop Color Fast>Slow No Rotation - Loop color Slow<Fast + Loop color Slow<Fast Gobo - Open - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 1 Shake - Gobo 2 Shake - Gobo 3 Shake - Gobo 4 Shake - Gobo 5 Shake - Gobo 6 Shake - Gobo 7 Shake + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 1 Shake + Gobo 2 Shake + Gobo 3 Shake + Gobo 4 Shake + Gobo 5 Shake + Gobo 6 Shake + Gobo 7 Shake Gobo @@ -65,22 +65,22 @@ Shutter - Close - Intensity - Strobe Min>Max - Open - Pulse - Open + Close + Intensity + Strobe Min>Max + Open + Pulse + Open Strobe Flash - Open + Open Maintenance Color Change Normal Color Change All position - Lampe On - Lampe Off - Reset + Lampe On + Lampe Off + Reset Macros 1 Macros 2 Macros 3 @@ -102,11 +102,11 @@ Shutter Strobe Lamp / Reset / Macros - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-EventKolor.qxf b/resources/fixtures/Starway/Starway-EventKolor.qxf index 535fa24381..6fd488c6cd 100644 --- a/resources/fixtures/Starway/Starway-EventKolor.qxf +++ b/resources/fixtures/Starway/Starway-EventKolor.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.5 GIT + 4.12.3 GIT Thierry Rodolfo Starway @@ -39,8 +39,8 @@ Shutter - No function - Strobe Min < Max + No function + Strobe Min < Max Effect @@ -55,15 +55,15 @@ Auto 8 Auto 9 Auto 10 - PR. 1 - PR. 2 - PR. 3 - PR. 4 - PR. 5 - PR. 6 - PR. 7 - PR. 8 - PR. 9 + PR. 1 + PR. 2 + PR. 3 + PR. 4 + PR. 5 + PR. 6 + PR. 7 + PR. 8 + PR. 9 PR. 10 @@ -151,11 +151,11 @@ 5 - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-MaxSpot500.qxf b/resources/fixtures/Starway/Starway-MaxSpot500.qxf new file mode 100644 index 0000000000..396089128a --- /dev/null +++ b/resources/fixtures/Starway/Starway-MaxSpot500.qxf @@ -0,0 +1,150 @@ + + + + + Q Light Controller Plus + 4.12.4 + David Thomas + + Starway + MaxSpot 500 + Moving Head + + + + + + + Colour + White + Red + Yellow + Magenta + Green + Orange + Blue + Light blue + Light Green + Colour rotation + + + Gobo + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Shake Gobo 9 + Shake Gogo 8 + Shake Gogo 7 + Shake Gogo 6 + Shake Gogo 5 + Shake Gogo 4 + Shake Gogo 3 + Shake Gogo 2 + Shake Gogo 1 + Gobo wheel rotation + + + Gobo + Open + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Shake Gobo 7 + Shake Gobo 6 + Shake Gobo 5 + Shake Gobo 4 + Shake Gobo 3 + Shake Gobo 2 + Shake Gobo 1 + Gobo wheel rotation + + + Gobo + No function + Gobo indexed + Clockwise rotation, slow to fast + CounterClockwise rotation, slow to fast + + + Prism + Off + Clockwise rotation from slow to fast + On + CounterClockwise rotation from slow to fast + + + + + Shutter + Closed + Opened + Strobe - Slow to fast + Opened + Pulse strobe from slow to fast + Opened + Random strobe from slow to fast + Opened + + + Maintenance + No function + Enable - Moving on blackout (3sec) + Disable - Moving on blackout (3sec) + Auto 1 (3sec) + Auto 2 (3sec) + Sound 1 (3sec) + Sound 2 (3sec) + User memories + Test (3 sec) + no function + Reset + No function + + + Pan + Pan Fine + Tilt + Tilt Fine + Speed Pan/Tilt + Colour + Gobo + Rotating Gobo + Gobos Rotation + Prism + Focus + Dimmer + Shutter + Control + + + Pan + Tilt + Colour + Gobo + Rotating Gobo + Gobos Rotation + Prism + Focus + Dimmer + Shutter + Control + + + + + + + + + diff --git a/resources/fixtures/Starway/Starway-MiniKolor.qxf b/resources/fixtures/Starway/Starway-MiniKolor.qxf index 8dddff7d6c..d797f0889c 100644 --- a/resources/fixtures/Starway/Starway-MiniKolor.qxf +++ b/resources/fixtures/Starway/Starway-MiniKolor.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.4 + 4.12.3 GIT Thierry Rodolfo Starway @@ -36,8 +36,8 @@ Shutter - No function - Strobe Min < Max + No function + Strobe Min < Max Effect @@ -115,11 +115,11 @@ Green Blue - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-Mode-B.qxf b/resources/fixtures/Starway/Starway-Mode-B.qxf index df7f844e5b..bae59ea079 100644 --- a/resources/fixtures/Starway/Starway-Mode-B.qxf +++ b/resources/fixtures/Starway/Starway-Mode-B.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.5 + 4.12.3 GIT Thierry Rodolfo Starway @@ -11,61 +11,61 @@ Moving Head Colour - White - White + Red - Red - Red + Orange - Orange - Orange + Cyan - Cyan - Cyan + Green - Green - Green + Light Green - Light Green - Light Green + Lavender - Lavender - Lavender + Pink - Pink - Pink + Yellow - Yellow - Yellow + Magenta - Magenta - Magenta + Cyan - Cyan - Cyan + CTO 260 - CTO 260 - CTO 260 + CTO 190 - CTO 190 - CTO 190 + CTB 8000 - CTB 8000 - CTB 8000 + Blue + White + White + Red + Red + Red + Orange + Orange + Orange + Cyan + Cyan + Cyan + Green + Green + Green + Light Green + Light Green + Light Green + Lavender + Lavender + Lavender + Pink + Pink + Pink + Yellow + Yellow + Yellow + Magenta + Magenta + Magenta + Cyan + Cyan + Cyan + CTO 260 + CTO 260 + CTO 260 + CTO 190 + CTO 190 + CTO 190 + CTB 8000 + CTB 8000 + CTB 8000 + Blue Rotation (Fast 160 rpm To Slow 0.2 rpm) Rotation (Slow 0.2 rpm to Fast 160 rpm) Shutter - Open - Stobe slow to fast - Open + Open + Stobe slow to fast + Open Gobo - White - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 + White + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 Rotation (Fast to slow) Rotation (Slow to fast) @@ -101,14 +101,14 @@ Maintenance Nothing - Reset + Reset Maintenance Reserved - Lamp OFF + Lamp OFF Reserved - Lamp ON + Lamp ON Reserved @@ -143,11 +143,11 @@ Tilt Lamp Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-Servo-Beam-5R.qxf b/resources/fixtures/Starway/Starway-Servo-Beam-5R.qxf index 3e4535b94f..aa195e0a09 100644 --- a/resources/fixtures/Starway/Starway-Servo-Beam-5R.qxf +++ b/resources/fixtures/Starway/Starway-Servo-Beam-5R.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 GIT + 4.12.3 GIT DJ Rodolfo Starway @@ -11,90 +11,90 @@ Moving Head Colour - White - White + Red - Red - Red + Orange - Orange - Orange + Cyan - Cyan - Cyan + Green - Green - Green + Light Green - Light Green - Light Green + Lavender - Lavender - Lavender + Pink - Pink - Pink + Yellow - Yellow - Yellow + Magenta - Magenta - Magenta + Cyan - Cyan - Cyan + CTO 260 - CTO 260 - CTO 260 + CTO 190 - CTO 190 - CTO 190 + CTB 8000 - CTB 8000 - CTB 8000 + Blue - Blue - Blue + White + White + White + Red + Red + Red + Orange + Orange + Orange + Cyan + Cyan + Cyan + Green + Green + Green + Light Green + Light Green + Light Green + Lavender + Lavender + Lavender + Pink + Pink + Pink + Yellow + Yellow + Yellow + Magenta + Magenta + Magenta + Cyan + Cyan + Cyan + CTO 260 + CTO 260 + CTO 260 + CTO 190 + CTO 190 + CTO 190 + CTB 8000 + CTB 8000 + CTB 8000 + Blue + Blue + Blue + White Rotation (Fast 160 rpm To Slow 0.2 rpm) Rotation (Slow 0.2 rpm to Fast 160 rpm) Shutter - Closed - Strobe (slow 1 flash/sec to fast 12 flashes/sec) - Open - Pulsation (Slow 30rpm to fast 360rpm) - Open - Random slow strobe - Random medium strobe - Random fast strobe - Open + Closed + Strobe (slow 1 flash/sec to fast 12 flashes/sec) + Open + Pulsation (Slow 30rpm to fast 360rpm) + Open + Random slow strobe + Random medium strobe + Random fast strobe + Open Gobo - White - Gobo 1 - Gobo 2 - Gobo 3 - Gobo 4 - Gobo 5 - Gobo 6 - Gobo 7 - Gobo 8 - Gobo 9 - Gobo 10 - Gobo 11 - Gobo 12 - Gobo 13 - Gobo 14 - Gobo 15 - Gobo 16 - Gobo 17 + White + Gobo 1 + Gobo 2 + Gobo 3 + Gobo 4 + Gobo 5 + Gobo 6 + Gobo 7 + Gobo 8 + Gobo 9 + Gobo 10 + Gobo 11 + Gobo 12 + Gobo 13 + Gobo 14 + Gobo 15 + Gobo 16 + Gobo 17 Rotation (Fast 60rpm to slow 5rpm) Open Rotation (Slow 5rpm to fast 60rpm) - Gobo 1 Shake (Slow to Fast) - Gobo 2 Shake (Slow to Fast) - Gobo 3 Shake (Slow to Fast) - Gobo 4 Shake (Slow to Fast) - Gobo 5 Shake (Slow to Fast) - Gobo 6 Shake (Slow to Fast) - Gobo 7 Shake (Slow to Fast) - Gobo 8 Shake (Slow to Fast) - Gobo 9 Shake (Slow to Fast) - Gobo 10 Shake (Slow to Fast) - Gobo 11 Shake (Slow to Fast) - Gobo 12 Shake (Slow to Fast) - Gobo 13 Shake (Slow to Fast) - Gobo 14 Shake (Slow to Fast) - Gobo 15 Shake (Slow to Fast) + Gobo 1 Shake (Slow to Fast) + Gobo 2 Shake (Slow to Fast) + Gobo 3 Shake (Slow to Fast) + Gobo 4 Shake (Slow to Fast) + Gobo 5 Shake (Slow to Fast) + Gobo 6 Shake (Slow to Fast) + Gobo 7 Shake (Slow to Fast) + Gobo 8 Shake (Slow to Fast) + Gobo 9 Shake (Slow to Fast) + Gobo 10 Shake (Slow to Fast) + Gobo 11 Shake (Slow to Fast) + Gobo 12 Shake (Slow to Fast) + Gobo 13 Shake (Slow to Fast) + Gobo 14 Shake (Slow to Fast) + Gobo 15 Shake (Slow to Fast) Prism @@ -139,15 +139,15 @@ Maintenance Reserved - Reset + Reset Reserved Maintenance Reserved - Lamp OFF + Lamp OFF Reserved - Lamp ON + Lamp ON Reserved @@ -205,11 +205,11 @@ Focus Time Gobo Time - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-Servo-Color-4k.qxf b/resources/fixtures/Starway/Starway-Servo-Color-4k.qxf index 6937c33bb1..091c15b94f 100644 --- a/resources/fixtures/Starway/Starway-Servo-Color-4k.qxf +++ b/resources/fixtures/Starway/Starway-Servo-Color-4k.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 GIT + 4.12.3 GIT miktallerra Starway @@ -60,9 +60,9 @@ For future function For future function Idle - Pan reset - Tilt reset - Zoom reset + Pan reset + Tilt reset + Zoom reset System reset Idle Not used diff --git a/resources/fixtures/Starway/Starway-Servocolor-600.qxf b/resources/fixtures/Starway/Starway-Servocolor-600.qxf index c7cd04ef99..dd8bb11257 100644 --- a/resources/fixtures/Starway/Starway-Servocolor-600.qxf +++ b/resources/fixtures/Starway/Starway-Servocolor-600.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 GIT + 4.12.3 GIT Thierry Rodolfo Starway @@ -32,7 +32,7 @@ Test Custom Sound1 - Reset + Reset No Function Dim 1 Dim 2 @@ -111,11 +111,11 @@ Zoom Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Starway/Starway-Servocolor-800.qxf b/resources/fixtures/Starway/Starway-Servocolor-800.qxf index 1f3855c9e2..96c2d0d0fc 100644 --- a/resources/fixtures/Starway/Starway-Servocolor-800.qxf +++ b/resources/fixtures/Starway/Starway-Servocolor-800.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.2 GIT + 4.12.3 GIT Thierry Rodolfo Starway @@ -28,7 +28,7 @@ Test Custom Sound1 - Reset + Reset No Function Dim 1 Dim 2 diff --git a/resources/fixtures/Starway/Starway-UrbanKolor.qxf b/resources/fixtures/Starway/Starway-UrbanKolor.qxf index bb5bbcea99..16a5b8c923 100644 --- a/resources/fixtures/Starway/Starway-UrbanKolor.qxf +++ b/resources/fixtures/Starway/Starway-UrbanKolor.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Thierry Rodolfo Starway @@ -11,19 +11,19 @@ Color Changer Shutter - Closed - Open - Strobe min to max + Closed + Open + Strobe min to max Open Pulse Slow Open Pulse Med Open Pulse Fast Close Pulse Slow Close Pulse Med Close Pulse Fast - Random Strobe Slow - Random Strobe Med - Random Strobe Fast - Open + Random Strobe Slow + Random Strobe Med + Random Strobe Fast + Open @@ -43,7 +43,7 @@ Rainbow Slow Rainbow Med Rainbow Fast - Rainbow very slow + Rainbow very slow Rainbow Random Register Colours Random medium @@ -66,11 +66,11 @@ Macro White Balance - - - - - - - + + + + + + + diff --git a/resources/fixtures/Studio_Due/Studio-Due-Shark-150C.qxf b/resources/fixtures/Studio_Due/Studio-Due-Shark-150C.qxf index c2c651609f..cf3ab12f82 100644 --- a/resources/fixtures/Studio_Due/Studio-Due-Shark-150C.qxf +++ b/resources/fixtures/Studio_Due/Studio-Due-Shark-150C.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.4 GIT + 4.12.3 GIT Dean Clough Studio Due @@ -22,27 +22,27 @@ Colour - White - C1 - Sky Blue - C2 - Magenta - C3 - Red - C4 - Orange - C5 - Yellow - C6 - Green - Rainbow + White + C1 - Sky Blue + C2 - Magenta + C3 - Red + C4 - Orange + C5 - Yellow + C6 - Green + Rainbow Gobo - Gobo-0 - Gobo-1 - Gobo-2 - Gobo-3 - Gobo-4 + Gobo-0 + Gobo-1 + Gobo-2 + Gobo-3 + Gobo-4 Shutter - Open - Flash (1Hz to 10Hz) + Open + Flash (1Hz to 10Hz) @@ -66,9 +66,9 @@ Maintenance Normal - Reset Fixture + Reset Fixture Normal - Lamp Off + Lamp Off Normal @@ -121,11 +121,11 @@ Rotation Gobos Remote Reset - - - - - - - + + + + + + + diff --git a/resources/fixtures/Talent/Talent-BL252A.qxf b/resources/fixtures/Talent/Talent-BL252A.qxf index b6134d5c2c..b595930807 100644 --- a/resources/fixtures/Talent/Talent-BL252A.qxf +++ b/resources/fixtures/Talent/Talent-BL252A.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.1 GIT + 4.12.3 GIT Massimiliano Palmieri Talent @@ -55,8 +55,8 @@ Shutter - No function - Strobo (slow to fast) + No function + Strobo (slow to fast) diff --git a/resources/fixtures/Talent/Talent-BL63-10-LED-Bar.qxf b/resources/fixtures/Talent/Talent-BL63-10-LED-Bar.qxf index c75250668b..86404c93f5 100644 --- a/resources/fixtures/Talent/Talent-BL63-10-LED-Bar.qxf +++ b/resources/fixtures/Talent/Talent-BL63-10-LED-Bar.qxf @@ -1,13 +1,13 @@ - + Q Light Controller Plus - 4.9.1 + 4.12.3 GIT FooSchnickens Talent - BL63 10" LED Bar + BL63 10" LED Bar Color Changer @@ -15,34 +15,34 @@ Shutter - Dimmer mode - Strobe from slow to fast - None - Pulse strobe from slow to fast - None - Strobe fading in from slow to fast - None - Strobe fading out from slow to fast + Dimmer mode + Strobe from slow to fast + None + Pulse strobe from slow to fast + None + Strobe fading in from slow to fast + None + Strobe fading out from slow to fast Effect - Dimmer mode - Static color mode - Color jump change mode - Color gradual change mode - Sound active mode + Dimmer mode + Static color mode + Color jump change mode + Color gradual change mode + Sound active mode Effect - Dimmer mode/Speed - Strobe from slow to fast/Speed - None/Speed - Pulse strobe from slow to fast/Speed - None/Speed - Strobe fading in from slow to fast/Speed - None/Speed - Strobe fading out from slow to fast/Speed + Dimmer mode/Speed + Strobe from slow to fast/Speed + None/Speed + Pulse strobe from slow to fast/Speed + None/Speed + Strobe fading in from slow to fast/Speed + None/Speed + Strobe fading out from slow to fast/Speed Red Dimmer @@ -65,11 +65,11 @@ Static Color Function - - - - - - - + + + + + + + diff --git a/resources/fixtures/Tomshine/Tomshine-Mini-Gobo-Moving-Head.qxf b/resources/fixtures/Tomshine/Tomshine-Mini-Gobo-Moving-Head.qxf index eeb9d06dfe..d228d70df7 100644 --- a/resources/fixtures/Tomshine/Tomshine-Mini-Gobo-Moving-Head.qxf +++ b/resources/fixtures/Tomshine/Tomshine-Mini-Gobo-Moving-Head.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 GIT + 4.12.3 GIT Gaudig Tomshine @@ -74,7 +74,7 @@ Maintenance No Function - RESET + RESET Pan diff --git a/resources/fixtures/Triton_Blue/Triton-Blue-Wally-MH-20.qxf b/resources/fixtures/Triton_Blue/Triton-Blue-Wally-MH-20.qxf index 0c61b14e83..caf5d754c9 100644 --- a/resources/fixtures/Triton_Blue/Triton-Blue-Wally-MH-20.qxf +++ b/resources/fixtures/Triton_Blue/Triton-Blue-Wally-MH-20.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.5 + 4.12.3 GIT Jose Paris Triton Blue @@ -11,35 +11,35 @@ Moving Head Colour - White - Red - Light Blue - Green - Yellow - Magenta - Orange - Blue - Violet - CW rainbow effect from fast to slow + White + Red + Light Blue + Green + Yellow + Magenta + Orange + Blue + Violet + CW rainbow effect from fast to slow No rotation - CCW rainbow effect from slow to fast + CCW rainbow effect from slow to fast Gobo - Open - Rotation Gobo 1 - Rotation Gobo 2 - Rotation Gobo 3 - Rotation Gobo 4 - Rotation Gobo 5 - Rotation Gobo 6 - Rotation Gobo 7 - Shake gobo 1 from slow to fast - Shake gobo 2 from slow to fast + Open + Rotation Gobo 1 + Rotation Gobo 2 + Rotation Gobo 3 + Rotation Gobo 4 + Rotation Gobo 5 + Rotation Gobo 6 + Rotation Gobo 7 + Shake gobo 1 from slow to fast + Shake gobo 2 from slow to fast Shake gobo 3 from slow to fast - Shake gobo 4 from slow to fast - Shake gobo 5 from slow to fast - Shake gobo 6 from slow to fast + Shake gobo 4 from slow to fast + Shake gobo 5 from slow to fast + Shake gobo 6 from slow to fast Shake gobo 7 from slow to fast Rotation gobo wheel continuous from slow to fast @@ -86,14 +86,14 @@ Shutter - Closed - Max. open - Strobe from slow to fast - Max. open - Pulsating from slow to fast - Max. open - Random from slow to fast - Max. open + Closed + Max. open + Strobe from slow to fast + Max. open + Pulsating from slow to fast + Max. open + Random from slow to fast + Max. open @@ -102,10 +102,10 @@ Color change to any position Color & Gobo change to any position Normal operation - All motor reset + All motor reset Scan motor reset - Colors motor reset - Gobo motor reset + Colors motor reset + Gobo motor reset Normal operation Other motor reset Internal program 1 @@ -131,11 +131,11 @@ Pan (fine) Tilt (fine) - - - - - - - + + + + + + + diff --git a/resources/fixtures/UKing/UKing-4-Head-Beam-RGBW.qxf b/resources/fixtures/UKing/UKing-4-Head-Beam-RGBW.qxf new file mode 100644 index 0000000000..53dedd3e87 --- /dev/null +++ b/resources/fixtures/UKing/UKing-4-Head-Beam-RGBW.qxf @@ -0,0 +1,134 @@ + + + + + Q Light Controller Plus + 4.12.3 GIT + Donny Lockart + + UKing + 4 Head Beam RGBW + Moving Head + + + Pan + No Rotation + X-axis CW Rotation + X-Axis CCW Rotation + + + + + + + + + + + + + + + + + + + + + + + + + + + Effect + No Program + Auto Prog 1 + Auto Prog 2 + Sound Active + + + Maintenance + Reset (Hold 5 sec) + + + Pan + X-axis + X-axis Speed + Tilt Head 1 + Tilt Head 2 + Tilt Head 3 + Tilt Head 4 + Y-axis speed + Master dimmer + Strobe + Red H1 + Green H1 + Blue H1 + White H1 + Red H2 + Green H2 + Blue H2 + White H2 + Red H3 + Green H3 + Blue H3 + White H3 + Red H4 + Green H4 + Blue H4 + White H4 + Auto Program + Reset + + 10 + 11 + 12 + 13 + + + 14 + 15 + 16 + 17 + + + 18 + 19 + 20 + 21 + + + 22 + 23 + 24 + 25 + + + + Pan + X-axis + X-axis Speed + Tilt Head 1 + Tilt Head 2 + Tilt Head 3 + Tilt Head 4 + Y-axis speed + Master dimmer + Strobe + Red H1 + Green H1 + Blue H1 + White H1 + Auto Program + Reset + + + + + + + + + + diff --git a/resources/fixtures/UKing/UKing-7x10W-Mini-Moving-Head.qxf b/resources/fixtures/UKing/UKing-7x10W-Mini-Moving-Head.qxf new file mode 100644 index 0000000000..42bc626963 --- /dev/null +++ b/resources/fixtures/UKing/UKing-7x10W-Mini-Moving-Head.qxf @@ -0,0 +1,86 @@ + + + + + Q Light Controller Plus + 4.12.4 + Peter Crowther + + U'King + 7x10W Mini Moving Head + Moving Head + + + + + + + + + + + Maintenance + No function + Reset + No function + + + Effect + Off + Master Dimmer + Strobe + Open + + + Effect + Mix color depend on 7CH-10CH + Macro color + Color jumping + + + Speed + Color jumping speed + + + Effect + Control freely depend on 1CH-12CH + Fast running + Slow running + Sound 1 + Sound 2 + + + Pan + Tilt + Off / Master Dimmer / Strobe / Open + Red + Green + Blue + White + XY Speed + Reset + + + Pan + Pan Fine + Tilt + Tilt Fine + XY Speed + Off / Master Dimmer / Strobe / Open + Red + Green + Blue + White + Color source + Color jumping speed + Fixture mode + Reset + + + + + + + + + diff --git a/resources/fixtures/UKing/UKing-LED-Spot-Moving-Head-100W.qxf b/resources/fixtures/UKing/UKing-LED-Spot-Moving-Head-100W.qxf new file mode 100644 index 0000000000..291f37d3f1 --- /dev/null +++ b/resources/fixtures/UKing/UKing-LED-Spot-Moving-Head-100W.qxf @@ -0,0 +1,108 @@ + + + + + Q Light Controller Plus + 4.12.4 + Jay Seaman + + UKing + LED Spot Moving Head 100W + Moving Head + + + + + + Colour + Clear + Red + Green + Blue + Yellow + Amber + Cyan + Magenta + Magenta / Cyan + Cyan / Amber + Amber / Yellow + Yellow / Blue + Blue / Green + Green / Red + Color Change Automatic Slow to Fast + + + Gobo + Pattern 1 - Clear + Pattern 2 - Flower + Pattern 3 - Circles + Pattern 4 - Triangle + Pattern 5 - Star + Pattern 6 - Sunburst + Pattern 7 - Spiral + Pattern 8 - Triangle Breakup + Pattern 1 Dither slow to fast + Pattern 2 Dither slow to fast + Pattern 3 Dither slow to fast + Pattern 4 Dither slow to fast + Pattern 5 Dither slow to fast + Pattern 6 Dither slow to fast + Pattern 7 Dither slow to fast + Pattern 8 Dither slow to fast + Pattern Auto Change slow to fast + + + + + + Effect + Other Mode + Automatic Mode 3 + Automatic Mode 2 + Automatic Mode 1 + Automatic Mode 0 + Sound Mode 3 + Sound Mode 2 + Sound Mode 1 + Sound Mode 0 + + + Effect + Other Mode + X-Motor Auto Mode + Y-Motor Auto Mode + XY Motor Auto Mode + Reset + + + Pan + Pan Fine + Tilt + Tilt Fine + Color Select + Pattern + Strobe + Brightness + Tilt/Pan speed + Automatic Mode + Other Mode + + + Pan + Tilt + Color Select + Pattern + Strobe + Brightness + Tilt/Pan speed + Automatic Mode + Other Mode + + + + + + + + + diff --git a/resources/fixtures/UKing/UKing-Mini-RGBW-Moving-Head.qxf b/resources/fixtures/UKing/UKing-Mini-RGBW-Moving-Head.qxf index 61b5e2a4c0..b99f8a48b9 100644 --- a/resources/fixtures/UKing/UKing-Mini-RGBW-Moving-Head.qxf +++ b/resources/fixtures/UKing/UKing-Mini-RGBW-Moving-Head.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.0 GIT + 4.12.3 GIT Mike S UKing @@ -46,7 +46,7 @@ Maintenance Do nothing - Reset + Reset Do nothing diff --git a/resources/fixtures/Vari-Lite/Vari-Lite-VL2500-Wash.qxf b/resources/fixtures/Vari-Lite/Vari-Lite-VL2500-Wash.qxf index 473c780b95..d81e271ba3 100644 --- a/resources/fixtures/Vari-Lite/Vari-Lite-VL2500-Wash.qxf +++ b/resources/fixtures/Vari-Lite/Vari-Lite-VL2500-Wash.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.3 GIT + 4.12.3 GIT Thierry Rodolfo Vari-Lite @@ -51,9 +51,9 @@ No Function Luminaire Reset No Function - Lamp Off + Lamp Off No Function - Lamp On + Lamp On Dimmer @@ -72,11 +72,11 @@ B Time Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Spot.qxf b/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Spot.qxf index 5de82f1c56..97195ba79d 100644 --- a/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Spot.qxf +++ b/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Spot.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.12.2 + 4.12.3 GIT Thierry Rodolfo Vari-Lite @@ -98,10 +98,10 @@ Shutter - Open - Closed - Slow Random - Med Random + Open + Closed + Slow Random + Med Random Speed Range diff --git a/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Wash.qxf b/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Wash.qxf index 9fe9222dc6..fe7ad8248e 100644 --- a/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Wash.qxf +++ b/resources/fixtures/Vari-Lite/Vari-Lite-VL3000-Wash.qxf @@ -3,7 +3,7 @@ Q Light Controller Plus - 4.11.3 GIT + 4.12.3 GIT Thierry Rodolfo Vari-Lite @@ -44,10 +44,10 @@ Shutter - Open - Closed - Slow Random - Med Random + Open + Closed + Slow Random + Med Random Speed Range diff --git a/resources/fixtures/Vari-Lite/Vari-Lite-VL3500-Spot.qxf b/resources/fixtures/Vari-Lite/Vari-Lite-VL3500-Spot.qxf index 2702193372..f76dd8b188 100644 --- a/resources/fixtures/Vari-Lite/Vari-Lite-VL3500-Spot.qxf +++ b/resources/fixtures/Vari-Lite/Vari-Lite-VL3500-Spot.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.8.5 GIT + 4.12.3 GIT Thierry Rodolfo Vari-Lite @@ -25,38 +25,38 @@ Colour - Open - Open/Congo - Congo Blue - Congo/Orange - Orange - Orange/Green - Green - Green/Fuchsia - Dark Fuchsia - Fuchsia/Mag - Magenta - Magenta/Red - Deep Red - Red/Open - Fast to Slow / CCW + Open + Open/Congo + Congo Blue + Congo/Orange + Orange + Orange/Green + Green + Green/Fuchsia + Dark Fuchsia + Fuchsia/Mag + Magenta + Magenta/Red + Deep Red + Red/Open + Fast to Slow / CCW No Scroll - Slow to Fast / CW + Slow to Fast / CW Gobo - Open - Alpha Rays - Night Sky - Tribal Break-up - Color Gobo - Glacier Gag + Open + Alpha Rays + Night Sky + Tribal Break-up + Color Gobo + Glacier Gag Open - Alpha Rays - Night Sky - Tribal Break-up - Color Gobo - Glacier Gag + Alpha Rays + Night Sky + Tribal Break-up + Color Gobo + Glacier Gag Fast to Slow / CCW Stop Slow to Fast / CW @@ -65,24 +65,24 @@ Gobo - Open - Palm Leaves - Shock Break-up - Triangle Break-up - Ice Blocks - Pebbles - Circle of Ovals - Fast to Slow / CCW + Open + Palm Leaves + Shock Break-up + Triangle Break-up + Ice Blocks + Pebbles + Circle of Ovals + Fast to Slow / CCW Stop - Slow to Fast / CW + Slow to Fast / CW Shutter - Open - Closed - Slow Random - Medium Random - Fast Random + Open + Closed + Slow Random + Medium Random + Fast Random Speed Range @@ -681,10 +681,10 @@ Gobo Recalibration Edge/Zoom/Shutter Recalibration Dimmer/Strobe Recalibration - Lamp Off + Lamp Off Lamp Standby Lamp Full - Lamp On + Lamp On Dimmer @@ -719,11 +719,11 @@ Gobo Time Control - - - - - - - + + + + + + + diff --git a/resources/fixtures/Varytec/Varytec-Easy-Scan-XT-Mini.qxf b/resources/fixtures/Varytec/Varytec-Easy-Scan-XT-Mini.qxf index 1ef37407df..11998bd0cc 100644 --- a/resources/fixtures/Varytec/Varytec-Easy-Scan-XT-Mini.qxf +++ b/resources/fixtures/Varytec/Varytec-Easy-Scan-XT-Mini.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.5 GIT + 4.12.3 GIT Thierry Rodolfo Varytec @@ -13,16 +13,16 @@ Shutter - Off - Open - Strobe Slow to Fast - Open - Ramp Up - Open - Ramp Down - Open - Strobe Random - Open + Off + Open + Strobe Slow to Fast + Open + Ramp Up + Open + Ramp Down + Open + Strobe Random + Open Gobo @@ -54,11 +54,11 @@ Gobo Wheel Dimmer - - - - - - - + + + + + + + diff --git a/resources/fixtures/Varytec/Varytec-Giga-Bar-Pix-8-RGB.qxf b/resources/fixtures/Varytec/Varytec-Giga-Bar-Pix-8-RGB.qxf new file mode 100644 index 0000000000..9146c45632 --- /dev/null +++ b/resources/fixtures/Varytec/Varytec-Giga-Bar-Pix-8-RGB.qxf @@ -0,0 +1,154 @@ + + + + + Q Light Controller Plus + 4.12.4 + vidschofelix + + Varytec + Giga Bar Pix 8 RGB + LED Bar (Pixels) + + Effect + LEDs off + Constant unicoloured pattern in red + Constant unicoloured pattern in red and green + Constant unicoloured pattern in green + Constant unicoloured pattern in blue and green + Constant unicoloured pattern in blue + Constant unicoloured pattern in blue and red + Constant unicoloured pattern in red, green and blue + Built-in automatic show programmes + + + Sound-controlled show + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Speed + Increasing speed + + + Intensity + Sensitivity of the built-in microphone for sound control + + + Function + No function + + + Red1 + Green1 + Blue1 + + + Red1 + Green1 + Blue1 + Master dimmer + Strobe + + + Red1 + Green1 + Blue1 + Red2 + Green2 + Blue2 + Red3 + Green3 + Blue3 + Red4 + Green4 + Blue4 + Red5 + Green5 + Blue5 + Red6 + Green6 + Blue6 + Red7 + Green7 + Blue7 + Red8 + Green8 + Blue8 + + 0 + 1 + 2 + + + 3 + 4 + 5 + + + 6 + 7 + 8 + + + 9 + 10 + 11 + + + 12 + 13 + 14 + + + 15 + 16 + 17 + + + 18 + 19 + 20 + + + 21 + 22 + 23 + + + + + + + + + + + diff --git a/resources/fixtures/Varytec/Varytec-LED-Easy-Move-Mini-Beam-Wash-RGBW.qxf b/resources/fixtures/Varytec/Varytec-LED-Easy-Move-Mini-Beam-Wash-RGBW.qxf index c6359f2d96..2fa6b87fa9 100644 --- a/resources/fixtures/Varytec/Varytec-LED-Easy-Move-Mini-Beam-Wash-RGBW.qxf +++ b/resources/fixtures/Varytec/Varytec-LED-Easy-Move-Mini-Beam-Wash-RGBW.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.11.0 GIT + 4.12.3 GIT Erik Varytec @@ -30,8 +30,8 @@ Shutter - No function - Strobe + No function + Strobe @@ -121,11 +121,11 @@ 10 - - - - - - - + + + + + + + diff --git a/resources/fixtures/Varytec/Varytec-LED-Hellball-3.qxf b/resources/fixtures/Varytec/Varytec-LED-Hellball-3.qxf index c3e65f0025..07d035c632 100644 --- a/resources/fixtures/Varytec/Varytec-LED-Hellball-3.qxf +++ b/resources/fixtures/Varytec/Varytec-LED-Hellball-3.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.1 GIT + 4.12.3 GIT daniel Varytec @@ -11,8 +11,8 @@ Flower Shutter - Strobe Off - Strobe (fast to slow) + Strobe Off + Strobe (fast to slow) @@ -36,11 +36,11 @@ Motor Speed Mode - - - - - - - + + + + + + + diff --git a/resources/fixtures/Varytec/Varytec-LED-Laser-4.qxf b/resources/fixtures/Varytec/Varytec-LED-Laser-4.qxf index 2ff3de6cb3..bdaff891f3 100644 --- a/resources/fixtures/Varytec/Varytec-LED-Laser-4.qxf +++ b/resources/fixtures/Varytec/Varytec-LED-Laser-4.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.10.1 + 4.12.3 GIT Heiko Fanieng Varytec @@ -11,8 +11,8 @@ Effect Shutter - Off - On + Off + On @@ -70,11 +70,11 @@ LED effects Speed settings for programm channel - - - - - - - + + + + + + + diff --git a/resources/fixtures/Velleman/Velleman-Beam-Driver-250.qxf b/resources/fixtures/Velleman/Velleman-Beam-Driver-250.qxf index 20855bcd1e..05992a8d96 100644 --- a/resources/fixtures/Velleman/Velleman-Beam-Driver-250.qxf +++ b/resources/fixtures/Velleman/Velleman-Beam-Driver-250.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.7.5 GIT + 4.12.3 GIT Rob Nieuwenhuizen Velleman @@ -11,29 +11,29 @@ Moving Head Colour - White - UV Blue - Pink - Green - Orange - Blue - Yellow - Magenta - White - Magenta - Yellow - Blue - Orange - Green - Pink - UV Blue - White + White + UV Blue + Pink + Green + Orange + Blue + Yellow + Magenta + White + Magenta + Yellow + Blue + Orange + Green + Pink + UV Blue + White Slow-fast rotation up Slow-fast rotation down Gobo - Open gobo + Open gobo Gobo 1 Gobo 2 Gobo 3 @@ -51,10 +51,10 @@ Shutter - Open shutter - Fast-slow shutter + Open shutter + Fast-slow shutter Reset - Open shutter + Open shutter @@ -71,11 +71,11 @@ Tilt - movement Effect wheel - - - - - - - + + + + + + + diff --git a/resources/fixtures/Venue/Venue-LEDPAR64.qxf b/resources/fixtures/Venue/Venue-LEDPAR64.qxf index 3545124a12..5c4ce6ab72 100644 --- a/resources/fixtures/Venue/Venue-LEDPAR64.qxf +++ b/resources/fixtures/Venue/Venue-LEDPAR64.qxf @@ -1,9 +1,9 @@ - + - Q Light Controller - 3.1.0 + Q Light Controller Plus + 4.12.3 GIT eklynx Venue @@ -49,8 +49,8 @@ Shutter - Off/Slowest - Slow to fast Strobe (increments every 16) + Off/Slowest + Slow to fast Strobe (increments every 16) Effect @@ -71,11 +71,11 @@ Strobe Speed Presets/Sound - - - - - - - + + + + + + + diff --git a/resources/fixtures/Venue/Venue-ThinPar-38.qxf b/resources/fixtures/Venue/Venue-ThinPar-38.qxf index e39a803c78..24565b4ec7 100644 --- a/resources/fixtures/Venue/Venue-ThinPar-38.qxf +++ b/resources/fixtures/Venue/Venue-ThinPar-38.qxf @@ -1,9 +1,9 @@ - + Q Light Controller Plus - 4.9.0 GIT + 4.12.3 GIT Thierry Rodolfo Venue @@ -19,8 +19,8 @@ Shutter - No Function - Strobe Slow - Fast + No Function + Strobe Slow - Fast @@ -48,11 +48,11 @@ Green Blue - - - - - - - + + + + + + + diff --git a/resources/gobos/SGM/gobo00359.svg b/resources/gobos/SGM/gobo00359.svg deleted file mode 100644 index aa9665f453..0000000000 --- a/resources/gobos/SGM/gobo00359.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/inputprofiles/KORG-nanoKONTROLStudio.qxi b/resources/inputprofiles/KORG-nanoKONTROLStudio.qxi new file mode 100644 index 0000000000..613c9f8532 --- /dev/null +++ b/resources/inputprofiles/KORG-nanoKONTROLStudio.qxi @@ -0,0 +1,1237 @@ + + + + + Q Light Controller Plus + 4.12.2 + Hans-Jürgen Tappe + + KORG + nanoKONTROL Studio + MIDI + + Slider 1 - Scene 1 + Slider + + + Slider 2 - Scene 1 + Slider + + + Slider 3 - Scene 1 + Slider + + + Slider 4 - Scene 1 + Slider + + + Slider 5 - Scene 1 + Slider + + + Slider 6 - Scene 1 + Slider + + + Slider 7 - Scene 1 + Slider + + + Slider 8 - Scene 1 + Slider + + + Knob 1 - Scene 1 + Knob + + + Knob 2 - Scene 1 + Knob + + + Knob 3 - Scene 1 + Knob + + + Knob 4 - Scene 1 + Knob + + + Knob 5 - Scene 1 + Knob + + + Knob 6 - Scene 1 + Knob + + + Knob 7 - Scene 1 + Knob + + + Knob 8 - Scene 1 + Knob + + + Mute 1 - Scene 1 + Button + + + Mute 2 - Scene 1 + Button + + + Mute 3 - Scene 1 + Button + + + Mute 4 - Scene 1 + Button + + + Mute 5 - Scene 1 + Button + + + Mute 6 - Scene 1 + Button + + + Mute 7 - Scene 1 + Button + + + Mute 8 - Scene 1 + Button + + + Solo 1 - Scene 1 + Button + + + Solo 2 - Scene 1 + Button + + + Solo 3 - Scene 1 + Button + + + Solo 4 - Scene 1 + Button + + + Solo 5 - Scene 1 + Button + + + Solo 6 - Scene 1 + Button + + + Solo 7 - Scene 1 + Button + + + Solo 8 - Scene 1 + Button + + + Rec 1 - Scene 1 + Button + + + Rec 2 - Scene 1 + Button + + + Rec 3 - Scene 1 + Button + + + Rec 4 - Scene 1 + Button + + + Rec 5 - Scene 1 + Button + + + Rec 6 - Scene 1 + Button + + + Rec 7 - Scene 1 + Button + + + Rec 8 - Scene 1 + Button + + + Select 1 - Scene 1 + Button + + + Select 2 - Scene 1 + Button + + + Select 3 - Scene 1 + Button + + + Select 4 - Scene 1 + Button + + + Select 5 - Scene 1 + Button + + + Select 6 - Scene 1 + Button + + + Select 7 - Scene 1 + Button + + + Select 8 - Scene 1 + Button + + + Cycle - Scene 1 + Button + + + Marker Set - Scene 1 + Button + + + Marker Left - Scene 1 + Button + + + Marker Right - Scene 1 + Button + + + Track Rew - Scene 1 + Button + + + Track Fwd - Scene 1 + Button + + + Track Left - Scene 1 + Button + + + Track Right - Scene 1 + Button + + + Back - Scene 1 + Button + + + Stop - Scene 1 + Button + + + Play - Scene 1 + Button + + + Rec - Scene 1 + Button + + + Jogwheel - Scene 1 + Encoder + + + + Slider 1 - Scene 2 + Slider + + + Slider 2 - Scene 2 + Slider + + + Slider 3 - Scene 2 + Slider + + + Slider 4 - Scene 2 + Slider + + + Slider 5 - Scene 2 + Slider + + + Slider 6 - Scene 2 + Slider + + + Slider 7 - Scene 2 + Slider + + + Slider 8 - Scene 2 + Slider + + + Knob 1 - Scene 2 + Knob + + + Knob 2 - Scene 2 + Knob + + + Knob 3 - Scene 2 + Knob + + + Knob 4 - Scene 2 + Knob + + + Knob 5 - Scene 2 + Knob + + + Knob 6 - Scene 2 + Knob + + + Knob 7 - Scene 2 + Knob + + + Knob 8 - Scene 2 + Knob + + + Mute 1 - Scene 2 + Button + + + Mute 2 - Scene 2 + Button + + + Mute 3 - Scene 2 + Button + + + Mute 4 - Scene 2 + Button + + + Mute 5 - Scene 2 + Button + + + Mute 6 - Scene 2 + Button + + + Mute 7 - Scene 2 + Button + + + Mute 8 - Scene 2 + Button + + + Solo 1 - Scene 2 + Button + + + Solo 2 - Scene 2 + Button + + + Solo 3 - Scene 2 + Button + + + Solo 4 - Scene 2 + Button + + + Solo 5 - Scene 2 + Button + + + Solo 6 - Scene 2 + Button + + + Solo 7 - Scene 2 + Button + + + Solo 8 - Scene 2 + Button + + + Rec 1 - Scene 2 + Button + + + Rec 2 - Scene 2 + Button + + + Rec 3 - Scene 2 + Button + + + Rec 4 - Scene 2 + Button + + + Rec 5 - Scene 2 + Button + + + Rec 6 - Scene 2 + Button + + + Rec 7 - Scene 2 + Button + + + Rec 8 - Scene 2 + Button + + + Select 1 - Scene 2 + Button + + + Select 2 - Scene 2 + Button + + + Select 3 - Scene 2 + Button + + + Select 4 - Scene 2 + Button + + + Select 5 - Scene 2 + Button + + + Select 6 - Scene 2 + Button + + + Select 7 - Scene 2 + Button + + + Select 8 - Scene 2 + Button + + + Cycle - Scene 2 + Button + + + Marker Set - Scene 2 + Button + + + Marker Left - Scene 2 + Button + + + Marker Right - Scene 2 + Button + + + Track Rew - Scene 2 + Button + + + Track Fwd - Scene 2 + Button + + + Track Left - Scene 2 + Button + + + Track Right - Scene 2 + Button + + + Back - Scene 2 + Button + + + Stop - Scene 2 + Button + + + Play - Scene 2 + Button + + + Rec - Scene 2 + Button + + + Jogwheel - Scene 2 + Encoder + + + + Slider 1 - Scene 3 + Slider + + + Slider 2 - Scene 3 + Slider + + + Slider 3 - Scene 3 + Slider + + + Slider 4 - Scene 3 + Slider + + + Slider 5 - Scene 3 + Slider + + + Slider 6 - Scene 3 + Slider + + + Slider 7 - Scene 3 + Slider + + + Slider 8 - Scene 3 + Slider + + + Knob 1 - Scene 3 + Knob + + + Knob 2 - Scene 3 + Knob + + + Knob 3 - Scene 3 + Knob + + + Knob 4 - Scene 3 + Knob + + + Knob 5 - Scene 3 + Knob + + + Knob 6 - Scene 3 + Knob + + + Knob 7 - Scene 3 + Knob + + + Knob 8 - Scene 3 + Knob + + + Mute 1 - Scene 3 + Button + + + Mute 2 - Scene 3 + Button + + + Mute 3 - Scene 3 + Button + + + Mute 4 - Scene 3 + Button + + + Mute 5 - Scene 3 + Button + + + Mute 6 - Scene 3 + Button + + + Mute 7 - Scene 3 + Button + + + Mute 8 - Scene 3 + Button + + + Solo 1 - Scene 3 + Button + + + Solo 2 - Scene 3 + Button + + + Solo 3 - Scene 3 + Button + + + Solo 4 - Scene 3 + Button + + + Solo 5 - Scene 3 + Button + + + Solo 6 - Scene 3 + Button + + + Solo 7 - Scene 3 + Button + + + Solo 8 - Scene 3 + Button + + + Rec 1 - Scene 3 + Button + + + Rec 2 - Scene 3 + Button + + + Rec 3 - Scene 3 + Button + + + Rec 4 - Scene 3 + Button + + + Rec 5 - Scene 3 + Button + + + Rec 6 - Scene 3 + Button + + + Rec 7 - Scene 3 + Button + + + Rec 8 - Scene 3 + Button + + + Select 1 - Scene 3 + Button + + + Select 2 - Scene 3 + Button + + + Select 3 - Scene 3 + Button + + + Select 4 - Scene 3 + Button + + + Select 5 - Scene 3 + Button + + + Select 6 - Scene 3 + Button + + + Select 7 - Scene 3 + Button + + + Select 8 - Scene 3 + Button + + + Cycle - Scene 3 + Button + + + Marker Set - Scene 3 + Button + + + Marker Left - Scene 3 + Button + + + Marker Right - Scene 3 + Button + + + Track Rew - Scene 3 + Button + + + Track Fwd - Scene 3 + Button + + + Track Left - Scene 3 + Button + + + Track Right - Scene 3 + Button + + + Back - Scene 3 + Button + + + Stop - Scene 3 + Button + + + Play - Scene 3 + Button + + + Rec - Scene 3 + Button + + + Jogwheel - Scene 3 + Encoder + + + + Slider 1 - Scene 4 + Button + + + Slider 2 - Scene 4 + Slider + + + Slider 3 - Scene 4 + Slider + + + Slider 4 - Scene 4 + Slider + + + Slider 5 - Scene 4 + Slider + + + Slider 6 - Scene 4 + Slider + + + Slider 7 - Scene 4 + Slider + + + Slider 8 - Scene 4 + Slider + + + Knob 1 - Scene 4 + Knob + + + Knob 2 - Scene 4 + Knob + + + Knob 3 - Scene 4 + Knob + + + Knob 4 - Scene 4 + Knob + + + Knob 5 - Scene 4 + Knob + + + Knob 6 - Scene 4 + Knob + + + Knob 7 - Scene 4 + Knob + + + Knob 8 - Scene 4 + Knob + + + Mute 1 - Scene 4 + Button + + + Mute 2 - Scene 4 + Button + + + Mute 3 - Scene 1 + Button + + + Mute 4 - Scene 4 + Button + + + Mute 5 - Scene 4 + Button + + + Mute 6 - Scene 4 + Button + + + Mute 7 - Scene 4 + Button + + + Mute 8 - Scene 4 + Button + + + Solo 1 - Scene 4 + Button + + + Solo 2 - Scene 4 + Button + + + Solo 3 - Scene 4 + Button + + + Solo 4 - Scene 4 + Button + + + Solo 5 - Scene 4 + Button + + + Solo 6 - Scene 4 + Button + + + Solo 7 - Scene 4 + Button + + + Solo 8 - Scene 4 + Button + + + Rec 1 - Scene 4 + Button + + + Rec 2 - Scene 4 + Button + + + Rec 3 - Scene 4 + Button + + + Rec 4 - Scene 4 + Button + + + Rec 5 - Scene 4 + Button + + + Rec 6 - Scene 4 + Button + + + Rec 7 - Scene 4 + Button + + + Rec 8 - Scene 4 + Button + + + Select 1 - Scene 4 + Button + + + Select 2 - Scene 4 + Button + + + Select 3 - Scene 4 + Button + + + Select 4 - Scene 4 + Button + + + Select 5 - Scene 4 + Button + + + Select 6 - Scene 4 + Button + + + Select 7 - Scene 4 + Button + + + Select 8 - Scene 4 + Button + + + Cycle - Scene 4 + Button + + + Marker Set - Scene 4 + Button + + + Marker Left - Scene 4 + Button + + + Marker Right - Scene 4 + Button + + + Track Rew - Scene 4 + Button + + + Track Fwd - Scene 4 + Button + + + Track Left - Scene 4 + Button + + + Track Right - Scene 4 + Button + + + Back - Scene 4 + Button + + + Stop - Scene 4 + Button + + + Play - Scene 4 + Button + + + Rec - Scene 4 + Button + + + Jogwheel - Scene 4 + Encoder + + + + Slider 1 - Scene 5 + Slider + + + Slider 2 - Scene 5 + Slider + + + Slider 3 - Scene 5 + Slider + + + Slider 4 - Scene 5 + Slider + + + Slider 5 - Scene 5 + Slider + + + Slider 6 - Scene 5 + Slider + + + Slider 7 - Scene 5 + Slider + + + Slider 8 - Scene 5 + Slider + + + Knob 1 - Scene 5 + Knob + + + Knob 2 - Scene 5 + Knob + + + Knob 3 - Scene 5 + Knob + + + Knob 4 - Scene 5 + Knob + + + Knob 5 - Scene 5 + Knob + + + Knob 6 - Scene 5 + Knob + + + Knob 7 - Scene 5 + Knob + + + Knob 8 - Scene 5 + Knob + + + Mute 1 - Scene 1 + Button + + + Mute 2 - Scene 5 + Button + + + Mute 3 - Scene 5 + Button + + + Mute 4 - Scene 5 + Button + + + Mute 5 - Scene 5 + Button + + + Mute 6 - Scene 5 + Button + + + Mute 7 - Scene 5 + Button + + + Mute 8 - Scene 5 + Button + + + Solo 1 - Scene 5 + Button + + + Solo 2 - Scene 5 + Button + + + Solo 3 - Scene 5 + Button + + + Solo 4 - Scene 5 + Button + + + Solo 5 - Scene 5 + Button + + + Solo 6 - Scene 5 + Button + + + Solo 7 - Scene 5 + Button + + + Solo 8 - Scene 5 + Button + + + Rec 1 - Scene 5 + Button + + + Rec 2 - Scene 5 + Button + + + Rec 3 - Scene 5 + Button + + + Rec 4 - Scene 5 + Button + + + Rec 5 - Scene 5 + Button + + + Rec 6 - Scene 5 + Button + + + Rec 7 - Scene 5 + Button + + + Rec 8 - Scene 5 + Button + + + Select 1 - Scene 5 + Button + + + Select 2 - Scene 5 + Button + + + Select 3 - Scene 5 + Button + + + Select 4 - Scene 5 + Button + + + Select 5 - Scene 5 + Button + + + Select 6 - Scene 5 + Button + + + Select 7 - Scene 5 + Button + + + Select 8 - Scene 5 + Button + + + Cycle - Scene 5 + Button + + + Marker Set - Scene 5 + Button + + + Marker Left - Scene 5 + Button + + + Marker Right - Scene 5 + Button + + + Track Rew - Scene 5 + Button + + + Track Fwd - Scene 5 + Button + + + Track Left - Scene 5 + Button + + + Track Right - Scene 5 + Button + + + Back - Scene 5 + Button + + + Stop - Scene 5 + Button + + + Play - Scene 5 + Button + + + Rec - Scene 5 + Button + + + Jogwheel - Scene 5 + Encoder + + + diff --git a/resources/inputprofiles/Novation-LaunchPadMiniMK3.qxi b/resources/inputprofiles/Novation-LaunchPadMiniMK3.qxi new file mode 100644 index 0000000000..d4fef4c79f --- /dev/null +++ b/resources/inputprofiles/Novation-LaunchPadMiniMK3.qxi @@ -0,0 +1,417 @@ + + + + + Q Light Controller Plus + 4.12.3 + vidschofelix + + Novation + Launchpad Mini MK3 + MIDI + + Stop Solo Mute + Button + + + + Row 2 Arrow + Button + + + + Row 3 Arrow + Button + + + + Row 4 Arrow + Button + + + + Row 5 Arrow + Button + + + + Row 6 Arrow + Button + + + + Row 7 Arrow + Button + + + + Row 8 Arrow + Button + + + + Up + Button + + + + Down + Button + + + + Left + Button + + + + Right + Button + + + + Session + Button + + + + Drums + Button + + + + Keys + Button + + + + User + Button + + + + Logo + Button + + + + Pad 1-1 + Button + + + + Pad 1-2 + Button + + + + Pad 1-3 + Button + + + + Pad 1-4 + Button + + + + Pad 1-5 + Button + + + + Pad 1-6 + Button + + + + Pad 1-7 + Button + + + + Pad 1-8 + Button + + + + Pad 2-1 + Button + + + + Pad 2-2 + Button + + + + Pad 2-3 + Button + + + + Pad 2-4 + Button + + + + Pad 2-5 + Button + + + + Pad 2-6 + Button + + + + Pad 2-7 + Button + + + + Pad 2-8 + Button + + + + Pad 3-1 + Button + + + + Pad 3-2 + Button + + + + Pad 3-3 + Button + + + + Pad 3-4 + Button + + + + Pad 3-5 + Button + + + + Pad 3-6 + Button + + + + Pad 3-7 + Button + + + + Pad 3-8 + Button + + + + Pad 4-1 + Button + + + + Pad 4-2 + Button + + + + Pad 4-3 + Button + + + + Pad 4-4 + Button + + + + Pad 4-5 + Button + + + + Pad 4-6 + Button + + + + Pad 4-7 + Button + + + + Pad 4-8 + Button + + + + Pad 5-1 + Button + + + + Pad 5-2 + Button + + + + Pad 5-3 + Button + + + + Pad 5-4 + Button + + + + Pad 5-5 + Button + + + + Pad 5-6 + Button + + + + Pad 5-7 + Button + + + + Pad 5-8 + Button + + + + Pad 6-1 + Button + + + + Pad 6-2 + Button + + + + Pad 6-3 + Button + + + + Pad 6-4 + Button + + + + Pad 6-5 + Button + + + + Pad 6-6 + Button + + + + Pad 6-7 + Button + + + + Pad 6-8 + Button + + + + Pad 7-1 + Button + + + + Pad 7-2 + Button + + + + Pad 7-3 + Button + + + + Pad 7-4 + Button + + + + Pad 7-5 + Button + + + + Pad 7-6 + Button + + + + Pad 7-7 + Button + + + + Pad 7-8 + Button + + + + Pad 8-1 + Button + + + + Pad 8-2 + Button + + + + Pad 8-3 + Button + + + + Pad 8-4 + Button + + + + Pad 8-5 + Button + + + + Pad 8-6 + Button + + + + Pad 8-7 + Button + + + + Pad 8-8 + Button + + + diff --git a/resources/miditemplates/Novation-LaunchPadMiniMK3.qxm b/resources/miditemplates/Novation-LaunchPadMiniMK3.qxm new file mode 100644 index 0000000000..80cb36f02a --- /dev/null +++ b/resources/miditemplates/Novation-LaunchPadMiniMK3.qxm @@ -0,0 +1,9 @@ + + + + vidschofelix + + Sets the Launchpad Mini MK3 into developer mode. + Novation Launchpad Mini MK3 Developer Mode + F0 00 20 29 02 0D 0E 01 F7 + diff --git a/resources/rgbscripts/alternate.js b/resources/rgbscripts/alternate.js new file mode 100644 index 0000000000..714489f308 --- /dev/null +++ b/resources/rgbscripts/alternate.js @@ -0,0 +1,275 @@ +/* + Q Light Controller Plus + alternate.js + + Copyright (c) Hans-Jürgen Tappe + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0.txt + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +// Development tool access +var testAlgo; + +(function() { + var colorPalette = new Object; + colorPalette.collection = new Array( + [ "White", 0xFFFFFF ], // 0 + [ "Cream", 0xFFFF7F ], // 1 + [ "Pink", 0xFF7F7F ], // 2 + [ "Rose", 0x7F3F3F ], // 3 + [ "Coral", 0x7F3F1F ], // 4 + [ "Dim Red", 0x7F0000 ], // 5 + [ "Red", 0xFF0000 ], // 6 + [ "Orange", 0xFF3F00 ], // 7 + [ "Dim Orange", 0x7F1F00 ], // 8 + [ "Goldenrod", 0x7F3F00 ], // 9 + [ "Gold", 0xFF7F00 ], // 10 + [ "Yellow", 0xFFFF00 ], // 11 + [ "Dim Yellow", 0x7F7F00 ], // 12 + [ "Lime", 0x7FFF00 ], // 13 + [ "Pale Green", 0x3F7F00 ], // 14 + [ "Dim Green", 0x007F00 ], // 15 + [ "Green", 0x00FF00 ], // 16 + [ "Seafoam", 0x00FF3F ], // 17 + [ "Turquoise", 0x007F3F ], // 18 + [ "Teal", 0x007F7F ], // 19 + [ "Cyan", 0x00FFFF ], // 20 + [ "Electric Blue", 0x007FFF ], // 21 + [ "Blue", 0x0000FF ], // 22 + [ "Dim Blue", 0x00007F ], // 23 + [ "Pale Blue", 0x1F1F7F ], // 24 + [ "Indigo", 0x1F00BF ], // 25 + [ "Purple", 0x3F00BF ], // 26 + [ "Violet", 0x7F007F ], // 27 + [ "Magenta", 0xFF00FF ], // 28 + [ "Hot Pink", 0xFF003F ], // 29 + [ "Deep Pink", 0x7F001F ], // 30 + [ "OFF", 0x000000 ]); // 31 + + colorPalette.makeSubArray = function(_index) { + var _array = new Array(); + for (var i = 0; i < colorPalette.collection.length; i++) { + _array.push(colorPalette.collection[parseInt(i)][parseInt(_index)]); + } + return _array; + }; + colorPalette.names = colorPalette.makeSubArray(0); + + var algo = new Object; + algo.apiVersion = 2; + algo.name = "Alternate"; + algo.author = "Hans-Jürgen Tappe"; + + var x = 0; + var y = 0; + + algo.acceptColors = 0; + // Only two steps; one for even pixels and another for odd pixels + algo.maxSteps = 2; + algo.properties = new Array(); + + algo.getColorIndex = function(_name) { + var idx = colorPalette.names.indexOf(_name); + if (idx === -1) { + idx = (colorPalette.collection.length - 1); + } + return idx; + }; + + algo.color1Index = algo.getColorIndex("Red"); + algo.properties.push("name:color1Index|type:list|display:Color 1|" + + "values:" + colorPalette.names.toString() + "|" + + "write:setColor1Index|read:getColor1Name"); + algo.color2Index = algo.getColorIndex("Green"); + algo.properties.push("name:color2Index|type:list|display:Color 2|" + + "values:" + colorPalette.names.toString() + "|" + + "write:setColor2Index|read:getColor2Name"); + + algo.getColorName = function(_index) { + if (_index < 0) { + _index = 0; + } + if (_index >= colorPalette.collection.length) { + _index = (colorPalette.collection.length - 1); + } + return colorPalette.collection[parseInt(_index)][0]; + }; + algo.getColorValue = function(_index) { + if (_index < 0) { + _index = 0; + } + if (_index >= colorPalette.collection.length) { + _index = (colorPalette.collection.length - 1); + } + return colorPalette.collection[parseInt(_index)][1]; + }; + + algo.setColor1Index = function(_name) { + algo.color1Index = algo.getColorIndex(_name); + }; + algo.getColor1Name = function() { + return algo.getColorName(algo.color1Index); + }; + algo.getColor1Value = function() { + return algo.getColorValue(algo.color1Index); + }; + + algo.setColor2Index = function(_name) { + algo.color2Index = algo.getColorIndex(_name); + }; + algo.getColor2Name = function() { + return algo.getColorName(algo.color2Index); + }; + algo.getColor2Value = function() { + return algo.getColorValue(algo.color2Index); + }; + + algo.align = 0; + algo.properties.push("name:align|type:list|" + + "display:Align (for even width)|values:Left,Centered|" + + "write:setAlign|read:getAlign"); + // Left aligned is default. + algo.setAlign = function(_align) { + if (_align === "Centered") { + algo.align = 1; + } else { + algo.align = 0; + } + }; + algo.getAlign = function() { + if (algo.align === 1) { + return "Center"; + } else { + return "Left"; + } + }; + + algo.orientation = 0; + algo.properties.push("name:orientation|type:list|" + + "display:Orientation|values:Horizontal,Vertical,Interleaved|" + + "write:setOrientation|read:getOrientation"); + algo.setOrientation = function(_orientation) { + if (_orientation === "Vertical") { + algo.orientation = 1; + } else if (_orientation === "Interleaved") { + algo.orientation = 2; + } else { + algo.orientation = 0; + } + }; + algo.getOrientation = function() { + if (parseInt(algo.orientation) === 1) { + return "Vertical"; + } else if (algo.orientation === 2) { + return "Interleaved"; + } else { + return "Horizontal"; + } + }; + + algo.blockSize = 1; + algo.properties.push("name:blockSize|type:range|" + + "display:Block Size (1-16)|" + + "values:1,16|" + + "write:setBlockSize|read:getBlockSize"); + algo.setBlockSize = function(_size) { + algo.blockSize = parseInt(_size); + }; + algo.getBlockSize = function() { + return algo.blockSize; + }; + + algo.offset = 0; + algo.properties.push("name:offset|type:range|" + + "display:Offset (0-16)|" + + "values:0,16|" + + "write:setOffset|read:getOffset"); + algo.setOffset = function(_size) { + algo.offset = parseInt(_size); + }; + algo.getOffset = function() { + return algo.offset; + }; + + algo.rgbMap = function(width, height, rgb, step) { + var map = new Array(height); + var effectiveStep = step; + var colorSelectOne = (step === 1) ? false : true; + var rowColorOne = colorSelectOne; + + var xMax = width; + if (algo.align === 1 && width % 2 === 0) { + xMax = width / 2 + width % 2; + } + for (y = 0; y < height; y++) { + if (algo.orientation === 0 ) { + // Initialize vertical bars, each column the same + colorSelectOne = (step === 1) ? false : true; + } else if (algo.orientation === 1) { + // Horizontal Bars, count steps by row + effectiveStep = y + step * algo.blockSize + algo.offset; + // Initialize start color for each row. + if (effectiveStep % algo.blockSize === 0) { + colorSelectOne = ! colorSelectOne; + } + } else if (algo.orientation === 2) { + var effectiveY = y + step * algo.blockSize + algo.offset; + if (effectiveY % (algo.blockSize) === 0) { + rowColorOne = ! rowColorOne; + } + colorSelectOne = rowColorOne; + } + map[parseInt(y)] = new Array(); + for (x = 0; x < width; x++) { + if (algo.orientation === 0) { + // Vertical bars, count steps by column + effectiveStep = x + algo.offset; + if (effectiveStep % algo.blockSize === 0) { + colorSelectOne = ! colorSelectOne; + } + } else if (algo.orientation === 2) { + // Horizontal Bars, count steps by row and column + var effectiveX = x + step * algo.blockSize + algo.offset; + // Change color each step. + if (effectiveX % algo.blockSize === 0) { + colorSelectOne = ! colorSelectOne; + } + } + if (colorSelectOne) { + map[parseInt(y)][parseInt(x)] = algo.getColor1Value(); + } else { + map[parseInt(y)][parseInt(x)] = algo.getColor2Value(); + } + } + } + // Align centered + if (algo.align === 1 && width % 2 === 0) { + for (y = 0; y < height; y++) { + for (x = 0; x < xMax; x++) { + map[parseInt(y)][parseInt(x)] = map[parseInt(y)][parseInt(width - x - 1)]; + } + } + } + + return map; + }; + + algo.rgbMapStepCount = function(width, height) { + return algo.maxSteps; + }; + + // Development tool access + testAlgo = algo; + + return algo; +})(); diff --git a/resources/rgbscripts/devtool.html b/resources/rgbscripts/devtool.html index 5b361da88d..96ca5330e9 100644 --- a/resources/rgbscripts/devtool.html +++ b/resources/rgbscripts/devtool.html @@ -1,136 +1,190 @@ - - -Q Light Controller Plus - RGBScript Development Tool + + + + +Q Light Controller Plus - RGBScript Development Tool + - - - - - - - - -

Q Light Controller Plus - RGB Script Development Tool

- -

Instructions

-

-To use this tool, you must first edit this file and include your script file to it and -make sure your favourite web browser supports JavaScript. Then, to make your algorithm -object accessible to this tool, you must create a global variable within your algorithm -file called testAlgo, which then actually contains your algorithm object i.e. the -object that provides rgbMap() and rgbMapStepCount() functions. Now you're ready to load + + + + +

Q Light Controller Plus - RGB Script Development Tool

+ +
+

Instructions

+

+To use this tool, you must first set the filename of the script you intend to test/debug +(including the .js extension) in the 'filename' field. Then hit 'Reload' to load it. +To make your algorithm object accessible to this tool, you must create a global variable +within your algorithm file called testAlgo, which then actually contains your algorithm +object i.e. the object that provides rgbMap() and rgbMapStepCount() functions. Now you're ready to load this file with your browser and see your first results. -

+

-

-If you see what you expect to see in the Algorithm Properties section below, +

+If you see what you expect to see in the Algorithm Properties section below, you'll know your script has been evaluated successfully. Next, put some values to the -Width and Height boxes in the Grid Size section, click Update -and see if your script calculates the rgbMapStepCount(width, height) result -correctly. If everything is A-OK, you should already see the first frame of your RGB map -at the bottom of the page. Clicking Next and Previous allows you to skip -between steps. -

+Width and Height boxes in the Grid Size section and see if your +script calculates the rgbMapStepCount(width, height) result correctly. +If everything is OK, you should already see your RGB script running through frames. +To inspect individual frames, stop the script and hit the previous and next buttons. +

-

+ For troubleshooting purposes, I would suggest using some good JavaScript development -tools for your browser. Mozilla FireFox has a built-in Web Console behind Tools -> Web -Developer which is very useful in hunting errors within the JavaScript code. -

- -

Algorithm Properties

-
- - - - - - - - - - - - - -
apiVersion
name
author
-
- -
-

Grid Size

- - - - - - - - - -
Width
Height
-
- -
-

Pixel colors

- - - - - - - -
Primary color (rrggbb) -
Secondary color (rrggbb, leave empty to disable) -
-
- -

Algorithm Functions

-
- - - - - -
rgbMapStepCount(width, height)
-
- - - - - - -
rgbMap(width, height, rgb, step) -
- - -
- - - Speed (ms): -
-
- - -
- -
-This file is licensed under the Apache 2.0 license. Copyright © Heikki Junnila. - - - +tools for your browser. Mozilla FireFox has a built-in Web Console behind Tools -> Web +Developer which is very useful in hunting errors within the JavaScript code. +Google Chrome has one as well, that you can access with F12 or with More Tools -> Developer Tools (Ctrl+Shift+I) + +
+ +
+

Algorithm Specification

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
filename
apiVersion
name
author
acceptColors
+ +
+
+ +

Grid Size

+
+ + + + + + + + + +
Width
Height
+
+ +
+ +
+
+

Pixel colors

+ + + + + + + + + +
Primary color (rrggbb)
Secondary color (rrggbb, leave empty to disable)
+
+ +

Algorithm Properties

+
+ +
+
+ +

Algorithm Functions

+
+ + + + + +
rgbMapStepCount(width, height)
+
+ +
+ + + + + + + + + + +
rgbMap(width, height, rgb, step) + +
+ +
+ + +
+ Speed (ms): +
+
+ +
+ +
+

Preview

+ +
+
+ +
+This file is licensed under the Apache 2.0 license. Copyright © Heikki Junnila, Massimo Callegari, APIv2 integration: Hans-Jürgen Tappe. + + + diff --git a/resources/rgbscripts/devtool.js b/resources/rgbscripts/devtool.js index e332e93a9e..a59fb2f9b7 100644 --- a/resources/rgbscripts/devtool.js +++ b/resources/rgbscripts/devtool.js @@ -21,20 +21,161 @@ var width; var height; var stepCount; var currentStep; +var testTimer; +var timerRunning; -function init() +function initDefinitions() { - initProperties(); - initPixelColors(); - onGridSizeUpdated(); - writeCurrentStep(); + document.getElementById("apiversion").value = testAlgo.apiVersion; + document.getElementById("name").value = testAlgo.name; + document.getElementById("author").value = testAlgo.author; + if (typeof testAlgo.acceptColors !== "undefined") { + document.getElementById("acceptColors").value = testAlgo.acceptColors; + } else { + document.getElementById("acceptColors").value = "2 (Default)"; + } +} + +function writeSelectOptions(item) +{ + var opt = document.createElement("option"); + var t = document.createTextNode(item); + if (window.testAlgo[this.readFunction]() === item) { + opt.selected = "selected"; + } + opt.setAttribute("value", item); + opt.appendChild(t); + this.inputElement.appendChild(opt); +} + +function addPropertyTableEntry(property) +{ + var table = document.getElementById("properties"); + var row = table.insertRow(-1); + var i = 0; + var keys = new Array(); + var input; + + for (i = 0; i < property.length; i++) { + keys.push(property[i][0]); + } + + var name = ""; + if (keys.indexOf("name") >= 0) { + name = property[keys.indexOf("name")][1]; + } + var displayName = name; + if (keys.indexOf("display") >= 0) { + displayName = property[keys.indexOf("display")][1]; + } + var typeProperty = "string"; + if (keys.indexOf("type") >= 0) { + // list: defines a list of strings that will be displayed by the QLC+ RGB Matrix Editor + // range: defined a range of integer values that this property can handle + // integer: an integer value that QLC+ can exchange with the script + // string: a string that QLC+ can exchange with the script + typeProperty = property[keys.indexOf("type")][1]; + } + var values = Array(0, 0); + if (keys.indexOf("values") >= 0) { + values = property[keys.indexOf("values")][1].split(","); + } + var writeFunction = ""; + if (keys.indexOf("write") >= 0) { + writeFunction = property[keys.indexOf("write")][1]; + if (name !== "") { + var storedValue = localStorage.getItem(name); + if (storedValue !== null) { + window.testAlgo[writeFunction](storedValue); + } + } + } + var readFunction = ""; + if (keys.indexOf("read") >= 0) { + readFunction = property[keys.indexOf("read")][1]; + } + + var nameCell = row.insertCell(-1); + var t = document.createTextNode(displayName); + nameCell.appendChild(t); + + var formCell = row.insertCell(-1); + if (typeProperty === "list") { + input = document.createElement("select"); + input.name = name; + input.id = name; + input.setAttribute("onChange", "writeFunction('" + writeFunction + "', '" + name + "', this.value); setStep(0); writeCurrentStep()"); + var selectOption = new Object(); + selectOption.readFunction = readFunction; + selectOption.inputElement = input; + values.forEach(writeSelectOptions, selectOption); + formCell.appendChild(input); + } else if (typeProperty === "range") { + input = document.createElement("input"); + input.type = "number"; + input.required = "required"; + input.name = name; + input.setAttribute("value", window.testAlgo[name]); + input.id = name; + input.min = values[0]; + input.max = values[1]; + input.setAttribute("onChange", "writeFunction('" + writeFunction + "', '" + name + "', this.value); setStep(0); writeCurrentStep()"); + formCell.appendChild(input); + } else if (typeProperty === "integer") { + input = document.createElement("input"); + input.type = "number"; + input.required = "required"; + input.name = name; + input.setAttribute("value", window.testAlgo[name]); + input.id = name; + input.setAttribute("onChange", "writeFunction('" + writeFunction + "', '" + name + "', this.value); setStep(0); writeCurrentStep()"); + formCell.appendChild(input); + } else { // string + input = document.createElement("input"); + input.type = "text"; + input.name = name; + input.setAttribute("value", window.testAlgo[name]); + input.id = name; + input.setAttribute("onChange", "writeFunction('" + writeFunction + "', '" + name + "', this.value); setStep(0); writeCurrentStep()"); + formCell.appendChild(input); + } } function initProperties() { - document.getElementById("apiversion").value = testAlgo.apiVersion; - document.getElementById("name").value = testAlgo.name; - document.getElementById("author").value = testAlgo.author; + var table = document.getElementById("properties"); + var properties = Array(); + var property = Array(); + var i = 0; + var entry = 0; + + // Cleanup the table before updating its contents + for (i = table.rows.length - 1; i >= 0; i--) { + table.deleteRow(i); + } + + // Algo properties not supported by versions prior to 2. + if (testAlgo.apiVersion < 2) { + return; + } + + // Get the properties + for (i = 0; i < testAlgo.properties.length; i++) + { + var propDef = testAlgo.properties[i]; + var propKeyValue = propDef.split("|"); + property = Array(); + + for (entry = 0; entry < propKeyValue.length; entry++) { + var keyValue = propKeyValue[entry].split(":"); + var key = keyValue[0]; + keyValue.shift(); + property.push(Array(key, keyValue.join(":"))); + } + properties.push(property); + } + // Write the properties + properties.forEach(addPropertyTableEntry); } function initPixelColors() @@ -46,41 +187,49 @@ function initPixelColors() secondaryColorChooser.hidden = testAlgo.acceptColors === 1; } -function onGridSizeUpdated() +function initSpeedValue() { - width = parseInt(document.getElementById("width").value); - height = parseInt(document.getElementById("height").value); - - stepCount = testAlgo.rgbMapStepCount(width, height); - document.getElementById("stepCount").value = stepCount; - document.getElementById("currentStep").max = stepCount - 1; - - setStep(0); + var speed = localStorage.getItem("speed"); + if (speed === null) { + speed = 500; + } + document.getElementById("speed").value = speed; } -function nextStep() +function getRgbFromColorInt(color) { - if (currentStep + 1 < stepCount) { - setStep(currentStep + 1); - } - else { - setStep(0); - } + var red = color >> 16; + var green = (color >> 8) - red * 256; + var blue = color - red * 256 * 256 - green * 256; + return [red, green, blue]; } -function previousStep() +function getCurrentColorInt() { - if (currentStep > 0) { - setStep(currentStep - 1); - } else { - setStep(stepCount - 1); // last step + var primaryColorInput = document.getElementById("primaryColor"); + var primaryColor = parseInt(primaryColorInput.value, 16); + var secondaryColorInput = document.getElementById("secondaryColor"); + var secondaryColor = parseInt(secondaryColorInput.value, 16); + + if (testAlgo.acceptColors === 0 || Number.isNaN(primaryColor)) { + return null; } -} -function setStep(step) { - currentStep = step; - document.getElementById("currentStep").value = currentStep; - writeCurrentStep(); + if (testAlgo.acceptColors === 1 || Number.isNaN(secondaryColor) || stepCount <= 1) { + return primaryColor; + } + + var primaryColorRgb = getRgbFromColorInt(primaryColor); + var secondaryColorRgb = getRgbFromColorInt(secondaryColor); + + var primaryFactor = (stepCount - currentStep - 1) / (stepCount - 1); + var secondaryFactor = currentStep / (stepCount - 1); + + var red = Math.round(primaryColorRgb[0] * primaryFactor + secondaryColorRgb[0] * secondaryFactor); + var green = Math.round(primaryColorRgb[1] * primaryFactor + secondaryColorRgb[1] * secondaryFactor); + var blue = Math.round(primaryColorRgb[2] * primaryFactor + secondaryColorRgb[2] * secondaryFactor); + + return red * 256 * 256 + green * 256 + blue; } function writeCurrentStep() @@ -106,45 +255,134 @@ function writeCurrentStep() } rgbStr = "#" + rgbStr; cell.style.backgroundColor = rgbStr; - cell.style.height = 20; - cell.style.width = 20; + cell.style.height = "20px"; + cell.style.width = "20px"; cell.title = "(" + x + ", " + y + "): " + rgbStr + " – " + cell.style.backgroundColor; // rgbStr will be #rrggbb whereas the cell style will be rgb(255, 255, 255) } } } -function getCurrentColorInt() +function setStep(step) { + currentStep = step; + document.getElementById("currentStep").value = currentStep; + writeCurrentStep(); +} + +function onGridSizeUpdated() { - var primaryColorInput = document.getElementById("primaryColor"); - var primaryColor = parseInt(primaryColorInput.value, 16); - var secondaryColorInput = document.getElementById("secondaryColor"); - var secondaryColor = parseInt(secondaryColorInput.value, 16); + width = parseInt(document.getElementById("width").value); + height = parseInt(document.getElementById("height").value); - if (testAlgo.acceptColors === 0 || Number.isNaN(primaryColor)) { - return null; + stepCount = testAlgo.rgbMapStepCount(width, height); + document.getElementById("stepCount").value = stepCount; + document.getElementById("currentStep").max = stepCount - 1; + + setStep(0); + writeCurrentStep(); +} + +function startTest() +{ + var speed = document.getElementById("speed").value; + window.clearInterval(testTimer); // avoid multiple timers running simultaneously + testTimer = window.setInterval("nextStep()", speed); + localStorage.setItem("timerRunning", 1); +} + +function stopTest() +{ + window.clearInterval(testTimer); + localStorage.setItem("timerRunning", 0); +} + +function initTestStatus() +{ + var timerStatus = localStorage.getItem("timerRunning"); + if (timerStatus === null || parseInt(timerStatus) === 1) { + startTest(); } +} - if (testAlgo.acceptColors === 1 || Number.isNaN(secondaryColor) || stepCount <= 1) { - return primaryColor; +function init() +{ + if (typeof testAlgo === "undefined") { + return; + } + initDefinitions(); + initSpeedValue(); + initProperties(); + initPixelColors(); + onGridSizeUpdated(); + writeCurrentStep(); + initTestStatus(); +} + +function handleLoadError() +{ + return; +} + +function onFilenameUpdated(filename) +{ + if (filename === "") { + return; } - var primaryColorRgb = getRgbFromColorInt(primaryColor); - var secondaryColorRgb = getRgbFromColorInt(secondaryColor); + localStorage.setItem("filename", filename); - var primaryFactor = (stepCount - currentStep - 1) / (stepCount - 1); - var secondaryFactor = currentStep / (stepCount - 1); + var script = document.getElementById("algoScript"); + if (script === null) { + script = document.createElement("script"); + script.id = "algoScript"; + script.addEventListener("load", () => init(), false); + script.addEventListener("error", () => handleLoadError(), false); + script.type = "text/javascript"; + script.src = filename; + document.head.appendChild(script); + } else { + script.src = filename; + } + // init(); // is called onload. +} - var red = Math.round(primaryColorRgb[0] * primaryFactor + secondaryColorRgb[0] * secondaryFactor); - var green = Math.round(primaryColorRgb[1] * primaryFactor + secondaryColorRgb[1] * secondaryFactor); - var blue = Math.round(primaryColorRgb[2] * primaryFactor + secondaryColorRgb[2] * secondaryFactor); +function loadAlgoFile() +{ + var storedValue = localStorage.getItem("filename"); + if (storedValue === null) { + storedValue = "evenodd.js"; + } + document.getElementById("filename").value = storedValue; + onFilenameUpdated(storedValue); +} - return red * 256 * 256 + green * 256 + blue; +function writeFunction(functionName, propertyName, value) +{ + window.testAlgo[functionName](value); + localStorage.setItem(propertyName, value); } -function getRgbFromColorInt(color) +function onSpeedChanged() { - var red = color >> 16; - var green = (color >> 8) - red * 256; - var blue = color - red * 256 * 256 - green * 256; - return [red, green, blue]; + var speed = document.getElementById("speed").value; + localStorage.setItem("speed", speed); + initTestStatus(); +} + +function nextStep() +{ + if (currentStep + 1 < stepCount) { + setStep(currentStep + 1); + } + else { + setStep(0); + } +} + +function previousStep() +{ + if (currentStep > 0) { + setStep(currentStep - 1); + } else { + setStep(stepCount - 1); // last step + } } diff --git a/resources/schemas/fixture.xsd b/resources/schemas/fixture.xsd index 1f5d6cad78..ebea5479b2 100644 --- a/resources/schemas/fixture.xsd +++ b/resources/schemas/fixture.xsd @@ -391,6 +391,7 @@ when changing this list --> + diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp index 240ada293e..ab166e7b80 100644 --- a/ui/src/chasereditor.cpp +++ b/ui/src/chasereditor.cpp @@ -1152,6 +1152,7 @@ void ChaserEditor::slotTestPreviousClicked() action.m_action = ChaserPreviousStep; action.m_masterIntensity = 1.0; action.m_stepIntensity = 1.0; + action.m_fadeMode = Chaser::FromFunction; m_chaser->setAction(action); } @@ -1161,6 +1162,7 @@ void ChaserEditor::slotTestNextClicked() action.m_action = ChaserNextStep; action.m_masterIntensity = 1.0; action.m_stepIntensity = 1.0; + action.m_fadeMode = Chaser::FromFunction; m_chaser->setAction(action); } diff --git a/ui/src/ctkrangeslider.cpp b/ui/src/ctkrangeslider.cpp index e1663bfabe..2acaae20fc 100644 --- a/ui/src/ctkrangeslider.cpp +++ b/ui/src/ctkrangeslider.cpp @@ -111,7 +111,7 @@ ctkRangeSliderPrivate::ctkRangeSliderPrivate(ctkRangeSlider& object) this->m_SubclassClickOffset = 0; this->m_SubclassPosition = 0; this->m_SubclassWidth = 0; - this->m_SelectedHandles = 0; + this->m_SelectedHandles = NoHandle; this->m_SymmetricMoves = false; } @@ -769,7 +769,7 @@ void ctkRangeSlider::mouseReleaseEvent(QMouseEvent* mouseEvent) this->QSlider::mouseReleaseEvent(mouseEvent); setSliderDown(false); - d->m_SelectedHandles = 0; + d->m_SelectedHandles = ctkRangeSliderPrivate::NoHandle; this->update(); } diff --git a/ui/src/dmxdumpfactory.cpp b/ui/src/dmxdumpfactory.cpp index d39a1e3f7e..7db73ca666 100644 --- a/ui/src/dmxdumpfactory.cpp +++ b/ui/src/dmxdumpfactory.cpp @@ -58,6 +58,7 @@ DmxDumpFactory::DmxDumpFactory(Doc *doc, DmxDumpFactoryProperties *props, QWidge m_fixturesTree = new FixtureTreeWidget(m_doc, treeFlags, this); m_fixturesTree->setIconSize(QSize(24, 24)); + m_fixturesTree->setSortingEnabled(false); m_treeLayout->addWidget(m_fixturesTree); m_fixturesTree->setChannelsMask(m_properties->channelsMask()); diff --git a/ui/src/fixturetreewidget.cpp b/ui/src/fixturetreewidget.cpp index 4df08486a2..ed7d410fc0 100644 --- a/ui/src/fixturetreewidget.cpp +++ b/ui/src/fixturetreewidget.cpp @@ -182,7 +182,7 @@ void FixtureTreeWidget::updateFixtureItem(QTreeWidgetItem* item, Fixture* fixtur if (m_disabledFixtures.contains(fixture->id()) == true) { // Disable selection - item->setFlags(0); + item->setFlags(Qt::NoItemFlags); } if (m_uniColumn > 0) @@ -235,14 +235,14 @@ void FixtureTreeWidget::updateFixtureItem(QTreeWidgetItem* item, Fixture* fixtur headItem->setData(KColumnName, PROP_HEAD, i); if (m_disabledHeads.contains(GroupHead(fixture->id(), i)) == true) { - headItem->setFlags(0); // Disable selection + headItem->setFlags(Qt::NoItemFlags); // Disable selection disabled++; } } // Disable the whole fixture if all heads are disabled if (disabled == fixture->heads()) - item->setFlags(0); + item->setFlags(Qt::NoItemFlags); } if (m_channelSelection == true) diff --git a/ui/src/flowlayout.cpp b/ui/src/flowlayout.cpp index 9c63e24e6f..019dcedca8 100644 --- a/ui/src/flowlayout.cpp +++ b/ui/src/flowlayout.cpp @@ -114,7 +114,7 @@ QLayoutItem *FlowLayout::takeAt(int index) //! [6] Qt::Orientations FlowLayout::expandingDirections() const { - return 0; + return Qt::Vertical; } //! [6] diff --git a/ui/src/functionselection.cpp b/ui/src/functionselection.cpp index 47b9a4ce55..4ed87fc37c 100644 --- a/ui/src/functionselection.cpp +++ b/ui/src/functionselection.cpp @@ -339,7 +339,7 @@ void FunctionSelection::refillTree() { QTreeWidgetItem* item = m_funcTree->addFunction(function->id()); if (disabledFunctions().contains(function->id())) - item->setFlags(0); // Disable the item + item->setFlags(Qt::NoItemFlags); // Disable the item else item->setSelected(selection.contains(function->id())); } diff --git a/ui/src/monitor/monitor.h b/ui/src/monitor/monitor.h index 269cd70ea7..2f1c7306a0 100644 --- a/ui/src/monitor/monitor.h +++ b/ui/src/monitor/monitor.h @@ -91,7 +91,7 @@ class Monitor : public QWidget void saveSettings(); /** Protected constructor to prevent multiple instances. */ - Monitor(QWidget* parent, Doc* doc, Qt::WindowFlags f = 0); + Monitor(QWidget* parent, Doc* doc, Qt::WindowFlags f = Qt::Widget); protected: /** The singleton Monitor instance */ diff --git a/ui/src/monitor/monitorlayout.cpp b/ui/src/monitor/monitorlayout.cpp index 81a995c3e3..aa51b59703 100644 --- a/ui/src/monitor/monitorlayout.cpp +++ b/ui/src/monitor/monitorlayout.cpp @@ -117,7 +117,7 @@ void MonitorLayout::sort() Qt::Orientations MonitorLayout::expandingDirections() const { - return 0; + return Qt::Vertical; } bool MonitorLayout::hasHeightForWidth() const diff --git a/ui/src/rgbmatrixeditor.cpp b/ui/src/rgbmatrixeditor.cpp index fb260b45a8..4703b280bc 100644 --- a/ui/src/rgbmatrixeditor.cpp +++ b/ui/src/rgbmatrixeditor.cpp @@ -154,12 +154,19 @@ void RGBMatrixEditor::init() break; } - /* Dimmer control */ - m_dimmerControlCb->setChecked(m_matrix->dimmerControl()); /* Blend mode */ m_blendModeCombo->setCurrentIndex(m_matrix->blendMode()); + /* Color mode */ + m_colorModeCombo->setCurrentIndex(m_matrix->controlMode()); + + /* Dimmer control */ + if (m_matrix->dimmerControl()) + m_dimmerControlCb->setChecked(m_matrix->dimmerControl()); + else + m_intensityGroup->hide(); + fillPatternCombo(); fillFixtureGroupCombo(); fillAnimationCombo(); @@ -192,6 +199,8 @@ void RGBMatrixEditor::init() this, SLOT(slotFixtureGroupActivated(int))); connect(m_blendModeCombo, SIGNAL(activated(int)), this, SLOT(slotBlendModeChanged(int))); + connect(m_colorModeCombo, SIGNAL(activated(int)), + this, SLOT(slotColorModeChanged(int))); connect(m_startColorButton, SIGNAL(clicked()), this, SLOT(slotStartColorButtonClicked())); connect(m_endColorButton, SIGNAL(clicked()), @@ -369,12 +378,13 @@ void RGBMatrixEditor::updateExtraOptions() else { m_startColorButton->show(); - if (accColors == 1 || m_blendModeCombo->currentIndex() != 0) + + if (accColors == 1 || m_blendModeCombo->currentIndex() == Universe::MaskBlend) { m_endColorButton->hide(); m_resetEndColorButton->hide(); } - else + else // accColors > 1 { m_endColorButton->show(); m_resetEndColorButton->show(); @@ -385,12 +395,77 @@ void RGBMatrixEditor::updateExtraOptions() } } +void RGBMatrixEditor::updateColors() +{ + if (m_matrix->algorithm() != NULL) + { + int accColors = m_matrix->algorithm()->acceptColors(); + if (accColors > 0) + { + if (m_matrix->blendMode() == Universe::MaskBlend) + { + m_matrix->setStartColor(Qt::white); + m_matrix->setEndColor(QColor()); + + m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); + + QPixmap pm(50, 26); + pm.fill(Qt::white); + m_startColorButton->setIcon(QIcon(pm)); + } + else if (m_colorModeCombo->currentIndex() != RGBMatrix::ControlModeRgb) + { + // Convert startColor to grayscale for single color modes + uchar gray = qGray(m_matrix->startColor().rgb()); + QPixmap pm(50, 26); + pm.fill(QColor(gray, gray, gray)); + m_startColorButton->setIcon(QIcon(pm)); + m_matrix->setStartColor(QColor(gray, gray, gray)); + + if (accColors > 1) + { + // Convert endColor to grayscale for single color modes + gray = qGray(m_matrix->endColor().rgb()); + m_matrix->setEndColor(QColor(gray, gray, gray)); + + if (m_matrix->endColor() == QColor()) + pm.fill(Qt::transparent); + else + pm.fill(QColor(gray, gray, gray)); + + m_endColorButton->setIcon(QIcon(pm)); + } + m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); + } + else + { + QPixmap pm(50, 26); + pm.fill(m_matrix->startColor()); + m_startColorButton->setIcon(QIcon(pm)); + + if (accColors > 1) + { + m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); + + if (m_matrix->endColor() == QColor()) + pm.fill(Qt::transparent); + else + pm.fill(m_matrix->endColor()); + + m_endColorButton->setIcon(QIcon(pm)); + } + } + } + } +} + /** * Helper function. Deletes all child widgets of the given layout @a item. */ void RGBMatrixEditor::resetProperties(QLayoutItem *item) { - if (item->layout()) { + if (item->layout()) + { // Process all child items recursively. for (int i = item->layout()->count() - 1; i >= 0; i--) resetProperties(item->layout()->itemAt(i)); @@ -427,20 +502,16 @@ void RGBMatrixEditor::displayProperties(RGBScript *script) { QString pValue = m_matrix->property(prop.m_name); if (!pValue.isEmpty()) -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + { propCombo->setCurrentText(pValue); -#else - propCombo->setCurrentIndex(propCombo->findText(pValue)); -#endif + } else { pValue = script->property(prop.m_name); if (!pValue.isEmpty()) -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + { propCombo->setCurrentText(pValue); -#else - propCombo->setCurrentIndex(propCombo->findText(pValue)); -#endif + } } } gridRowIdx++; @@ -635,23 +706,23 @@ void RGBMatrixEditor::slotBlendModeChanged(int index) if (index == Universe::MaskBlend) { - m_matrix->setEndColor(QColor()); - QPixmap pm(50, 26); - pm.fill(Qt::transparent); - m_endColorButton->setIcon(QIcon(pm)); - - m_matrix->setStartColor(Qt::white); - m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); - pm.fill(Qt::white); - m_startColorButton->setIcon(QIcon(pm)); m_startColorButton->setEnabled(false); - slotRestartTest(); } else { m_startColorButton->setEnabled(true); } updateExtraOptions(); + updateColors(); + slotRestartTest(); +} + +void RGBMatrixEditor::slotColorModeChanged(int index) +{ + RGBMatrix::ControlMode mode = RGBMatrix::ControlMode(index); + m_matrix->setControlMode(mode); + updateColors(); + slotRestartTest(); } void RGBMatrixEditor::slotStartColorButtonClicked() @@ -660,10 +731,7 @@ void RGBMatrixEditor::slotStartColorButtonClicked() if (col.isValid() == true) { m_matrix->setStartColor(col); - m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); - QPixmap pm(50, 26); - pm.fill(col); - m_startColorButton->setIcon(QIcon(pm)); + updateColors(); slotRestartTest(); } } @@ -674,10 +742,7 @@ void RGBMatrixEditor::slotEndColorButtonClicked() if (col.isValid() == true) { m_matrix->setEndColor(col); - m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); - QPixmap pm(50, 26); - pm.fill(col); - m_endColorButton->setIcon(QIcon(pm)); + updateColors(); slotRestartTest(); } } @@ -686,9 +751,7 @@ void RGBMatrixEditor::slotResetEndColorButtonClicked() { m_matrix->setEndColor(QColor()); m_previewHandler->calculateColorDelta(m_matrix->startColor(), m_matrix->endColor()); - QPixmap pm(50, 26); - pm.fill(Qt::transparent); - m_endColorButton->setIcon(QIcon(pm)); + updateColors(); slotRestartTest(); } @@ -857,6 +920,8 @@ void RGBMatrixEditor::slotBackwardClicked() void RGBMatrixEditor::slotDimmerControlClicked() { m_matrix->setDimmerControl(m_dimmerControlCb->isChecked()); + if (m_dimmerControlCb->isChecked() == false) + m_dimmerControlCb->setEnabled(false); } void RGBMatrixEditor::slotFadeInChanged(int ms) diff --git a/ui/src/rgbmatrixeditor.h b/ui/src/rgbmatrixeditor.h index 8e06843622..4806c13893 100644 --- a/ui/src/rgbmatrixeditor.h +++ b/ui/src/rgbmatrixeditor.h @@ -63,6 +63,7 @@ public slots: void fillAnimationCombo(); void fillImageAnimationCombo(); void updateExtraOptions(); + void updateColors(); void resetProperties(QLayoutItem *item); void displayProperties(RGBScript *script); @@ -75,6 +76,7 @@ private slots: void slotPatternActivated(const QString& text); void slotFixtureGroupActivated(int index); void slotBlendModeChanged(int index); + void slotColorModeChanged(int index); void slotStartColorButtonClicked(); void slotEndColorButtonClicked(); void slotResetEndColorButtonClicked(); diff --git a/ui/src/rgbmatrixeditor.ui b/ui/src/rgbmatrixeditor.ui index 82314eda0d..1d09c025e9 100644 --- a/ui/src/rgbmatrixeditor.ui +++ b/ui/src/rgbmatrixeditor.ui @@ -7,14 +7,14 @@ Copyright (c) 2015 Massimo Callegari - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.txt Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. @@ -25,8 +25,8 @@ 0 0 - 549 - 610 + 575 + 728 @@ -42,7 +42,10 @@ 5 - + + + + @@ -65,7 +68,20 @@ 4 - + + + + Matrix start color + + + + 50 + 26 + + + + + Matrix end color @@ -81,7 +97,14 @@ - + + + + The RGB matrix pattern + + + + Reset the end color @@ -92,53 +115,74 @@ - - - - The RGB matrix pattern - + + + + + Default (HTP) + + + + + Mask + + + + + Additive + + + + + Subtractive + + - - - Matrix start color - - - - 50 - 26 - + + + Blend mode - + - Blend mode + Control mode - + - Default (HTP) + Default (RGB) - Mask + White - Additive + Amber - Subtractive + UV + + + + + Dimmer + + + + + Shutter @@ -346,10 +390,7 @@ - - - - + @@ -380,120 +421,6 @@ - - - - - 0 - 0 - - - - Direction - - - - 4 - - - 4 - - - - - Start from the first step - - - Forward - - - true - - - - - - - Start from the last step - - - Backward - - - - - - - Qt::Vertical - - - QSizePolicy::Maximum - - - - 20 - 20 - - - - - - - - - - - - 0 - 0 - - - - Run Order - - - - 4 - - - 4 - - - - - Run through over and over again - - - Loop - - - true - - - - - - - Run through once and stop - - - Single Shot - - - - - - - First run forwards, then backwards, again forwards, etc. - - - Ping Pong - - - - - - @@ -634,11 +561,128 @@ + + + + + + + 0 + 0 + + + + Run Order + + + + 4 + + + 4 + + + + + Run through over and over again + + + Loop + + + true + + + + + + + Run through once and stop + + + Single Shot + + + + + + + First run forwards, then backwards, again forwards, etc. + + + Ping Pong + + + + + + + + + + + 0 + 0 + + + + Direction + + + + 4 + + + 4 + + + + + Start from the first step + + + Forward + + + true + + + + + + + Start from the last step + + + Backward + + + + + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 20 + 35 + + + + + + + + + - diff --git a/ui/src/scripteditor.cpp b/ui/src/scripteditor.cpp index ed0a56f8ee..b8f6e3fdcd 100644 --- a/ui/src/scripteditor.cpp +++ b/ui/src/scripteditor.cpp @@ -475,7 +475,7 @@ void ScriptEditor::slotCheckSyntax() } else { - QStringList lines = scriptText.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts); + QStringList lines = scriptText.split(QRegExp("(\r\n|\n\r|\r|\n)")); foreach(int line, errLines) { errResult.append(tr("Syntax error at line %1:\n%2\n\n").arg(line).arg(lines.at(line - 1))); diff --git a/ui/src/simpledesk.cpp b/ui/src/simpledesk.cpp index e855b94c2b..29b94e6910 100644 --- a/ui/src/simpledesk.cpp +++ b/ui/src/simpledesk.cpp @@ -1661,7 +1661,7 @@ void SimpleDesk::resizeEvent(QResizeEvent *ev) { PlaybackSlider* slider = new PlaybackSlider(m_playbackGroup); m_playbackGroup->layout()->addWidget(slider); - slider->setLabel(QString::number(m_playbackSliders.count())); + slider->setLabel(QString::number(m_playbackSliders.count() + 1)); slider->setProperty(PROP_PLAYBACK, uint(m_playbackSliders.count())); m_playbackSliders << slider; connect(slider, SIGNAL(selected()), this, SLOT(slotPlaybackSelected())); diff --git a/ui/src/virtualconsole/vcbutton.cpp b/ui/src/virtualconsole/vcbutton.cpp index f7fcc3c803..91f80b45ca 100644 --- a/ui/src/virtualconsole/vcbutton.cpp +++ b/ui/src/virtualconsole/vcbutton.cpp @@ -55,6 +55,7 @@ #include "clickandgoslider.h" #include "qlcinputchannel.h" #include "virtualconsole.h" +#include "chaseraction.h" #include "mastertimer.h" #include "vcsoloframe.h" #include "inputpatch.h" @@ -62,6 +63,7 @@ #include "function.h" #include "fixture.h" #include "apputil.h" +#include "chaser.h" #include "doc.h" const QSize VCButton::defaultSize(QSize(50, 50)); @@ -686,6 +688,23 @@ void VCButton::pressFunction() else { adjustFunctionIntensity(f, intensity()); + + // starting a Chaser is a special case, since it is necessary + // to use Chaser Actions to properly start the first + // Chaser step with the right intensity + if (f->type() == Function::ChaserType || f->type() == Function::SequenceType) + { + ChaserAction action; + action.m_action = ChaserSetStepIndex; + action.m_stepIndex = 0; + action.m_masterIntensity = intensity(); + action.m_stepIntensity = 1.0; + action.m_fadeMode = Chaser::FromFunction; + + Chaser *chaser = qobject_cast(f); + chaser->setAction(action); + } + f->start(m_doc->masterTimer(), functionParent()); setState(Active); emit functionStarting(m_function); diff --git a/ui/src/virtualconsole/vccuelist.cpp b/ui/src/virtualconsole/vccuelist.cpp index 2dd9637ce4..d47a499393 100644 --- a/ui/src/virtualconsole/vccuelist.cpp +++ b/ui/src/virtualconsole/vccuelist.cpp @@ -1364,6 +1364,9 @@ void VCCueList::slotInputValueChanged(quint32 universe, quint32 channel, uchar v } else if (checkInputSource(universe, pagedCh, value, sender(), sideFaderInputSourceId)) { + if (sideFaderMode() == None) + return; + float val = SCALE((float) value, (float) 0, (float) UCHAR_MAX, (float) m_sideFader->minimum(), (float) m_sideFader->maximum()); diff --git a/ui/src/virtualconsole/vcmatrixcontrol.cpp b/ui/src/virtualconsole/vcmatrixcontrol.cpp index e863b34d7e..609ea0e8ed 100644 --- a/ui/src/virtualconsole/vcmatrixcontrol.cpp +++ b/ui/src/virtualconsole/vcmatrixcontrol.cpp @@ -31,20 +31,31 @@ VCMatrixControl::VCMatrixControl(quint8 id) m_resource = QString(); } -VCMatrixControl::VCMatrixControl(VCMatrixControl const& vcmc) - : m_id(vcmc.m_id) - , m_type(vcmc.m_type) - , m_color(vcmc.m_color) - , m_resource(vcmc.m_resource) - , m_properties(vcmc.m_properties) - , m_keySequence(vcmc.m_keySequence) +VCMatrixControl::VCMatrixControl(const VCMatrixControl &other) { - if (vcmc.m_inputSource != NULL) + *this = other; +} + +VCMatrixControl &VCMatrixControl::operator=(const VCMatrixControl &vcmc) +{ + if (this != &vcmc) { - m_inputSource = QSharedPointer(new QLCInputSource(vcmc.m_inputSource->universe(), - vcmc.m_inputSource->channel())); - m_inputSource->setRange(vcmc.m_inputSource->lowerValue(), vcmc.m_inputSource->upperValue()); + m_id = vcmc.m_id; + m_type = vcmc.m_type; + m_color = vcmc.m_color; + m_resource = vcmc.m_resource; + m_properties = vcmc.m_properties; + m_keySequence = vcmc.m_keySequence; + + if (vcmc.m_inputSource != NULL) + { + m_inputSource = QSharedPointer(new QLCInputSource(vcmc.m_inputSource->universe(), + vcmc.m_inputSource->channel())); + m_inputSource->setRange(vcmc.m_inputSource->lowerValue(), vcmc.m_inputSource->upperValue()); + } } + + return *this; } VCMatrixControl::~VCMatrixControl() diff --git a/ui/src/virtualconsole/vcmatrixcontrol.h b/ui/src/virtualconsole/vcmatrixcontrol.h index 83b4f51b97..c318320975 100644 --- a/ui/src/virtualconsole/vcmatrixcontrol.h +++ b/ui/src/virtualconsole/vcmatrixcontrol.h @@ -47,11 +47,13 @@ class VCMatrixControl public: explicit VCMatrixControl(quint8 id); - explicit VCMatrixControl(VCMatrixControl const& vcmc); + VCMatrixControl(const VCMatrixControl &other); /** Destructor */ ~VCMatrixControl(); + VCMatrixControl& operator=(const VCMatrixControl& vcmc); + enum ControlType { StartColor = 0, diff --git a/ui/src/virtualconsole/vcslider.cpp b/ui/src/virtualconsole/vcslider.cpp index dac0214ac5..73ff8ca2b3 100644 --- a/ui/src/virtualconsole/vcslider.cpp +++ b/ui/src/virtualconsole/vcslider.cpp @@ -1828,8 +1828,18 @@ VCSlider::LevelChannel::LevelChannel(quint32 fid, quint32 ch) VCSlider::LevelChannel::LevelChannel(const LevelChannel& lc) { - this->fixture = lc.fixture; - this->channel = lc.channel; + *this = lc; +} + +VCSlider::LevelChannel &VCSlider::LevelChannel::operator=(const VCSlider::LevelChannel &lc) +{ + if (this != &lc) + { + this->fixture = lc.fixture; + this->channel = lc.channel; + } + + return *this; } bool VCSlider::LevelChannel::operator==(const LevelChannel& lc) const diff --git a/ui/src/virtualconsole/vcslider.h b/ui/src/virtualconsole/vcslider.h index c9eae0ee94..8a6160a733 100644 --- a/ui/src/virtualconsole/vcslider.h +++ b/ui/src/virtualconsole/vcslider.h @@ -231,6 +231,8 @@ public slots: LevelChannel(quint32 fid, quint32 ch); /** Copy constructor */ LevelChannel(const LevelChannel& lc); + /** Copy operator */ + LevelChannel& operator=(const LevelChannel& lc); /** Comparison operator */ bool operator==(const LevelChannel& lc) const; /** Sorting operator */ diff --git a/ui/src/virtualconsole/vcspeeddialpreset.cpp b/ui/src/virtualconsole/vcspeeddialpreset.cpp index 7fbfe0b34d..83e464ba9c 100644 --- a/ui/src/virtualconsole/vcspeeddialpreset.cpp +++ b/ui/src/virtualconsole/vcspeeddialpreset.cpp @@ -31,24 +31,34 @@ VCSpeedDialPreset::VCSpeedDialPreset(quint8 id) { } -VCSpeedDialPreset::VCSpeedDialPreset(VCSpeedDialPreset const& preset) - : m_id(preset.m_id) - , m_name(preset.m_name) - , m_value(preset.m_value) - , m_keySequence(preset.m_keySequence) +VCSpeedDialPreset::VCSpeedDialPreset(VCSpeedDialPreset const& other) { - if (preset.m_inputSource != NULL) - { - m_inputSource = QSharedPointer(new QLCInputSource(preset.m_inputSource->universe(), - preset.m_inputSource->channel())); - m_inputSource->setRange(preset.m_inputSource->lowerValue(), preset.m_inputSource->upperValue()); - } + *this = other; } VCSpeedDialPreset::~VCSpeedDialPreset() { } +VCSpeedDialPreset &VCSpeedDialPreset::operator=(const VCSpeedDialPreset &preset) +{ + if (this != &preset) + { + m_id = preset.m_id; + m_name = preset.m_name; + m_value = preset.m_value; + m_keySequence = preset.m_keySequence; + + if (preset.m_inputSource != NULL) + { + m_inputSource = QSharedPointer(new QLCInputSource(preset.m_inputSource->universe(), + preset.m_inputSource->channel())); + m_inputSource->setRange(preset.m_inputSource->lowerValue(), preset.m_inputSource->upperValue()); + } + } + return *this; +} + bool VCSpeedDialPreset::operator<(VCSpeedDialPreset const& right) const { return m_id < right.m_id; diff --git a/ui/src/virtualconsole/vcspeeddialpreset.h b/ui/src/virtualconsole/vcspeeddialpreset.h index c48c468a0e..5a46b0d8af 100644 --- a/ui/src/virtualconsole/vcspeeddialpreset.h +++ b/ui/src/virtualconsole/vcspeeddialpreset.h @@ -47,6 +47,7 @@ class VCSpeedDialPreset ~VCSpeedDialPreset(); public: + VCSpeedDialPreset& operator=(const VCSpeedDialPreset& preset); bool operator<(VCSpeedDialPreset const& right) const; static bool compare(VCSpeedDialPreset const* left, VCSpeedDialPreset const* right); /************************************************************************ diff --git a/ui/src/virtualconsole/vcxypadpreset.cpp b/ui/src/virtualconsole/vcxypadpreset.cpp index 0410f19d08..cc9f2795da 100644 --- a/ui/src/virtualconsole/vcxypadpreset.cpp +++ b/ui/src/virtualconsole/vcxypadpreset.cpp @@ -34,26 +34,13 @@ VCXYPadPreset::VCXYPadPreset(quint8 id) } -VCXYPadPreset::VCXYPadPreset(const VCXYPadPreset &vcpp) - : m_id(vcpp.m_id) - , m_type(vcpp.m_type) - , m_name(vcpp.m_name) - , m_dmxPos(vcpp.m_dmxPos) - , m_funcID(vcpp.m_funcID) - , m_fxGroup(vcpp.m_fxGroup) - , m_keySequence(vcpp.m_keySequence) +VCXYPadPreset::VCXYPadPreset(const VCXYPadPreset &other) { - if (vcpp.m_inputSource != NULL) - { - m_inputSource = QSharedPointer(new QLCInputSource(vcpp.m_inputSource->universe(), - vcpp.m_inputSource->channel())); - m_inputSource->setRange(vcpp.m_inputSource->lowerValue(), vcpp.m_inputSource->upperValue()); - } + *this = other; } VCXYPadPreset::~VCXYPadPreset() { - } QString VCXYPadPreset::getColor() const @@ -100,6 +87,28 @@ QList VCXYPadPreset::fixtureGroup() const return m_fxGroup; } +VCXYPadPreset &VCXYPadPreset::operator=(const VCXYPadPreset &vcpp) +{ + if (this != &vcpp) + { + m_id = vcpp.m_id; + m_type = vcpp.m_type; + m_name = vcpp.m_name; + m_dmxPos = vcpp.m_dmxPos; + m_funcID = vcpp.m_funcID; + m_fxGroup = vcpp.m_fxGroup; + m_keySequence = vcpp.m_keySequence; + + if (vcpp.m_inputSource != NULL) + { + m_inputSource = QSharedPointer(new QLCInputSource(vcpp.m_inputSource->universe(), + vcpp.m_inputSource->channel())); + m_inputSource->setRange(vcpp.m_inputSource->lowerValue(), vcpp.m_inputSource->upperValue()); + } + } + return *this; +} + bool VCXYPadPreset::operator<(const VCXYPadPreset &right) const { return m_id < right.m_id; diff --git a/ui/src/virtualconsole/vcxypadpreset.h b/ui/src/virtualconsole/vcxypadpreset.h index d62cccc5fd..b9ebc1235d 100644 --- a/ui/src/virtualconsole/vcxypadpreset.h +++ b/ui/src/virtualconsole/vcxypadpreset.h @@ -48,7 +48,7 @@ class VCXYPadPreset { public: explicit VCXYPadPreset(quint8 id); - explicit VCXYPadPreset(VCXYPadPreset const& vcpp); + explicit VCXYPadPreset(VCXYPadPreset const& other); /** Destructor */ ~VCXYPadPreset(); @@ -73,6 +73,7 @@ class VCXYPadPreset QList fixtureGroup() const; public: + VCXYPadPreset& operator=(const VCXYPadPreset& vcpp); bool operator<(VCXYPadPreset const& right) const; static bool compare(VCXYPadPreset const* left, VCXYPadPreset const* right); diff --git a/ui/test/vcbutton/vcbutton_test.cpp b/ui/test/vcbutton/vcbutton_test.cpp index 3f281cd500..e18d265f06 100644 --- a/ui/test/vcbutton/vcbutton_test.cpp +++ b/ui/test/vcbutton/vcbutton_test.cpp @@ -517,10 +517,10 @@ void VCButton_Test::toggle() // Mouse button press in design mode doesn't toggle the function QCOMPARE(m_doc->mode(), Doc::Design); - QMouseEvent ev(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, 0, 0); + QMouseEvent ev(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); btn.mousePressEvent(&ev); QCOMPARE(m_doc->masterTimer()->m_functionList.size(), 0); - ev = QMouseEvent(QEvent::MouseButtonRelease, QPoint(0, 0), Qt::LeftButton, 0, 0); + ev = QMouseEvent(QEvent::MouseButtonRelease, QPoint(0, 0), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); btn.mouseReleaseEvent(&ev); QCOMPARE(m_doc->masterTimer()->m_functionList.size(), 0); @@ -537,7 +537,7 @@ void VCButton_Test::toggle() QCOMPARE(sc->stopped(), false); QCOMPARE(btn.state(), VCButton::Active); - ev = QMouseEvent(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, 0, 0); + ev = QMouseEvent(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); btn.mousePressEvent(&ev); QCOMPARE(sc->m_stop, true); QCOMPARE(btn.state(), VCButton::Active); @@ -549,7 +549,7 @@ void VCButton_Test::toggle() QTest::qWait(500); QVERIFY(btn.palette().color(QPalette::Button) == another.palette().color(QPalette::Button)); - ev = QMouseEvent(QEvent::MouseButtonRelease, QPoint(0, 0), Qt::LeftButton, 0, 0); + ev = QMouseEvent(QEvent::MouseButtonRelease, QPoint(0, 0), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); btn.mouseReleaseEvent(&ev); } diff --git a/ui/test/vccuelist/vccuelist_test.cpp b/ui/test/vccuelist/vccuelist_test.cpp index 2fe3dadab8..9dc67dd594 100644 --- a/ui/test/vccuelist/vccuelist_test.cpp +++ b/ui/test/vccuelist/vccuelist_test.cpp @@ -405,7 +405,7 @@ void VCCueList_Test::loadXML() QCOMPARE(cl.pos(), QPoint(3, 4)); QCOMPARE(cl.size(), QSize(42, 69)); - QCOMPARE(cl.font(), f); + QCOMPARE(cl.font().toString(), f.toString()); cl.postLoad(); QCOMPARE(cl.m_tree->topLevelItemCount(), 4); diff --git a/ui/test/vclabel/vclabel_test.cpp b/ui/test/vclabel/vclabel_test.cpp index 21625aa4c1..c48b4ae9c1 100644 --- a/ui/test/vclabel/vclabel_test.cpp +++ b/ui/test/vclabel/vclabel_test.cpp @@ -124,7 +124,7 @@ void VCLabel_Test::loadXML() QCOMPARE(label.geometry().height(), 69); QCOMPARE(label.geometry().x(), 3); QCOMPARE(label.geometry().y(), 4); - QCOMPARE(label.font(), f); + QCOMPARE(label.font().toString(), f.toString()); buffer.close(); QByteArray bData = buffer.data(); diff --git a/ui/test/vcwidget/vcwidget_test.cpp b/ui/test/vcwidget/vcwidget_test.cpp index e2ee281fe2..f54a4da40d 100644 --- a/ui/test/vcwidget/vcwidget_test.cpp +++ b/ui/test/vcwidget/vcwidget_test.cpp @@ -243,12 +243,12 @@ void VCWidget_Test::font() StubWidget stub(&w, m_doc); stub.setFont(font); - QCOMPARE(stub.font(), font); + QCOMPARE(stub.font().toString(), font.toString()); QCOMPARE(stub.hasCustomFont(), true); QCOMPARE(spy.size(), 1); stub.resetFont(); - QCOMPARE(stub.font(), w.font()); + QCOMPARE(stub.font().toString(), w.font().toString()); QCOMPARE(stub.hasCustomFont(), false); QCOMPARE(spy.size(), 2); } @@ -483,7 +483,7 @@ void VCWidget_Test::loadAppearance() QCOMPARE(stub.foregroundColor(), QColor(Qt::red)); QCOMPARE(stub.hasCustomBackgroundColor(), true); QCOMPARE(stub.backgroundColor(), QColor(Qt::blue)); - QCOMPARE(stub.font(), font); + QCOMPARE(stub.font().toString(), font.toString()); buffer.close(); QByteArray bData = buffer.data(); @@ -501,7 +501,7 @@ void VCWidget_Test::loadAppearance() QCOMPARE(stub.hasCustomForegroundColor(), false); QCOMPARE(stub.hasCustomBackgroundColor(), false); QCOMPARE(stub.backgroundImage(), QFileInfo("../../../resources/icons/png/qlcplus.png").absoluteFilePath()); - QCOMPARE(stub.font(), font); + QCOMPARE(stub.font().toString(), font.toString()); buffer.close(); bData = buffer.data(); @@ -517,7 +517,7 @@ void VCWidget_Test::loadAppearance() QCOMPARE(stub.hasCustomForegroundColor(), false); QCOMPARE(stub.hasCustomBackgroundColor(), false); QCOMPARE(stub.backgroundImage(), QFileInfo("../../../resources/icons/png/qlcplus.png").absoluteFilePath()); - QCOMPARE(stub.font(), font); + QCOMPARE(stub.font().toString(), font.toString()); } void VCWidget_Test::saveInput() @@ -937,7 +937,7 @@ void VCWidget_Test::mousePress() stub->resize(QSize(20, 20)); QCOMPARE(stub->pos(), QPoint(0, 0)); - QMouseEvent e(QEvent::MouseButtonPress, QPoint(10, 10), Qt::LeftButton, 0, 0); + QMouseEvent e(QEvent::MouseButtonPress, QPoint(10, 10), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); stub->mousePressEvent(&e); QCOMPARE(vc->selectedWidgets().size(), 1); @@ -945,7 +945,7 @@ void VCWidget_Test::mousePress() QCOMPARE(stub->lastClickPoint(), QPoint(10, 10)); QTest::qWait(10); - e = QMouseEvent(QEvent::MouseMove, QPoint(20, 20), Qt::NoButton, Qt::LeftButton, 0); + e = QMouseEvent(QEvent::MouseMove, QPoint(20, 20), Qt::NoButton, Qt::LeftButton, Qt::NoModifier); stub->mouseMoveEvent(&e); QTest::qWait(10); QCOMPARE(stub->pos(), QPoint(10, 10)); diff --git a/ui/test/vcxypadarea/vcxypadarea_test.cpp b/ui/test/vcxypadarea/vcxypadarea_test.cpp index a366b4c91d..bba5731b7b 100644 --- a/ui/test/vcxypadarea/vcxypadarea_test.cpp +++ b/ui/test/vcxypadarea/vcxypadarea_test.cpp @@ -106,7 +106,7 @@ void VCXYPadArea_Test::mouseEvents() VCXYPadArea area(NULL); area.resize(QSize(256, 256)); - QMouseEvent e(QEvent::MouseButtonPress, QPoint(20, 30), Qt::LeftButton, 0, 0); + QMouseEvent e(QEvent::MouseButtonPress, QPoint(20, 30), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); area.mousePressEvent(&e); QCOMPARE(area.m_dmxPos, QPointF(0, 0)); QVERIFY(area.cursor().shape() != Qt::CrossCursor); @@ -116,7 +116,7 @@ void VCXYPadArea_Test::mouseEvents() QCOMPARE(area.m_dmxPos, QPointF(20, 30)); QCOMPARE(area.cursor().shape(), Qt::CrossCursor); - QMouseEvent e2(QEvent::MouseButtonPress, QPoint(320, 330), Qt::LeftButton, 0, 0); + QMouseEvent e2(QEvent::MouseButtonPress, QPoint(320, 330), Qt::LeftButton, Qt::NoButton, Qt::NoModifier); area.mouseMoveEvent(&e2); QCOMPARE(area.m_dmxPos, QPointF(255.0 + 255.0/256, 255.0 + 255.0/256)); QCOMPARE(area.cursor().shape(), Qt::CrossCursor); diff --git a/variables.pri b/variables.pri index 0a5ca2fb6b..9326b81814 100644 --- a/variables.pri +++ b/variables.pri @@ -4,8 +4,8 @@ APPNAME = Q Light Controller Plus FXEDNAME = Fixture Definition Editor -!qmlui: APPVERSION = 4.12.3 GIT -qmlui: APPVERSION = 5.0.0 Alpha 4 +!qmlui: APPVERSION = 4.12.4 GIT +qmlui: APPVERSION = 5.0.0 Beta 1 # Disable these if you don't want to see GIT short hash in the About Box #unix:REVISION = $$system(git log --pretty=format:'%h' -n 1) diff --git a/webaccess/src/webaccessauth.cpp b/webaccess/src/webaccessauth.cpp index 50c58c1ef8..acad900b0f 100644 --- a/webaccess/src/webaccessauth.cpp +++ b/webaccess/src/webaccessauth.cpp @@ -23,6 +23,9 @@ #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#include +#endif #include "webaccessauth.h" #include "qlcconfig.h" @@ -107,7 +110,11 @@ bool WebAccessAuth::savePasswordsFile() const << user.passwordHash << ':' << (int)user.level << ':' << user.hashType << ':' +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + << user.passwordSalt << Qt::endl; +#else << user.passwordSalt << endl; +#endif } return true; @@ -208,7 +215,11 @@ QString WebAccessAuth::generateSalt() const for(int i = 0; i < SALT_LENGTH; i++) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) int halfByte = qrand() % 16; +#else + int halfByte = QRandomGenerator::global()->generate() % 16; +#endif salt.append(QString::number(halfByte, 16)); }