Don't need currentStep since we are using currentProgress now

Scott Klum
1 parent 34648949
Showing 4 changed files with 3 additions and 9 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/gallery.cpp
openbr/plugins/misc.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);
     }
 }
@@ -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)
@@ -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()) {
@@ -661,7 +661,6 @@ class ProgressCounterTransform : public TimeVaryingTransform
                 Globals->currentProgress = dst[i].file.get<qint64>("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;
     }