Added filelist sorting by metadata key

Scott Klum
1 parent 2db5366c
Showing 5 changed files with 41 additions and 5 deletions
app/openbr-gui/initialize.cpp
app/openbr-gui/initialize.h
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
share/openbr/doc
@@ -20,13 +20,13 @@
 #include "initialize.h"
-void br_initialize_gui()
+void br_initialize_gui(const char *sdk_path)
 {
     Q_INIT_RESOURCE(icons);
     qRegisterMetaType<br::File>("br::File");
     qRegisterMetaType<br::FileList>("br::FileList");
     qRegisterMetaType<br::Template>("br::Template");
     qRegisterMetaType<br::TemplateList>("br::TemplateList");
-    br_initialize_qt();
+    br_initialize_qt(sdk_path);
     br_set_property("log", qPrintable(QString("%1/log.txt").arg(br_scratch_path())));
 }
@@ -19,6 +19,6 @@
 #include <openbr_export.h>
-BR_EXPORT_GUI void br_initialize_gui();
+BR_EXPORT_GUI void br_initialize_gui(const char *sdk_path = "");
 #endif // __INITIALIZE_H
@@ -26,6 +26,8 @@
 #endif // BR_DISTRIBUTED
 #include <openbr_plugin.h>
+#include <algorithm>
+
 #include "version.h"
 #include "core/bee.h"
 #include "core/common.h"
@@ -357,6 +359,38 @@ QStringList FileList::names() const
     return names;
 }
+typedef std::pair<std::string,int> metadataPair;
+bool comparator( const metadataPair &l, const metadataPair &r)
+{
+    return l.first < r.first;
+}
+
+void FileList::sort(const QString& key)
+{
+    std::vector<metadataPair> metadata;
+
+    int i = 0;
+
+    foreach (const File &file, *this)
+    {
+        metadataPair pair = std::make_pair(file.get(key).toString().toStdString().c_str(), i);
+        metadata.push_back(pair);
+        i++;
+    }
+
+    std::sort(metadata.begin(), metadata.end(), comparator);
+
+    for (int j = 0; j < metadata.size(); j++)
+    {
+        this->push_back(this->at(metadata[j].second));
+    }
+
+    iterator half = this->begin();
+    half += metadata.size();
+
+    this->erase(this->begin(), half);
+}
+
 QList<float> FileList::labels() const
 {
     QList<float> labels;
@@ -118,7 +118,7 @@ void reset_##NAME() { NAME = DEFAULT; }
  * ---             | ----           | -----------
  * path            | QString        | Resolve complete file paths from file names
  * enrollAll       | bool           | Enroll zero or more templates per file
- * separator       | QString        | Sperate #name into multiple files
+ * separator       | QString        | Seperate #name into multiple files
  * Input_Index     | int            | Index of a template in a template list
  * Label           | float          | Classification/Regression class
  * Confidence      | float          | Classification/Regression quality
@@ -135,6 +135,7 @@ void reset_##NAME() { NAME = DEFAULT; }
  * Yaw             | float          | Pose
  * Landmarks       | QList<QPointF> | Landmark list
  * ROIs            | QList<Rect>    | Region Of Interest (ROI) list
+ * Age             | QString        | Age used for demographic filtering
  * _*              | *              | Reserved for internal use
  */
 struct BR_EXPORT File
@@ -239,6 +240,7 @@ struct BR_EXPORT FileList : public QList&lt;File&gt;
     QStringList flat() const; /*!< \brief Returns br::File::flat() for each file in the list. */
     QStringList names() const; /*!<  \brief Returns #br::File::name for each file in the list. */
+    void sort(const QString& key); /*!<  \brief Sort the list based on metadata. */
     QList<float> labels() const; /*!< \brief Returns br::File::label() for each file in the list. */
     int failures() const; /*!< \brief Returns the number of files with br::File::failed(). */
 };
-Subproject commit 504960df12db25e09c39ab098fb8614c1db51617
+Subproject commit 1031e9e416427f5dd8e9f4e7ff4dd74632626c22