diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 223cc47..8b47e5e 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -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", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep); + 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->currentProgress); fflush(stderr); } } diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h index cb31430..4413f66 100644 --- a/openbr/openbr_plugin.h +++ b/openbr/openbr_plugin.h @@ -695,8 +695,6 @@ 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) diff --git a/openbr/plugins/gallery.cpp b/openbr/plugins/gallery.cpp index 1fc9ff6..55fc576 100644 --- a/openbr/plugins/gallery.cpp +++ b/openbr/plugins/gallery.cpp @@ -145,7 +145,6 @@ class BinaryGallery : public Gallery gallery.seek(0); TemplateList templates; - qDebug() << "testing..."; while ((templates.size() < readBlockSize) && !gallery.atEnd()) { const Template t = readTemplate(); if (!t.isEmpty() || !t.file.isNull()) { diff --git a/openbr/plugins/misc.cpp b/openbr/plugins/misc.cpp index 86bce8e..ba78591 100644 --- a/openbr/plugins/misc.cpp +++ b/openbr/plugins/misc.cpp @@ -661,7 +661,6 @@ class ProgressCounterTransform : public TimeVaryingTransform Globals->currentProgress = dst[i].file.get("progress",0); dst[i].file.remove("progress"); - Globals->currentStep++; last_frame = frame; } } @@ -684,11 +683,10 @@ class ProgressCounterTransform : public TimeVaryingTransform { (void) data; float p = br_progress(); - 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); + 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->currentProgress); timer.start(); Globals->startTime.start(); - Globals->currentStep = 0; - Globals->currentProgress = 0; + Globals->currentProgress = totalProgress; Globals->totalSteps = totalProgress; } @@ -696,7 +694,6 @@ class ProgressCounterTransform : public TimeVaryingTransform { timer.start(); Globals->startTime.start(); - Globals->currentStep = 0; Globals->currentProgress = 0; Globals->totalSteps = totalProgress; }