Remove some special casing of label and some dated comments

Remove special casing of label in cache, and getCSVElement

Remove some special casing of label and some dated comments
Remove special casing of label in cache, and getCSVElement
Charles Otto
1 parent 4fd55360
Showing 5 changed files with 3 additions and 9 deletions
openbr/frvt2012.cpp
openbr/openbr_plugin.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/gallery.cpp
openbr/plugins/meta.cpp
@@ -141,7 +141,6 @@ int32_t SdkEstimator::estimate_gender(const ONEFACE &amp;input_face, int8_t &amp;gender,
     TemplateList templates;
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_gender_transform.data();
-    // TODO: lookup gender strings/expected int outputs -cao
     mf = gender = templates.first().file.get<QString>("Subject") == "Male" ? 0 : 1;
     return templates.first().file.failed() ? 4 : 0;
 }
@@ -434,7 +434,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
 }
 // indexes some property, assigns an integer id to each unique value of propName
-// stores the index values in "Label" of the output template list -cao
+// stores the index values in "Label" of the output template list
 TemplateList TemplateList::relabel(const TemplateList &tl, const QString & propName)
 {
     const QList<QString> originalLabels = tl.get<QString>(propName);
@@ -329,7 +329,7 @@ class LDATransform : public Transform
     void train(const TemplateList &_trainingSet)
     {
-        // creates "Label" -cao
+        // creates "Label"
         TemplateList trainingSet = TemplateList::relabel(_trainingSet, "Subject");
         int instances = trainingSet.size();
@@ -517,10 +517,7 @@ class csvGallery : public Gallery
     static QString getCSVElement(const QString &key, const QVariant &value, bool header)
     {
-        if ((key == "Label") && !header) {
-            // problem -cao
-            return value.value<QString>();
-        } else if (value.canConvert<QString>()) {
+        if (value.canConvert<QString>()) {
             if (header) return key;
             else        return value.value<QString>();
         } else if (value.canConvert<QPointF>()) {
@@ -453,8 +453,6 @@ private:
         const QString &file = src.file;
         if (cache.contains(file)) {
             dst = cache[file];
-            // don't get this -cao
-//            dst.file.set("Label", src.file.value("Label"));
         } else {
             transform->project(src, dst);
             cacheLock.lock();