diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp index 948aec1..f5c48ff 100644 --- a/openbr/core/core.cpp +++ b/openbr/core/core.cpp @@ -81,7 +81,7 @@ struct AlgorithmCore store(model); } - qDebug("Training Time: %s", qPrintable(QtUtils::toTime(Globals->startTime.elapsed()))); + qDebug("Training Time: %s", qPrintable(QtUtils::toTime(Globals->startTime.elapsed()/1000.0f))); } void store(const QString &model) const @@ -184,6 +184,7 @@ struct AlgorithmCore wrapper->projectUpdate(data,data); files.append(data.files()); + return files; } diff --git a/openbr/gui/progress.cpp b/openbr/gui/progress.cpp index 8aa30f5..fbe2bf6 100644 --- a/openbr/gui/progress.cpp +++ b/openbr/gui/progress.cpp @@ -1,5 +1,4 @@ #include -#include #include "progress.h" @@ -20,7 +19,7 @@ br::Progress::Progress(QWidget *parent) addPermanentWidget(&pbProgress); addPermanentWidget(&lTimeRemaining); connect(&timer, SIGNAL(timeout()), this, SLOT(checkProgress())); - timer.start(5000); + timer.start(1000); } /*** PRIVATE SLOTS ***/ @@ -34,8 +33,19 @@ void br::Progress::checkProgress() pbProgress.setValue(progress); if (progress > 100) pbProgress.setMaximum(0); else pbProgress.setMaximum(100); + + int s = br_time_remaining(); + if (s >= 0) { + int h = s / (60*60); + int m = (s - h*60*60) / 60; + s = (s - h*60*60 - m*60); + lTimeRemaining.setText(QString("%1:%2:%3").arg(h, 2, 10, QLatin1Char('0')).arg(m, 2, 10, QLatin1Char('0')).arg(s, 2, 10, QLatin1Char('0'))); + } else { + lTimeRemaining.clear(); + } } else { clearMessage(); + lTimeRemaining.clear(); } pbProgress.setVisible(visible); diff --git a/openbr/plugins/misc.cpp b/openbr/plugins/misc.cpp index fec8319..9c25c63 100644 --- a/openbr/plugins/misc.cpp +++ b/openbr/plugins/misc.cpp @@ -565,8 +565,7 @@ class ProgressCounterTransform : public TimeVaryingTransform qint64 elapsed = timer.elapsed(); calls++; set_calls++; - - // Updated every 5 seconds + // updated every 10 seconds if (elapsed > 5 * 1000) { float f_elapsed = elapsed / 1000.0f; // remaining calls (according to our input variable) @@ -579,11 +578,7 @@ class ProgressCounterTransform : public TimeVaryingTransform // seconds remaining int s = float(remaining) / speed; - // Output some timing information - qDebug("%05.2f%% ELAPSED=%s REMAINING=%s COUNT=%g \r", p, qPrintable(QtUtils::toTime(Globals->startTime.elapsed()/1000.0f)), qPrintable(QtUtils::toTime(s)), float(calls)); - - // Set globals - Globals->currentStep = calls; + 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(), float(calls)); timer.start(); set_calls = 0; diff --git a/openbr/plugins/stream.cpp b/openbr/plugins/stream.cpp index 0679746..dce0d7a 100644 --- a/openbr/plugins/stream.cpp +++ b/openbr/plugins/stream.cpp @@ -1075,9 +1075,13 @@ public: final_output.append(output_set); } + // Clear dst, since we set it to src so that the datasource could open it + dst.clear(); + // dst is set to all output received by the final stage, along // with anything output via the calls to finalize. //dst = collectionStage->getOutput(); + foreach(const TemplateList & list, collector->sets) { dst.append(list); }