engine: add some more capability presets and fix XML load/save

mcallegari · May 1, 2018 · a1a724b · a1a724b
1 parent 9598aff
commit a1a724b
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 39 deletions.
diff --git a/engine/src/qlccapability.cpp b/engine/src/qlccapability.cpp
@@ -111,11 +111,13 @@ QLCCapability::PresetType QLCCapability::presetType() const
 {
     switch (m_preset)
     {
-        case StrobeFreq:
-        case PulseFreq:
+        case StrobeFrequency:
+        case PulseInFrequency:
+        case PulseOutFrequency:
             return SingleValue;
         case StrobeFreqRange:
-        case PulseFreqRange:
+        case PulseInFreqRange:
+        case PulseOutFreqRange:
             return DoubleValue;
         case ColorMacro:
             return SingleColor;
@@ -260,41 +262,51 @@ bool QLCCapability::saveXML(QXmlStreamWriter *doc)
     if (m_preset != Custom)
         doc->writeAttribute(KXMLQLCCapabilityPreset, presetToString(m_preset));
 
-    /* First resource attribute */
-    if (resource(0).isValid())
+    /* Resource attributes */
+    for (int i = 0; i < m_resources.count(); i++)
     {
-        if (presetType() == Picture)
+        switch (presetType())
         {
-            QString modFilename = resource(0).toString();
-            QDir dir = QDir::cleanPath(QLCFile::systemDirectory(GOBODIR).path());
-
-            if (modFilename.contains(dir.path()))
+            case Picture:
             {
-                modFilename.remove(dir.path());
-                // The following line is a dirty workaround for an issue raised on Windows
-                // When building with MinGW, dir.path() is something like "C:/QLC+/Gobos"
-                // while QDir::separator() returns "\"
-                // So, to avoid any string mismatch I remove the first character
-                // no matter what it is
-                modFilename.remove(0, 1);
+                QString modFilename = resource(i).toString();
+                QDir dir = QDir::cleanPath(QLCFile::systemDirectory(GOBODIR).path());
+
+                if (modFilename.contains(dir.path()))
+                {
+                    modFilename.remove(dir.path());
+                    // The following line is a dirty workaround for an issue raised on Windows
+                    // When building with MinGW, dir.path() is something like "C:/QLC+/Gobos"
+                    // while QDir::separator() returns "\"
+                    // So, to avoid any string mismatch I remove the first character
+                    // no matter what it is
+                    modFilename.remove(0, 1);
+                }
+
+                doc->writeAttribute(KXMLQLCCapabilityRes1, modFilename);
             }
-
-            doc->writeAttribute(KXMLQLCCapabilityRes1, modFilename);
-        }
-        else if (presetType() == SingleColor || presetType() == DoubleColor)
-        {
-            QColor col = resource(0).value<QColor>();
-            if (col.isValid())
-                doc->writeAttribute(KXMLQLCCapabilityRes1, col.name());
-        }
-    }
-    if (resource(0).isValid())
-    {
-        if (presetType() == DoubleColor)
-        {
-            QColor col = resource(1).value<QColor>();
-            if (col.isValid())
-                doc->writeAttribute(KXMLQLCCapabilityRes2, col.name());
+            break;
+            case SingleColor:
+            case DoubleColor:
+            {
+                QColor col = resource(i).value<QColor>();
+                if (i == 0 && col.isValid())
+                    doc->writeAttribute(KXMLQLCCapabilityRes1, col.name());
+                else if (i == 1 && col.isValid())
+                    doc->writeAttribute(KXMLQLCCapabilityRes2, col.name());
+            }
+            break;
+            case SingleValue:
+            case DoubleValue:
+            {
+                if (i == 0)
+                    doc->writeAttribute(KXMLQLCCapabilityRes1, QString::number(resource(i).toFloat()));
+                else if (i == 1)
+                    doc->writeAttribute(KXMLQLCCapabilityRes2, QString::number(resource(i).toFloat()));
+            }
+            break;
+            default:
+            break;
         }
     }
 
@@ -362,6 +374,54 @@ bool QLCCapability::loadXML(QXmlStreamReader &doc)
         setPreset(stringToPreset(str));
     }
 
+    switch(presetType())
+    {
+        case Picture:
+        {
+            QString path = attrs.value(KXMLQLCCapabilityRes1).toString();
+            if (QFileInfo(path).isRelative())
+            {
+                QDir dir = QLCFile::systemDirectory(GOBODIR);
+                path = dir.path() + QDir::separator() + path;
+            }
+            setResource(0, path);
+        }
+        break;
+        case SingleColor:
+        case DoubleColor:
+        {
+            QColor col1 = QColor(attrs.value(KXMLQLCCapabilityRes1).toString());
+            QColor col2 = QColor();
+            if (attrs.hasAttribute(KXMLQLCCapabilityRes2))
+                col2 = QColor(attrs.value(KXMLQLCCapabilityRes2).toString());
+
+            if (col1.isValid())
+            {
+                setResource(0, col1);
+                if (col2.isValid())
+                    setResource(1, col2);
+            }
+        }
+        break;
+        case SingleValue:
+        case DoubleValue:
+        {
+            float val1 = attrs.value(KXMLQLCCapabilityRes1).toFloat();
+            setResource(0, val1);
+
+            if (attrs.hasAttribute(KXMLQLCCapabilityRes2))
+            {
+                float val2 = attrs.value(KXMLQLCCapabilityRes2).toFloat();
+                setResource(1, val2);
+            }
+        }
+        break;
+        default:
+        break;
+    }
+
+    /* ************************* LEGACY ATTRIBUTES ************************* */
+
     /* Get (optional) resource name for gobo/effect/... */
     if(attrs.hasAttribute(KXMLQLCCapabilityResource))
     {

diff --git a/engine/src/qlccapability.h b/engine/src/qlccapability.h
@@ -114,14 +114,19 @@ class QLCCapability: public QObject
         ShutterClose,
         StrobeSlowToFast,
         StrobeFastToSlow,
+        StrobeRandom,
         StrobeRandomSlowToFast,
         StrobeRandomFastToSlow,
-        PulseSlowToFast,
-        PulseFastToSlow,
-        StrobeFreq,             /** precise frequency value in hertz specified in m_resources */
+        PulseInSlowToFast,
+        PulseInFastToSlow,
+        PulseOutSlowToFast,
+        PulseOutFastToSlow,
+        StrobeFrequency,        /** precise frequency value in hertz specified in m_resources */
         StrobeFreqRange,        /** specified in m_resources as 0: min, 1: max hertz */
-        PulseFreq,
-        PulseFreqRange,
+        PulseInFrequency,
+        PulseOutFrequency,
+        PulseInFreqRange,
+        PulseOutFreqRange,
         RotationClockwise,
         RotationCounterClockwise,
         TiltContinuous,

diff --git a/engine/src/qlcchannel.cpp b/engine/src/qlcchannel.cpp
@@ -318,6 +318,10 @@ void QLCChannel::setPreset(QLCChannel::Preset preset)
             grp = Pan;
             prname = KXMLQLCChannelGroupPan;
         break;
+        case PositionPanCounterClockwise:
+            grp = Pan;
+            prname = KXMLQLCChannelGroupPan + " counterclockwise";
+        break;
         case PositionPanFine:
             grp = Pan;
             prname = KXMLQLCChannelGroupPan + " fine";
@@ -487,6 +491,7 @@ QLCCapability *QLCChannel::addPresetCapability()
         case IntensityLightnessFine:
         case IntensityValueFine:
         case PositionPan:
+        case PositionPanCounterClockwise:
         case PositionPanFine:
         case PositionTilt:
         case PositionTiltFine:

diff --git a/engine/src/qlcchannel.h b/engine/src/qlcchannel.h
@@ -132,6 +132,7 @@ class QLCChannel : public QObject
         IntensityValue,
         IntensityValueFine,
         PositionPan,
+        PositionPanCounterClockwise,
         PositionPanFine,
         PositionTilt,
         PositionTiltFine,