Peter M. Groen / openbr

Commit 8813ca47a71388b6f6723424e5521db56bf85025

Authored by Scott Klum
1 parent fdfdd566

Attempting to get consistent progress messages across br

Inline Side-by-side
Showing 2 changed files with 2 additions and 6 deletions
openbr/openbr_plugin.cpp
  View file @8813ca4
... ... @@ -863,7 +863,7 @@ void br::Context::printStatus()
863 863 const float p = progress();
864 864 if (p < 1) {
865 865 int s = timeRemaining();
866   - fprintf(stderr, "%05.2f%% REMAINING=%s COUNT=%g \r", 100 * p, QtUtils::toTime(s/1000.0f).toStdString().c_str(), totalSteps);
  866 + 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);
867 867 }
868 868 }
869 869  
... ...
openbr/plugins/misc.cpp
  View file @8813ca4
... ... @@ -519,11 +519,7 @@ class ProgressCounterTransform : public TimeVaryingTransform
519 519  
520 520 // updated every second
521 521 if (elapsed > 1000) {
522   - float p = br_progress();
523   - int s = br_time_remaining();
524   -
525   - 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);
526   -
  522 + Globals->printStatus();
527 523 timer.start();
528 524 }
529 525  
... ...