Almost have copying done, need to work out enums

Scott Klum
1 parent 83b596bd
Showing 4 changed files with 33 additions and 3 deletions
openbr/core/core.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/quality.cpp
openbr/plugins/stream.cpp
@@ -45,7 +45,7 @@ struct AlgorithmCore
         qDebug("Training on %s%s", qPrintable(input.flat()),
                model.isEmpty() ? "" : qPrintable(" to " + model));
  
-        QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream([Identity])", NULL));
+        QScopedPointer<Transform> trainingWrapper(Transform::make("DirectStream([Identity], readMode=DistributeFrames)", NULL));
         CompositeTransform * downcast = dynamic_cast<CompositeTransform *>(trainingWrapper.data());
         if (downcast == NULL)
             qFatal("downcast failed?");
 #ifndef OPENBR_INTERNAL_H
 #define OPENBR_INTERNAL_H
  
+#include <QMetaProperty>
+
 #include "openbr/openbr_plugin.h"
 #include "openbr/core/resource.h"
  
@@ -260,9 +262,27 @@ public:
         newTransform = true;
  
         QString name = metaObject()->className();
+
         name.replace("Transform","");
-        name += "([])";
+        name += "([";
+        name += "],";
+
+        QStringList parameters;
+
+        // Skip name and transforms (handled below)
+        for (int i = 2; i < metaObject()->propertyCount();i++) {
+            QMetaProperty property = metaObject()->property(i);
+            parameters.append(property.read(this).toString());
+        }
+
+        name += parameters.join(",");
+
+        name += ")";
+
         name.replace("br::","");
+
+        qDebug() << name;
+
         CompositeTransform * output = dynamic_cast<CompositeTransform *>(Transform::make(name, NULL));
  
         if (output == NULL)
@@ -179,6 +179,9 @@ class MatchProbabilityDistance : public Distance
             }
         }
  
+        qDebug() << "Genuines:" << genuineScores;
+        qDebug() << "Impostors:" << impostorScores;
+
         mp = MP(genuineScores, impostorScores);
     }
  
@@ -253,6 +253,8 @@ public:
  
     bool getNextTemplate(Template & output)
     {
+        qDebug() << "Next as video";
+
         if (!isOpen()) {
             qDebug("video source is not open");
             return false;
@@ -1058,7 +1060,9 @@ public:
         if (src.empty())
             return;
  
-        bool res = readStage->dataSource.open(src,readMode);
+        qDebug() << "Reading with mode:" << readMode;
+
+        bool res = readStage->dataSource.open(src,br::Idiocy::DistributeFrames);
         if (!res) {
             qDebug("stream failed to open %s", qPrintable(dst[0].file.name));
             return;
@@ -1206,6 +1210,8 @@ public:
         // And the collection stage points to the read stage, because this is
         // a ring buffer.
         collectionStage->nextStage = readStage;
+
+        qDebug() << "Init Readmode:" << readMode;
     }
  
     DirectStreamTransform()
@@ -1323,6 +1329,7 @@ public:
         basis.activeFrames = this->activeFrames;
         basis.readMode = this->readMode;
  
+                                   qDebug() << basis.readMode;
         // We need at least a CompositeTransform * to acess transform's children.
         CompositeTransform * downcast = dynamic_cast<CompositeTransform *> (transform);