Merge remote-tracking branch 'upstream/master' into effectsInWizard

Author: 8-Lambda-8

.github/workflows/build.yml

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 project(qlcplus VERSION 4.14.1 LANGUAGES C CXX)
 
+option(qmlui "Build for QLC+ 5 QML UI" OFF)
+
 # Set Release build type by default
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)

CMakeLists.txt

@@ -12,6 +12,12 @@ set -e
 TARGET_DIR=$HOME/qlcplus.AppDir
 CMAKE_OPTS=""
 
+if ! command -v chrpath 2>&1 >/dev/null
+then
+    echo "chrpath could not be found. Install it before running this script"
+    exit 1
+fi
+
 if [ "$1" == "qmlui" ]; then
     ./translate.sh "qmlui"
     CMAKE_OPTS="-Dqmlui=ON"
@@ -45,6 +51,9 @@ if [ ! -d "$TARGET_DIR" ]; then
 fi
 make install
 
+cp -v ../resources/icons/svg/qlcplus.svg $TARGET_DIR
+cp -v ../platforms/linux/qlcplus.desktop $TARGET_DIR
+
 find $TARGET_DIR/usr/lib/ -name 'libqlcplusengine.so*' -exec strip -v {} \;
 
 if [ "$1" == "qmlui" ]; then
@@ -55,7 +64,7 @@ if [ "$1" == "qmlui" ]; then
     pushd $TARGET_DIR/usr/bin
     find . -name plugins.qmltypes -type f -delete
     find . -name *.qmlc -type f -delete
-    rm -rf QtQuick/Extras QtQuick/Particles.2 QtQuick/XmlListModel
+    rm -rf Qt/test QtQuick/Extras QtQuick/Particles.2 QtQuick/XmlListModel
     rm -rf QtQuick/Controls.2/designer QtQuick/Controls.2/Material
     rm -rf QtQuick/Controls.2/Universal QtQuick/Controls.2/Fusion
     rm -rf QtQuick/Controls.2/Imagine QtQuick/Controls.2/Scene2D
@@ -67,9 +76,6 @@ else
     sed -i -e 's/Exec=qlcplus --open %f/Exec=qlcplus/g' $TARGET_DIR/qlcplus.desktop
 fi
 
-cp -v ../resources/icons/svg/qlcplus.svg $TARGET_DIR
-cp -v ../platforms/linux/qlcplus.desktop $TARGET_DIR
-
 # There might be a new version of the tool available.
 wget -c https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 -O $TARGET_DIR/AppRun
 chmod a+x $TARGET_DIR/AppRun

create-appimage-cmake.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+#VERSION=$(head -1 debian/changelog | sed 's/.*(\(.*\)).*/\1/')
+VERSION=$(grep -m 1 APPVERSION variables.pri | cut -d '=' -f 2 | sed -e 's/^[[:space:]]*//' | tr ' ' _ | tr -d '\r\n')
+APP_DIR=/c/qlcplus
+ROOT_DIR=$PWD
+
+# cleanup previous builds
+rm -rf $APP_DIR
+rm -rf build
+mkdir build
+cd build
+
+# Build
+# export QTDIR=/c/projects/Qt/6.9.0/mingw_64/
+if [ -n "$QTDIR" ]; then
+ if [ "$1" == "qmlui" ]; then
+    cmake -DCMAKE_PREFIX_PATH="$QTDIR/lib/cmake" -Dqmlui=on ..
+ else
+    cmake -DCMAKE_PREFIX_PATH="$QTDIR/lib/cmake" ..
+ fi
+else
+    echo "QTDIR not set. Aborting."
+    exit 1
+fi
+
+ninja
+
+if [ ! $? -eq 0 ]; then
+    echo Compiler error. Aborting package creation.
+    exit $?
+fi
+
+# Install to target
+ninja install
+if [ ! $? -eq 0 ]; then
+    echo Installation error. Aborting package creation.
+    exit $?
+fi
+
+cd ..
+
+echo "Run windeployqt..."
+cd $APP_DIR
+if [ "$1" == "qmlui" ]; then
+  $QTDIR/bin/windeployqt --qmldir $ROOT_DIR/qmlui/qml qlcplusengine.dll Plugins/dmxusb.dll qlcplus-qml.exe
+  rm sceneparsers/gltfsceneexport.dll
+else
+  $QTDIR/bin/windeployqt qlcplusengine.dll qlcplusui.dll qlcpluswebaccess.dll Plugins/dmxusb.dll qlcplus.exe
+fi
+
+# remove uneeded stuff
+rm -rf generic networkinformation qmltooling renderplugins tls translations
+
+
+# Create Installer
+makensis -X'SetCompressor /FINAL lzma' qlcplus*.nsi
+ 

create-exe.sh

@@ -1,12 +1,27 @@
 qlcplus (4.14.2) stable; urgency=low
 
   * engine: fix audio end of stream causing a crash on Qt 6 builds
+  * engine: decrease memory usage of RGB Matrix (thanks to Nick Shaforostoff)
+  * engine: fix crash when changing EFX timing after "Stop all functions" (thanks to Jurrie Overgoor)
+  * engine: input profiles are now loaded from project folder too
+  * engine: fix RGB Matrix color lost while editing (thanks to Jurrie Overgoor)
+  * engine: fix RGB Matrix dimmer control mode on generic dimmers
+  * engine: fix EFX duration change when asymmetrical
+  * UI/Fixture Remap: include channel modifiers when fixture model and mode are the same
   * Virtual Console: add an option to hide Grand Master (thanks to Jurrie Overgoor)
+  * Plugins/DMX USB: fix crash with some FTDI adapters
+  * Plugins/DMX USB: improve Open DMX timer accuracy (thanks to Basil Hussain)
+  * Web Access: improved multiple connections handling (thank to Jurrie Overgoor)
   * Input profiles: added M-Wave SMC Mixer
   * New fixtures: Eurolite LED TMH-40, Stairville HF-900 Haze Fogger (thanks to thegasta)
   * New fixtures: Sagitter Prince, Sagitter Lite Beam 5R, Sagitter ARS 1500FC (thanks to Alessandro Caseti)
+  * New fixtures: Stairville BEL6 IP Bar HEX, BSW-350 LED (thanks to Theodor Hein)
+  * New fixtures: American DJ Encore FR50z, Encore FR150z, Showtec LED Blinder 2 COB (thanks to Bram Janssen)
+  * New fixture: Showtec LED Par 64 36x3W (thanks to Bostjan Vodnik)
+  * New fixture: Expolite TourBar 32PIX RGBW (thanks to Wim Van Laer)
+  * New fixture: Clay Paky Mini-B Spot
 
-  -- Massimo Callegari <massimocallegari@yahoo.it>  Sat, 24 May 2025 18:19:20 +0200
+  -- Massimo Callegari <massimocallegari@yahoo.it>  Sat, 14 Jun 2025 18:19:20 +0200
 
 qlcplus (4.14.1) stable; urgency=high
 

debian/changelog

@@ -64,7 +64,7 @@
 
 Doc::Doc(QObject* parent, int universes)
     : QObject(parent)
-    , m_wsPath("")
+    , m_workspacePath("")
     , m_fixtureDefCache(new QLCFixtureDefCache)
     , m_modifiersCache(new QLCModifiersCache)
     , m_rgbScriptsCache(new RGBScriptsCache(this))
@@ -197,12 +197,12 @@ void Doc::clearContents()
 
 void Doc::setWorkspacePath(QString path)
 {
-    m_wsPath = path;
+    m_workspacePath = path;
 }
 
-QString Doc::getWorkspacePath() const
+QString Doc::workspacePath() const
 {
-    return m_wsPath;
+    return m_workspacePath;
 }
 
 QString Doc::normalizeComponentPath(const QString& filePath) const
@@ -212,9 +212,9 @@ QString Doc::normalizeComponentPath(const QString& filePath) const
 
     QFileInfo f(filePath);
 
-    if (f.absolutePath().startsWith(getWorkspacePath()))
+    if (f.absolutePath().startsWith(workspacePath()))
     {
-        return QDir(getWorkspacePath()).relativeFilePath(f.absoluteFilePath());
+        return QDir(workspacePath()).relativeFilePath(f.absoluteFilePath());
     }
     else
     {
@@ -227,7 +227,7 @@ QString Doc::denormalizeComponentPath(const QString& filePath) const
     if (filePath.isEmpty())
         return filePath;
 
-    return QFileInfo(QDir(getWorkspacePath()), filePath).absoluteFilePath();
+    return QFileInfo(QDir(workspacePath()), filePath).absoluteFilePath();
 }
 
 /*****************************************************************************
@@ -592,6 +592,13 @@ bool Doc::replaceFixtures(QList<Fixture*> newFixturesList)
         newFixture->setForcedHTPChannels(fixture->forcedHTPChannels());
         newFixture->setForcedLTPChannels(fixture->forcedLTPChannels());
 
+        for (quint32 s = 0; s < fixture->channels(); s++)
+        {
+            ChannelModifier *chMod = fixture->channelModifier(s);
+            if (chMod != NULL)
+                newFixture->setChannelModifier(s, chMod);
+        }
+
         m_fixtures.insert(id, newFixture);
         m_fixturesListCacheUpToDate = false;
 

engine/src/doc.cpp

@@ -81,7 +81,7 @@ class Doc : public QObject
     void setWorkspacePath(QString path);
 
     /** Retrieve the current workspace absolute path */
-    QString getWorkspacePath() const;
+    QString workspacePath() const;
 
     /** If filePath is in the workspace directory or in one of its subdirectories,
      *  return path relative to the workspace directory.
@@ -100,7 +100,7 @@ class Doc : public QObject
     QString denormalizeComponentPath(const QString& filePath) const;
 
 private:
-    QString m_wsPath;
+    QString m_workspacePath;
 
 signals:
     /** Emitted when clearContents() is called, before actually doing anything. */

engine/src/doc.h

@@ -525,6 +525,9 @@ public slots:
         Serial,     /**< Pattern propagates to the next fixture after a delay */
         Asymmetric  /**< All fixtures move with an offset */
     };
+#if QT_VERSION >= 0x050500
+    Q_ENUM(PropagationMode)
+#endif
 
     /** Set the EFX's fixture propagation mode (see the enum above) */
     void setPropagationMode(PropagationMode mode);

engine/src/efx.h

@@ -186,6 +186,9 @@ bool EFXFixture::isValid() const
 
 void EFXFixture::durationChanged()
 {
+    if (m_elapsed == 0)
+        return;
+
     // To avoid jumps when changing duration,
     // the elapsed time is rescaled to the
     // new duration.
@@ -195,11 +198,12 @@ void EFXFixture::durationChanged()
 
     // Serial or Asymmetric propagation mode:
     // we must subtract the offset from the current position
-    if (timeOffset())
+    uint offset = timeOffset();
+    if (offset)
     {
-        if (m_elapsed < timeOffset())
+        if (m_elapsed < offset)
             m_elapsed += m_parent->loopDuration();
-        m_elapsed -= timeOffset();
+        m_elapsed -= offset;
     }
 }
 

engine/src/efxfixture.cpp

@@ -1243,7 +1243,7 @@ bool Fixture::loadXML(QXmlStreamReader &xmlDoc, Doc *doc,
             QString man(manufacturer);
             QString mod(model);
             QString path = QString("%1%2%3-%4%5")
-                    .arg(doc->getWorkspacePath()).arg(QDir::separator())
+                    .arg(doc->workspacePath()).arg(QDir::separator())
                     .arg(man.replace(" ", "-")).arg(mod.replace(" ", "-")).arg(KExtFixture);
 
             qDebug() << "Fixture not found. Fallback to:" << path;