+
#include "vinceusbdmx512.h"
-VinceUSBDMX512::VinceUSBDMX512(DMXInterface *interface, quint32 outputLine)
- : DMXUSBWidget(interface, outputLine, DEFAULT_OUTPUT_FREQUENCY)
+VinceUSBDMX512::VinceUSBDMX512(DMXInterface *iface, quint32 outputLine)
+ : QThread(NULL)
+ , DMXUSBWidget(iface, outputLine, DEFAULT_OUTPUT_FREQUENCY)
+ , m_running(false)
{
// TODO: Check if DMX IN is available
}
VinceUSBDMX512::~VinceUSBDMX512()
{
+ stopOutputThread();
}
DMXUSBWidget::Type VinceUSBDMX512::type() const
@@ -35,26 +39,6 @@ DMXUSBWidget::Type VinceUSBDMX512::type() const
return DMXUSBWidget::VinceTX;
}
-/****************************************************************************
- * Name & Serial
- ****************************************************************************/
-
-QString VinceUSBDMX512::additionalInfo() const
-{
- QString info;
-
- info += QString("");
- info += QString("%1: %2 (%3)").arg(QObject::tr("Protocol"))
- .arg("Vince USB-DMX512")
- .arg(QObject::tr("Output"));
- info += QString("
");
- info += QString("%1: %2").arg(QObject::tr("Serial number"))
- .arg(serial());
- info += QString("
");
-
- return info;
-}
-
/****************************************************************************
* Open & Close
****************************************************************************/
@@ -74,104 +58,94 @@ bool VinceUSBDMX512::open(quint32 line, bool input)
if (iface()->write(QByteArray(2, 0x00)) == false)
return false;
- // Request start DMX command
- return this->writeData(VinceUSBDMX512::StartDMX);
+ QByteArray startSequence;
+
+ startSequence.append(QByteArray(2, VINCE_START_OF_MSG));
+ startSequence.append(VINCE_CMD_START_DMX);
+ startSequence.append(QByteArray(2, 0x00));
+ startSequence.append(VINCE_END_OF_MSG);
+
+ if (iface()->write(startSequence) == false)
+ qWarning() << Q_FUNC_INFO << name() << "START command failed";
+
+ start();
+
+ return true;
}
bool VinceUSBDMX512::close(quint32 line, bool input)
{
- Q_UNUSED(line)
Q_UNUSED(input)
- if (isOpen() == false)
- return true;
+ stopOutputThread();
+
+ QByteArray stopSequence;
- // Reqest stop DMX command
- if (this->writeData(VinceUSBDMX512::StopDMX) == true)
- return DMXUSBWidget::close();
+ stopSequence.append(QByteArray(2, VINCE_START_OF_MSG));
+ stopSequence.append(VINCE_CMD_STOP_DMX);
+ stopSequence.append(QByteArray(2, 0x00));
+ stopSequence.append(VINCE_END_OF_MSG);
- return false;
+ if (iface()->write(stopSequence) == false)
+ qWarning() << Q_FUNC_INFO << name() << "STOP command failed";
+
+ return DMXUSBWidget::close(line);
}
/****************************************************************************
- * Write & Read
+ * Inputs
****************************************************************************/
-bool VinceUSBDMX512::writeData(Command command, const QByteArray &data)
+int readData(DMXInterface *iface, QByteArray &payload)
{
- QByteArray message(1, command); // Command
- message.prepend(QByteArray(2, VINCE_START_OF_MSG)); // Start condition
- if (data.size() == 0)
- message.append(QByteArray(2, 0x00)); // Data length
- else
- {
- message.append(int((data.size() + 2) / 256)); // Data length
- message.append(int((data.size() + 2) % 256));
- message.append(QByteArray(2, 0x00)); // Gap with data
- message.append(data); // Data
- }
- message.append(VINCE_END_OF_MSG); // Stop condition
-
- return iface()->write(message);
-}
-
-QByteArray VinceUSBDMX512::readData(bool* ok)
-{
- uchar byte = 0;
+ bool ok;
+ char byte;
ushort dataLength = 0;
- QByteArray data = QByteArray();
// Read headers
for (int i = 0; i < 6; i++)
{
- *ok = false;
- // Attempt to read byte
- byte = iface()->readByte(ok);
- if (*ok == false)
- return data;
+ byte = iface->readByte(&ok);
+
+ if (ok == false)
+ return 0;
// Retrieve response (4th byte)
- if (i == 3 && byte != VINCE_RESP_OK)
+ if (i == 3)
{
- qWarning() << Q_FUNC_INFO << "Error" << byte << "in readed message";
- *ok = false;
+ if (byte != VINCE_RESP_OK)
+ {
+ qWarning() << Q_FUNC_INFO << "Unable to find start of next message";
+ return 0;
+ }
}
- // Retrieve length (5th & 6th bytes)
+ // Retrieve data length (5th & 6th bytes)
else if (i == 4)
dataLength = ushort(byte) * 256;
else if (i == 5)
dataLength += ushort(byte);
}
- // Read data
if (dataLength > 0)
{
qDebug() << Q_FUNC_INFO << "Attempt to read" << dataLength << "bytes";
- ushort i;
- for (i = 0; i < dataLength; i++)
- {
- byte = iface()->readByte(ok);
- if (*ok == false)
- {
- qWarning() << Q_FUNC_INFO << "No available byte to read (" << (dataLength - i) << "missing bytes)";
- return data;
- }
- data.append(byte);
- }
+ // Read the whole payload
+ payload.clear();
+ payload = iface->read(dataLength);
}
// Read end of message
- byte = iface()->readByte();
- if (byte != VINCE_END_OF_MSG)
- {
+ if ((byte = iface->readByte()) != VINCE_END_OF_MSG)
qWarning() << Q_FUNC_INFO << "Incorrect end of message received:" << byte;
- *ok = false;
- }
- return data;
+ return dataLength;
}
+/****************************************************************************
+ * Outputs
+ ****************************************************************************/
+
bool VinceUSBDMX512::writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged)
{
Q_UNUSED(universe)
@@ -180,28 +154,89 @@ bool VinceUSBDMX512::writeUniverse(quint32 universe, quint32 output, const QByte
if (isOpen() == false)
return false;
- // Write only if universe has changed
- if (!dataChanged)
- return true;
+ if (m_outputLines[0].m_universeData.size() == 0)
+ {
+ m_outputLines[0].m_universeData.append(data);
+ m_outputLines[0].m_universeData.append(DMX_CHANNELS - data.size(), 0);
+ }
- if (writeData(VinceUSBDMX512::UpdateDMX, data) == false)
+ if (dataChanged)
+ m_outputLines[0].m_universeData.replace(0, data.size(), data);
+
+ return true;
+}
+
+void VinceUSBDMX512::stopOutputThread()
+{
+ if (isRunning() == true)
{
- qWarning() << Q_FUNC_INFO << name() << "will not accept DMX data";
- return false;
+ m_running = false;
+ wait();
}
- else
+}
+
+void VinceUSBDMX512::run()
+{
+ qDebug() << "OUTPUT thread started";
+
+ QElapsedTimer timer;
+
+ m_running = true;
+
+ while (m_running == true)
{
- bool ok = false;
- QByteArray resp = this->readData(&ok);
+ timer.restart();
+
+ int dataLen = m_outputLines[0].m_universeData.length();
- // Check the interface reponse
- if (ok == false || resp.size() > 0)
+ if (dataLen > 0)
{
- qWarning() << Q_FUNC_INFO << name() << "doesn't respond properly";
- return false;
+ QByteArray request;
+ request.append(QByteArray(2, VINCE_START_OF_MSG)); // Start byte
+ request.append(VINCE_CMD_UPDATE_DMX); // Command
+ request.append(int((dataLen + 2) / 256)); // Data length
+ request.append(int((dataLen + 2) % 256));
+ request.append(QByteArray(2, 0x00)); // Gap with data
+ request.append(m_outputLines[0].m_universeData);
+ request.append(VINCE_END_OF_MSG); // Stop byte
+
+ if (iface()->write(request) == false)
+ qWarning() << Q_FUNC_INFO << name() << "Will not accept DMX data";
+ else
+ {
+ QByteArray reply;
+
+ if (readData(iface(), reply) > 0)
+ qWarning() << Q_FUNC_INFO << name() << "Invalid response";
+ }
}
- m_universe = data;
- return true;
+ int timetoSleep = m_frameTimeUs - (timer.nsecsElapsed() / 1000);
+ if (timetoSleep < 0)
+ qWarning() << "DMX output is running late !";
+ else
+ usleep(timetoSleep);
}
+
+ qDebug() << "OUTPUT thread terminated";
+}
+
+/****************************************************************************
+ * Serial & name
+ ****************************************************************************/
+
+QString VinceUSBDMX512::additionalInfo() const
+{
+ QString info;
+
+ info += QString("");
+ info += QString("%1: %2 (%3)").arg(QObject::tr("Protocol"))
+ .arg("Vince USB-DMX512")
+ .arg(QObject::tr("Output"));
+ info += QString("
");
+ info += QString("%1: %2").arg(QObject::tr("Serial number"))
+ .arg(serial());
+ info += QString("
");
+
+ return info;
}
diff --git a/plugins/dmxusb/src/vinceusbdmx512.h b/plugins/dmxusb/src/vinceusbdmx512.h
index 08c3001f30..ab68d5aa4d 100644
--- a/plugins/dmxusb/src/vinceusbdmx512.h
+++ b/plugins/dmxusb/src/vinceusbdmx512.h
@@ -21,7 +21,7 @@
#define VINCEUSBDMX512_H
#include
-#include
+#include
#include "dmxusbwidget.h"
@@ -39,38 +39,18 @@
#define VINCE_RESP_IO_ERR char(0x10) //! CMD_IO_ERR
#define VINCE_RESP_PARAM_ERR char(0x11) //! CMD_PARAM_ERR
-/**
- * This is the base interface class for Vince USB-DMX512 widgets.
- */
-class VinceUSBDMX512 : public DMXUSBWidget
+class VinceUSBDMX512 : public QThread, public DMXUSBWidget
{
- /************************************************************************
- * Initialization
- ************************************************************************/
+ Q_OBJECT
+
public:
- VinceUSBDMX512(DMXInterface *interface, quint32 outputLine);
+ VinceUSBDMX512(DMXInterface *iface, quint32 outputLine);
+
virtual ~VinceUSBDMX512();
/** @reimp */
Type type() const;
-protected:
- /** Requests commands */
- enum Command
- {
- StartDMX = VINCE_CMD_START_DMX,
- StopDMX = VINCE_CMD_STOP_DMX,
- ResetDMX = VINCE_CMD_RESET_DMX,
- UpdateDMX = VINCE_CMD_UPDATE_DMX
- };
-
- /****************************************************************************
- * Name & Serial
- ****************************************************************************/
-public:
- /** @reimp */
- QString additionalInfo() const;
-
/****************************************************************************
* Open & Close
****************************************************************************/
@@ -79,38 +59,31 @@ class VinceUSBDMX512 : public DMXUSBWidget
bool open(quint32 line = 0, bool input = false);
/** @reimp */
- virtual bool close(quint32 line = 0, bool input = false);
-
- /************************************************************************
- * Write & Read
- ************************************************************************/
-protected:
- /**
- * Format and write data to the opened interface.
- *
- * @param command The request type
- * @param data The data to write
- * @return true if the values were sent successfully, otherwise false
- */
- bool writeData(enum Command command, const QByteArray& data = QByteArray());
-
- /**
- * Read and extract data from the opened interface.
- *
- * @param ok A pointer which tells if data was read or not
- * @return The available data
- */
- QByteArray readData(bool* ok = NULL);
-
- /************************************************************************
- * Write universe
- ************************************************************************/
+ bool close(quint32 line = 0, bool input = false);
+
+ /********************************************************************
+ * Outputs
+ ********************************************************************/
public:
/** @reimp */
bool writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged);
private:
- QByteArray m_universe;
+ /** Stop the output thread */
+ void stopOutputThread();
+
+ /** Output thread worker method */
+ void run();
+
+private:
+ bool m_running;
+
+ /****************************************************************************
+ * Serial & name
+ ****************************************************************************/
+public:
+ /** @reimp */
+ QString additionalInfo() const;
};
#endif
diff --git a/plugins/dummy/dummyplugin.cpp b/plugins/dummy/dummyplugin.cpp
index 97bacc3a26..bf64e6a3dc 100644
--- a/plugins/dummy/dummyplugin.cpp
+++ b/plugins/dummy/dummyplugin.cpp
@@ -200,13 +200,13 @@ QString DummyPlugin::inputInfo(quint32 input)
return str;
}
-void DummyPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString &key)
+void DummyPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QVariant ¶ms)
{
Q_UNUSED(universe)
Q_UNUSED(output)
Q_UNUSED(channel)
Q_UNUSED(value)
- Q_UNUSED(key)
+ Q_UNUSED(params)
/**
* If the device support this feature, this is the method to send data back for
diff --git a/plugins/dummy/dummyplugin.h b/plugins/dummy/dummyplugin.h
index 0811dfec3f..7a5e7f558a 100644
--- a/plugins/dummy/dummyplugin.h
+++ b/plugins/dummy/dummyplugin.h
@@ -85,7 +85,7 @@ class DummyPlugin : public QLCIOPlugin
QString inputInfo(quint32 input);
/** @reimp */
- void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString& key);
+ void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QVariant ¶ms);
protected:
/** Place here the variables used by this plugin */
diff --git a/plugins/enttecwing/src/enttecwing.cpp b/plugins/enttecwing/src/enttecwing.cpp
index de77ac6e87..7d81253b50 100644
--- a/plugins/enttecwing/src/enttecwing.cpp
+++ b/plugins/enttecwing/src/enttecwing.cpp
@@ -169,7 +169,7 @@ QString EnttecWing::inputInfo(quint32 input)
}
void EnttecWing::sendFeedBack(quint32 universe, quint32 input,
- quint32 channel, uchar value, const QString &)
+ quint32 channel, uchar value, const QVariant &)
{
Q_UNUSED(universe)
diff --git a/plugins/enttecwing/src/enttecwing.h b/plugins/enttecwing/src/enttecwing.h
index 4f497016ca..34baf921e0 100644
--- a/plugins/enttecwing/src/enttecwing.h
+++ b/plugins/enttecwing/src/enttecwing.h
@@ -78,7 +78,7 @@ class EnttecWing : public QLCIOPlugin
QString inputInfo(quint32 input);
/** @reimp */
- void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QString& key);
+ void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QVariant ¶ms);
/*************************************************************************
* Outputs
diff --git a/plugins/gpio/gpioplugin.cpp b/plugins/gpio/gpioplugin.cpp
index 68dee2608e..bb2b134241 100644
--- a/plugins/gpio/gpioplugin.cpp
+++ b/plugins/gpio/gpioplugin.cpp
@@ -139,6 +139,7 @@ QString GPIOPlugin::outputInfo(quint32 output)
void GPIOPlugin::writeUniverse(quint32 universe, quint32 output, const QByteArray &data, bool dataChanged)
{
Q_UNUSED(universe)
+ Q_UNUSED(dataChanged)
if (output != 0)
return;
diff --git a/plugins/interfaces/qlcioplugin.cpp b/plugins/interfaces/qlcioplugin.cpp
index 03d2e6747b..2faabdd58f 100644
--- a/plugins/interfaces/qlcioplugin.cpp
+++ b/plugins/interfaces/qlcioplugin.cpp
@@ -86,13 +86,13 @@ QString QLCIOPlugin::inputInfo(quint32 input)
}
void QLCIOPlugin::sendFeedBack(quint32 universe, quint32 inputLine,
- quint32 channel, uchar value, const QString &key)
+ quint32 channel, uchar value, const QVariant ¶ms)
{
Q_UNUSED(universe)
Q_UNUSED(inputLine)
Q_UNUSED(channel)
Q_UNUSED(value)
- Q_UNUSED(key)
+ Q_UNUSED(params)
}
/*************************************************************************
diff --git a/plugins/interfaces/qlcioplugin.h b/plugins/interfaces/qlcioplugin.h
index 4b46f09cf0..72588f64f9 100644
--- a/plugins/interfaces/qlcioplugin.h
+++ b/plugins/interfaces/qlcioplugin.h
@@ -129,7 +129,8 @@ class QLCIOPlugin : public QObject
Input = 1 << 1,
Feedback = 1 << 2,
Infinite = 1 << 3,
- RDM = 1 << 4
+ RDM = 1 << 4,
+ Beats = 1 << 5
};
/**
@@ -263,7 +264,7 @@ class QLCIOPlugin : public QObject
* @param key a string to identify a channel by name (ATM used only by OSC)
*/
virtual void sendFeedBack(quint32 universe, quint32 inputLine,
- quint32 channel, uchar value, const QString& key = 0);
+ quint32 channel, uchar value, const QVariant ¶ms);
signals:
/**
diff --git a/plugins/loopback/src/loopback.cpp b/plugins/loopback/src/loopback.cpp
index 37e3335791..47b417a337 100644
--- a/plugins/loopback/src/loopback.cpp
+++ b/plugins/loopback/src/loopback.cpp
@@ -206,7 +206,7 @@ void Loopback::writeUniverse(quint32 universe, quint32 output, const QByteArray
}
}
-void Loopback::sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QString &)
+void Loopback::sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QVariant &)
{
if (!m_inputMap.contains(input))
return;
diff --git a/plugins/loopback/src/loopback.h b/plugins/loopback/src/loopback.h
index 546e0bb323..cc3979e875 100644
--- a/plugins/loopback/src/loopback.h
+++ b/plugins/loopback/src/loopback.h
@@ -86,7 +86,7 @@ class QLC_DECLSPEC Loopback : public QLCIOPlugin
QString inputInfo(quint32 input);
/** @reimp */
- void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QString& key);
+ void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QVariant ¶ms);
private:
//! loopback line -> channel data
diff --git a/plugins/midi/src/common/midiplugin.cpp b/plugins/midi/src/common/midiplugin.cpp
index 452a690b7d..8d04c9ba8b 100644
--- a/plugins/midi/src/common/midiplugin.cpp
+++ b/plugins/midi/src/common/midiplugin.cpp
@@ -66,7 +66,7 @@ QString MidiPlugin::name()
int MidiPlugin::capabilities() const
{
- return QLCIOPlugin::Output | QLCIOPlugin::Input | QLCIOPlugin::Feedback;
+ return QLCIOPlugin::Output | QLCIOPlugin::Input | QLCIOPlugin::Feedback | QLCIOPlugin::Beats;
}
/*****************************************************************************
@@ -285,7 +285,7 @@ QString MidiPlugin::inputInfo(quint32 input)
return str;
}
-void MidiPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString &)
+void MidiPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QVariant ¶ms)
{
Q_UNUSED(universe)
@@ -297,7 +297,11 @@ void MidiPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel,
qDebug() << "[sendFeedBack] Dev:" << dev->name() << ", channel:" << channel << ", value:" << value << dev->sendNoteOff();
uchar cmd = 0;
uchar data1 = 0, data2 = 0;
- if (QLCMIDIProtocol::feedbackToMidi(channel, value, dev->midiChannel(), dev->sendNoteOff(),
+ int midiChannel = dev->midiChannel();
+ if (params.isValid() && params.toInt() >= 0)
+ midiChannel += params.toInt();
+
+ if (QLCMIDIProtocol::feedbackToMidi(channel, value, midiChannel, dev->sendNoteOff(),
&cmd, &data1, &data2) == true)
{
qDebug() << "[sendFeedBack] cmd:" << cmd << "data1:" << data1 << "data2:" << data2;
@@ -330,7 +334,8 @@ void MidiPlugin::slotValueChanged(const QVariant& uid, ushort channel, uchar val
MidiInputDevice* dev = m_enumerator->inputDevices().at(i);
if (dev->uid() == uid)
{
- emit valueChanged(UINT_MAX, i, channel, value);
+ emit valueChanged(UINT_MAX, i, channel, value,
+ channel == CHANNEL_OFFSET_MBC_BEAT ? "beat" : "");
break;
}
}
diff --git a/plugins/midi/src/common/midiplugin.h b/plugins/midi/src/common/midiplugin.h
index cb00cc2415..b9764d53c8 100644
--- a/plugins/midi/src/common/midiplugin.h
+++ b/plugins/midi/src/common/midiplugin.h
@@ -110,7 +110,7 @@ class MidiPlugin : public QLCIOPlugin
QString inputInfo(quint32 input);
/** @reimp */
- void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString& key);
+ void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QVariant ¶ms);
void sendSysEx(quint32 output, const QByteArray &data);
diff --git a/plugins/os2l/os2lplugin.cpp b/plugins/os2l/os2lplugin.cpp
index 7c18228ed6..75850d3f9b 100644
--- a/plugins/os2l/os2lplugin.cpp
+++ b/plugins/os2l/os2lplugin.cpp
@@ -48,7 +48,7 @@ QString OS2LPlugin::name()
int OS2LPlugin::capabilities() const
{
- return QLCIOPlugin::Input | QLCIOPlugin::Feedback;
+ return QLCIOPlugin::Input | QLCIOPlugin::Feedback | QLCIOPlugin::Beats;
}
QString OS2LPlugin::pluginInfo()
@@ -127,23 +127,6 @@ QString OS2LPlugin::inputInfo(quint32 input)
return str;
}
-void OS2LPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString &key)
-{
- Q_UNUSED(universe)
- Q_UNUSED(output)
- Q_UNUSED(channel)
- Q_UNUSED(value)
- Q_UNUSED(key)
-
- /**
- * If the device support this feature, this is the method to send data back for
- * visual feedback.
- * To implement such method, the plugin must have an input line corresponding
- * to the specified output line.
- * Basically feedback data must return to the same line where it came from
- */
-}
-
quint32 OS2LPlugin::universe() const
{
return m_inputUniverse;
diff --git a/plugins/os2l/os2lplugin.h b/plugins/os2l/os2lplugin.h
index 99ec246584..5c1ec5457c 100644
--- a/plugins/os2l/os2lplugin.h
+++ b/plugins/os2l/os2lplugin.h
@@ -70,9 +70,6 @@ class OS2LPlugin : public QLCIOPlugin
/** @reimp */
QString inputInfo(quint32 input);
- /** @reimp */
- void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString& key);
-
quint32 universe() const;
protected:
diff --git a/plugins/osc/oscplugin.cpp b/plugins/osc/oscplugin.cpp
index e807898b80..d3ce296b92 100644
--- a/plugins/osc/oscplugin.cpp
+++ b/plugins/osc/oscplugin.cpp
@@ -293,14 +293,14 @@ QString OSCPlugin::inputInfo(quint32 input)
}
void OSCPlugin::sendFeedBack(quint32 universe, quint32 input,
- quint32 channel, uchar value, const QString &key)
+ quint32 channel, uchar value, const QVariant ¶ms)
{
if (input >= (quint32)m_IOmapping.count())
return;
OSCController *controller = m_IOmapping[input].controller;
if (controller != NULL)
- controller->sendFeedback(universe, channel, value, key);
+ controller->sendFeedback(universe, channel, value, params.toString());
}
/*********************************************************************
diff --git a/plugins/osc/oscplugin.h b/plugins/osc/oscplugin.h
index 87f0db73b0..6050db1c1c 100644
--- a/plugins/osc/oscplugin.h
+++ b/plugins/osc/oscplugin.h
@@ -108,7 +108,7 @@ class OSCPlugin : public QLCIOPlugin
QString inputInfo(quint32 input);
/** @reimp */
- void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QString& key);
+ void sendFeedBack(quint32 universe, quint32 input, quint32 channel, uchar value, const QVariant ¶ms);
/*********************************************************************
* Configuration
diff --git a/plugins/uart/uartplugin.cpp b/plugins/uart/uartplugin.cpp
index c4ef329617..d6fbd8918b 100644
--- a/plugins/uart/uartplugin.cpp
+++ b/plugins/uart/uartplugin.cpp
@@ -130,6 +130,7 @@ QString UARTPlugin::outputInfo(quint32 output)
void UARTPlugin::writeUniverse(quint32 universe, quint32 output, const QByteArray &data, bool dataChanged)
{
Q_UNUSED(universe)
+ Q_UNUSED(dataChanged)
if (output < quint32(m_widgets.count()))
m_widgets.at(output)->writeUniverse(data);
@@ -184,20 +185,3 @@ QString UARTPlugin::inputInfo(quint32 input)
return str;
}
-
-void UARTPlugin::sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString &key)
-{
- Q_UNUSED(universe)
- Q_UNUSED(output)
- Q_UNUSED(channel)
- Q_UNUSED(value)
- Q_UNUSED(key)
-
- /**
- * If the device support this feature, this is the method to send data back for
- * visual feedback.
- * To implement such method, the plugin must have an input line corresponding
- * to the specified output line.
- * Basically feedback data must return to the same line where it came from
- */
-}
diff --git a/plugins/uart/uartplugin.h b/plugins/uart/uartplugin.h
index 02d6892bd3..1db50cc366 100644
--- a/plugins/uart/uartplugin.h
+++ b/plugins/uart/uartplugin.h
@@ -85,9 +85,6 @@ class UARTPlugin : public QLCIOPlugin
/** @reimp */
QString inputInfo(quint32 input);
-
- /** @reimp */
- void sendFeedBack(quint32 universe, quint32 output, quint32 channel, uchar value, const QString& key);
};
#endif
diff --git a/plugins/uart/uartwidget.cpp b/plugins/uart/uartwidget.cpp
index d2e5ee34fd..1e5a1522d4 100644
--- a/plugins/uart/uartwidget.cpp
+++ b/plugins/uart/uartwidget.cpp
@@ -18,7 +18,7 @@
*/
#include
-#include
+#include
#include
#include
@@ -141,7 +141,7 @@ void UARTWidget::run()
int frameTime = (int) floor(((double)1000 / 30) + (double)0.5);
m_granularity = Bad;
- QTime time;
+ QElapsedTimer time;
time.start();
usleep(1000);
if (time.elapsed() <= 3)
diff --git a/qlc.pro b/qlc.pro
index fe7a4452bd..6ae1c69626 100644
--- a/qlc.pro
+++ b/qlc.pro
@@ -47,7 +47,9 @@ win32:coverage.commands = @echo Get a better OS.
# Translations
translations.target = translate
-QMAKE_EXTRA_TARGETS += translations
+!android: {
+ QMAKE_EXTRA_TARGETS += translations
+}
qmlui: {
translations.commands += ./translate.sh "qmlui"
} else {
@@ -59,7 +61,9 @@ appimage: {
} else {
translations.path = $$INSTALLROOT/$$TRANSLATIONDIR
}
-INSTALLS += translations
+!android: {
+ INSTALLS += translations
+}
QMAKE_DISTCLEAN += $$translations.files
# run
diff --git a/qmlui/CMakeLists.txt b/qmlui/CMakeLists.txt
index ad1e0bf867..cf26f1828c 100644
--- a/qmlui/CMakeLists.txt
+++ b/qmlui/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
qt5_add_translation(QM_FILES ${TS_FILES})
endif()
-add_executable(${module_name} WIN32 MACOSX_BUNDLE
+set(SRC_FILES
app.cpp app.h
audioeditor.cpp audioeditor.h
chasereditor.cpp chasereditor.h
@@ -63,6 +63,8 @@ add_executable(${module_name} WIN32 MACOSX_BUNDLE
uimanager.cpp uimanager.h
videoeditor.cpp videoeditor.h
videoprovider.cpp videoprovider.h
+ virtualconsole/vcanimation.cpp virtualconsole/vcanimation.h
+ virtualconsole/vcaudiotrigger.cpp virtualconsole/vcaudiotrigger.h
virtualconsole/vcbutton.cpp virtualconsole/vcbutton.h
virtualconsole/vcclock.cpp virtualconsole/vcclock.h
virtualconsole/vccuelist.cpp virtualconsole/vccuelist.h
@@ -72,10 +74,26 @@ add_executable(${module_name} WIN32 MACOSX_BUNDLE
virtualconsole/vcslider.cpp virtualconsole/vcslider.h
virtualconsole/vcsoloframe.cpp virtualconsole/vcsoloframe.h
virtualconsole/vcwidget.cpp virtualconsole/vcwidget.h
+ virtualconsole/vcxypad.cpp virtualconsole/vcxypad.h
+ virtualconsole/vcspeeddial.cpp virtualconsole/vcspeeddial.h
virtualconsole/virtualconsole.cpp virtualconsole/virtualconsole.h
- ${QM_FILES}
)
+if(ANDROID)
+ add_library(${module_name} SHARED
+ ${SRC_FILES}
+ ${QM_FILES}
+ )
+ set_target_properties(
+ ${module_name}
+ PROPERTIES LIBRARY_OUTPUT_NAME qlcplus)
+else()
+ add_executable(${module_name} WIN32 MACOSX_BUNDLE
+ ${SRC_FILES}
+ ${QM_FILES}
+ )
+endif()
+
if(WIN32)
target_sources(${module_name} PRIVATE
qmlui.rc
@@ -111,6 +129,17 @@ target_link_libraries(${module_name} PRIVATE
qlcplusengine
)
+if(ANDROID)
+ target_link_libraries(${module_name} PRIVATE
+ Qt${QT_MAJOR_VERSION}::Concurrent
+ Qt${QT_MAJOR_VERSION}::OpenGL
+ GLESv2
+ log
+ z
+ c++_shared
+ )
+endif()
+
if(lupdate_only)
target_sources(${module_name} PRIVATE
qml/*.qml
diff --git a/qmlui/contextmanager.cpp b/qmlui/contextmanager.cpp
index b06952bf70..a5752e4b49 100644
--- a/qmlui/contextmanager.cpp
+++ b/qmlui/contextmanager.cpp
@@ -1381,6 +1381,8 @@ void ContextManager::slotNewFixtureCreated(quint32 fxID, qreal x, qreal y, qreal
qDebug() << "[ContextManager] New fixture created" << fxID;
+ if (m_uniGridView->isEnabled())
+ m_monProps->setFixturePosition(fxID, 0, 0, QVector3D(0, 0, 0));
if (m_DMXView->isEnabled())
m_DMXView->createFixtureItem(fxID);
if (m_2DView->isEnabled())
@@ -1626,6 +1628,9 @@ void ContextManager::slotUniverseWritten(quint32 idx, const QByteArray &ua)
void ContextManager::slotFunctionEditingChanged(bool status)
{
+ if (status == m_editingEnabled)
+ return;
+
resetFixtureSelection();
m_editingEnabled = status;
}
@@ -1643,7 +1648,7 @@ void ContextManager::setDumpValue(quint32 fxID, quint32 channel, uchar value, bo
currentVal.setValue(SceneValue(fxID, channel, currDmxValue));
newVal.setValue(sValue);
- if (currentVal != newVal || value != currDmxValue)
+ //if (currentVal != newVal || value != currDmxValue)
{
if (output)
{
diff --git a/qmlui/fixtureeditor/editorview.cpp b/qmlui/fixtureeditor/editorview.cpp
index 5c864bc272..307a71fb61 100644
--- a/qmlui/fixtureeditor/editorview.cpp
+++ b/qmlui/fixtureeditor/editorview.cpp
@@ -374,6 +374,24 @@ QString EditorView::checkFixture()
errors.append(tr("Empty capability description provided in channel '%1'").arg(channel->name()));
}
}
+
+ for (QLCFixtureMode *mode : m_fixtureDef->modes())
+ {
+ if (mode->name().isEmpty())
+ errors.append(tr("Empty mode name provided"));
+
+ if (mode->channels().count() == 0)
+ errors.append(tr("Mode '%1' has no channels defined").arg(mode->name()));
+
+ quint32 chIndex = 0;
+ for (QLCChannel *channel : mode->channels())
+ {
+
+ if (mode->channelActsOn(chIndex) == chIndex)
+ errors.append(tr("In mode '%1', channel '%2' cannot act on itself").arg(mode->name(), channel->name()));
+ chIndex++;
+ }
+ }
}
if (m_fixtureDef->modes().count() == 0)
diff --git a/qmlui/fixtureeditor/modeedit.cpp b/qmlui/fixtureeditor/modeedit.cpp
index f30e235c6f..cead486ac2 100644
--- a/qmlui/fixtureeditor/modeedit.cpp
+++ b/qmlui/fixtureeditor/modeedit.cpp
@@ -100,6 +100,33 @@ bool ModeEdit::deleteChannel(QLCChannel *channel)
return res;
}
+QStringList ModeEdit::actsOnChannels()
+{
+ QStringList list;
+ list << "-";
+
+ for (QLCChannel *channel : m_mode->channels())
+ list << channel->name();
+
+ return list;
+}
+
+int ModeEdit::actsOnChannel(int index)
+{
+ quint32 actsOnChannelIndex = m_mode->channelActsOn(index);
+
+ if (actsOnChannelIndex != QLCChannel::invalid())
+ return actsOnChannelIndex + 1;
+ else
+ return 0;
+}
+
+void ModeEdit::setActsOnChannel(int sourceIndex, int destIndex)
+{
+ quint32 actsOnChannel = destIndex == 0 ? QLCChannel::invalid() : destIndex - 1;
+ m_mode->setChannelActsOn(sourceIndex, actsOnChannel);
+}
+
void ModeEdit::updateChannelList()
{
m_channelList->clear();
@@ -113,6 +140,7 @@ void ModeEdit::updateChannelList()
}
emit channelsChanged();
+ emit actsOnChannelsChanged();
}
/************************************************************************
diff --git a/qmlui/fixtureeditor/modeedit.h b/qmlui/fixtureeditor/modeedit.h
index 8fd9341397..ef6ebbd18a 100644
--- a/qmlui/fixtureeditor/modeedit.h
+++ b/qmlui/fixtureeditor/modeedit.h
@@ -37,6 +37,7 @@ class ModeEdit : public QObject
Q_PROPERTY(QVariant heads READ heads NOTIFY headsChanged)
Q_PROPERTY(bool useGlobalPhysical READ useGlobalPhysical CONSTANT)
Q_PROPERTY(PhysicalEdit *physical READ physical CONSTANT)
+ Q_PROPERTY(QStringList actsOnChannels READ actsOnChannels NOTIFY actsOnChannelsChanged)
public:
ModeEdit(QLCFixtureMode *mode, QObject *parent = nullptr);
@@ -73,11 +74,20 @@ class ModeEdit : public QObject
/** Delete the given $channel from the mode being edited */
Q_INVOKABLE bool deleteChannel(QLCChannel *channel);
+ /** Return a simple list with the possible channels to act on */
+ QStringList actsOnChannels();
+
+ /** Return the channel where channel at $index acts on */
+ Q_INVOKABLE int actsOnChannel(int index);
+
+ Q_INVOKABLE void setActsOnChannel(int sourceIndex, int destIndex);
+
private:
void updateChannelList();
signals:
void channelsChanged();
+ void actsOnChannelsChanged();
private:
/** Reference to a channel list usable in QML */
diff --git a/qmlui/fixturemanager.cpp b/qmlui/fixturemanager.cpp
index 5c8f6201d6..0cb0f0a2bd 100644
--- a/qmlui/fixturemanager.cpp
+++ b/qmlui/fixturemanager.cpp
@@ -274,7 +274,7 @@ bool FixtureManager::addFixture(QString manuf, QString model, QString mode, QStr
{
Fixture *fxi = new Fixture(m_doc);
//quint32 fxAddress = address + (i * channels) + (i * gap);
- if (fxAddress + channels >= UNIVERSE_SIZE)
+ if (fxAddress + channels > UNIVERSE_SIZE)
{
uniIdx++;
if (m_doc->inputOutputMap()->getUniverseID(uniIdx) == m_doc->inputOutputMap()->invalidUniverse())
@@ -1054,6 +1054,9 @@ void FixtureManager::slotFixtureAdded(quint32 id, QVector3D pos)
else
{
Fixture *fixture = m_doc->fixture(id);
+ if (fixture == nullptr)
+ return;
+
QStringList uniNames = m_doc->inputOutputMap()->universeNames();
QString universeName = uniNames.at(fixture->universe());
int matchMask = 0;
diff --git a/qmlui/inputoutputmanager.cpp b/qmlui/inputoutputmanager.cpp
index 1b2e3a813a..5e244b7587 100644
--- a/qmlui/inputoutputmanager.cpp
+++ b/qmlui/inputoutputmanager.cpp
@@ -93,6 +93,20 @@ QStringList InputOutputManager::universeNames() const
return m_ioMap->universeNames();
}
+QString InputOutputManager::universeName(quint32 universeId)
+{
+ if (universeId == Universe::invalid())
+ return tr("All universes");
+ else
+ {
+ Universe *uni = m_ioMap->universe(universeId);
+ if (uni != nullptr)
+ return uni->name();
+ }
+
+ return QString();
+}
+
QVariant InputOutputManager::universesListModel() const
{
QVariantList universesList;
@@ -718,20 +732,20 @@ QVariant InputOutputManager::beatGeneratorsList()
internalMap.insert("privateName", "");
genList.append(internalMap);
- // add the currently open MIDI input devices
+ // add the currently open input devices that support beats
foreach (Universe *uni, m_ioMap->universes())
{
InputPatch *ip = uni->inputPatch();
- if (ip == nullptr || ip->pluginName() != "MIDI")
+ if (ip == nullptr || (ip->plugin()->capabilities() & QLCIOPlugin::Beats) == 0)
continue;
- QVariantMap midiInMap;
- midiInMap.insert("type", "MIDI");
- midiInMap.insert("name", ip->inputName());
- midiInMap.insert("uni", uni->id());
- midiInMap.insert("line", ip->input());
- midiInMap.insert("privateName", "");
- genList.append(midiInMap);
+ QVariantMap pluginMap;
+ pluginMap.insert("type", "PLUGIN");
+ pluginMap.insert("name", ip->inputName());
+ pluginMap.insert("uni", uni->id());
+ pluginMap.insert("line", ip->input());
+ pluginMap.insert("privateName", ip->pluginName());
+ genList.append(pluginMap);
}
// add the currently selected audio input device
@@ -789,8 +803,8 @@ void InputOutputManager::setBeatType(QString beatType)
if (m_beatType == "INTERNAL")
m_ioMap->setBeatGeneratorType(InputOutputMap::Internal);
- else if (m_beatType == "MIDI")
- m_ioMap->setBeatGeneratorType(InputOutputMap::MIDI);
+ else if (m_beatType == "PLUGIN")
+ m_ioMap->setBeatGeneratorType(InputOutputMap::Plugin);
else if (m_beatType == "AUDIO")
m_ioMap->setBeatGeneratorType(InputOutputMap::Audio);
else
@@ -806,7 +820,7 @@ void InputOutputManager::slotBeatTypeChanged()
switch(m_ioMap->beatGeneratorType())
{
case InputOutputMap::Internal: m_beatType = "INTERNAL"; break;
- case InputOutputMap::MIDI: m_beatType = "MIDI"; break;
+ case InputOutputMap::Plugin: m_beatType = "PLUGIN"; break;
case InputOutputMap::Audio: m_beatType = "AUDIO"; break;
case InputOutputMap::Disabled:
default:
diff --git a/qmlui/inputoutputmanager.h b/qmlui/inputoutputmanager.h
index 5445e137c9..4bac8c40ee 100644
--- a/qmlui/inputoutputmanager.h
+++ b/qmlui/inputoutputmanager.h
@@ -70,6 +70,7 @@ protected slots:
public:
QVariant universes();
QStringList universeNames() const;
+ Q_INVOKABLE QString universeName(quint32 universeId);
QVariant universesListModel() const;
/** Get/Set the currently selected universe index */
diff --git a/qmlui/js/FixtureDrag.js b/qmlui/js/FixtureDrag.js
index ba38ec72f0..4563ced4a4 100644
--- a/qmlui/js/FixtureDrag.js
+++ b/qmlui/js/FixtureDrag.js
@@ -87,21 +87,19 @@ function handleDrag(mouse)
function endDrag(mouse)
{
if (draggedItem == null)
- {
return;
- }
var currContext = previewLoader.item.contextName;
var offset = 0;
- console.log("Current context: " + currContext);
+ console.log("[FixtureDrag] Current context: " + currContext);
+
if (currContext === "2D")
- {
offset = View2D.gridPosition.x;
- }
+
var x = draggedItem.x - leftSidePanel.width - offset;
var y = draggedItem.y - previewLoader.y - viewToolbar.height;
- console.log("Item x: " + x + ", y: " + y);
+ console.log("[FixtureDrag] Item x: " + x + ", y: " + y);
if (x >= 0 && y >= 0)
{
diff --git a/qmlui/js/GenericHelpers.js b/qmlui/js/GenericHelpers.js
index 0f317b16e5..051c9ff385 100644
--- a/qmlui/js/GenericHelpers.js
+++ b/qmlui/js/GenericHelpers.js
@@ -19,7 +19,7 @@
function pluginIconFromName(name)
{
- switch(name)
+ switch (name)
{
case "ArtNet": return "qrc:/artnetplugin.svg";
case "DMX USB": return "qrc:/dmxusbplugin.svg";
diff --git a/qmlui/main.cpp b/qmlui/main.cpp
index 005418dee6..391cf6c78e 100644
--- a/qmlui/main.cpp
+++ b/qmlui/main.cpp
@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
parser.process(app);
+#if !defined Q_OS_ANDROID
if (!parser.isSet(threedSupportOption))
{
QSurfaceFormat format;
@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
format.setProfile(QSurfaceFormat::CoreProfile);
QSurfaceFormat::setDefaultFormat(format);
}
-
+#endif
if (parser.isSet(debugOption))
qInstallMessageHandler(debugMessageHandler);
diff --git a/qmlui/mainview3d.cpp b/qmlui/mainview3d.cpp
index 6bcf45a857..cc1d8c0a02 100644
--- a/qmlui/mainview3d.cpp
+++ b/qmlui/mainview3d.cpp
@@ -90,6 +90,8 @@ MainView3D::MainView3D(QQuickView *view, Doc *doc, QObject *parent)
QStringList listRoles;
listRoles << "itemID" << "name" << "isSelected";
m_genericItemsList->setRoleNames(listRoles);
+
+ resetCameraPosition();
}
MainView3D::~MainView3D()
@@ -164,13 +166,11 @@ void MainView3D::resetItems()
{
it.next();
SceneItem *e = it.value();
- //if (e->m_headItem)
- // delete e->m_headItem;
- //if (e->m_armItem)
- // delete e->m_armItem;
delete e->m_goboTexture;
- // delete e->m_rootItem; // TODO: with this -> segfault
delete e->m_selectionBox;
+ // delete e->m_rootItem; // TODO: with this -> segfault
+ e->m_rootItem->setProperty("enabled", false); // workaround for the above
+ delete e;
}
//const auto end = m_entitiesMap.end();
@@ -196,6 +196,52 @@ void MainView3D::resetItems()
setFrameCountEnabled(false);
}
+void MainView3D::resetCameraPosition()
+{
+ setCameraPosition(QVector3D(0.0, 3.0, 7.5));
+ setCameraUpVector(QVector3D(0.0, 1.0, 0.0));
+ setCameraViewCenter(QVector3D(0.0, 1.0, 0.0));
+}
+
+QVector3D MainView3D::cameraPosition() const
+{
+ return m_cameraPosition;
+}
+
+void MainView3D::setCameraPosition(const QVector3D &newCameraPosition)
+{
+ if (m_cameraPosition == newCameraPosition)
+ return;
+ m_cameraPosition = newCameraPosition;
+ emit cameraPositionChanged();
+}
+
+QVector3D MainView3D::cameraUpVector() const
+{
+ return m_cameraUpVector;
+}
+
+void MainView3D::setCameraUpVector(const QVector3D &newCameraUpVector)
+{
+ if (m_cameraUpVector == newCameraUpVector)
+ return;
+ m_cameraUpVector = newCameraUpVector;
+ emit cameraUpVectorChanged();
+}
+
+QVector3D MainView3D::cameraViewCenter() const
+{
+ return m_cameraViewCenter;
+}
+
+void MainView3D::setCameraViewCenter(const QVector3D &newCameraViewCenter)
+{
+ if (m_cameraViewCenter == newCameraViewCenter)
+ return;
+ m_cameraViewCenter = newCameraViewCenter;
+ emit cameraViewCenterChanged();
+}
+
QString MainView3D::meshDirectory() const
{
QDir dir = QDir::cleanPath(QLCFile::systemDirectory(MESHESDIR).path());
@@ -1454,8 +1500,11 @@ void MainView3D::removeFixtureItem(quint32 itemID)
SceneItem *mesh = m_entitiesMap.take(itemID);
- delete mesh->m_rootItem;
+ delete mesh->m_goboTexture;
delete mesh->m_selectionBox;
+ delete mesh->m_rootTransform;
+// delete mesh->m_rootItem; // this will cause a segfault
+ mesh->m_rootItem->setProperty("enabled", false); // workaround for the above
delete mesh;
}
diff --git a/qmlui/mainview3d.h b/qmlui/mainview3d.h
index 477a3366b1..961360aece 100644
--- a/qmlui/mainview3d.h
+++ b/qmlui/mainview3d.h
@@ -94,6 +94,10 @@ class MainView3D : public PreviewContext
{
Q_OBJECT
+ Q_PROPERTY(QVector3D cameraPosition READ cameraPosition WRITE setCameraPosition NOTIFY cameraPositionChanged FINAL)
+ Q_PROPERTY(QVector3D cameraUpVector READ cameraUpVector WRITE setCameraUpVector NOTIFY cameraUpVectorChanged FINAL)
+ Q_PROPERTY(QVector3D cameraViewCenter READ cameraViewCenter WRITE setCameraViewCenter NOTIFY cameraViewCenterChanged FINAL)
+
Q_PROPERTY(RenderQuality renderQuality READ renderQuality WRITE setRenderQuality NOTIFY renderQualityChanged)
Q_PROPERTY(QString meshDirectory READ meshDirectory CONSTANT)
Q_PROPERTY(QStringList stagesList READ stagesList CONSTANT)
@@ -123,8 +127,24 @@ class MainView3D : public PreviewContext
/** @reimp */
void setUniverseFilter(quint32 universeFilter);
+ /** Cleanup all the items in the scene */
void resetItems();
+ /** Reset the camera position to initial values */
+ void resetCameraPosition();
+
+ /** Get set the scene camera position */
+ QVector3D cameraPosition() const;
+ void setCameraPosition(const QVector3D &newCameraPosition);
+
+ /** Get set the scene camera position */
+ QVector3D cameraUpVector() const;
+ void setCameraUpVector(const QVector3D &newCameraUpVector);
+
+ /** Get set the scene camera position */
+ QVector3D cameraViewCenter() const;
+ void setCameraViewCenter(const QVector3D &newCameraViewCenter);
+
protected:
/** Returns a string with the mesh location, suitable to be used by QML */
QString meshDirectory() const;
@@ -135,6 +155,11 @@ public slots:
/** @reimp */
void slotRefreshView();
+signals:
+ void cameraPositionChanged();
+ void cameraUpVectorChanged();
+ void cameraViewCenterChanged();
+
private:
/** Reference to the Doc Monitor properties */
MonitorProperties *m_monProps;
@@ -147,6 +172,10 @@ public slots:
QQmlComponent *m_fillGBufferLayer;
int m_createItemCount;
+ QVector3D m_cameraPosition;
+ QVector3D m_cameraUpVector;
+ QVector3D m_cameraViewCenter;
+
/*********************************************************************
* Frame counter
*********************************************************************/
diff --git a/qmlui/mainviewdmx.cpp b/qmlui/mainviewdmx.cpp
index a1aae20cc0..6084f5955b 100644
--- a/qmlui/mainviewdmx.cpp
+++ b/qmlui/mainviewdmx.cpp
@@ -103,6 +103,9 @@ void MainViewDMX::createFixtureItem(quint32 fxID)
MonitorProperties *monProps = m_doc->monitorProperties();
quint32 itemFlags = monProps->fixtureFlags(fxID, 0, 0);
+ if (monProps->containsFixture(fxID) == false)
+ monProps->setFixturePosition(fxID, 0, 0, QVector3D(0, 0, 0));
+
newFixtureItem->setParentItem(contextItem());
newFixtureItem->setProperty("fixtureObj", QVariant::fromValue(fixture));
if (itemFlags & MonitorProperties::HiddenFlag)
diff --git a/qmlui/qml/ActionsMenu.qml b/qmlui/qml/ActionsMenu.qml
index cc0f53c6bf..3d43d00fb4 100644
--- a/qmlui/qml/ActionsMenu.qml
+++ b/qmlui/qml/ActionsMenu.qml
@@ -161,6 +161,7 @@ Popup
border.width: 1
border.color: UISettings.bgStronger
color: UISettings.bgStrong
+ height: actionsMenuEntries.height
}
Column
@@ -307,6 +308,7 @@ Popup
ContextMenuEntry
{
Layout.fillWidth: true
+ Layout.fillHeight: true
imgSource: "qrc:/undo.svg"
entryText: qsTr("Undo")
onEntered: submenuItem = null
@@ -320,6 +322,7 @@ Popup
ContextMenuEntry
{
Layout.fillWidth: true
+ Layout.fillHeight: true
imgSource: "qrc:/redo.svg"
entryText: qsTr("Redo")
onEntered: submenuItem = null
diff --git a/qmlui/qml/BeatGeneratorsPanel.qml b/qmlui/qml/BeatGeneratorsPanel.qml
index 6c2a4b9d59..2e9acfa967 100644
--- a/qmlui/qml/BeatGeneratorsPanel.qml
+++ b/qmlui/qml/BeatGeneratorsPanel.qml
@@ -20,6 +20,8 @@
import QtQuick 2.6
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
+
+import "GenericHelpers.js" as Helpers
import "."
Rectangle
@@ -89,6 +91,7 @@ Rectangle
width: parent.width
height: UISettings.bigItemHeight * 2
+ clip: true
boundsBehavior: Flickable.StopAtBounds
delegate:
@@ -99,11 +102,11 @@ Rectangle
Component.onCompleted:
{
- if (modelData.type === "MIDI")
+ if (modelData.type === "PLUGIN")
{
iconBox.color = "white"
iconBox.visible = true
- genIcon.source = "qrc:/midiplugin.svg"
+ genIcon.source = Helpers.pluginIconFromName(modelData.privateName)
}
else if (modelData.type === "AUDIO")
{
@@ -151,6 +154,7 @@ Rectangle
{
id: keyPadBox
width: parent.width
+ height: UISettings.iconSizeDefault * 6
showDMXcontrol: false
showTapButton: true
visible: ioManager.beatType === "INTERNAL"
diff --git a/qmlui/qml/ChannelToolLoader.qml b/qmlui/qml/ChannelToolLoader.qml
index 011b41d81a..c00368254f 100644
--- a/qmlui/qml/ChannelToolLoader.qml
+++ b/qmlui/qml/ChannelToolLoader.qml
@@ -23,10 +23,10 @@ import QtQuick.Controls 2.5
import org.qlcplus.classes 1.0
import "."
-Popup
+Item
{
- id: popupRoot
- padding: 0
+ id: itemRoot
+ visible: false
property int fixtureId: -1
property int channelType: -1
@@ -39,13 +39,14 @@ Popup
function loadChannelTool(cItem, fxId, chIdx, val)
{
channelType = fixtureManager.channelType(fxId, chIdx)
+
if (channelType === QLCChannel.NoGroup || channelType === QLCChannel.Nothing)
return
var map = cItem.mapToItem(parent, cItem.x, cItem.y)
toolLoader.source = ""
- x = map.x
- yPos = map.y
+ x = map.x + UISettings.iconSizeMedium
+ y = map.y
fixtureId = fxId
channelIndex = chIdx
channelValue = val
@@ -59,7 +60,6 @@ Popup
case QLCChannel.Tilt:
toolLoader.source = "qrc:/SingleAxisTool.qml"
break
-
case QLCChannel.Colour:
case QLCChannel.Gobo:
case QLCChannel.Speed:
@@ -82,34 +82,35 @@ Popup
onLoaded:
{
- popupRoot.y = popupRoot.yPos - height
- popupRoot.width = width
- popupRoot.height = height
+ itemRoot.width = width
+ itemRoot.height = height
item.showPalette = false
- //item.closeOnSelect = true
-
- popupRoot.open()
+ if (item.hasOwnProperty('dragTarget'))
+ item.dragTarget = itemRoot
if (channelType >= 0xFF)
{
- item.currentValue = popupRoot.channelValue
- item.targetColor = popupRoot.channelType
+ item.currentValue = itemRoot.channelValue
+ item.targetColor = itemRoot.channelType
}
else if (channelType == QLCChannel.Intensity)
{
- item.currentValue = popupRoot.channelValue
+ item.show(itemRoot.channelValue)
}
else if (channelType == QLCChannel.Pan ||
channelType == QLCChannel.Tilt)
{
- item.currentValue = popupRoot.channelValue
- item.maxDegrees = fixtureManager.channelDegrees(popupRoot.fixtureId, popupRoot.channelIndex)
+ item.currentValue = itemRoot.channelValue
+ item.maxDegrees = fixtureManager.channelDegrees(itemRoot.fixtureId, itemRoot.channelIndex)
}
else
{
- item.updatePresets(fixtureManager.presetChannel(popupRoot.fixtureId, popupRoot.channelIndex))
+ item.updatePresets(fixtureManager.presetChannel(itemRoot.fixtureId, itemRoot.channelIndex))
}
+
+ item.closeOnSelect = true
+ itemRoot.visible = true
}
Connections
@@ -118,7 +119,12 @@ Popup
target: toolLoader.item
function onValueChanged()
{
- popupRoot.valueChanged(popupRoot.fixtureId, popupRoot.channelIndex, target.currentValue)
+ itemRoot.valueChanged(itemRoot.fixtureId, itemRoot.channelIndex, target.currentValue)
+ }
+ function onClose()
+ {
+ itemRoot.visible = false
+ toolLoader.source = ""
}
}
}
diff --git a/qmlui/qml/ColorTool.qml b/qmlui/qml/ColorTool.qml
index 7cbd048994..5f92b432a6 100644
--- a/qmlui/qml/ColorTool.qml
+++ b/qmlui/qml/ColorTool.qml
@@ -33,6 +33,7 @@ Rectangle
color: UISettings.bgMedium
property bool closeOnSelect: false
+ property var dragTarget: null
property int colorsMask: 0
property color currentRGB
property color currentWAUV
@@ -164,7 +165,7 @@ Rectangle
{
Layout.fillWidth: true
height: colorToolBar.height
- drag.target: paletteBox.isEditing ? null : colorToolBox
+ drag.target: paletteBox.isEditing ? null : (colorToolBox.dragTarget ? colorToolBox.dragTarget : colorToolBox)
}
GenericButton
{
diff --git a/qmlui/qml/ColorToolFull.qml b/qmlui/qml/ColorToolFull.qml
index 1d9af3b3aa..8bd92eb0ba 100644
--- a/qmlui/qml/ColorToolFull.qml
+++ b/qmlui/qml/ColorToolFull.qml
@@ -125,6 +125,7 @@ Rectangle
bSpin.value = b*/
currentRGB = Qt.rgba(r / 255, g / 255, b / 255, 1.0)
+ colorChanged(currentRGB.r, currentRGB.g, currentRGB.b, currentWAUV.r, currentWAUV.g, currentWAUV.b)
}
onPressed: setPickedColor(mouse)
diff --git a/qmlui/qml/ColorToolPrimary.qml b/qmlui/qml/ColorToolPrimary.qml
index f3be683beb..5240ebe99e 100644
--- a/qmlui/qml/ColorToolPrimary.qml
+++ b/qmlui/qml/ColorToolPrimary.qml
@@ -38,6 +38,7 @@ Rectangle
property bool showPalette: false
signal valueChanged(int value)
+ signal close()
Canvas
{
@@ -92,7 +93,8 @@ Rectangle
{
anchors.fill: parent
- onClicked: {
+ function calculateValue(mouse)
+ {
var val = 0
if (mouse.x < width * 0.1)
@@ -112,6 +114,20 @@ Rectangle
boxRoot.currentValue = val
boxRoot.valueChanged(val)
}
+
+ onPressed: calculateValue()
+ onPositionChanged:
+ {
+ if (!pressed)
+ return
+
+ calculateValue(mouse)
+ }
+ onReleased:
+ {
+ if (closeOnSelect)
+ boxRoot.close()
+ }
}
}
}
diff --git a/qmlui/qml/ExternalControlDelegate.qml b/qmlui/qml/ExternalControlDelegate.qml
index ea01b2bc72..e7398a7963 100644
--- a/qmlui/qml/ExternalControlDelegate.qml
+++ b/qmlui/qml/ExternalControlDelegate.qml
@@ -155,7 +155,7 @@ Column
Layout.fillWidth: true
height: UISettings.listItemHeight
visible: customFeedback
- label: qsTr("Custom feedbacks")
+ label: qsTr("Custom feedback")
color: UISettings.bgMedium
}
diff --git a/qmlui/qml/GenericMultiDragItem.qml b/qmlui/qml/GenericMultiDragItem.qml
index e3ca4e4759..b354a9d6ee 100644
--- a/qmlui/qml/GenericMultiDragItem.qml
+++ b/qmlui/qml/GenericMultiDragItem.qml
@@ -1,6 +1,6 @@
/*
Q Light Controller Plus
- FunctionDragItem.qml
+ GenericMultiDragItem.qml
Copyright (c) Massimo Callegari
diff --git a/qmlui/qml/KeyPad.qml b/qmlui/qml/KeyPad.qml
index 217e1db541..ffa0f51c0e 100644
--- a/qmlui/qml/KeyPad.qml
+++ b/qmlui/qml/KeyPad.qml
@@ -34,7 +34,7 @@ Rectangle
property bool showDMXcontrol: true
property bool showTapButton: false
-
+
property alias commandString: commandBox.text
property real itemHeight: Math.max(UISettings.iconSizeDefault, keyPadRoot.height / keyPadGrid.rows) - 3
@@ -109,15 +109,15 @@ Rectangle
else
{
var currTime = new Date().getTime()
-
+
if (lastTap != 0 && currTime - lastTap < 1500)
{
var newTime = currTime - lastTap
-
+
tapHistory.push(newTime)
tapTimeValue = TimeUtils.calculateBPMByTapIntervals(tapHistory)
-
+
keyPadRoot.tapTimeChanged(tapTimeValue)
tapTimer.interval = tapTimeValue
tapTimer.restart()
diff --git a/qmlui/qml/MainView.qml b/qmlui/qml/MainView.qml
index 58ef1fc426..5204b48b1a 100644
--- a/qmlui/qml/MainView.qml
+++ b/qmlui/qml/MainView.qml
@@ -144,6 +144,7 @@ Rectangle
MenuBarEntry
{
id: actEntry
+ Layout.alignment: Qt.AlignTop
imgSource: "qrc:/qlcplus.svg"
entryText: qsTr("Actions")
onPressed: actionsMenu.open()
@@ -165,6 +166,7 @@ Rectangle
{
id: fnfEntry
property string ctxName: "FIXANDFUNC"
+ Layout.alignment: Qt.AlignTop
property string ctxRes: "qrc:/FixturesAndFunctions.qml"
imgSource: "qrc:/editor.svg"
@@ -180,6 +182,7 @@ Rectangle
MenuBarEntry
{
id: vcEntry
+ Layout.alignment: Qt.AlignTop
property string ctxName: "VC"
property string ctxRes: "qrc:/VirtualConsole.qml"
@@ -201,6 +204,7 @@ Rectangle
MenuBarEntry
{
id: sdEntry
+ Layout.alignment: Qt.AlignTop
property string ctxName: "SDESK"
property string ctxRes: "qrc:/SimpleDesk.qml"
@@ -222,6 +226,7 @@ Rectangle
MenuBarEntry
{
id: smEntry
+ Layout.alignment: Qt.AlignTop
property string ctxName: "SHOWMGR"
property string ctxRes: "qrc:/ShowManager.qml"
@@ -243,6 +248,7 @@ Rectangle
MenuBarEntry
{
id: ioEntry
+ Layout.alignment: Qt.AlignTop
property string ctxName: "IOMGR"
property string ctxRes: "qrc:/InputOutputManager.qml"
@@ -265,7 +271,7 @@ Rectangle
{
// acts like an horizontal spacer
Layout.fillWidth: true
- height: parent.height
+ implicitHeight: parent.height
color: "transparent"
}
RobotoText
@@ -273,6 +279,9 @@ Rectangle
label: "BPM: " + (ioManager.bpmNumber > 0 ? ioManager.bpmNumber : qsTr("Off"))
color: gsMouseArea.containsMouse ? UISettings.bgLight : "transparent"
fontSize: UISettings.textSizeDefault
+ Layout.alignment: Qt.AlignTop
+ implicitWidth: width
+ implicitHeight: parent.height
MouseArea
{
@@ -294,8 +303,9 @@ Rectangle
Rectangle
{
id: beatIndicator
- width: height
- height: parent.height * 0.5
+ implicitWidth: height
+ implicitHeight: parent.height * 0.5
+ Layout.alignment: Qt.AlignVCenter
radius: height / 2
border.width: 2
border.color: "#333"
@@ -324,8 +334,9 @@ Rectangle
IconButton
{
id: stopAllButton
- width: UISettings.iconSizeDefault
- height: UISettings.iconSizeDefault
+ implicitWidth: UISettings.iconSizeDefault
+ implicitHeight: UISettings.iconSizeDefault
+ Layout.alignment: Qt.AlignTop
enabled: runningCount ? true : false
bgColor: "transparent"
imgSource: "qrc:/stop.svg"
diff --git a/qmlui/qml/QLCPlusKnob.qml b/qmlui/qml/QLCPlusKnob.qml
index f9b1de0c46..f30cfffdf1 100644
--- a/qmlui/qml/QLCPlusKnob.qml
+++ b/qmlui/qml/QLCPlusKnob.qml
@@ -17,8 +17,8 @@
limitations under the License.
*/
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick 2.14
+import QtQuick.Controls 2.14
import "CanvasDrawFunctions.js" as DrawFuncs
import "."
@@ -33,6 +33,8 @@ Dial
from: 0
to: 255
+ stepSize: 1.0
+ wheelEnabled: true
onPositionChanged: kCanvas.requestPaint()
onHeightChanged: kCanvas.requestPaint()
diff --git a/qmlui/qml/SimpleDesk.qml b/qmlui/qml/SimpleDesk.qml
index a9570025a8..0f0beb57d5 100644
--- a/qmlui/qml/SimpleDesk.qml
+++ b/qmlui/qml/SimpleDesk.qml
@@ -46,6 +46,7 @@ Rectangle
{
anchors.fill: parent
orientation: Qt.Vertical
+ z: 1
// Top view (faders)
Rectangle
@@ -254,7 +255,8 @@ Rectangle
from: 0
to: 255
value: model.chValue
- onMoved: {
+ onMoved:
+ {
model.isOverride = true
model.chValue = valueAt(position)
simpleDesk.setValue(fixtureObj ? fixtureObj.id : -1, fixtureObj ? model.chIndex : index, model.chValue)
@@ -274,7 +276,8 @@ Rectangle
padding: 0
horizontalAlignment: Qt.AlignHCenter
value: dmxValues ? model.chValue : (model.chValue / 255.0) * 100.0
- onValueModified: {
+ onValueModified:
+ {
model.isOverride = true
model.chValue = value * (dmxValues ? 1.0 : 2.55)
simpleDesk.setValue(fixtureObj ? fixtureObj.id : -1, fixtureObj ? model.chIndex : index, model.chValue)
diff --git a/qmlui/qml/SingleAxisTool.qml b/qmlui/qml/SingleAxisTool.qml
index 965492cd8f..9d773934d0 100644
--- a/qmlui/qml/SingleAxisTool.qml
+++ b/qmlui/qml/SingleAxisTool.qml
@@ -39,6 +39,7 @@ Rectangle
property bool showPalette: false
signal valueChanged(int value)
+ signal close()
GridLayout
{
@@ -60,6 +61,11 @@ Rectangle
currentValue = Math.round((valueAt(position) * 255.0) / maxDegrees)
boxRoot.valueChanged(currentValue)
}
+ onPressedChanged:
+ {
+ if (!pressed && closeOnSelect)
+ boxRoot.close()
+ }
}
RobotoText
diff --git a/qmlui/qml/TreeNodeDelegate.qml b/qmlui/qml/TreeNodeDelegate.qml
index f421b52760..1b9f1bea3c 100644
--- a/qmlui/qml/TreeNodeDelegate.qml
+++ b/qmlui/qml/TreeNodeDelegate.qml
@@ -103,6 +103,7 @@ Column
id: nodeLabel
width: nodeBgRect.width - x - 1
text: cRef ? cRef.name : textLabel
+ originalText: text
onTextConfirmed: nodeContainer.pathChanged(nodePath, text)
}
diff --git a/qmlui/qml/UISettingsEditor.qml b/qmlui/qml/UISettingsEditor.qml
index 664a6b9595..7afe49446b 100644
--- a/qmlui/qml/UISettingsEditor.qml
+++ b/qmlui/qml/UISettingsEditor.qml
@@ -30,13 +30,16 @@ Rectangle
anchors.fill: parent
color: "transparent"
- property real origItemHeight: UISettings.listItemHeight
- property real origIconMedium: UISettings.iconSizeMedium
+ property real origItemHeight: { origItemHeight = UISettings.listItemHeight }
+ property real origIconMedium: { origIconMedium = UISettings.iconSizeMedium }
+ property real origTextSizeDefault: { origTextSizeDefault = UISettings.textSizeDefault}
+ property real origIconDefault: {origIconDefault = UISettings.iconSizeDefault}
onVisibleChanged:
{
origItemHeight = UISettings.listItemHeight
origIconMedium = UISettings.iconSizeMedium
+ origTextSizeDefault = UISettings.textSizeDefault
sfRestore.origScaleFactor = qlcplus.uiScaleFactor
}
@@ -135,6 +138,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Scaling factor")
}
RowLayout
@@ -153,6 +157,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: sfSlider.value.toFixed(2) + "x"
}
@@ -181,6 +186,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Background darker")
}
Loader
@@ -199,6 +205,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Background dark")
}
Loader
@@ -218,6 +225,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Background medium")
}
Loader
@@ -236,6 +244,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Background light")
}
Loader
@@ -255,6 +264,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Background lighter")
}
Loader
@@ -273,6 +283,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Controls background")
}
Loader
@@ -292,6 +303,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Foreground main")
}
Loader
@@ -310,6 +322,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Foreground medium")
}
Loader
@@ -329,6 +342,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Foreground light")
}
Loader
@@ -347,6 +361,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Toolbar gradient start")
}
Loader
@@ -366,6 +381,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Sub-toolbar gradient start")
}
Loader
@@ -384,6 +400,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Toolbar gradient end")
}
Loader
@@ -403,6 +420,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Toolbar hover gradient start")
}
Loader
@@ -422,6 +440,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Toolbar hover gradient end")
}
Loader
@@ -441,6 +460,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Toolbar selection")
}
Loader
@@ -460,6 +480,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Sub-toolbar selection")
}
Loader
@@ -479,6 +500,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Section header")
}
Loader
@@ -497,6 +519,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Section header divider")
}
Loader
@@ -516,6 +539,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Item highlight")
}
Loader
@@ -534,6 +558,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Item highlight pressed")
}
Loader
@@ -553,6 +578,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Item hover")
}
Loader
@@ -571,6 +597,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Item selection")
}
Loader
@@ -590,6 +617,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("VC Frame drop area")
}
Loader
@@ -608,6 +636,7 @@ Rectangle
RobotoText
{
height: origItemHeight
+ fontSize: origTextSizeDefault
label: qsTr("Item dark border")
}
Loader
@@ -628,6 +657,8 @@ Rectangle
Layout.columnSpan: 4
Layout.alignment: Qt.AlignHCenter
width: origIconMedium * 10
+ height: origIconDefault
+ fontSize: origTextSizeDefault
label: qsTr("Save to file")
onClicked:
{
diff --git a/qmlui/qml/fixtureeditor/ModeEditor.qml b/qmlui/qml/fixtureeditor/ModeEditor.qml
index d3e05b8e1d..1deab6a26f 100644
--- a/qmlui/qml/fixtureeditor/ModeEditor.qml
+++ b/qmlui/qml/fixtureeditor/ModeEditor.qml
@@ -294,10 +294,15 @@ Rectangle
iSrc: mcDelegate.cRef ? mcDelegate.cRef.getIconNameFromGroup(mcDelegate.cRef.group, true) : ""
}
Rectangle { width: 1; height: UISettings.listItemHeight }
+
CustomComboBox
{
implicitWidth: UISettings.bigItemHeight * 2
height: UISettings.listItemHeight
+ model: mode ? mode.actsOnChannels : null
+ textRole: ""
+ currentIndex: mode ? mode.actsOnChannel(index) : -1
+ onCurrentIndexChanged: if (mode) mode.setActsOnChannel(index, currentIndex)
}
}
diff --git a/qmlui/qml/fixturesfunctions/3DView/3DView.qml b/qmlui/qml/fixturesfunctions/3DView/3DView.qml
index 393f6fb2cb..c88a28baee 100644
--- a/qmlui/qml/fixturesfunctions/3DView/3DView.qml
+++ b/qmlui/qml/fixturesfunctions/3DView/3DView.qml
@@ -323,16 +323,6 @@ Rectangle
objectName: "scene3DEntity"
Component.onCompleted: contextManager.enableContext("3D", true, scene3d)
-/*
- OrbitCameraController
- {
- id: camController
- camera: sceneEntity.camera
- linearSpeed: 40.0
- lookSpeed: 300.0
- }
-*/
-
// Global elements
Camera
{
@@ -343,9 +333,9 @@ Rectangle
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)
+ position: View3D.cameraPosition
+ upVector: View3D.cameraUpVector
+ viewCenter: View3D.cameraViewCenter
function setZoom(amount)
{
@@ -455,6 +445,10 @@ Rectangle
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))
+
+ View3D.cameraPosition = viewCamera.position
+ View3D.cameraUpVector = viewCamera.upVector
+ View3D.cameraViewCenter = viewCamera.viewCenter
}
else if (mouse.buttons === Qt.MiddleButton) // camera translation
{
@@ -462,6 +456,10 @@ Rectangle
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))
+
+ View3D.cameraPosition = viewCamera.position
+ View3D.cameraUpVector = viewCamera.upVector
+ View3D.cameraViewCenter = viewCamera.viewCenter
}
startPoint = Qt.point(mouse.x, mouse.y)
}
diff --git a/qmlui/qml/fixturesfunctions/DMXView.qml b/qmlui/qml/fixturesfunctions/DMXView.qml
index a4df0b86ab..f471b579d5 100644
--- a/qmlui/qml/fixturesfunctions/DMXView.qml
+++ b/qmlui/qml/fixturesfunctions/DMXView.qml
@@ -83,7 +83,7 @@ Rectangle
}
Component.onCompleted: contextManager.enableContext("DMX", true, flowLayout)
- Component.onDestruction: if(contextManager) contextManager.enableContext("DMX", false, flowLayout)
+ Component.onDestruction: if (contextManager) contextManager.enableContext("DMX", false, flowLayout)
}
ScrollBar.vertical: CustomScrollBar { }
diff --git a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml
index 9a44a25cd9..739e084412 100644
--- a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml
+++ b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml
@@ -132,6 +132,7 @@ Column
id: nodeLabel
Layout.fillWidth: true
text: textLabel
+ originalText: text
onTextConfirmed:
{
diff --git a/qmlui/qml/fixturesfunctions/FixtureProperties.qml b/qmlui/qml/fixturesfunctions/FixtureProperties.qml
index 8633e93f17..e6a18e6cf4 100644
--- a/qmlui/qml/fixturesfunctions/FixtureProperties.qml
+++ b/qmlui/qml/fixturesfunctions/FixtureProperties.qml
@@ -18,7 +18,7 @@
*/
import QtQuick 2.3
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.14
import QtQuick.Layouts 1.1
import "."
diff --git a/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml b/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml
index 2593da1142..69dac04182 100644
--- a/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml
+++ b/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml
@@ -135,6 +135,8 @@ Rectangle
onCheckedChanged: loadContext(checked, "qrc:/UniverseGridView.qml", "UNIGRID")
onRightClicked:
{
+ if (checked)
+ dmxView.checked = true
uniView.visible = false
contextManager.detachContext("UNIGRID")
}
@@ -151,6 +153,8 @@ Rectangle
onCheckedChanged: loadContext(checked, "qrc:/DMXView.qml", "DMX")
onRightClicked:
{
+ if (checked)
+ uniView.checked = true
dmxView.visible = false
contextManager.detachContext("DMX")
}
@@ -168,6 +172,8 @@ Rectangle
onCheckedChanged: loadContext(checked, "qrc:/2DView.qml", "2D")
onRightClicked:
{
+ if (checked)
+ dmxView.checked = true
twodView.visible = false
contextManager.detachContext("2D")
}
@@ -193,6 +199,8 @@ Rectangle
}
onRightClicked:
{
+ if (checked)
+ twodView.checked = true
threedView.visible = false
contextManager.detachContext("3D")
}
diff --git a/qmlui/qml/fixturesfunctions/GridEditor.qml b/qmlui/qml/fixturesfunctions/GridEditor.qml
index c8e2eac887..165a6f7b27 100644
--- a/qmlui/qml/fixturesfunctions/GridEditor.qml
+++ b/qmlui/qml/fixturesfunctions/GridEditor.qml
@@ -222,17 +222,31 @@ Rectangle
onTriggered: calculateCellSize()
}
+ Text
+ {
+ id: ttText
+
+ property string tooltipText: ""
+ visible: false
+ x: gridMouseArea.mouseX
+ y: gridMouseArea.mouseY
+ ToolTip.visible: ttText.visible
+ ToolTip.timeout: 3000
+ ToolTip.text: tooltipText
+ }
+
Timer
{
id: ttTimer
+ repeat: false
interval: 1000
- running: gridMouseArea.containsMouse
+ running: false
onTriggered:
{
var xPos = parseInt(gridMouseArea.mouseX / cellSize)
var yPos = parseInt(gridMouseArea.mouseY / cellSize)
- var tooltip = getTooltip(xPos, yPos)
- Tooltip.showText(gridMouseArea, Qt.point(gridMouseArea.mouseX, gridMouseArea.mouseY), tooltip)
+ ttText.tooltipText = getTooltip(xPos, yPos)
+ ttText.visible = true
}
}
@@ -343,6 +357,7 @@ Rectangle
onPositionChanged:
{
+ ttText.visible = false
ttTimer.restart()
if (movingSelection == false)
@@ -368,8 +383,7 @@ Rectangle
updateViewSelection(selectionOffset)
}
- onExited: Tooltip.hideText()
- onCanceled: Tooltip.hideText()
+ onExited: ttTimer.stop()
}
DropArea
diff --git a/qmlui/qml/fixturesfunctions/IntensityTool.qml b/qmlui/qml/fixturesfunctions/IntensityTool.qml
index 61ebe7ca3f..8192a71950 100644
--- a/qmlui/qml/fixturesfunctions/IntensityTool.qml
+++ b/qmlui/qml/fixturesfunctions/IntensityTool.qml
@@ -35,6 +35,7 @@ Rectangle
property bool dmxValues: true
property bool closeOnSelect: false
+ property var dragTarget: null
property alias showPalette: paletteBox.visible
property alias currentValue: spinBox.value
@@ -55,34 +56,34 @@ Rectangle
else
{
var val = relativeValue ? currentValue - previousValue : currentValue
- intRoot.valueChanged(dmxValues ? val : val * 2.55)
- if (closeOnSelect)
- intRoot.visible = false
+ if (intRoot.visible)
+ intRoot.valueChanged(dmxValues ? val : val * 2.55)
+ //if (closeOnSelect)
+ // intRoot.close()
}
previousValue = currentValue
}
onVisibleChanged:
{
- if (visible)
+ if (!visible)
+ paletteBox.checked = false
+ }
+
+ function show(value)
+ {
+ previousValue = 0
+ if (value === -1)
{
- previousValue = 0
- var val = contextManager.getCurrentValue(QLCChannel.Intensity, false)
- if (val === -1)
- {
- relativeValue = true
- currentValue = 0
- }
- else
- {
- relativeValue = false
- currentValue = dmxValues ? Math.round(val) : Math.round(val / 2.55)
- }
+ relativeValue = true
+ currentValue = 0
}
else
{
- paletteBox.checked = false
+ relativeValue = false
+ currentValue = dmxValues ? Math.round(value) : Math.round(value / 2.55)
}
+ visible = true
}
function loadPalette(pId)
@@ -137,7 +138,7 @@ Rectangle
MouseArea
{
anchors.fill: parent
- drag.target: intRoot
+ drag.target: intRoot.dragTarget ? intRoot.dragTarget : intRoot
}
GenericButton
@@ -232,7 +233,7 @@ Rectangle
suffix: dmxValues ? "" : "%"
to: dmxValues ? 255 : 100
- onValueChanged: currentValue = value
+ onValueModified: currentValue = value
}
DMXPercentageButton
diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml
index afab32e9f5..0d170aff97 100644
--- a/qmlui/qml/fixturesfunctions/LeftPanel.qml
+++ b/qmlui/qml/fixturesfunctions/LeftPanel.qml
@@ -99,7 +99,10 @@ SidePanel
onToggled:
{
if (checked == true)
+ {
loaderSource = "qrc:/FixtureGroupManager.qml"
+ fixtureManager.searchFilter = ""
+ }
animatePanel(checked)
}
}
@@ -133,7 +136,16 @@ SidePanel
tooltip: qsTr("Intensity")
counter: 0
ButtonGroup.group: capabilitiesGroup
- onCheckedChanged: intTool.visible = !intTool.visible
+ onCheckedChanged:
+ {
+ if (checked)
+ {
+ var val = contextManager.getCurrentValue(QLCChannel.Intensity, false)
+ intTool.show(val)
+ }
+ else
+ intTool.visible = false
+ }
onCounterChanged: if (counter == 0) intTool.visible = false
IntensityTool
diff --git a/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml b/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml
index a1a0a5d3af..922fe02773 100644
--- a/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml
+++ b/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml
@@ -27,6 +27,7 @@ Rectangle
id: iRoot
width: UISettings.bigItemHeight * 1.5
height: UISettings.iconSizeDefault * 1.2
+ color: capMouseArea.pressed ? UISettings.bgLight : "white"
border.width: 1
border.color: UISettings.borderColorDark
@@ -63,7 +64,7 @@ Rectangle
if (Qt.platform.os === "android")
pic.source = resArray[0]
else
- pic.source = "file:/" + resArray[0]
+ pic.source = "file:" + resArray[0]
}
}
@@ -137,14 +138,13 @@ Rectangle
}
MouseArea
{
+ id: capMouseArea
anchors.fill: parent
hoverEnabled: true
preventStealing: false
onPositionChanged: capBar.width = mouse.x
onExited: capBar.width = 0
- onPressed: iRoot.color = UISettings.bgLight
- onReleased: iRoot.color = "white"
onClicked:
{
var value = ((capability.max - capability.min) * capBar.width) / iRoot.width
diff --git a/qmlui/qml/fixturesfunctions/PresetsTool.qml b/qmlui/qml/fixturesfunctions/PresetsTool.qml
index 17d07bd963..f239becbda 100644
--- a/qmlui/qml/fixturesfunctions/PresetsTool.qml
+++ b/qmlui/qml/fixturesfunctions/PresetsTool.qml
@@ -38,6 +38,8 @@ Rectangle
property int selectedChannel: -1
property bool showPalette: false
property int currentValue: 0 // as DMX value
+ property int rangeLowLimit: 0
+ property int rangeHighLimit: 255
signal presetSelected(QLCCapability cap, int fxID, int chIdx, int value)
signal valueChanged(int value)
@@ -152,11 +154,13 @@ Rectangle
{
capability: modelData
capIndex: index + 1
+ visible: (capability.min <= toolRoot.rangeHighLimit || capability.max <= toolRoot.rangeLowLimit)
onValueChanged:
{
- toolRoot.currentValue = value
- toolRoot.presetSelected(capability, selectedFixture, selectedChannel, value)
- toolRoot.valueChanged(value)
+ var val = Math.min(Math.max(value, rangeLowLimit), rangeHighLimit)
+ toolRoot.currentValue = val
+ toolRoot.presetSelected(capability, selectedFixture, selectedChannel, val)
+ toolRoot.valueChanged(val)
if (closeOnSelect)
toolRoot.visible = false
}
diff --git a/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml b/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml
index c6251b69a9..bfcbee19fd 100644
--- a/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml
+++ b/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml
@@ -18,6 +18,7 @@
*/
import QtQuick 2.3
+import QtQuick.Controls 2.14
import QtQuick.Layouts 1.1
import org.qlcplus.classes 1.0
diff --git a/qmlui/qml/fixturesfunctions/UniverseGridView.qml b/qmlui/qml/fixturesfunctions/UniverseGridView.qml
index 1c6eb4c200..81694b84c0 100644
--- a/qmlui/qml/fixturesfunctions/UniverseGridView.qml
+++ b/qmlui/qml/fixturesfunctions/UniverseGridView.qml
@@ -30,8 +30,9 @@ Flickable
boundsBehavior: Flickable.StopAtBounds
contentHeight: uniGrid.height + topbar.height + UISettings.bigItemHeight
+ property alias contextItem: uniGrid
property string contextName: "UNIGRID"
- property int uniStartAddr: viewUniverseCombo.currentIndex * 512
+ property int uniStartAddr: contextManager.universeFilter * 512
property var fixtureClipboard: null
function hasSettings()
@@ -44,7 +45,7 @@ Flickable
id: errorPopup
standardButtons: Dialog.Ok
title: qsTr("Error")
- message: qsTr("Unable to perform the operation.\nThere is either not enough space or the target universe in invalid")
+ message: qsTr("Unable to perform the operation.\nThere is either not enough space or the target universe is invalid")
onAccepted: close()
}
@@ -60,7 +61,7 @@ Flickable
id: uniText
height: UISettings.textSizeDefault * 2
labelColor: UISettings.fgLight
- label: viewUniverseCombo.currentText
+ label: ioManager.universeName(contextManager.universeFilter)
fontSize: UISettings.textSizeDefault * 1.5
fontBold: true
}
@@ -101,13 +102,16 @@ Flickable
x: UISettings.iconSizeMedium
anchors.top: topbar.bottom
width: parent.width - (UISettings.iconSizeMedium * 3)
- height: cellSize * gridSize.height
+ height: 32 * gridSize.height
showIndices: 512
gridSize: Qt.size(24, 22)
gridLabels: fixtureManager.fixtureNamesMap
gridData: fixtureManager.fixturesMap
+ Component.onCompleted: contextManager.enableContext("UNIGRID", true, uniGrid)
+ Component.onDestruction: if (contextManager) contextManager.enableContext("UNIGRID", false, uniGrid)
+
property int prevFixtureID: -1
function getItemIcon(itemID, chNumber)
@@ -135,6 +139,7 @@ Flickable
if (multiSelection === 0)
contextManager.resetFixtureSelection()
+ console.log("prevFixtureID: " + prevFixtureID + "currentItemID: " + currentItemID)
if (prevFixtureID != currentItemID && multiSelection === 0)
contextManager.setFixtureIDSelection(prevFixtureID, false)
diff --git a/qmlui/qml/fixturesfunctions/qmldir b/qmlui/qml/fixturesfunctions/qmldir
index 9c33c9b773..c270f28276 100644
--- a/qmlui/qml/fixturesfunctions/qmldir
+++ b/qmlui/qml/fixturesfunctions/qmldir
@@ -7,6 +7,7 @@ ColorToolFull 0.1 ../ColorToolFull.qml
ContextMenuEntry 0.1 ../ContextMenuEntry.qml
CustomCheckBox 0.1 ../CustomCheckBox.qml
CustomComboBox 0.1 ../CustomComboBox.qml
+CustomPopupDialog 0.1 ../popup/CustomPopupDialog.qml
CustomScrollBar 0.1 ../CustomScrollBar.qml
CustomSpinBox 0.1 ../CustomSpinBox.qml
CustomDoubleSpinBox 0.1 ../CustomDoubleSpinBox.qml
diff --git a/qmlui/qml/inputoutput/UniverseIOItem.qml b/qmlui/qml/inputoutput/UniverseIOItem.qml
index 8a4816d87c..688ebc820d 100644
--- a/qmlui/qml/inputoutput/UniverseIOItem.qml
+++ b/qmlui/qml/inputoutput/UniverseIOItem.qml
@@ -151,7 +151,7 @@ Rectangle
z: 10
patchesNumber: inputPatchesNumber
- showFeedback: universe ? universe.hasFeedbacks : false
+ showFeedback: universe ? universe.hasFeedback : false
}
// Input patch drop area
@@ -266,8 +266,8 @@ Rectangle
checkedColor: "green"
imgSource: ""
checkable: true
- checked: universe ? universe.hasFeedbacks : false
- tooltip: qsTr("Enable/Disable feedbacks")
+ checked: universe ? universe.hasFeedback : false
+ tooltip: qsTr("Enable/Disable feedback")
onToggled:
{
if (universe)
diff --git a/qmlui/qml/popup/PopupAbout.qml b/qmlui/qml/popup/PopupAbout.qml
index 41b4fa9deb..5282488cbe 100644
--- a/qmlui/qml/popup/PopupAbout.qml
+++ b/qmlui/qml/popup/PopupAbout.qml
@@ -57,6 +57,8 @@ CustomPopupDialog
" " +
qsTr("Apache 2.0 license") + "."
onLinkActivated: Qt.openUrlExternally(link)
+ Layout.fillWidth: true
+ wrapMode: Text.WordWrap
MouseArea
{
diff --git a/qmlui/qml/virtualconsole/VCAnimationItem.qml b/qmlui/qml/virtualconsole/VCAnimationItem.qml
new file mode 100644
index 0000000000..c855c09ea1
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCAnimationItem.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCAnimationItem.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.0
+import QtQuick.Controls 2.2
+
+import org.qlcplus.classes 1.0
+import "."
+
+VCWidgetItem
+{
+ id: animationRoot
+ property VCAnimation animationObj: null
+
+ clip: true
+
+ onAnimationObjChanged:
+ {
+ setCommonProperties(animationObj)
+ }
+
+ Row
+ {
+ anchors.fill: parent
+
+ // value text box
+ Text
+ {
+ width: parent.width
+ height: parent.height
+ color: "#bbb"
+ lineHeight: 0.8
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ textFormat: Text.RichText
+ wrapMode: Text.Wrap
+ text: "VCAnimation not implemented yet.
See QML Status"
+
+ onLinkActivated: Qt.openUrlExternally(link)
+
+ MouseArea
+ {
+ anchors.fill: parent
+ acceptedButtons: Qt.NoButton
+ cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+ }
+ }
+ }
+}
diff --git a/qmlui/qml/virtualconsole/VCAnimationProperties.qml b/qmlui/qml/virtualconsole/VCAnimationProperties.qml
new file mode 100644
index 0000000000..d0b061f249
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCAnimationProperties.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCAnimationProperties.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.1
+import QtQuick.Controls 2.1
+
+import org.qlcplus.classes 1.0
+import "."
+
+Rectangle
+{
+ id: propsRoot
+ color: "transparent"
+ height: animationPropsColumn.height
+
+ property VCAnimation widgetRef: null
+
+ property int gridItemsHeight: UISettings.listItemHeight
+
+ Column
+ {
+ id: animationPropsColumn
+ width: parent.width
+ spacing: 5
+
+ SectionBox
+ {
+ id: animationProp
+ sectionLabel: qsTr("Animation Properties")
+
+ sectionContents:
+ GridLayout
+ {
+ width: parent.width
+ columns: 2
+ columnSpacing: 5
+ rowSpacing: 4
+
+ // row 1
+ RobotoText
+ {
+ height: gridItemsHeight
+ Layout.fillWidth: true
+ label: "Not implemented."
+ }
+ } // GridLayout
+ } // SectionBox
+ } // Column
+}
diff --git a/qmlui/qml/virtualconsole/VCAudioTriggerItem.qml b/qmlui/qml/virtualconsole/VCAudioTriggerItem.qml
new file mode 100644
index 0000000000..f93186d298
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCAudioTriggerItem.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCAudioTriggerItem.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.0
+import QtQuick.Controls 2.2
+
+import org.qlcplus.classes 1.0
+import "."
+
+VCWidgetItem
+{
+ id: audioTriggerRoot
+ property VCAudioTrigger audioTriggerObj: null
+
+ clip: true
+
+ onAudioTriggerObjChanged:
+ {
+ setCommonProperties(audioTriggerObj)
+ }
+
+ Row
+ {
+ anchors.fill: parent
+
+ // value text box
+ Text
+ {
+ width: parent.width
+ height: parent.height
+ color: "#bbb"
+ lineHeight: 0.8
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ textFormat: Text.RichText
+ wrapMode: Text.Wrap
+ text: "VCAudioTrigger not implemented yet.
See QML Status"
+
+ onLinkActivated: Qt.openUrlExternally(link)
+
+ MouseArea
+ {
+ anchors.fill: parent
+ acceptedButtons: Qt.NoButton
+ cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+ }
+ }
+ }
+}
diff --git a/qmlui/qml/virtualconsole/VCAudioTriggerProperties.qml b/qmlui/qml/virtualconsole/VCAudioTriggerProperties.qml
new file mode 100644
index 0000000000..3e8dd5d1db
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCAudioTriggerProperties.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCAudioTriggerProperties.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.1
+import QtQuick.Controls 2.1
+
+import org.qlcplus.classes 1.0
+import "."
+
+Rectangle
+{
+ id: propsRoot
+ color: "transparent"
+ height: audioTriggerPropsColumn.height
+
+ property VCAudioTrigger widgetRef: null
+
+ property int gridItemsHeight: UISettings.listItemHeight
+
+ Column
+ {
+ id: audioTriggerPropsColumn
+ width: parent.width
+ spacing: 5
+
+ SectionBox
+ {
+ id: audioTriggerProp
+ sectionLabel: qsTr("Audio Trigger Properties")
+
+ sectionContents:
+ GridLayout
+ {
+ width: parent.width
+ columns: 2
+ columnSpacing: 5
+ rowSpacing: 4
+
+ // row 1
+ RobotoText
+ {
+ height: gridItemsHeight
+ Layout.fillWidth: true
+ label: "Not implemented."
+ }
+ } // GridLayout
+ } // SectionBox
+ } // Column
+}
diff --git a/qmlui/qml/virtualconsole/VCSliderItem.qml b/qmlui/qml/virtualconsole/VCSliderItem.qml
index dcea323ffe..2209ca1954 100644
--- a/qmlui/qml/virtualconsole/VCSliderItem.qml
+++ b/qmlui/qml/virtualconsole/VCSliderItem.qml
@@ -17,7 +17,7 @@
limitations under the License.
*/
-import QtQuick 2.0
+import QtQuick 2.14
import QtQuick.Layouts 1.1
import org.qlcplus.classes 1.0
@@ -149,7 +149,7 @@ VCWidgetItem
to: sliderObj ? sliderObj.rangeHighLimit : 255
value: sliderValue
- onMoved: if (sliderObj) sliderObj.value = value // position * 255
+ onValueChanged: if (sliderObj) sliderObj.value = value
}
// widget name text box
@@ -194,6 +194,24 @@ VCWidgetItem
onClicked: if (sliderObj) sliderObj.isOverriding = false
}
+ IconButton
+ {
+ visible: sliderObj ? sliderObj.adjustFlashEnabled : false
+ Layout.alignment: Qt.AlignHCenter
+ imgSource: "qrc:/flash.svg"
+ tooltip: qsTr("Flash the controlled Function")
+ onPressed:
+ {
+ if (sliderObj)
+ sliderObj.flashFunction(true)
+ }
+ onReleased:
+ {
+ if (sliderObj)
+ sliderObj.flashFunction(false)
+ }
+ }
+
// Click & Go button
IconButton
{
@@ -230,7 +248,7 @@ VCWidgetItem
if (Qt.platform.os === "android")
presetImageBox.source = cngResource
else
- presetImageBox.source = "file:/" + cngResource
+ presetImageBox.source = "file:" + cngResource
}
onClicked: colorToolLoader.toggleVisibility()
@@ -285,6 +303,11 @@ VCWidgetItem
{
item.visible = false
item.closeOnSelect = true
+ if (sliderObj && clickAndGoButton.cngType == VCSlider.CnGPreset)
+ {
+ item.rangeLowLimit = sliderObj.rangeLowLimit
+ item.rangeHighLimit = sliderObj.rangeHighLimit
+ }
}
Connections
diff --git a/qmlui/qml/virtualconsole/VCSliderProperties.qml b/qmlui/qml/virtualconsole/VCSliderProperties.qml
index 33e77ab8f7..fd7c087e49 100644
--- a/qmlui/qml/virtualconsole/VCSliderProperties.qml
+++ b/qmlui/qml/virtualconsole/VCSliderProperties.qml
@@ -257,6 +257,21 @@ Rectangle
currentIndex: widgetRef ? widgetRef.controlledAttribute : 0
onCurrentIndexChanged: if (widgetRef) widgetRef.controlledAttribute = currentIndex
}
+
+ CustomCheckBox
+ {
+ implicitWidth: UISettings.iconSizeMedium
+ implicitHeight: implicitWidth
+ checked: widgetRef ? widgetRef.adjustFlashEnabled : false
+ onClicked: if (widgetRef) widgetRef.adjustFlashEnabled = checked
+ }
+
+ RobotoText
+ {
+ height: gridItemsHeight
+ Layout.fillWidth: true
+ label: qsTr("Show flash button")
+ }
} // GridLayout
} // SectionBox Function control
diff --git a/qmlui/qml/virtualconsole/VCSpeedDialItem.qml b/qmlui/qml/virtualconsole/VCSpeedDialItem.qml
new file mode 100644
index 0000000000..e653de4c4c
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCSpeedDialItem.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCSpeedDialItem.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.0
+import QtQuick.Controls 2.2
+
+import org.qlcplus.classes 1.0
+import "."
+
+VCWidgetItem
+{
+ id: speedDialRoot
+ property VCSpeedDial speedDialObj: null
+
+ clip: true
+
+ onSpeedDialObjChanged:
+ {
+ setCommonProperties(speedDialObj)
+ }
+
+ Row
+ {
+ anchors.fill: parent
+
+ // value text box
+ Text
+ {
+ width: parent.width
+ height: parent.height
+ color: "#bbb"
+ lineHeight: 0.8
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ textFormat: Text.RichText
+ wrapMode: Text.Wrap
+ text: "VCSpeedDial not implemented yet.
See QML Status"
+
+ onLinkActivated: Qt.openUrlExternally(link)
+
+ MouseArea
+ {
+ anchors.fill: parent
+ acceptedButtons: Qt.NoButton
+ cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+ }
+ }
+ }
+}
diff --git a/qmlui/qml/virtualconsole/VCSpeedDialProperties.qml b/qmlui/qml/virtualconsole/VCSpeedDialProperties.qml
new file mode 100644
index 0000000000..476993e100
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCSpeedDialProperties.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCSpeedDialProperties.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.1
+import QtQuick.Controls 2.1
+
+import org.qlcplus.classes 1.0
+import "."
+
+Rectangle
+{
+ id: propsRoot
+ color: "transparent"
+ height: speedDialPropsColumn.height
+
+ property VCSpeedDial widgetRef: null
+
+ property int gridItemsHeight: UISettings.listItemHeight
+
+ Column
+ {
+ id: speedDialPropsColumn
+ width: parent.width
+ spacing: 5
+
+ SectionBox
+ {
+ id: speedDialProp
+ sectionLabel: qsTr("Speed Dial Properties")
+
+ sectionContents:
+ GridLayout
+ {
+ width: parent.width
+ columns: 2
+ columnSpacing: 5
+ rowSpacing: 4
+
+ // row 1
+ RobotoText
+ {
+ height: gridItemsHeight
+ Layout.fillWidth: true
+ label: "Not implemented."
+ }
+ } // GridLayout
+ } // SectionBox
+ } // Column
+}
diff --git a/qmlui/qml/virtualconsole/VCXYPadItem.qml b/qmlui/qml/virtualconsole/VCXYPadItem.qml
new file mode 100644
index 0000000000..bf3f813f89
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCXYPadItem.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCXYPadItem.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.0
+import QtQuick.Controls 2.2
+
+import org.qlcplus.classes 1.0
+import "."
+
+VCWidgetItem
+{
+ id: xyPadRoot
+ property VCXYPad xyPadObj: null
+
+ clip: true
+
+ onXyPadObjChanged:
+ {
+ setCommonProperties(xyPadObj)
+ }
+
+ Row
+ {
+ anchors.fill: parent
+
+ // value text box
+ Text
+ {
+ width: parent.width
+ height: parent.height
+ color: "#bbb"
+ lineHeight: 0.8
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ textFormat: Text.RichText
+ wrapMode: Text.Wrap
+ text: "VCXYPad not implemented yet.
See QML Status"
+
+ onLinkActivated: Qt.openUrlExternally(link)
+
+ MouseArea
+ {
+ anchors.fill: parent
+ acceptedButtons: Qt.NoButton
+ cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+ }
+ }
+ }
+}
diff --git a/qmlui/qml/virtualconsole/VCXYPadProperties.qml b/qmlui/qml/virtualconsole/VCXYPadProperties.qml
new file mode 100644
index 0000000000..519a51b4fb
--- /dev/null
+++ b/qmlui/qml/virtualconsole/VCXYPadProperties.qml
@@ -0,0 +1,66 @@
+/*
+ Q Light Controller Plus
+ VCXYPadProperties.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.1
+import QtQuick.Controls 2.1
+
+import org.qlcplus.classes 1.0
+import "."
+
+Rectangle
+{
+ id: propsRoot
+ color: "transparent"
+ height: xyPadPropsColumn.height
+
+ property VCXYPad widgetRef: null
+
+ property int gridItemsHeight: UISettings.listItemHeight
+
+ Column
+ {
+ id: xyPadPropsColumn
+ width: parent.width
+ spacing: 5
+
+ SectionBox
+ {
+ id: xyPadProp
+ sectionLabel: qsTr("XY Pad Properties")
+
+ sectionContents:
+ GridLayout
+ {
+ width: parent.width
+ columns: 2
+ columnSpacing: 5
+ rowSpacing: 4
+
+ // row 1
+ RobotoText
+ {
+ height: gridItemsHeight
+ Layout.fillWidth: true
+ label: "Not implemented."
+ }
+ } // GridLayout
+ } // SectionBox
+ } // Column
+}
diff --git a/qmlui/qml/virtualconsole/qmldir b/qmlui/qml/virtualconsole/qmldir
index 15add3510b..2d813e6045 100644
--- a/qmlui/qml/virtualconsole/qmldir
+++ b/qmlui/qml/virtualconsole/qmldir
@@ -22,6 +22,7 @@ IconPopupButton 0.1 ../IconPopupButton.qml
IconTextEntry 0.1 ../IconTextEntry.qml
MenuBarEntry 0.1 ../MenuBarEntry.qml
QLCPlusFader 0.1 ../QLCPlusFader.qml
+QLCPlusKnob 0.1 ../QLCPlusKnob.qml
RobotoText 0.1 ../RobotoText.qml
SectionBox 0.1 ../SectionBox.qml
SidePanel 0.1 ../SidePanel.qml
diff --git a/qmlui/qmlui.pro b/qmlui/qmlui.pro
index 41473b6f3a..9eec79c66b 100644
--- a/qmlui/qmlui.pro
+++ b/qmlui/qmlui.pro
@@ -23,7 +23,14 @@ INCLUDEPATH += ../plugins/interfaces
INCLUDEPATH += ../plugins/midi/src/common
DEPENDPATH += ../engine/src
QMAKE_LIBDIR += ../engine/src
-LIBS += -lqlcplusengine
+
+android {
+ LIBS += -lqlcplusengine_$${QT_ARCH}
+} else {
+ LIBS += -lqlcplusengine
+}
+
+
#win32:QMAKE_LFLAGS += -shared
win32:RC_FILE = qmlui.rc
@@ -126,6 +133,10 @@ HEADERS += \
virtualconsole/vcbutton.h \
virtualconsole/vclabel.h \
virtualconsole/vcslider.h \
+ virtualconsole/vcanimation.h \
+ virtualconsole/vcaudiotrigger.h \
+ virtualconsole/vcxypad.h \
+ virtualconsole/vcspeeddial.h \
virtualconsole/vcclock.h \
virtualconsole/vccuelist.h
@@ -138,6 +149,10 @@ SOURCES += \
virtualconsole/vcbutton.cpp \
virtualconsole/vclabel.cpp \
virtualconsole/vcslider.cpp \
+ virtualconsole/vcanimation.cpp \
+ virtualconsole/vcaudiotrigger.cpp \
+ virtualconsole/vcxypad.cpp \
+ virtualconsole/vcspeeddial.cpp \
virtualconsole/vcclock.cpp \
virtualconsole/vccuelist.cpp
diff --git a/qmlui/qmlui.qrc b/qmlui/qmlui.qrc
index ec4b6dfdd8..e0c168ee2b 100644
--- a/qmlui/qmlui.qrc
+++ b/qmlui/qmlui.qrc
@@ -233,6 +233,14 @@
qml/virtualconsole/VCLabelItem.qml
qml/virtualconsole/VCSliderItem.qml
qml/virtualconsole/VCSliderProperties.qml
+ qml/virtualconsole/VCAnimationItem.qml
+ qml/virtualconsole/VCAnimationProperties.qml
+ qml/virtualconsole/VCAudioTriggerItem.qml
+ qml/virtualconsole/VCAudioTriggerProperties.qml
+ qml/virtualconsole/VCXYPadItem.qml
+ qml/virtualconsole/VCXYPadProperties.qml
+ qml/virtualconsole/VCSpeedDialItem.qml
+ qml/virtualconsole/VCSpeedDialProperties.qml
qml/virtualconsole/VCClockItem.qml
qml/virtualconsole/VCClockProperties.qml
qml/virtualconsole/VCCueListItem.qml
diff --git a/qmlui/treemodel.cpp b/qmlui/treemodel.cpp
index bbd8881ad3..b4ca42f743 100644
--- a/qmlui/treemodel.cpp
+++ b/qmlui/treemodel.cpp
@@ -136,7 +136,7 @@ TreeModelItem *TreeModel::addItem(QString label, QVariantList data, QString path
QStringList pathList = path.split(TreeModel::separator());
if (m_itemsPathMap.contains(pathList.at(0)))
{
- item = m_itemsPathMap[pathList.at(0)];
+ item = m_itemsPathMap.value(pathList.at(0), nullptr);
}
else
{
@@ -202,7 +202,10 @@ TreeModelItem *TreeModel::itemAtPath(QString path)
return nullptr;
}
- TreeModelItem *item = m_itemsPathMap[pathList.at(0)];
+ TreeModelItem *item = m_itemsPathMap.value(pathList.at(0), nullptr);
+ if (item == nullptr)
+ return nullptr;
+
QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);
return item->children()->itemAtPath(subPath);
}
@@ -236,7 +239,10 @@ bool TreeModel::removeItem(QString path)
}
else
{
- TreeModelItem *item = m_itemsPathMap[pathList.at(0)];
+ TreeModelItem *item = m_itemsPathMap.value(pathList.at(0), nullptr);
+ if (item == nullptr)
+ return false;
+
QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);
item->children()->removeItem(subPath);
}
@@ -270,7 +276,10 @@ void TreeModel::setItemRoleData(QString path, const QVariant &value, int role)
}
else
{
- TreeModelItem *item = m_itemsPathMap[pathList.at(0)];
+ TreeModelItem *item = m_itemsPathMap.value(pathList.at(0), nullptr);
+ if (item == nullptr)
+ return;
+
QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);
item->children()->setItemRoleData(subPath, value, role);
}
@@ -300,18 +309,18 @@ void TreeModel::setPathData(QString path, QVariantList data)
return;
QStringList pathList = path.split(TreeModel::separator());
- if (m_itemsPathMap.contains(pathList.at(0)))
+ TreeModelItem *item = m_itemsPathMap.value(pathList.at(0), nullptr);
+ if (item == nullptr)
+ return;
+
+ if (pathList.count() == 1)
{
- TreeModelItem *item = m_itemsPathMap[pathList.at(0)];
- if (pathList.count() == 1)
- {
- item->setData(data);
- }
- else if (item->hasChildren())
- {
- QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);
- item->children()->setPathData(subPath, data);
- }
+ item->setData(data);
+ }
+ else if (item->hasChildren())
+ {
+ QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);
+ item->children()->setPathData(subPath, data);
}
}
diff --git a/qmlui/virtualconsole/vcanimation.cpp b/qmlui/virtualconsole/vcanimation.cpp
new file mode 100644
index 0000000000..1ddd37e6d9
--- /dev/null
+++ b/qmlui/virtualconsole/vcanimation.cpp
@@ -0,0 +1,169 @@
+/*
+ Q Light Controller Plus
+ vcanimation.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
+#include
+
+#include "doc.h"
+#include "vcanimation.h"
+
+VCAnimation::VCAnimation(Doc *doc, QObject *parent)
+ : VCWidget(doc, parent)
+{
+ setType(VCWidget::AnimationWidget);
+}
+
+VCAnimation::~VCAnimation()
+{
+ if (m_item)
+ delete m_item;
+}
+
+QString VCAnimation::defaultCaption()
+{
+ return tr("Animation %1").arg(id() + 1);
+}
+
+void VCAnimation::setupLookAndFeel(qreal pixelDensity, int page)
+{
+ setPage(page);
+ QFont wFont = font();
+ wFont.setBold(true);
+ wFont.setPointSize(pixelDensity * 5.0);
+ setFont(wFont);
+}
+
+void VCAnimation::render(QQuickView *view, QQuickItem *parent)
+{
+ if (view == nullptr || parent == nullptr)
+ return;
+
+ QQmlComponent *component = new QQmlComponent(view->engine(), QUrl("qrc:/VCAnimationItem.qml"));
+
+ if (component->isError())
+ {
+ qDebug() << component->errors();
+ return;
+ }
+
+ m_item = qobject_cast(component->create());
+
+ m_item->setParentItem(parent);
+ m_item->setProperty("animationObj", QVariant::fromValue(this));
+}
+
+QString VCAnimation::propertiesResource() const
+{
+ return QString("qrc:/VCAnimationProperties.qml");
+}
+
+VCWidget *VCAnimation::createCopy(VCWidget *parent)
+{
+ Q_ASSERT(parent != nullptr);
+
+ VCAnimation *animation = new VCAnimation(m_doc, parent);
+ if (animation->copyFrom(this) == false)
+ {
+ delete animation;
+ animation = nullptr;
+ }
+
+ return animation;
+}
+
+bool VCAnimation::copyFrom(const VCWidget *widget)
+{
+ const VCAnimation *animation = qobject_cast (widget);
+ if (animation == nullptr)
+ return false;
+
+ /* Copy and set properties */
+
+ /* Copy object lists */
+
+ /* Common stuff */
+ return VCWidget::copyFrom(widget);
+}
+
+FunctionParent VCAnimation::functionParent() const
+{
+ return FunctionParent(FunctionParent::AutoVCWidget, id());
+}
+
+/*********************************************************************
+ * Load & Save
+ *********************************************************************/
+
+bool VCAnimation::loadXML(QXmlStreamReader &root)
+{
+ if (root.name() != KXMLQLCVCAnimation)
+ {
+ qWarning() << Q_FUNC_INFO << "Animation node not found";
+ return false;
+ }
+
+ QXmlStreamAttributes attrs = root.attributes();
+
+ /* Widget commons */
+ loadXMLCommon(root);
+
+ while (root.readNextStartElement())
+ {
+ if (root.name() == KXMLQLCWindowState)
+ {
+ bool visible = false;
+ int x = 0, y = 0, w = 0, h = 0;
+ loadXMLWindowState(root, &x, &y, &w, &h, &visible);
+ setGeometry(QRect(x, y, w, h));
+ }
+ else if (root.name() == KXMLQLCVCWidgetAppearance)
+ {
+ loadXMLAppearance(root);
+ }
+ else
+ {
+ qWarning() << Q_FUNC_INFO << "Unknown animation tag:" << root.name().toString();
+ root.skipCurrentElement();
+ }
+ }
+
+ return true;
+}
+
+bool VCAnimation::saveXML(QXmlStreamWriter *doc)
+{
+ Q_ASSERT(doc != nullptr);
+
+ /* VC object entry */
+ doc->writeStartElement(KXMLQLCVCAnimation);
+
+ saveXMLCommon(doc);
+
+ /* Window state */
+ saveXMLWindowState(doc);
+
+ /* Appearance */
+ saveXMLAppearance(doc);
+
+ /* Write the tag */
+ doc->writeEndElement();
+
+ return true;
+}
diff --git a/qmlui/virtualconsole/vcanimation.h b/qmlui/virtualconsole/vcanimation.h
new file mode 100644
index 0000000000..bf7259512a
--- /dev/null
+++ b/qmlui/virtualconsole/vcanimation.h
@@ -0,0 +1,103 @@
+/*
+ Q Light Controller Plus
+ vcanimation.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 VCANIMATION_H
+#define VCANIMATION_H
+
+#include "vcwidget.h"
+
+#define KXMLQLCVCAnimation QString("Control")
+#define KXMLQLCVCAnimationID QString("ID")
+#define KXMLQLCVCAnimationType QString("Type")
+#define KXMLQLCVCAnimationColor QString("Color")
+#define KXMLQLCVCAnimationResource QString("Resource")
+#define KXMLQLCVCAnimationProperty QString("Property")
+#define KXMLQLCVCAnimationPropertyName QString("Name")
+
+class VCAnimation : public VCWidget
+{
+ Q_OBJECT
+
+ /*********************************************************************
+ * Initialization
+ *********************************************************************/
+public:
+ VCAnimation(Doc* doc = nullptr, QObject *parent = nullptr);
+ virtual ~VCAnimation();
+
+ /** @reimp */
+ QString defaultCaption();
+
+ /** @reimp */
+ void setupLookAndFeel(qreal pixelDensity, int page);
+
+ /** @reimp */
+ void render(QQuickView *view, QQuickItem *parent);
+
+ /** @reimp */
+ QString propertiesResource() const;
+
+ /** @reimp */
+ VCWidget *createCopy(VCWidget *parent);
+
+protected:
+ /** @reimp */
+ bool copyFrom(const VCWidget* widget);
+
+private:
+ FunctionParent functionParent() const;
+
+ /*********************************************************************
+ * Type
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Data
+ *********************************************************************/
+public:
+
+protected slots:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Functions connections
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Load & Save
+ *********************************************************************/
+public:
+ bool loadXML(QXmlStreamReader &root);
+ bool saveXML(QXmlStreamWriter *doc);
+};
+
+#endif
diff --git a/qmlui/virtualconsole/vcaudiotrigger.cpp b/qmlui/virtualconsole/vcaudiotrigger.cpp
new file mode 100644
index 0000000000..3e5773bd60
--- /dev/null
+++ b/qmlui/virtualconsole/vcaudiotrigger.cpp
@@ -0,0 +1,169 @@
+/*
+ Q Light Controller Plus
+ vcaudiotrigger.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
+#include
+
+#include "doc.h"
+#include "vcaudiotrigger.h"
+
+VCAudioTrigger::VCAudioTrigger(Doc *doc, QObject *parent)
+ : VCWidget(doc, parent)
+{
+ setType(VCWidget::AudioTriggersWidget);
+}
+
+VCAudioTrigger::~VCAudioTrigger()
+{
+ if (m_item)
+ delete m_item;
+}
+
+QString VCAudioTrigger::defaultCaption()
+{
+ return tr("Audio Trigger %1").arg(id() + 1);
+}
+
+void VCAudioTrigger::setupLookAndFeel(qreal pixelDensity, int page)
+{
+ setPage(page);
+ QFont wFont = font();
+ wFont.setBold(true);
+ wFont.setPointSize(pixelDensity * 5.0);
+ setFont(wFont);
+}
+
+void VCAudioTrigger::render(QQuickView *view, QQuickItem *parent)
+{
+ if (view == nullptr || parent == nullptr)
+ return;
+
+ QQmlComponent *component = new QQmlComponent(view->engine(), QUrl("qrc:/VCAudioTriggerItem.qml"));
+
+ if (component->isError())
+ {
+ qDebug() << component->errors();
+ return;
+ }
+
+ m_item = qobject_cast(component->create());
+
+ m_item->setParentItem(parent);
+ m_item->setProperty("audioTriggerObj", QVariant::fromValue(this));
+}
+
+QString VCAudioTrigger::propertiesResource() const
+{
+ return QString("qrc:/VCAudioTriggerProperties.qml");
+}
+
+VCWidget *VCAudioTrigger::createCopy(VCWidget *parent)
+{
+ Q_ASSERT(parent != nullptr);
+
+ VCAudioTrigger *audioTrigger = new VCAudioTrigger(m_doc, parent);
+ if (audioTrigger->copyFrom(this) == false)
+ {
+ delete audioTrigger;
+ audioTrigger = nullptr;
+ }
+
+ return audioTrigger;
+}
+
+bool VCAudioTrigger::copyFrom(const VCWidget *widget)
+{
+ const VCAudioTrigger *audioTrigger = qobject_cast (widget);
+ if (audioTrigger == nullptr)
+ return false;
+
+ /* Copy and set properties */
+
+ /* Copy object lists */
+
+ /* Common stuff */
+ return VCWidget::copyFrom(widget);
+}
+
+FunctionParent VCAudioTrigger::functionParent() const
+{
+ return FunctionParent(FunctionParent::AutoVCWidget, id());
+}
+
+/*********************************************************************
+ * Load & Save
+ *********************************************************************/
+
+bool VCAudioTrigger::loadXML(QXmlStreamReader &root)
+{
+ if (root.name() != KXMLQLCVCAudioTriggers)
+ {
+ qWarning() << Q_FUNC_INFO << "Audio trigger node not found";
+ return false;
+ }
+
+ QXmlStreamAttributes attrs = root.attributes();
+
+ /* Widget commons */
+ loadXMLCommon(root);
+
+ while (root.readNextStartElement())
+ {
+ if (root.name() == KXMLQLCWindowState)
+ {
+ bool visible = false;
+ int x = 0, y = 0, w = 0, h = 0;
+ loadXMLWindowState(root, &x, &y, &w, &h, &visible);
+ setGeometry(QRect(x, y, w, h));
+ }
+ else if (root.name() == KXMLQLCVCWidgetAppearance)
+ {
+ loadXMLAppearance(root);
+ }
+ else
+ {
+ qWarning() << Q_FUNC_INFO << "Unknown audio trigger tag:" << root.name().toString();
+ root.skipCurrentElement();
+ }
+ }
+
+ return true;
+}
+
+bool VCAudioTrigger::saveXML(QXmlStreamWriter *doc)
+{
+ Q_ASSERT(doc != nullptr);
+
+ /* VC object entry */
+ doc->writeStartElement(KXMLQLCVCAudioTriggers);
+
+ saveXMLCommon(doc);
+
+ /* Window state */
+ saveXMLWindowState(doc);
+
+ /* Appearance */
+ saveXMLAppearance(doc);
+
+ /* Write the tag */
+ doc->writeEndElement();
+
+ return true;
+}
diff --git a/qmlui/virtualconsole/vcaudiotrigger.h b/qmlui/virtualconsole/vcaudiotrigger.h
new file mode 100644
index 0000000000..c12b3bd7c8
--- /dev/null
+++ b/qmlui/virtualconsole/vcaudiotrigger.h
@@ -0,0 +1,97 @@
+/*
+ Q Light Controller Plus
+ vcaudiotrigger.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 VCAUDIOTRIGGER_H
+#define VCAUDIOTRIGGER_H
+
+#include "vcwidget.h"
+
+#define KXMLQLCVCAudioTriggers QString("AudioTriggers")
+
+class VCAudioTrigger : public VCWidget
+{
+ Q_OBJECT
+
+ /*********************************************************************
+ * Initialization
+ *********************************************************************/
+public:
+ VCAudioTrigger(Doc* doc = nullptr, QObject *parent = nullptr);
+ virtual ~VCAudioTrigger();
+
+ /** @reimp */
+ QString defaultCaption();
+
+ /** @reimp */
+ void setupLookAndFeel(qreal pixelDensity, int page);
+
+ /** @reimp */
+ void render(QQuickView *view, QQuickItem *parent);
+
+ /** @reimp */
+ QString propertiesResource() const;
+
+ /** @reimp */
+ VCWidget *createCopy(VCWidget *parent);
+
+protected:
+ /** @reimp */
+ bool copyFrom(const VCWidget* widget);
+
+private:
+ FunctionParent functionParent() const;
+
+ /*********************************************************************
+ * Type
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Data
+ *********************************************************************/
+public:
+
+protected slots:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Functions connections
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Load & Save
+ *********************************************************************/
+public:
+ bool loadXML(QXmlStreamReader &root);
+ bool saveXML(QXmlStreamWriter *doc);
+};
+
+#endif
diff --git a/qmlui/virtualconsole/vcbutton.cpp b/qmlui/virtualconsole/vcbutton.cpp
index 84debd96e8..740e05fdda 100644
--- a/qmlui/virtualconsole/vcbutton.cpp
+++ b/qmlui/virtualconsole/vcbutton.cpp
@@ -514,6 +514,8 @@ void VCButton::updateFeedback()
if (m_state == Inactive)
sendFeedback(0, INPUT_PRESSURE_ID, VCWidget::LowerValue);
+ else if (m_state == Monitoring)
+ sendFeedback(0, INPUT_PRESSURE_ID, VCWidget::MonitorValue);
else
sendFeedback(UCHAR_MAX, INPUT_PRESSURE_ID, VCWidget::UpperValue);
}
diff --git a/qmlui/virtualconsole/vccuelist.cpp b/qmlui/virtualconsole/vccuelist.cpp
index efc90202db..d7edee1be9 100644
--- a/qmlui/virtualconsole/vccuelist.cpp
+++ b/qmlui/virtualconsole/vccuelist.cpp
@@ -488,6 +488,8 @@ void VCCueList::setChaserID(quint32 fid)
this, SLOT(slotCurrentStepChanged(int)));
connect(function, SIGNAL(stepChanged(int)),
this, SLOT(slotStepChanged(int)));
+ connect(function, SIGNAL(stepsListChanged(quint32)),
+ this, SLOT(slotStepsListChanged(quint32)));
emit chaserIDChanged(fid);
}
@@ -524,6 +526,15 @@ void VCCueList::slotStepChanged(int index)
ChaserEditor::updateStepInListModel(m_doc, chaser(), m_stepsList, step, index);
}
+void VCCueList::slotStepsListChanged(quint32 fid)
+{
+ if (fid == m_chaserID)
+ {
+ ChaserEditor::updateStepsList(m_doc, chaser(), m_stepsList);
+ emit stepsListChanged();
+ }
+}
+
void VCCueList::slotFunctionNameChanged(quint32 fid)
{
if (fid == m_chaserID)
diff --git a/qmlui/virtualconsole/vccuelist.h b/qmlui/virtualconsole/vccuelist.h
index 8d7bfe6c63..a6db069d14 100644
--- a/qmlui/virtualconsole/vccuelist.h
+++ b/qmlui/virtualconsole/vccuelist.h
@@ -188,6 +188,7 @@ private slots:
void slotFunctionRemoved(quint32 fid);
void slotFunctionNameChanged(quint32 fid);
void slotStepChanged(int index);
+ void slotStepsListChanged(quint32 fid);
private:
FunctionParent functionParent() const;
diff --git a/qmlui/virtualconsole/vcframe.cpp b/qmlui/virtualconsole/vcframe.cpp
index b3b103a259..5679a65445 100644
--- a/qmlui/virtualconsole/vcframe.cpp
+++ b/qmlui/virtualconsole/vcframe.cpp
@@ -31,6 +31,10 @@
#include "vccuelist.h"
#include "vcsoloframe.h"
#include "simplecrypt.h"
+#include "vcanimation.h"
+#include "vcaudiotrigger.h"
+#include "vcxypad.h"
+#include "vcspeeddial.h"
#include "virtualconsole.h"
#define INPUT_NEXT_PAGE_ID 0
@@ -289,6 +293,54 @@ void VCFrame::addWidget(QQuickItem *parent, QString wType, QPoint pos)
slider->render(m_vc->view(), parent);
}
break;
+ case AnimationWidget:
+ {
+ VCAnimation *animation = new VCAnimation(m_doc, this);
+ QQmlEngine::setObjectOwnership(animation, QQmlEngine::CppOwnership);
+ m_vc->addWidgetToMap(animation);
+ Tardis::instance()->enqueueAction(Tardis::VCWidgetCreate, this->id(), QVariant(),
+ Tardis::instance()->actionToByteArray(Tardis::VCWidgetCreate, animation->id()));
+ animation->setGeometry(QRect(pos.x(), pos.y(), m_vc->pixelDensity() * 25, m_vc->pixelDensity() * 8));
+ setupWidget(animation, currentPage());
+ animation->render(m_vc->view(), parent);
+ }
+ break;
+ case AudioTriggersWidget:
+ {
+ VCAudioTrigger *audioTrigger = new VCAudioTrigger(m_doc, this);
+ QQmlEngine::setObjectOwnership(audioTrigger, QQmlEngine::CppOwnership);
+ m_vc->addWidgetToMap(audioTrigger);
+ Tardis::instance()->enqueueAction(Tardis::VCWidgetCreate, this->id(), QVariant(),
+ Tardis::instance()->actionToByteArray(Tardis::VCWidgetCreate, audioTrigger->id()));
+ audioTrigger->setGeometry(QRect(pos.x(), pos.y(), m_vc->pixelDensity() * 25, m_vc->pixelDensity() * 8));
+ setupWidget(audioTrigger, currentPage());
+ audioTrigger->render(m_vc->view(), parent);
+ }
+ break;
+ case XYPadWidget:
+ {
+ VCXYPad *xyPad = new VCXYPad(m_doc, this);
+ QQmlEngine::setObjectOwnership(xyPad, QQmlEngine::CppOwnership);
+ m_vc->addWidgetToMap(xyPad);
+ Tardis::instance()->enqueueAction(Tardis::VCWidgetCreate, this->id(), QVariant(),
+ Tardis::instance()->actionToByteArray(Tardis::VCWidgetCreate, xyPad->id()));
+ xyPad->setGeometry(QRect(pos.x(), pos.y(), m_vc->pixelDensity() * 25, m_vc->pixelDensity() * 8));
+ setupWidget(xyPad, currentPage());
+ xyPad->render(m_vc->view(), parent);
+ }
+ break;
+ case SpeedDialWidget:
+ {
+ VCSpeedDial *speedDial = new VCSpeedDial(m_doc, this);
+ QQmlEngine::setObjectOwnership(speedDial, QQmlEngine::CppOwnership);
+ m_vc->addWidgetToMap(speedDial);
+ Tardis::instance()->enqueueAction(Tardis::VCWidgetCreate, this->id(), QVariant(),
+ Tardis::instance()->actionToByteArray(Tardis::VCWidgetCreate, speedDial->id()));
+ speedDial->setGeometry(QRect(pos.x(), pos.y(), m_vc->pixelDensity() * 25, m_vc->pixelDensity() * 8));
+ setupWidget(speedDial, currentPage());
+ speedDial->render(m_vc->view(), parent);
+ }
+ break;
case ClockWidget:
{
VCClock *clock = new VCClock(m_doc, this);
@@ -1034,6 +1086,66 @@ bool VCFrame::loadWidgetXML(QXmlStreamReader &root, bool render)
slider->render(m_vc->view(), m_item);
}
}
+ else if (root.name() == KXMLQLCVCAnimation)
+ {
+ /* Create a new clock into its parent */
+ VCAnimation *animation = new VCAnimation(m_doc, this);
+ if (animation->loadXML(root) == false)
+ delete animation;
+ else
+ {
+ QQmlEngine::setObjectOwnership(animation, QQmlEngine::CppOwnership);
+ setupWidget(animation, animation->page());
+ m_vc->addWidgetToMap(animation);
+ if (render && m_item)
+ animation->render(m_vc->view(), m_item);
+ }
+ }
+ else if (root.name() == KXMLQLCVCAudioTriggers)
+ {
+ /* Create a new clock into its parent */
+ VCAudioTrigger *audioTrigger = new VCAudioTrigger(m_doc, this);
+ if (audioTrigger->loadXML(root) == false)
+ delete audioTrigger;
+ else
+ {
+ QQmlEngine::setObjectOwnership(audioTrigger, QQmlEngine::CppOwnership);
+ setupWidget(audioTrigger, audioTrigger->page());
+ m_vc->addWidgetToMap(audioTrigger);
+ if (render && m_item)
+ audioTrigger->render(m_vc->view(), m_item);
+ }
+ }
+ else if (root.name() == KXMLQLCVCSpeedDial)
+ {
+ /* Create a new speedDial into its parent */
+ VCSpeedDial *speedDial = new VCSpeedDial(m_doc, this);
+ if (speedDial->loadXML(root) == false)
+ delete speedDial;
+ else
+ {
+ QQmlEngine::setObjectOwnership(speedDial, QQmlEngine::CppOwnership);
+ setupWidget(speedDial, speedDial->page());
+ m_vc->addWidgetToMap(speedDial);
+ if (render && m_item)
+ speedDial->render(m_vc->view(), m_item);
+ }
+ }
+ else if (root.name() == KXMLQLCVCXYPad)
+ {
+ /* Create a new xyPad into its parent */
+ VCXYPad *xyPad = new VCXYPad(m_doc, this);
+ if (xyPad->loadXML(root) == false)
+ delete xyPad;
+ else
+ {
+ QQmlEngine::setObjectOwnership(xyPad, QQmlEngine::CppOwnership);
+ setupWidget(xyPad, xyPad->page());
+ m_vc->addWidgetToMap(xyPad);
+ if (render && m_item)
+ xyPad->render(m_vc->view(), m_item);
+ }
+ }
else if (root.name() == KXMLQLCVCClock)
{
/* Create a new clock into its parent */
diff --git a/qmlui/virtualconsole/vcslider.cpp b/qmlui/virtualconsole/vcslider.cpp
index 8d22e3902e..6747ca542d 100644
--- a/qmlui/virtualconsole/vcslider.cpp
+++ b/qmlui/virtualconsole/vcslider.cpp
@@ -38,6 +38,7 @@
#define INPUT_SLIDER_CONTROL_ID 0
#define INPUT_SLIDER_RESET_ID 1
+#define INPUT_SLIDER_FLASH_ID 2
VCSlider::VCSlider(Doc *doc, QObject *parent)
: VCWidget(doc, parent)
@@ -64,12 +65,14 @@ VCSlider::VCSlider(Doc *doc, QObject *parent)
, m_controlledAttributeId(Function::invalidAttributeId())
, m_attributeMinValue(0)
, m_attributeMaxValue(UCHAR_MAX)
+ , m_adjustFlashEnabled(false)
{
setType(VCWidget::SliderWidget);
setSliderMode(Adjust);
registerExternalControl(INPUT_SLIDER_CONTROL_ID, tr("Slider Control"), false);
registerExternalControl(INPUT_SLIDER_RESET_ID, tr("Reset Control"), false);
+ registerExternalControl(INPUT_SLIDER_FLASH_ID, tr("Flash Control"), true);
}
VCSlider::~VCSlider()
@@ -676,7 +679,7 @@ QVariantList VCSlider::clickAndGoPresetsList()
return prList;
/* Find the first valid channel and return it to QML */
- for (SceneValue scv : m_levelChannels)
+ for (SceneValue &scv : m_levelChannels)
{
Fixture *fixture = m_doc->fixture(scv.fxi);
if (fixture == nullptr)
@@ -849,7 +852,7 @@ void VCSlider::adjustIntensity(qreal val)
if (sliderMode() == Adjust)
{
- Function* function = m_doc->function(m_controlledFunctionId);
+ Function *function = m_doc->function(m_controlledFunctionId);
if (function == nullptr)
return;
@@ -882,7 +885,7 @@ void VCSlider::slotControlledFunctionStopped(quint32 fid)
if (m_controlledAttributeIndex == Function::Intensity)
setValue(0, false, true);
- Function* function = m_doc->function(fid);
+ Function *function = m_doc->function(fid);
function->releaseAttributeOverride(m_controlledAttributeId);
m_controlledAttributeId = Function::invalidAttributeId();
}
@@ -898,7 +901,7 @@ void VCSlider::setControlledAttribute(int attributeIndex)
if (m_controlledAttributeIndex == attributeIndex)
return;
- Function* function = m_doc->function(m_controlledFunctionId);
+ Function *function = m_doc->function(m_controlledFunctionId);
if (function == nullptr || attributeIndex >= function->attributes().count())
return;
@@ -944,15 +947,46 @@ void VCSlider::adjustFunctionAttribute(Function *f, qreal value)
f->adjustAttribute(value, m_controlledAttributeId);
}
+bool VCSlider::adjustFlashEnabled() const
+{
+ return m_adjustFlashEnabled;
+}
+
+void VCSlider::setAdjustFlashEnabled(bool enable)
+{
+ if (enable == m_adjustFlashEnabled)
+ return;
+
+ m_adjustFlashEnabled = enable;
+ emit adjustFlashEnabledChanged(enable);
+}
+
+void VCSlider::flashFunction(bool on)
+{
+ Function *function = m_doc->function(m_controlledFunctionId);
+ if (function == nullptr)
+ return;
+
+ if (on)
+ {
+ if (m_controlledAttributeId == Function::invalidAttributeId())
+ m_adjustFlashPreviousValue = 0;
+ else
+ m_adjustFlashPreviousValue = function->getAttributeValue(m_controlledAttributeIndex);
+ }
+
+ adjustFunctionAttribute(function, on ? 1.0 : m_adjustFlashPreviousValue);
+}
+
QStringList VCSlider::availableAttributes() const
{
QStringList list;
- Function* function = m_doc->function(m_controlledFunctionId);
+ Function *function = m_doc->function(m_controlledFunctionId);
if (function == nullptr)
return list;
- for (Attribute attr : function->attributes())
+ for (Attribute &attr : function->attributes())
list << attr.m_name;
return list;
@@ -1029,7 +1063,7 @@ void VCSlider::writeDMXLevel(MasterTimer* timer, QList universes)
if (clickAndGoType() == CnGColors)
{
- float f = SCALE(float(m_value), rangeLowLimit(), rangeHighLimit(), 0.0, 200.0);
+ float f = SCALE(float(modLevel), rangeLowLimit(), rangeHighLimit(), 0.0, 200.0);
if ((uchar)f != 0)
{
@@ -1053,7 +1087,7 @@ void VCSlider::writeDMXLevel(MasterTimer* timer, QList universes)
bool mixedDMXlevels = false;
int monitorSliderValue = -1;
- for (SceneValue scv : m_levelChannels)
+ for (SceneValue &scv : m_levelChannels)
{
Fixture* fxi = m_doc->fixture(scv.fxi);
if (fxi != nullptr)
@@ -1108,7 +1142,7 @@ void VCSlider::writeDMXLevel(MasterTimer* timer, QList universes)
if (m_levelValueChanged)
{
- for (SceneValue scv : m_levelChannels)
+ for (SceneValue &scv : m_levelChannels)
{
Fixture* fxi = m_doc->fixture(scv.fxi);
if (fxi == nullptr)
@@ -1136,6 +1170,10 @@ void VCSlider::writeDMXLevel(MasterTimer* timer, QList universes)
if (m_isOverriding)
fc->addFlag(FadeChannel::Override);
+ // request to autoremove LTP channels when set
+ if (! (chType & FadeChannel::Intensity))
+ fc->addFlag(FadeChannel::AutoRemove);
+
if (chType & FadeChannel::Intensity && clickAndGoType() == CnGColors)
{
const QLCChannel *qlcch = fxi->channel(scv.channel);
@@ -1176,7 +1214,7 @@ void VCSlider::writeDMXAdjust(MasterTimer* timer, QList ua)
if (m_adjustChangeCounter == 0)
return;
- Function* function = m_doc->function(m_controlledFunctionId);
+ Function *function = m_doc->function(m_controlledFunctionId);
if (function == nullptr)
return;
@@ -1233,15 +1271,22 @@ void VCSlider::updateFeedback()
void VCSlider::slotInputValueChanged(quint8 id, uchar value)
{
+ int scaledValue = SCALE(float(value), float(0), float(UCHAR_MAX),
+ float(rangeLowLimit()),
+ float(rangeHighLimit()));
+
switch (id)
{
case INPUT_SLIDER_CONTROL_ID:
- setValue(value, true, false);
+ setValue(scaledValue, true, false);
break;
case INPUT_SLIDER_RESET_ID:
if (value)
setIsOverriding(false);
break;
+ case INPUT_SLIDER_FLASH_ID:
+ flashFunction(value ? true : false);
+ break;
}
}
@@ -1323,6 +1368,11 @@ bool VCSlider::loadXML(QXmlStreamReader &root)
{
loadXMLAdjust(root);
}
+ else if (root.name() == KXMLQLCVCSliderFunctionFlash)
+ {
+ setAdjustFlashEnabled(true);
+ loadXMLSources(root, INPUT_SLIDER_FLASH_ID);
+ }
else if (root.name() == KXMLQLCVCSliderPlayback) // LEGACY
{
loadXMLLegacyPlayback(root);
@@ -1451,6 +1501,11 @@ bool VCSlider::loadXMLLegacyPlayback(QXmlStreamReader &pb_root)
setControlledFunction(pb_root.readElementText().toUInt());
setControlledAttribute(Function::Intensity);
}
+ else if (pb_root.name() == KXMLQLCVCSliderFunctionFlash)
+ {
+ setAdjustFlashEnabled(true);
+ loadXMLSources(pb_root, INPUT_SLIDER_FLASH_ID);
+ }
else
{
qWarning() << Q_FUNC_INFO << "Unknown slider playback tag:" << pb_root.name().toString();
@@ -1524,7 +1579,7 @@ bool VCSlider::saveXML(QXmlStreamWriter *doc)
doc->writeAttribute(KXMLQLCVCSliderLevelValue, QString::number(value()));
/* Level channels */
- for (SceneValue scv : m_levelChannels)
+ for (SceneValue &scv : m_levelChannels)
{
doc->writeStartElement(KXMLQLCVCSliderChannel);
doc->writeAttribute(KXMLQLCVCSliderChannelFixture, QString::number(scv.fxi));
@@ -1545,6 +1600,13 @@ bool VCSlider::saveXML(QXmlStreamWriter *doc)
doc->writeAttribute(KXMLQLCVCSliderControlledFunction, QString::number(controlledFunction()));
/* End the tag */
doc->writeEndElement();
+
+ if (adjustFlashEnabled())
+ {
+ //doc->writeStartElement(KXMLQLCVCSliderFunctionFlash);
+ saveXMLInputControl(doc, INPUT_SLIDER_FLASH_ID, KXMLQLCVCSliderFunctionFlash);
+ //doc->writeEndElement();
+ }
}
/* End the tag */
diff --git a/qmlui/virtualconsole/vcslider.h b/qmlui/virtualconsole/vcslider.h
index 573ee4ab1f..b624a271fe 100644
--- a/qmlui/virtualconsole/vcslider.h
+++ b/qmlui/virtualconsole/vcslider.h
@@ -44,6 +44,7 @@
#define KXMLQLCVCSliderLevelValue QString("Value")
#define KXMLQLCVCSliderLevelMonitor QString("Monitor")
#define KXMLQLCVCSliderOverrideReset QString("Reset")
+#define KXMLQLCVCSliderFunctionFlash QString("Flash")
#define KXMLQLCVCSliderChannel QString("Channel")
#define KXMLQLCVCSliderChannelFixture QString("Fixture")
@@ -75,6 +76,8 @@ class VCSlider : public VCWidget, public DMXSource
Q_PROPERTY(int monitorValue READ monitorValue NOTIFY monitorValueChanged)
Q_PROPERTY(bool isOverriding READ isOverriding WRITE setIsOverriding NOTIFY isOverridingChanged)
+ Q_PROPERTY(bool adjustFlashEnabled READ adjustFlashEnabled WRITE setAdjustFlashEnabled NOTIFY adjustFlashEnabledChanged)
+
Q_PROPERTY(quint32 controlledFunction READ controlledFunction WRITE setControlledFunction NOTIFY controlledFunctionChanged)
Q_PROPERTY(int controlledAttribute READ controlledAttribute WRITE setControlledAttribute NOTIFY controlledAttributeChanged)
Q_PROPERTY(QStringList availableAttributes READ availableAttributes NOTIFY availableAttributesChanged)
@@ -372,6 +375,12 @@ protected slots:
void adjustFunctionAttribute(Function *f, qreal value);
+ /** Get/Set the status of the flash button enablement */
+ bool adjustFlashEnabled() const;
+ void setAdjustFlashEnabled(bool enable);
+
+ Q_INVOKABLE void flashFunction(bool on);
+
/** Get the list of the available attributes for the Function to control */
QStringList availableAttributes() const;
@@ -388,6 +397,7 @@ protected slots:
signals:
void controlledFunctionChanged(quint32 fid);
void controlledAttributeChanged(int attr);
+ void adjustFlashEnabledChanged(bool enable);
void availableAttributesChanged();
void attributeMinValueChanged();
void attributeMaxValueChanged();
@@ -404,6 +414,9 @@ protected slots:
qreal m_attributeMinValue;
qreal m_attributeMaxValue;
+ bool m_adjustFlashEnabled;
+ qreal m_adjustFlashPreviousValue;
+
/*********************************************************************
* Submaster
*********************************************************************/
diff --git a/qmlui/virtualconsole/vcspeeddial.cpp b/qmlui/virtualconsole/vcspeeddial.cpp
new file mode 100644
index 0000000000..337ae16e36
--- /dev/null
+++ b/qmlui/virtualconsole/vcspeeddial.cpp
@@ -0,0 +1,169 @@
+/*
+ Q Light Controller Plus
+ vcspeeddial.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
+#include
+
+#include "doc.h"
+#include "vcspeeddial.h"
+
+VCSpeedDial::VCSpeedDial(Doc *doc, QObject *parent)
+ : VCWidget(doc, parent)
+{
+ setType(VCWidget::SpeedDialWidget);
+}
+
+VCSpeedDial::~VCSpeedDial()
+{
+ if (m_item)
+ delete m_item;
+}
+
+QString VCSpeedDial::defaultCaption()
+{
+ return tr("Speed Dial %1").arg(id() + 1);
+}
+
+void VCSpeedDial::setupLookAndFeel(qreal pixelDensity, int page)
+{
+ setPage(page);
+ QFont wFont = font();
+ wFont.setBold(true);
+ wFont.setPointSize(pixelDensity * 5.0);
+ setFont(wFont);
+}
+
+void VCSpeedDial::render(QQuickView *view, QQuickItem *parent)
+{
+ if (view == nullptr || parent == nullptr)
+ return;
+
+ QQmlComponent *component = new QQmlComponent(view->engine(), QUrl("qrc:/VCSpeedDialItem.qml"));
+
+ if (component->isError())
+ {
+ qDebug() << component->errors();
+ return;
+ }
+
+ m_item = qobject_cast(component->create());
+
+ m_item->setParentItem(parent);
+ m_item->setProperty("speedDialObj", QVariant::fromValue(this));
+}
+
+QString VCSpeedDial::propertiesResource() const
+{
+ return QString("qrc:/VCSpeedDialProperties.qml");
+}
+
+VCWidget *VCSpeedDial::createCopy(VCWidget *parent)
+{
+ Q_ASSERT(parent != nullptr);
+
+ VCSpeedDial *speedDial = new VCSpeedDial(m_doc, parent);
+ if (speedDial->copyFrom(this) == false)
+ {
+ delete speedDial;
+ speedDial = nullptr;
+ }
+
+ return speedDial;
+}
+
+bool VCSpeedDial::copyFrom(const VCWidget *widget)
+{
+ const VCSpeedDial *speedDial = qobject_cast (widget);
+ if (speedDial == nullptr)
+ return false;
+
+ /* Copy and set properties */
+
+ /* Copy object lists */
+
+ /* Common stuff */
+ return VCWidget::copyFrom(widget);
+}
+
+FunctionParent VCSpeedDial::functionParent() const
+{
+ return FunctionParent(FunctionParent::AutoVCWidget, id());
+}
+
+/*********************************************************************
+ * Load & Save
+ *********************************************************************/
+
+bool VCSpeedDial::loadXML(QXmlStreamReader &root)
+{
+ if (root.name() != KXMLQLCVCSpeedDial)
+ {
+ qWarning() << Q_FUNC_INFO << "Speed dial node not found";
+ return false;
+ }
+
+ QXmlStreamAttributes attrs = root.attributes();
+
+ /* Widget commons */
+ loadXMLCommon(root);
+
+ while (root.readNextStartElement())
+ {
+ if (root.name() == KXMLQLCWindowState)
+ {
+ bool visible = false;
+ int x = 0, y = 0, w = 0, h = 0;
+ loadXMLWindowState(root, &x, &y, &w, &h, &visible);
+ setGeometry(QRect(x, y, w, h));
+ }
+ else if (root.name() == KXMLQLCVCWidgetAppearance)
+ {
+ loadXMLAppearance(root);
+ }
+ else
+ {
+ qWarning() << Q_FUNC_INFO << "Unknown speed dial tag:" << root.name().toString();
+ root.skipCurrentElement();
+ }
+ }
+
+ return true;
+}
+
+bool VCSpeedDial::saveXML(QXmlStreamWriter *doc)
+{
+ Q_ASSERT(doc != nullptr);
+
+ /* VC object entry */
+ doc->writeStartElement(KXMLQLCVCSpeedDial);
+
+ saveXMLCommon(doc);
+
+ /* Window state */
+ saveXMLWindowState(doc);
+
+ /* Appearance */
+ saveXMLAppearance(doc);
+
+ /* Write the tag */
+ doc->writeEndElement();
+
+ return true;
+}
diff --git a/qmlui/virtualconsole/vcspeeddial.h b/qmlui/virtualconsole/vcspeeddial.h
new file mode 100644
index 0000000000..0684b10227
--- /dev/null
+++ b/qmlui/virtualconsole/vcspeeddial.h
@@ -0,0 +1,118 @@
+/*
+ Q Light Controller Plus
+ vcspeeddial.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 VCSPEEDDIAL_H
+#define VCSPEEDDIAL_H
+
+#include "vcwidget.h"
+
+#define KXMLQLCVCSpeedDial QString("SpeedDial")
+#define KXMLQLCVCSpeedDialSpeedTypes QString("SpeedTypes")
+#define KXMLQLCVCSpeedDialAbsoluteValue QString("AbsoluteValue")
+#define KXMLQLCVCSpeedDialAbsoluteValueMin QString("Minimum")
+#define KXMLQLCVCSpeedDialAbsoluteValueMax QString("Maximum")
+#define KXMLQLCVCSpeedDialTap QString("Tap")
+#define KXMLQLCVCSpeedDialMult QString("Mult")
+#define KXMLQLCVCSpeedDialDiv QString("Div")
+#define KXMLQLCVCSpeedDialMultDivReset QString("MultDivReset")
+#define KXMLQLCVCSpeedDialApply QString("Apply")
+#define KXMLQLCVCSpeedDialTapKey QString("Key")
+#define KXMLQLCVCSpeedDialMultKey QString("MultKey")
+#define KXMLQLCVCSpeedDialDivKey QString("DivKey")
+#define KXMLQLCVCSpeedDialMultDivResetKey QString("MultDivResetKey")
+#define KXMLQLCVCSpeedDialApplyKey QString("ApplyKey")
+#define KXMLQLCVCSpeedDialResetFactorOnDialChange QString("ResetFactorOnDialChange")
+#define KXMLQLCVCSpeedDialVisibilityMask QString("Visibility")
+#define KXMLQLCVCSpeedDialTime QString("Time")
+
+// Legacy: infinite checkbox
+#define KXMLQLCVCSpeedDialInfinite QString("Infinite")
+#define KXMLQLCVCSpeedDialInfiniteKey QString("InfiniteKey")
+
+class VCSpeedDial : public VCWidget
+{
+ Q_OBJECT
+
+ /*********************************************************************
+ * Initialization
+ *********************************************************************/
+public:
+ VCSpeedDial(Doc* doc = nullptr, QObject *parent = nullptr);
+ virtual ~VCSpeedDial();
+
+ /** @reimp */
+ QString defaultCaption();
+
+ /** @reimp */
+ void setupLookAndFeel(qreal pixelDensity, int page);
+
+ /** @reimp */
+ void render(QQuickView *view, QQuickItem *parent);
+
+ /** @reimp */
+ QString propertiesResource() const;
+
+ /** @reimp */
+ VCWidget *createCopy(VCWidget *parent);
+
+protected:
+ /** @reimp */
+ bool copyFrom(const VCWidget* widget);
+
+private:
+ FunctionParent functionParent() const;
+
+ /*********************************************************************
+ * Type
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Data
+ *********************************************************************/
+public:
+
+protected slots:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Functions connections
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Load & Save
+ *********************************************************************/
+public:
+ bool loadXML(QXmlStreamReader &root);
+ bool saveXML(QXmlStreamWriter *doc);
+};
+
+#endif
diff --git a/qmlui/virtualconsole/vcwidget.cpp b/qmlui/virtualconsole/vcwidget.cpp
index 65fa66700f..ae49e1c482 100644
--- a/qmlui/virtualconsole/vcwidget.cpp
+++ b/qmlui/virtualconsole/vcwidget.cpp
@@ -120,7 +120,12 @@ bool VCWidget::copyFrom(const VCWidget* widget)
{
QSharedPointer dst(new QLCInputSource(src->universe(), src->channel()));
dst->setID(src->id());
- dst->setRange(src->lowerValue(), src->upperValue());
+ dst->setFeedbackValue(QLCInputFeedback::LowerValue, src->feedbackValue(QLCInputFeedback::LowerValue));
+ dst->setFeedbackValue(QLCInputFeedback::UpperValue, src->feedbackValue(QLCInputFeedback::UpperValue));
+ dst->setFeedbackValue(QLCInputFeedback::MonitorValue, src->feedbackValue(QLCInputFeedback::MonitorValue));
+ dst->setFeedbackExtraParams(QLCInputFeedback::LowerValue, src->feedbackExtraParams(QLCInputFeedback::LowerValue));
+ dst->setFeedbackExtraParams(QLCInputFeedback::UpperValue, src->feedbackExtraParams(QLCInputFeedback::UpperValue));
+ dst->setFeedbackExtraParams(QLCInputFeedback::MonitorValue, src->feedbackExtraParams(QLCInputFeedback::MonitorValue));
addInputSource(dst);
}
@@ -659,6 +664,16 @@ void VCWidget::addInputSource(QSharedPointer const& source)
QLCInputChannel *ich = ip->profile()->channel(source->channel() & 0x0000FFFF);
if (ich != nullptr)
{
+ QLCInputProfile *profile = ip->profile();
+
+ // retrieve plugin specific params for feedback
+ if (source->feedbackExtraParams(QLCInputFeedback::LowerValue).toInt() == -1)
+ source->setFeedbackExtraParams(QLCInputFeedback::LowerValue, profile->channelExtraParams(ich));
+ if (source->feedbackExtraParams(QLCInputFeedback::UpperValue).toInt() == -1)
+ source->setFeedbackExtraParams(QLCInputFeedback::UpperValue, profile->channelExtraParams(ich));
+ if (source->feedbackExtraParams(QLCInputFeedback::MonitorValue).toInt() == -1)
+ source->setFeedbackExtraParams(QLCInputFeedback::MonitorValue, profile->channelExtraParams(ich));
+
if (ich->movementType() == QLCInputChannel::Relative)
{
source->setWorkingMode(QLCInputSource::Relative);
@@ -682,9 +697,16 @@ void VCWidget::addInputSource(QSharedPointer const& source)
this, SLOT(slotInputSourceValueChanged(quint32,quint32,uchar)));
}
- // user custom feedbacks have precedence over input profile custom feedbacks
- source->setRange((source->lowerValue() != 0) ? source->lowerValue() : ich->lowerValue(),
- (source->upperValue() != UCHAR_MAX) ? source->upperValue() : ich->upperValue());
+ // user custom feedback have precedence over input profile custom feedback
+ uchar lower = source->feedbackValue(QLCInputFeedback::LowerValue) != 0 ?
+ source->feedbackValue(QLCInputFeedback::LowerValue) :
+ ich->lowerValue();
+ uchar upper = source->feedbackValue(QLCInputFeedback::UpperValue) != UCHAR_MAX ?
+ source->feedbackValue(QLCInputFeedback::UpperValue) :
+ ich->upperValue();
+
+ source->setFeedbackValue(QLCInputFeedback::LowerValue, lower);
+ source->setFeedbackValue(QLCInputFeedback::UpperValue, upper);
}
}
}
@@ -725,7 +747,8 @@ bool VCWidget::updateInputSourceRange(quint32 universe, quint32 channel, quint8
{
if (source->universe() == universe && source->channel() == channel)
{
- source->setRange(lower, upper);
+ source->setFeedbackValue(QLCInputFeedback::LowerValue, lower);
+ source->setFeedbackValue(QLCInputFeedback::UpperValue, upper);
return true;
}
}
@@ -787,16 +810,20 @@ QVariantList VCWidget::inputSourcesList()
}
QVariantMap sourceMap;
+ uchar lower = source->feedbackValue(QLCInputFeedback::LowerValue);
+ uchar upper = source->feedbackValue(QLCInputFeedback::UpperValue);
+
if (source->isValid() == false)
sourceMap.insert("invalid", true);
+
sourceMap.insert("type", Controller);
sourceMap.insert("id", source->id());
sourceMap.insert("uniString", uniName);
sourceMap.insert("chString", chName);
sourceMap.insert("universe", source->universe());
sourceMap.insert("channel", source->channel());
- sourceMap.insert("lower", source->lowerValue() != 0 ? source->lowerValue() : min);
- sourceMap.insert("upper", source->upperValue() != UCHAR_MAX ? source->upperValue() : max);
+ sourceMap.insert("lower", lower != 0 ? lower : min);
+ sourceMap.insert("upper", upper != UCHAR_MAX ? upper : max);
sourceMap.insert("customFeedback", supportCustomFeedback);
m_sourcesList.append(sourceMap);
}
@@ -863,9 +890,11 @@ void VCWidget::sendFeedback(int value, quint8 id, SourceValueType type)
continue;
if (type == LowerValue)
- value = source->lowerValue();
+ value = source->feedbackValue(QLCInputFeedback::LowerValue);
else if (type == UpperValue)
- value = source->upperValue();
+ value = source->feedbackValue(QLCInputFeedback::UpperValue);
+ else if (type == MonitorValue)
+ value = source->feedbackValue(QLCInputFeedback::MonitorValue);
// if in relative mode, send a "feedback" to this
// input source so it can continue to emit values
@@ -1084,7 +1113,7 @@ bool VCWidget::loadXMLInputSource(QXmlStreamReader &root, const quint8 &id)
quint32 uni = attrs.value(KXMLQLCVCWidgetInputUniverse).toString().toUInt();
quint32 ch = attrs.value(KXMLQLCVCWidgetInputChannel).toString().toUInt();
- uchar min = 0, max = UCHAR_MAX;
+ uchar min = 0, max = UCHAR_MAX, mon = UCHAR_MAX;
QSharedPointerinputSource = QSharedPointer(new QLCInputSource(uni, ch));
inputSource->setID(id);
@@ -1093,8 +1122,20 @@ bool VCWidget::loadXMLInputSource(QXmlStreamReader &root, const quint8 &id)
min = uchar(attrs.value(KXMLQLCVCWidgetInputLowerValue).toString().toUInt());
if (attrs.hasAttribute(KXMLQLCVCWidgetInputUpperValue))
max = uchar(attrs.value(KXMLQLCVCWidgetInputUpperValue).toString().toUInt());
+ if (attrs.hasAttribute(KXMLQLCVCWidgetInputMonitorValue))
+ mon = uchar(attrs.value(KXMLQLCVCWidgetInputMonitorValue).toString().toUInt());
+
+ inputSource->setFeedbackValue(QLCInputFeedback::LowerValue, min);
+ inputSource->setFeedbackValue(QLCInputFeedback::UpperValue, max);
+ inputSource->setFeedbackValue(QLCInputFeedback::MonitorValue, mon);
- inputSource->setRange(min, max);
+ // load feedback extra params
+ if (attrs.hasAttribute(KXMLQLCVCWidgetInputLowerParams))
+ inputSource->setFeedbackExtraParams(QLCInputFeedback::LowerValue, attrs.value(KXMLQLCVCWidgetInputLowerParams).toInt());
+ if (attrs.hasAttribute(KXMLQLCVCWidgetInputUpperParams))
+ inputSource->setFeedbackExtraParams(QLCInputFeedback::UpperValue, attrs.value(KXMLQLCVCWidgetInputUpperParams).toInt());
+ if (attrs.hasAttribute(KXMLQLCVCWidgetInputMonitorParams))
+ inputSource->setFeedbackExtraParams(QLCInputFeedback::MonitorValue, attrs.value(KXMLQLCVCWidgetInputMonitorParams).toInt());
addInputSource(inputSource);
@@ -1262,10 +1303,29 @@ bool VCWidget::saveXMLInputControl(QXmlStreamWriter *doc, quint8 controlId, QStr
doc->writeStartElement(KXMLQLCVCWidgetInput);
doc->writeAttribute(KXMLQLCVCWidgetInputUniverse, QString("%1").arg(source->universe()));
doc->writeAttribute(KXMLQLCVCWidgetInputChannel, QString("%1").arg(source->channel()));
- if (source->lowerValue() != 0)
- doc->writeAttribute(KXMLQLCVCWidgetInputLowerValue, QString::number(source->lowerValue()));
- if (source->upperValue() != UCHAR_MAX)
- doc->writeAttribute(KXMLQLCVCWidgetInputUpperValue, QString::number(source->upperValue()));
+ if (source->feedbackValue(QLCInputFeedback::LowerValue) != 0)
+ doc->writeAttribute(KXMLQLCVCWidgetInputLowerValue, QString::number(source->feedbackValue(QLCInputFeedback::LowerValue)));
+ if (source->feedbackValue(QLCInputFeedback::UpperValue) != UCHAR_MAX)
+ doc->writeAttribute(KXMLQLCVCWidgetInputUpperValue, QString::number(source->feedbackValue(QLCInputFeedback::UpperValue)));
+ if (source->feedbackValue(QLCInputFeedback::MonitorValue) != UCHAR_MAX)
+ doc->writeAttribute(KXMLQLCVCWidgetInputMonitorValue, QString::number(source->feedbackValue(QLCInputFeedback::MonitorValue)));
+
+ // save feedback extra params
+ QVariant extraParams = source->feedbackExtraParams(QLCInputFeedback::LowerValue);
+
+ if (extraParams.isValid() && extraParams.type() == QVariant::Int && extraParams.toInt() != -1)
+ doc->writeAttribute(KXMLQLCVCWidgetInputLowerParams, QString::number(extraParams.toInt()));
+
+ extraParams = source->feedbackExtraParams(QLCInputFeedback::UpperValue);
+
+ if (extraParams.isValid() && extraParams.type() == QVariant::Int && extraParams.toInt() != -1)
+ doc->writeAttribute(KXMLQLCVCWidgetInputUpperParams, QString::number(extraParams.toInt()));
+
+ extraParams = source->feedbackExtraParams(QLCInputFeedback::MonitorValue);
+
+ if (extraParams.isValid() && extraParams.type() == QVariant::Int && extraParams.toInt() != -1)
+ doc->writeAttribute(KXMLQLCVCWidgetInputMonitorParams, QString::number(extraParams.toInt()));
+
doc->writeEndElement();
}
diff --git a/qmlui/virtualconsole/vcwidget.h b/qmlui/virtualconsole/vcwidget.h
index e63ee77d70..67bf43e613 100644
--- a/qmlui/virtualconsole/vcwidget.h
+++ b/qmlui/virtualconsole/vcwidget.h
@@ -54,12 +54,16 @@
#define KXMLQLCWindowStateWidth QString("Width")
#define KXMLQLCWindowStateHeight QString("Height")
-#define KXMLQLCVCWidgetKey QString("Key")
-#define KXMLQLCVCWidgetInput QString("Input")
-#define KXMLQLCVCWidgetInputUniverse QString("Universe")
-#define KXMLQLCVCWidgetInputChannel QString("Channel")
-#define KXMLQLCVCWidgetInputLowerValue QString("LowerValue")
-#define KXMLQLCVCWidgetInputUpperValue QString("UpperValue")
+#define KXMLQLCVCWidgetKey QString("Key")
+#define KXMLQLCVCWidgetInput QString("Input")
+#define KXMLQLCVCWidgetInputUniverse QString("Universe")
+#define KXMLQLCVCWidgetInputChannel QString("Channel")
+#define KXMLQLCVCWidgetInputLowerValue QString("LowerValue")
+#define KXMLQLCVCWidgetInputUpperValue QString("UpperValue")
+#define KXMLQLCVCWidgetInputMonitorValue QString("MonitorValue")
+#define KXMLQLCVCWidgetInputLowerParams QString("LowerParams")
+#define KXMLQLCVCWidgetInputUpperParams QString("UpperParams")
+#define KXMLQLCVCWidgetInputMonitorParams QString("MonitorParams")
typedef struct
{
@@ -480,7 +484,7 @@ class VCWidget : public QObject
* Input sources
*********************************************************************/
public:
- enum SourceValueType { ExactValue, LowerValue, UpperValue };
+ enum SourceValueType { ExactValue, LowerValue, UpperValue, MonitorValue };
Q_ENUM(SourceValueType)
/**
diff --git a/qmlui/virtualconsole/vcxypad.cpp b/qmlui/virtualconsole/vcxypad.cpp
new file mode 100644
index 0000000000..539176aa14
--- /dev/null
+++ b/qmlui/virtualconsole/vcxypad.cpp
@@ -0,0 +1,169 @@
+/*
+ Q Light Controller Plus
+ vcxypad.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
+#include
+
+#include "doc.h"
+#include "vcxypad.h"
+
+VCXYPad::VCXYPad(Doc *doc, QObject *parent)
+ : VCWidget(doc, parent)
+{
+ setType(VCWidget::XYPadWidget);
+}
+
+VCXYPad::~VCXYPad()
+{
+ if (m_item)
+ delete m_item;
+}
+
+QString VCXYPad::defaultCaption()
+{
+ return tr("XY Pad %1").arg(id() + 1);
+}
+
+void VCXYPad::setupLookAndFeel(qreal pixelDensity, int page)
+{
+ setPage(page);
+ QFont wFont = font();
+ wFont.setBold(true);
+ wFont.setPointSize(pixelDensity * 5.0);
+ setFont(wFont);
+}
+
+void VCXYPad::render(QQuickView *view, QQuickItem *parent)
+{
+ if (view == nullptr || parent == nullptr)
+ return;
+
+ QQmlComponent *component = new QQmlComponent(view->engine(), QUrl("qrc:/VCXYPadItem.qml"));
+
+ if (component->isError())
+ {
+ qDebug() << component->errors();
+ return;
+ }
+
+ m_item = qobject_cast(component->create());
+
+ m_item->setParentItem(parent);
+ m_item->setProperty("xyPadObj", QVariant::fromValue(this));
+}
+
+QString VCXYPad::propertiesResource() const
+{
+ return QString("qrc:/VCXYPadProperties.qml");
+}
+
+VCWidget *VCXYPad::createCopy(VCWidget *parent)
+{
+ Q_ASSERT(parent != nullptr);
+
+ VCXYPad *XYPad = new VCXYPad(m_doc, parent);
+ if (XYPad->copyFrom(this) == false)
+ {
+ delete XYPad;
+ XYPad = nullptr;
+ }
+
+ return XYPad;
+}
+
+bool VCXYPad::copyFrom(const VCWidget *widget)
+{
+ const VCXYPad *XYPad = qobject_cast (widget);
+ if (XYPad == nullptr)
+ return false;
+
+ /* Copy and set properties */
+
+ /* Copy object lists */
+
+ /* Common stuff */
+ return VCWidget::copyFrom(widget);
+}
+
+FunctionParent VCXYPad::functionParent() const
+{
+ return FunctionParent(FunctionParent::AutoVCWidget, id());
+}
+
+/*********************************************************************
+ * Load & Save
+ *********************************************************************/
+
+bool VCXYPad::loadXML(QXmlStreamReader &root)
+{
+ if (root.name() != KXMLQLCVCXYPad)
+ {
+ qWarning() << Q_FUNC_INFO << "XY Pad node not found";
+ return false;
+ }
+
+ QXmlStreamAttributes attrs = root.attributes();
+
+ /* Widget commons */
+ loadXMLCommon(root);
+
+ while (root.readNextStartElement())
+ {
+ if (root.name() == KXMLQLCWindowState)
+ {
+ bool visible = false;
+ int x = 0, y = 0, w = 0, h = 0;
+ loadXMLWindowState(root, &x, &y, &w, &h, &visible);
+ setGeometry(QRect(x, y, w, h));
+ }
+ else if (root.name() == KXMLQLCVCWidgetAppearance)
+ {
+ loadXMLAppearance(root);
+ }
+ else
+ {
+ qWarning() << Q_FUNC_INFO << "Unknown XY pad tag:" << root.name().toString();
+ root.skipCurrentElement();
+ }
+ }
+
+ return true;
+}
+
+bool VCXYPad::saveXML(QXmlStreamWriter *doc)
+{
+ Q_ASSERT(doc != nullptr);
+
+ /* VC object entry */
+ doc->writeStartElement(KXMLQLCVCXYPad);
+
+ saveXMLCommon(doc);
+
+ /* Window state */
+ saveXMLWindowState(doc);
+
+ /* Appearance */
+ saveXMLAppearance(doc);
+
+ /* Write the tag */
+ doc->writeEndElement();
+
+ return true;
+}
diff --git a/qmlui/virtualconsole/vcxypad.h b/qmlui/virtualconsole/vcxypad.h
new file mode 100644
index 0000000000..6cd6434eba
--- /dev/null
+++ b/qmlui/virtualconsole/vcxypad.h
@@ -0,0 +1,112 @@
+/*
+ Q Light Controller Plus
+ vcxypad.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 VCXYPAD_H
+#define VCXYPAD_H
+
+#include "vcwidget.h"
+
+#define KXMLQLCVCXYPad QString("XYPad")
+#define KXMLQLCVCXYPadPan QString("Pan")
+#define KXMLQLCVCXYPadTilt QString("Tilt")
+#define KXMLQLCVCXYPadWidth QString("Width")
+#define KXMLQLCVCXYPadHeight QString("Height")
+#define KXMLQLCVCXYPadPosition QString("Position")
+#define KXMLQLCVCXYPadRangeWindow QString("Window")
+#define KXMLQLCVCXYPadRangeHorizMin QString("hMin")
+#define KXMLQLCVCXYPadRangeHorizMax QString("hMax")
+#define KXMLQLCVCXYPadRangeVertMin QString("vMin")
+#define KXMLQLCVCXYPadRangeVertMax QString("vMax")
+
+#define KXMLQLCVCXYPadPositionX "X" // Legacy
+#define KXMLQLCVCXYPadPositionY "Y" // Legacy
+
+#define KXMLQLCVCXYPadInvertedAppearance "InvertedAppearance"
+
+class VCXYPad : public VCWidget
+{
+ Q_OBJECT
+
+ /*********************************************************************
+ * Initialization
+ *********************************************************************/
+public:
+ VCXYPad(Doc* doc = nullptr, QObject *parent = nullptr);
+ virtual ~VCXYPad();
+
+ /** @reimp */
+ QString defaultCaption();
+
+ /** @reimp */
+ void setupLookAndFeel(qreal pixelDensity, int page);
+
+ /** @reimp */
+ void render(QQuickView *view, QQuickItem *parent);
+
+ /** @reimp */
+ QString propertiesResource() const;
+
+ /** @reimp */
+ VCWidget *createCopy(VCWidget *parent);
+
+protected:
+ /** @reimp */
+ bool copyFrom(const VCWidget* widget);
+
+private:
+ FunctionParent functionParent() const;
+
+ /*********************************************************************
+ * Type
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Data
+ *********************************************************************/
+public:
+
+protected slots:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Functions connections
+ *********************************************************************/
+public:
+
+signals:
+
+private:
+
+ /*********************************************************************
+ * Load & Save
+ *********************************************************************/
+public:
+ bool loadXML(QXmlStreamReader &root);
+ bool saveXML(QXmlStreamWriter *doc);
+};
+
+#endif
diff --git a/qmlui/virtualconsole/virtualconsole.cpp b/qmlui/virtualconsole/virtualconsole.cpp
index bc17556a08..92664ee582 100644
--- a/qmlui/virtualconsole/virtualconsole.cpp
+++ b/qmlui/virtualconsole/virtualconsole.cpp
@@ -33,6 +33,10 @@
#include "vcslider.h"
#include "vcframe.h"
#include "vclabel.h"
+#include "vcanimation.h"
+#include "vcaudiotrigger.h"
+#include "vcxypad.h"
+#include "vcspeeddial.h"
#include "vcclock.h"
#include "vcpage.h"
#include "tardis.h"
@@ -96,6 +100,10 @@ VirtualConsole::VirtualConsole(QQuickView *view, Doc *doc,
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCButton");
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCLabel");
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCSlider");
+ qmlRegisterType("org.qlcplus.classes", 1, 0, "VCAnimation");
+ qmlRegisterType("org.qlcplus.classes", 1, 0, "VCAudioTrigger");
+ qmlRegisterType("org.qlcplus.classes", 1, 0, "VCXYPad");
+ qmlRegisterType("org.qlcplus.classes", 1, 0, "VCSpeedDial");
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCClock");
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCClockSchedule");
qmlRegisterType("org.qlcplus.classes", 1, 0, "VCCueList");
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 01910ebf6d..42ff4fe251 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -7,9 +7,6 @@ add_subdirectory(miditemplates)
add_subdirectory(modifierstemplates)
add_subdirectory(rgbscripts)
add_subdirectory(samples)
-if(NOT qmlui)
- add_subdirectory(docs)
-endif()
if(qmlui)
add_subdirectory(colorfilters)
add_subdirectory(meshes)
diff --git a/resources/colorfilters/CMakeLists.txt b/resources/colorfilters/CMakeLists.txt
index 73aeb6c5b9..bbfb7df23e 100644
--- a/resources/colorfilters/CMakeLists.txt
+++ b/resources/colorfilters/CMakeLists.txt
@@ -2,4 +2,15 @@ project(colorfilters)
file(GLOB COLOR_FILTER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.qxcf")
-install(FILES ${COLOR_FILTER_FILES} DESTINATION ${INSTALLROOT}/${COLORFILTERSDIR})
\ No newline at end of file
+if(ANDROID)
+ set(COLOR_FILTERS_ASSETS_DIR "${ANDROID_PACKAGE_SOURCE_DIR}/${COLORFILTERSDIR}")
+ # Create the assets directory if it doesn't exist
+ file(MAKE_DIRECTORY ${COLOR_FILTERS_ASSETS_DIR})
+
+ # Copy the color filter files to the assets directory
+ foreach(COLOR_FILTER_FILE ${COLOR_FILTER_FILES})
+ file(COPY ${COLOR_FILTER_FILE} DESTINATION ${COLOR_FILTERS_ASSETS_DIR})
+ endforeach()
+endif()
+
+install(FILES ${COLOR_FILTER_FILES} DESTINATION ${INSTALLROOT}/${COLORFILTERSDIR})
diff --git a/resources/docs/CMakeLists.txt b/resources/docs/CMakeLists.txt
index ddc718d5b3..5097d7837f 100644
--- a/resources/docs/CMakeLists.txt
+++ b/resources/docs/CMakeLists.txt
@@ -1,7 +1,28 @@
project(docs)
file(GLOB HTML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/html_en_EN/*.html")
-install(FILES ${HTML_FILES} DESTINATION ${INSTALLROOT}/${DOCSDIR}/html)
-
file(GLOB IMAGE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/*.png")
-install(FILES ${IMAGE_FILES} DESTINATION ${INSTALLROOT}/${DOCSDIR}/images)
\ No newline at end of file
+
+# Only perform the copy if we're building for Android
+if(ANDROID)
+ # Define the destination directories for the HTML and image files within the Android package
+ set(HTML_ASSETS_DIR "${ANDROID_PACKAGE_SOURCE_DIR}/${DOCSDIR}/html")
+ set(IMAGES_ASSETS_DIR "${ANDROID_PACKAGE_SOURCE_DIR}/${DOCSDIR}/images")
+
+ # Create the assets directories if they don't exist
+ file(MAKE_DIRECTORY ${HTML_ASSETS_DIR})
+ file(MAKE_DIRECTORY ${IMAGES_ASSETS_DIR})
+
+ # Copy the HTML files to the assets directory
+ foreach(HTML_FILE IN LISTS HTML_FILES)
+ file(COPY ${HTML_FILE} DESTINATION ${HTML_ASSETS_DIR})
+ endforeach()
+
+ # Copy the image files to the assets directory
+ foreach(IMAGE_FILE IN LISTS IMAGE_FILES)
+ file(COPY ${IMAGE_FILE} DESTINATION ${IMAGES_ASSETS_DIR})
+ endforeach()
+endif()
+
+install(FILES ${HTML_FILES} DESTINATION ${INSTALLROOT}/${DOCSDIR}/html)
+install(FILES ${IMAGE_FILES} DESTINATION ${INSTALLROOT}/${DOCSDIR}/images)
diff --git a/resources/docs/html_en_EN/fixturemanager.html b/resources/docs/html_en_EN/fixturemanager.html
index 70a3c1d41c..e92cc2332d 100644
--- a/resources/docs/html_en_EN/fixturemanager.html
+++ b/resources/docs/html_en_EN/fixturemanager.html
@@ -100,6 +100,13 @@ Controls
Opens the Fixtures remapping window.
+
+  |
+
+ Enables or disables the Highlight Fixtures features. When enabled, this will set the selected features to max brightness
+ so you can easily verify these fixture are patched correctly.
+ |
+