From 3289608e4f5a9dc91633d695787f0c728f5cd4a8 Mon Sep 17 00:00:00 2001
From: Josh Klontz <Joshua.Klontz@noblis.org>
Date: Mon, 14 Apr 2014 15:23:34 -0400
Subject: [PATCH] moved turkGallery to turk.cpp

---
 openbr/plugins/gallery.cpp | 66 ------------------------------------------------------------------
 openbr/plugins/turk.cpp    | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/openbr/plugins/gallery.cpp b/openbr/plugins/gallery.cpp
index d3187a8..e1e2144 100644
--- a/openbr/plugins/gallery.cpp
+++ b/openbr/plugins/gallery.cpp
@@ -1019,72 +1019,6 @@ class landmarksGallery : public Gallery
 
 BR_REGISTER(Gallery, landmarksGallery)
 
-/*!
- * \ingroup galleries
- * \brief Treats each line as a file.
- * \author Josh Klontz \cite jklontz
- *
- * Columns should be comma separated with first row containing headers.
- * The first column in the file should be the path to the file to enroll.
- * Other columns will be treated as file metadata.
- *
- * \see txtGallery
- */
-class turkGallery : public Gallery
-{
-    Q_OBJECT
-;
-    TemplateList readBlock(bool *done)
-    {
-        *done = true;
-        TemplateList templates;
-        if (!file.exists()) return templates;
-
-        QStringList lines = QtUtils::readLines(file);
-        QRegExp regexp(",(?!(?:\\w+,?)+\\])");
-
-        QStringList headers;
-
-        if (!lines.isEmpty()) headers = lines.takeFirst().split(regexp);
-
-        foreach (const QString &line, lines) {
-            QStringList words = line.split(regexp);
-            if (words.size() != headers.size()) continue;
-            File f;
-            f.name = words[0];
-            f.set("Label", words[0].mid(0,5));
-
-            for (int i=1; i<words.size(); i++) {
-                QStringList categories = headers[i].split('[');
-                categories.last().chop(1); // Remove trailing bracket
-                QStringList types = categories.last().split(',');
-
-                QStringList ratings = words[i].split(',');
-                ratings.first() = ratings.first().mid(1); // Remove first bracket
-                ratings.last().chop(1); // Remove trailing bracket
-
-                if (types.size() != ratings.size()) continue;
-
-                QMap<QString,QVariant> categoryMap;
-                for (int j=0; j<types.size(); j++) categoryMap.insert(types[j],ratings[j]);
-
-                f.set(categories[0], categoryMap);
-            }
-            templates.append(f);
-        }
-
-        return templates;
-    }
-
-    void write(const Template &t)
-    {
-        (void)t;
-        qFatal("turkGallery write not implemented.");
-    }
-};
-
-BR_REGISTER(Gallery, turkGallery)
-
 #ifdef CVMATIO
 
 using namespace cv;
diff --git a/openbr/plugins/turk.cpp b/openbr/plugins/turk.cpp
index 3898307..1061237 100644
--- a/openbr/plugins/turk.cpp
+++ b/openbr/plugins/turk.cpp
@@ -1,8 +1,68 @@
 #include "openbr_internal.h"
+#include "openbr/core/qtutils.h"
 
 namespace br
 {
 
+/*!
+ * \ingroup galleries
+ * \brief For Amazon Mechanical Turk datasets
+ * \author Scott Klum \cite sklum
+ */
+class turkGallery : public Gallery
+{
+    Q_OBJECT
+
+    TemplateList readBlock(bool *done)
+    {
+        *done = true;
+        TemplateList templates;
+        if (!file.exists()) return templates;
+
+        QStringList lines = QtUtils::readLines(file);
+        QRegExp regexp(",(?!(?:\\w+,?)+\\])");
+
+        QStringList headers;
+
+        if (!lines.isEmpty()) headers = lines.takeFirst().split(regexp);
+
+        foreach (const QString &line, lines) {
+            QStringList words = line.split(regexp);
+            if (words.size() != headers.size()) continue;
+            File f;
+            f.name = words[0];
+            f.set("Label", words[0].mid(0,5));
+
+            for (int i=1; i<words.size(); i++) {
+                QStringList categories = headers[i].split('[');
+                categories.last().chop(1); // Remove trailing bracket
+                QStringList types = categories.last().split(',');
+
+                QStringList ratings = words[i].split(',');
+                ratings.first() = ratings.first().mid(1); // Remove first bracket
+                ratings.last().chop(1); // Remove trailing bracket
+
+                if (types.size() != ratings.size()) continue;
+
+                QMap<QString,QVariant> categoryMap;
+                for (int j=0; j<types.size(); j++) categoryMap.insert(types[j],ratings[j]);
+
+                f.set(categories[0], categoryMap);
+            }
+            templates.append(f);
+        }
+
+        return templates;
+    }
+
+    void write(const Template &)
+    {
+        qFatal("turkGallery write not implemented.");
+    }
+};
+
+BR_REGISTER(Gallery, turkGallery)
+
 static Template unmap(const Template &t, const QString& variable, const float maxVotes, const float maxRange, const float minRange, const bool classify, const bool consensusOnly) {
     // Create a new template matching the one containing the votes in the map structure
     // but remove the map structure
--
libgit2 0.21.4