Merge branch 'master' into script-blackout

mcallegari · Oct 28, 2017 · eea8db1 · eea8db1
2 parents e649536 + 2de123e
commit eea8db1
Show file tree

Hide file tree

Showing 50 changed files with 4,197 additions and 162 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -3,17 +3,19 @@ qlcplus (4.11.1) stable; urgency=low
   * engine: fixed audio files detection by prioritizing sndfile over mad
   * engine: fixed HTP/LTP forced channels not set correctly
   * engine: keep track of input/output device lines even if they are disconnected
-  * Scripts: add blackout:on and blackout:off commands
+  * engine/Script: add blackout:on and blackout:off commands
+  * engine/Script: do not keep empty trailing lines when saving a workspace
   * UI: it is now possible to detach a QLC+ context tab on a separate window by double clicking on it
   * UI/RGB Panel: added RBG pixel type (thanks to Peter Marks)
   * UI/Remap: fixed RGB Panels remapping
   * UI/Input Output Manager: added a button to enable/disable USB hotplugging (disabled by default)
   * UI/Function Live Edit: restore basic live editing of Sequences
   * UI/RGB Matrix Editor: fixed save to Sequence feature
+  * UI/Function Manager: when cloning a Sequence, clone the bound Scene too
   * Virtual Console/Slider: fix DMX values not updated when interacting with the mouse wheel, keyboard or Click And Go button
   * Virtual Console/Slider: fix level mode values range scaling
   * Virtual Console/XYPad: the speed of a running EFX preset can now be controlled by a Speed Dial widget
-  * RGB Scripts: added "Random pixel per row" and "Random pixel per row multicolor" (thanks to Doug Puckett)
+  * RGB Scripts: added "Noise", "Random pixel per row" and "Random pixel per row multicolor" (thanks to Doug Puckett)
   * Web access: added basic authentication support (thanks to Bartosz Grabias)
   * Web access: fixed solo frames collapse state
   * Web access: update feedbacks when a slider is moved
@@ -22,8 +24,19 @@ qlcplus (4.11.1) stable; urgency=low
   * New fixture: Clay Paky Tiger Scan HMI 575/1200 (thanks to Daris Tomasoni)
   * New fixture: Litecraft WashX.21 (thanks to Hannes Braun)
   * New fixtures: Briteq Stagepainter 12, Nicols IP Wash 120, Showtec LED Powerline 16 Bar (thanks to Fredje Gallon)
+  * New fixtures: Nicols Movelight, Nicols Birdy Wash 122, Briteq Giga Flash RGB (thanks to Fredje Gallon)
   * New fixtures: Litecraft PowerBar AT10.sx, Stairville MH-z1915 (thanks to Thorben / Fredje)
   * New fixtures: Martin MAC 700 Wash, ADB Warp M (thanks to Thorben)
+  * New fixture: Laserworld CS-1000RGB Mk II (thanks to Piotr Nowik)
+  * New fixture: Chauvet COLORrail IRC (thanks to Lane Parsons)
+  * New fixtures: American DJ COB Cannon Wash DW, lightmaXX Vega Zoom Wash Beam (thanks to Florian Gerstenlauer)
+  * New fixture: Martin Rush MH5 Profile (thanks to Falko)
+  * New fixture: Cameo Flash Bar 150 (thanks to Kevin Wimmer)
+  * New fixtures: Chauvet FXpar 9, IMG Stageline Wash-40 LED (thanks to PeterK)
+  * New fixtures: JB Systems iRock 5C, JB Systems LED Devil (thanks to Andres Robles)
+  * New fixtures: beamZ BAC406, Geni Mojo Color Moc (thanks to Mark Sy)
+  * New fixtures: Stairville MH-250 S, Chauvet GigBAR 2, Pro-Lights Onyx (thanks to Freasy)
+  * New fixtures: Coemar ProSpot 250 LX, Showtec Kanjo Spot 60 (thanks to Flo Edelmann)
 
  -- Massimo Callegari <massimocallegari@yahoo.it>  Sun, 27 Aug 2017 12:13:14 +0200
 

diff --git a/engine/src/script.cpp b/engine/src/script.cpp
@@ -188,7 +188,12 @@ QString Script::data() const
 
 QStringList Script::dataLines() const
 {
-    return m_data.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts);
+    QStringList result = m_data.split(QRegExp("(\r\n|\n\r|\r|\n)"), QString::KeepEmptyParts);
+
+    while (result.count() && result.last().isEmpty())
+        result.takeLast();
+
+    return result;
 }
 
 QList<quint32> Script::functionList() const

diff --git a/qmlui/qml/DMXPercentageButton.qml b/qmlui/qml/DMXPercentageButton.qml
@@ -23,7 +23,7 @@ import "."
 Rectangle
 {
     id: buttonRoot
-    width: 50
+    width: UISettings.iconSizeDefault * 1.1
     height: UISettings.listItemHeight
     border.width: 2
     border.color: "white"
@@ -35,6 +35,7 @@ Rectangle
 
     RobotoText
     {
+        id: text
         height: parent.height
         anchors.horizontalCenter: parent.horizontalCenter
         label: dmxMode ? "DMX" : "%"

diff --git a/qmlui/qmlui.qrc b/qmlui/qmlui.qrc
@@ -1,8 +1,5 @@
 <RCC>
   <qresource prefix="/">
-    <file alias="dimmer-back.svg">svg/dimmer-back.svg</file>
-    <file alias="dimmer-fill.svg">svg/dimmer-fill.svg</file>
-
     <file alias="qmldir">qml/qmldir</file>
 
     <!-- Common components -->

diff --git a/resources/docs/concept.html b/resources/docs/concept.html
@@ -142,9 +142,10 @@ <H3 id="DMX">DMX</H3>
 </P>
 
 <P>
-QLC+ supports 4 individual universes. They do not necessarily need to be connected to
-DMX hardware; rather, DMX has just been selected as the de facto lighting
-standard. Actual hardware abstraction (whether it's analogue 0-10V, DMX or some
+QLC+ supports unlimited universes (there are 4 initial, but more can be
+added if needed). They do not necessarily need to be connected to DMX hardware;
+rather, DMX has just been selected as the de facto lighting standard.
+Actual hardware abstraction (whether it's analogue 0-10V, DMX or some
 other method) is achieved through <A HREF="#OutputPlugins">output plugins</A>.
 </P>
 

diff --git a/resources/docs/functionmanager.html b/resources/docs/functionmanager.html
@@ -136,7 +136,7 @@ <H2>Controls</H2>
    <IMG SRC="qrc:/editcopy.png">
   </TD>
   <TD>
-   Create a copy of each of the selected functions.
+   Create a copy of each of the selected functions. <b>Note</b>: cloning a Sequence will clone its bound Scene too.
   </TD>
  </TR>
  <TR>

diff --git a/resources/docs/vcbutton.html b/resources/docs/vcbutton.html
@@ -10,8 +10,13 @@
 <H1><IMG SRC="qrc:/button.png" ALIGN="absmiddle"> Virtual Console Button</H1>
 
 <P>
-A Button is the simplest and at the same time the most powerful widget in QLC+;
-with it, you can start, stop and flash your functions.
+A Button is the simplest and at the same time one of the most powerful widget in QLC+;
+with it, you can start, stop and flash your Functions.<br>
+When activated in toggle mode, the Button border will turn to green, but if a Function
+attached to a Button is started from another Virtual Console widget, the Button border
+will turn to orange, to indicate that the Function is active but not actually controlled
+by the Button. Pressing a Button in "monitoring" state will take control of the running Function
+and the Button border will turn to green. Another press and the attached Function will be stopped.
 </P>
 
 <H3>Configuration</H3>
@@ -41,23 +46,11 @@ <H3>Configuration</H3>
    Shows you the name of the <A HREF="file:concept.html#Function">Function</A> that
    is currently assigned to the button.
    <P>
-    <IMG SRC="qrc:/attach.png" ALIGN="absmiddle"> Attach a function to the button<BR>
-    <IMG SRC="qrc:/detach.png" ALIGN="absmiddle"> Detach the current function from the button
+    <IMG SRC="qrc:/attach.png" ALIGN="absmiddle"> Attach a Function to the button<BR>
+    <IMG SRC="qrc:/detach.png" ALIGN="absmiddle"> Detach the current Function from the button
    </P>
   </TD>
  </TR>
- <TR>
-  <TD>
-   <B>Attributes</B>
-  </TD>
-  <TD>
-   Shows you the list of attributes of the assigned function that can be adjusted. Attributes can be controlled
-   by right clicking on the button when in <A HREF="file:concept.html#Modes">Operate Mode</A>.<br>
-   A popup will display a number of sliders corresponding to the number of available attributes.<br>
-   If the assigned function is a <A HREF="file:concept.html#Show">Show</A>, attributes correspond
-   to the Show tracks, so you can adjust the intensity (or volume) of a whole track with just one click.
-  </TD>
- </TR>
  <TR>
   <TD>
    <B>External input</B>
@@ -102,26 +95,27 @@ <H3>Configuration</H3>
   </TD>
   <TD>
    <UL>
-    <LI>Toggle function on/off: When you click the button, the attached function
-    is started. When you click the button a second time, the function is stopped,
+    <LI>Toggle Function on/off: When you click the button, the attached Function
+    is started. When you click the button a second time, the Function is stopped,
     unless it has already stopped by itself.</LI>
-    <LI>Flash function: You can "flash" the attached
+    <LI>Flash Function: You can "flash" the attached
     <A HREF="file:concept.html#Scene">Scene</A> when you keep the button pressed. If
-    another type of function is attached to the button, nothing happens when you
+    another type of Function is attached to the button, nothing happens when you
     click it.</LI>
-    <LI>Blackout on/off: When you click the button, QLC+ will toggle the 
+    <LI>Toggle Blackout: When you click the button, QLC+ will toggle the 
     <A HREF="file:concept.html#Blackout">blackout mode</A></LI>
-    <LI>Stop all functions: When you click the button, all the functions that are running
-    in QLC+  will be stopped immediately</LI>
+    <LI>Stop All Functions: When you click the button, all the Functions that are running
+    in QLC+  will be stopped immediately. It is possible to specify a fade out time
+    to wait for all the intensity channels to reach a zero level</LI>
    </UL>
   </TD>
  </TR>
  <TR>
    <TD>
-   <B>Adjust function intensity</B>
+   <B>Adjust Function intensity</B>
   </TD>
   <TD>
-    If checked, this feature will adjust the intensity of the assigned function just before
+    If checked, this feature will adjust the intensity of the assigned Function just before
     playing it when the button is pressed.
   </TD>
  </TR>

diff --git a/resources/docs/webinterface.html b/resources/docs/webinterface.html
@@ -125,7 +125,7 @@ <H3>DMX Keypad</H3>
 
 <H2>Configuration page</H2>
 <P>
-This page allows to remotely set the QLC+ configuration, divided in three areas:
+This page allows to remotely set the QLC+ configuration, divided in four areas:
 
 <UL>
  <LI><B>Universes configuration</B>: Allows to set the inputs, outputs, feedback, 
@@ -144,6 +144,27 @@ <H2>Configuration page</H2>
    When adding new custom fixtures it is recommended to reload a project or either restart QLC+
    on the target device.<BR>
  </LI>
+ <LI><B>Authorized users</B>: This section is available only when starting QLC+ with the "-wa" or "--web-auth" option.
+   It enables basic HTTP authentication (no HTTPS or certificates involved).<br>
+   When enabling this feature for the first time, you need to add at least an administrator, otherwise you will
+   not be asked for any password when accessing the web interface.<br>
+   Users can have the following access levels:
+   <UL>
+    <LI><B>Everything</B>: This is the access level for administrators. They can access every functionality of the web interface
+    and add more authenticated users</LI>
+    <LI><B>Virtual Console and Simple Desk</B>: a user with this access level can view the Virtual Console and Simple Desk page,
+    but cannot access the Configuration page</LI>
+    <LI><B>Only Virtual Console</B>: a user with this access level can view only the Virtual Console page,
+    but cannot access the Simple Desk and the Configuration page</LI>
+   </UL>
+   An administrator can:
+   <UL>
+    <LI>Add more users by filling the Username and Password fields and then clicking on the "Add user" button</LI>
+    <LI>Delete an existing user by clicking on the "Delete user" button</LI>
+    <LI>Change the access level or password of an existing user and then click on the "Change" button</LI>
+   </UL>
+
+ </LI>
 </UL>
 
 Once the configuration has been set, it is possible to go back to the web interface 

diff --git a/resources/fixtures/American-DJ-COB-Cannon-Wash-DW.qxf b/resources/fixtures/American-DJ-COB-Cannon-Wash-DW.qxf
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FixtureDefinition>
+<FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
+ <Creator>
+  <Name>Q Light Controller Plus</Name>
+  <Version>4.11.1 GIT</Version>
+  <Author>Florian Gerstenlauer</Author>
+ </Creator>
+ <Manufacturer>American DJ</Manufacturer>
+ <Model>COB Cannon Wash DW</Model>
+ <Type>Color Changer</Type>
+ <Channel Name="Cool White">
+  <Group Byte="0">Intensity</Group>
+  <Colour>White</Colour>
+  <Capability Min="0" Max="255">0% - 100%</Capability>
+ </Channel>
+ <Channel Name="Warm White">
+  <Group Byte="0">Intensity</Group>
+  <Colour>White</Colour>
+  <Capability Min="0" Max="255">0% - 100%</Capability>
+ </Channel>
+ <Channel Name="Colour Temperature">
+  <Group Byte="0">Colour</Group>
+  <Capability Min="0" Max="0" Color="#000000">OFF</Capability>
+  <Capability Min="1" Max="255" Color="#ffff7f" Color2="#ffffff">3200 K - 6400 K</Capability>
+ </Channel>
+ <Channel Name="Shutter/Strobe">
+  <Group Byte="0">Shutter</Group>
+  <Capability Min="0" Max="31">OFF</Capability>
+  <Capability Min="32" Max="63">ON</Capability>
+  <Capability Min="64" Max="95">Strobe Slow - Fast</Capability>
+  <Capability Min="96" Max="127">ON</Capability>
+  <Capability Min="128" Max="159">Strobe-Pulse Slow - Fast</Capability>
+  <Capability Min="160" Max="191">ON</Capability>
+  <Capability Min="192" Max="223">Random-Strobe Slow - Fast</Capability>
+  <Capability Min="224" Max="255">ON</Capability>
+ </Channel>
+ <Channel Name="Master-Dimmer">
+  <Group Byte="0">Intensity</Group>
+  <Capability Min="0" Max="255">0% - 100%</Capability>
+ </Channel>
+ <Channel Name="Dimmer Curves">
+  <Group Byte="0">Effect</Group>
+  <Capability Min="0" Max="20">Standard</Capability>
+  <Capability Min="21" Max="40">Stage</Capability>
+  <Capability Min="41" Max="60">TV</Capability>
+  <Capability Min="61" Max="80">Architecture</Capability>
+  <Capability Min="81" Max="100">Theatre </Capability>
+  <Capability Min="101" Max="255">Default to unit setting</Capability>
+ </Channel>
+ <Mode Name="1 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Colour Temperature</Channel>
+ </Mode>
+ <Mode Name="2 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Cool White</Channel>
+  <Channel Number="1">Warm White</Channel>
+ </Mode>
+ <Mode Name="3 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Cool White</Channel>
+  <Channel Number="1">Warm White</Channel>
+  <Channel Number="2">Master-Dimmer</Channel>
+ </Mode>
+ <Mode Name="4 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Cool White</Channel>
+  <Channel Number="1">Warm White</Channel>
+  <Channel Number="2">Colour Temperature</Channel>
+  <Channel Number="3">Master-Dimmer</Channel>
+ </Mode>
+ <Mode Name="5 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Cool White</Channel>
+  <Channel Number="1">Warm White</Channel>
+  <Channel Number="2">Colour Temperature</Channel>
+  <Channel Number="3">Shutter/Strobe</Channel>
+  <Channel Number="4">Master-Dimmer</Channel>
+ </Mode>
+ <Mode Name="6 Channel">
+  <Physical>
+   <Bulb Type="LED" Lumens="8000" ColourTemperature="0"/>
+   <Dimensions Weight="4.1" Width="245" Height="192" Depth="415"/>
+   <Lens Name="Other" DegreesMin="40" DegreesMax="80"/>
+   <Focus Type="Fixed" PanMax="0" TiltMax="0"/>
+   <Technical PowerConsumption="135" DmxConnector="3-pin and 5-pin"/>
+  </Physical>
+  <Channel Number="0">Cool White</Channel>
+  <Channel Number="1">Warm White</Channel>
+  <Channel Number="2">Colour Temperature</Channel>
+  <Channel Number="3">Shutter/Strobe</Channel>
+  <Channel Number="4">Master-Dimmer</Channel>
+  <Channel Number="5">Dimmer Curves</Channel>
+ </Mode>
+</FixtureDefinition>