Using printStatus() for deduplication progress

Scott Klum
1 parent 4f2f80e2
Showing 2 changed files with 5 additions and 7 deletions
openbr/core/core.cpp
openbr/plugins/misc.cpp
@@ -272,22 +272,20 @@ struct AlgorithmCore
             for (int j=0; j<i; j++) {
                 float score = distance->compare(t[i], t[j]);
                 if (score >= threshold) {
-                    qDebug() << t[i].file.baseName() << t[j].file.baseName() << score << i;
                     duplicates.append(i);
+                    break;
                 }
             }
+            Globals->currentStep++;
+            Globals->printStatus();
         }
  
         std::sort(duplicates.begin(),duplicates.end(),std::greater<float>());
  
         qDebug("\n%d duplicates removed.", duplicates.size());
  
-        qDebug() << duplicates;
-
-        for (int i=0; i<duplicates.size(); i++) {
-            qDebug() << "Removing" << inputFiles.at(duplicates[i]);
+        for (int i=0; i<duplicates.size(); i++)
             inputFiles.removeAt(duplicates[i]);
-        }
  
         QScopedPointer<Gallery> o(Gallery::make(outputGallery));
  
@@ -537,7 +537,7 @@ class ProgressCounterTransform : public TimeVaryingTransform
     {
         (void) data;
         float p = br_progress();
-        qDebug("%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100., QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
+        qDebug("%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
     }
  
     void init()