Reverted to the old progress display

Scott Klum
1 parent 5e7ee449
Showing 4 changed files with 12 additions and 4 deletions
openbr/gui/progress.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/misc.cpp
@@ -27,7 +27,7 @@ br::Progress::Progress(QWidget *parent)
 void br::Progress::checkProgress()
 {
     const int progress = 100 * br_progress();
-    const bool visible = progress >= 0 && progress < 100;
+    const bool visible = progress > 0 && progress < 100;
     if (visible) {
         showMessage(Globals->mostRecentMessage);
@@ -937,7 +937,7 @@ void br::Context::printStatus()
     const float p = progress();
     if (p < 1) {
         int s = timeRemaining();
-        fprintf(stderr,"\r%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentProgress, Globals->totalSteps);
+        fprintf(stderr,"\r%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep);
         fflush(stderr);
     }
 }
@@ -696,6 +696,9 @@ public:
      * \brief Used internally to compute progress() and timeRemaining().
      */
+    Q_PROPERTY(double currentStep READ get_currentStep WRITE set_currentStep RESET reset_currentStep)
+    BR_PROPERTY(double, currentStep, 0)
+
     Q_PROPERTY(double currentProgress READ get_currentProgress WRITE set_currentProgress RESET reset_currentProgress)
     BR_PROPERTY(double, currentProgress, 0)
@@ -663,6 +663,8 @@ class ProgressCounterTransform : public TimeVaryingTransform
                 Globals->currentProgress = dst[i].file.get<qint64>("progress",0)+1;
                 dst[i].file.remove("progress");
                 last_frame = frame;
+
+                Globals->currentStep++;
             }
         }
@@ -684,10 +686,12 @@ class ProgressCounterTransform : public TimeVaryingTransform
     {
         (void) data;
         float p = br_progress();
-        Globals->currentProgress = totalProgress;
-        qDebug("\r%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), Globals->currentProgress, Globals->totalSteps);
+        qDebug("\r%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), Globals->currentStep);
         timer.start();
         Globals->startTime.start();
+        Globals->currentStep = 0;
+        Globals->currentProgress = 0;
+        Globals->totalSteps = totalProgress;
     }
     void init()
@@ -695,6 +699,7 @@ class ProgressCounterTransform : public TimeVaryingTransform
         timer.start();
         Globals->startTime.start();
         Globals->currentProgress = 0;
+        Globals->currentStep = 0;
         Globals->totalSteps = totalProgress;
     }