Peter M. Groen / openbr

Commit 0e61c85959f6e13006841b1c0af4616b79ddd59e

Authored by Scott Klum
1 parent 34648949

Don't need currentStep since we are using currentProgress now

Inline Side-by-side
Showing 4 changed files with 3 additions and 9 deletions
openbr/openbr_plugin.cpp
  View file @0e61c85
... ... @@ -937,7 +937,7 @@ void br::Context::printStatus()
937 937 const float p = progress();
938 938 if (p < 1) {
939 939 int s = timeRemaining();
940   - 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);
  940 + 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);
941 941 fflush(stderr);
942 942 }
943 943 }
... ...
openbr/openbr_plugin.h
  View file @0e61c85
... ... @@ -695,8 +695,6 @@ public:
695 695 /*!
696 696 * \brief Used internally to compute progress() and timeRemaining().
697 697 */
698   - Q_PROPERTY(double currentStep READ get_currentStep WRITE set_currentStep RESET reset_currentStep)
699   - BR_PROPERTY(double, currentStep, 0)
700 698  
701 699 Q_PROPERTY(double currentProgress READ get_currentProgress WRITE set_currentProgress RESET reset_currentProgress)
702 700 BR_PROPERTY(double, currentProgress, 0)
... ...
openbr/plugins/gallery.cpp
  View file @0e61c85
... ... @@ -145,7 +145,6 @@ class BinaryGallery : public Gallery
145 145 gallery.seek(0);
146 146  
147 147 TemplateList templates;
148   - qDebug() << "testing...";
149 148 while ((templates.size() < readBlockSize) && !gallery.atEnd()) {
150 149 const Template t = readTemplate();
151 150 if (!t.isEmpty() || !t.file.isNull()) {
... ...
openbr/plugins/misc.cpp
  View file @0e61c85
... ... @@ -661,7 +661,6 @@ class ProgressCounterTransform : public TimeVaryingTransform
661 661  
662 662 Globals->currentProgress = dst[i].file.get<qint64>("progress",0);
663 663 dst[i].file.remove("progress");
664   - Globals->currentStep++;
665 664 last_frame = frame;
666 665 }
667 666 }
... ... @@ -684,11 +683,10 @@ class ProgressCounterTransform : public TimeVaryingTransform
684 683 {
685 684 (void) data;
686 685 float p = br_progress();
687   - 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);
  686 + 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);
688 687 timer.start();
689 688 Globals->startTime.start();
690   - Globals->currentStep = 0;
691   - Globals->currentProgress = 0;
  689 + Globals->currentProgress = totalProgress;
692 690 Globals->totalSteps = totalProgress;
693 691 }
694 692  
... ... @@ -696,7 +694,6 @@ class ProgressCounterTransform : public TimeVaryingTransform
696 694 {
697 695 timer.start();
698 696 Globals->startTime.start();
699   - Globals->currentStep = 0;
700 697 Globals->currentProgress = 0;
701 698 Globals->totalSteps = totalProgress;
702 699 }
... ...