Attempting to get consistent progress messages across br

Scott Klum
1 parent fdfdd566
Showing 2 changed files with 2 additions and 6 deletions
openbr/openbr_plugin.cpp
openbr/plugins/misc.cpp
@@ -863,7 +863,7 @@ void br::Context::printStatus()
     const float p = progress();
     if (p < 1) {
         int s = timeRemaining();
-        fprintf(stderr, "%05.2f%%  REMAINING=%s  COUNT=%g  \r", 100 * p, QtUtils::toTime(s/1000.0f).toStdString().c_str(), totalSteps);
+        fprintf(stderr, "%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100., QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
     }
 }
@@ -519,11 +519,7 @@ class ProgressCounterTransform : public TimeVaryingTransform
         // updated every second
         if (elapsed > 1000) {
-            float p = br_progress();
-            int s = br_time_remaining();
-
-            fprintf(stderr, "%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100., QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
-
+            Globals->printStatus();
             timer.start();
         }