From 06ef43c77f286f64adc1f90020d51fb3b982d29a Mon Sep 17 00:00:00 2001
From: Stian Skjelstad <stian.skjelstad@gmail.com>
Date: Sun, 30 Dec 2018 23:57:30 +0100
Subject: [PATCH] Fix #3697

We need to initialize progressTime for given number of step-operations too,
else the filter that checks for X ms between each refresh update will always
fail, due to time-difference being way out of range.

Also, 10 updates per second is not a lot, since we also filter out the
QT event loop for long operations performed in the main thread.
---
 src/Gui/ProgressBar.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp
index 443c761b17..f12641cf48 100644
--- a/src/Gui/ProgressBar.cpp
+++ b/src/Gui/ProgressBar.cpp
@@ -132,19 +132,14 @@ void Sequencer::startStep()
     if (thr != currentThread) {
         d->guiThread = false;
         d->bar->setRange(0, (int)nTotalSteps);
-        if (nTotalSteps == 0) {
-            d->progressTime.start();
-        }
+        d->progressTime.start();
         d->measureTime.start();
         QMetaObject::invokeMethod(d->bar, "aboutToShow", Qt::QueuedConnection);
     }
     else {
         d->guiThread = true;
         d->bar->setRange(0, (int)nTotalSteps);
-        if (nTotalSteps == 0) {
-            d->progressTime.start();
-        }
-
+        d->progressTime.start();
         d->measureTime.start();
         d->waitCursor = new Gui::WaitCursor;
         d->bar->enterControlEvents();
@@ -194,8 +189,8 @@ void Sequencer::setValue(int step)
     // if number of total steps is unknown then increment only by one
     if (nTotalSteps == 0) {
         int elapsed = d->progressTime.elapsed();
-        // allow an update every 500 milliseconds only
-        if (elapsed > 500) {
+        // allow an update every 100 milliseconds only
+        if (elapsed > 100) {
             d->progressTime.restart();
             if (thr != currentThread) {
                 QMetaObject::invokeMethod(d->bar, "setValue", Qt::/*Blocking*/QueuedConnection,
@@ -208,13 +203,10 @@ void Sequencer::setValue(int step)
         }
     }
     else {
-        // FIXME: This check causes the progress bar
-        // to never appear when loading a STEP file
-#if 1
         int elapsed = d->progressTime.elapsed();
+        // allow an update every 100 milliseconds only
         if (elapsed > 100) {
             d->progressTime.restart();
-#endif
             if (thr != currentThread) {
                 QMetaObject::invokeMethod(d->bar, "setValue", Qt::/*Blocking*/QueuedConnection,
                 QGenericReturnArgument(), Q_ARG(int,step));
@@ -228,9 +220,7 @@ void Sequencer::setValue(int step)
                 d->bar->resetObserveEventFilter();
                 qApp->processEvents();
             }
-#if 1
         }
-#endif
     }
 }