ui/showmanager: fix hanging with an infinite duration EFX (fix mcallegari#1678)

Author: mcallegari

debian/changelog

@@ -1,5 +1,6 @@
 qlcplus (4.14.1) stable; urgency=low
 
+  * Show Manager: fix hanging with an infinite duration EFX
   * New fixture: beamZ MHL75 Hybrid Moving Head (thanks to Mikko Wuokko)
   * New fixtures: Eurolite LED TSL-1000 Scan MK2, Varytec LED Theater Spot 100 (thanks to Christoph Wieser)
 

ui/src/showmanager/efxitem.cpp

@@ -46,14 +46,24 @@ void EFXItem::calculateWidth()
 {
     int newWidth = 0;
     qint64 efxDuration = getDuration();
+    float timeUnit = 50.0 / float(getTimeScale());
 
-    if (efxDuration != 0)
-        newWidth = ((50.0 / float(getTimeScale())) * float(efxDuration)) / 1000.0;
-    else
+    if (efxDuration == 0)
+    {
         newWidth = 100;
+    }
+    else if (efxDuration == Function::infiniteSpeed())
+    {
+        newWidth = timeUnit * 10000;
+    }
+    else
+    {
+        newWidth = (timeUnit * float(efxDuration)) / 1000.0;
+    }
+
+    if (newWidth < timeUnit)
+        newWidth = timeUnit;
 
-    if (newWidth < (50 / m_timeScale))
-        newWidth = 50 / m_timeScale;
     setWidth(newWidth);
 }
 
@@ -63,14 +73,19 @@ void EFXItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
     Q_UNUSED(widget);
 
     float xpos = 0;
-    float timeScale = 50 / float(m_timeScale);
+    float timeUnit = 50.0 / float(getTimeScale());
 
     ShowItem::paint(painter, option, widget);
 
-    int loopCount = m_function->duration() ? qFloor(m_function->duration() / m_efx->duration()) : 0;
+    int loopCount = 0;
+    if (getDuration() == Function::infiniteSpeed())
+        loopCount = 10000 / m_efx->duration();
+    else if (getDuration() > 0)
+        loopCount = qFloor(getDuration() / m_efx->duration());
+
     for (int i = 0; i < loopCount; i++)
     {
-        xpos += ((timeScale * float(m_efx->duration())) / 1000);
+        xpos += ((timeUnit * float(m_efx->duration())) / 1000);
         // draw loop vertical delimiter
         painter->setPen(QPen(Qt::white, 1));
         painter->drawLine(int(xpos), 1, int(xpos), TRACK_HEIGHT - 5);