Commit 6e514de344a0bea80ff5e0ac2465cda4fb52c530
1 parent
d8ff49d5
Fixed progress percentage output
Showing
2 changed files
with
3 additions
and
2 deletions
openbr/core/core.cpp
| @@ -148,7 +148,8 @@ struct AlgorithmCore | @@ -148,7 +148,8 @@ struct AlgorithmCore | ||
| 148 | if (data.empty()) | 148 | if (data.empty()) |
| 149 | return files; | 149 | return files; |
| 150 | 150 | ||
| 151 | - // Store totalSteps for ProgressCounter | 151 | + // Store steps for ProgressCounter |
| 152 | + Globals->currentStep = 0; | ||
| 152 | Globals->totalSteps = data.length(); | 153 | Globals->totalSteps = data.length(); |
| 153 | 154 | ||
| 154 | // Trust me, this makes complete sense. | 155 | // Trust me, this makes complete sense. |
openbr/plugins/misc.cpp
| @@ -522,7 +522,7 @@ class ProgressCounterTransform : public TimeVaryingTransform | @@ -522,7 +522,7 @@ class ProgressCounterTransform : public TimeVaryingTransform | ||
| 522 | float p = br_progress(); | 522 | float p = br_progress(); |
| 523 | int s = br_time_remaining(); | 523 | int s = br_time_remaining(); |
| 524 | 524 | ||
| 525 | - fprintf(stderr, "%05.2f%% ELAPSED=%s REMAINING=%s COUNT=%g \r", p, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep); | 525 | + fprintf(stderr, "%05.2f%% ELAPSED=%s REMAINING=%s COUNT=%g \r", p*100., QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep); |
| 526 | 526 | ||
| 527 | timer.start(); | 527 | timer.start(); |
| 528 | } | 528 | } |