Merge pull request #392 from biometrics/utility_update

Utility Update

Merge pull request #392 from biometrics/utility_update
Utility Update
Scott Klum
2 parents 7b34a1cb 8c9d9957
Showing 5 changed files with 41 additions and 36 deletions
openbr/core/qtutils.cpp
openbr/core/qtutils.h
openbr/gui/utility.cpp
openbr/gui/utility.h
openbr/plugins/gallery/empty.cpp
@@ -38,38 +38,6 @@ using namespace br;
 namespace QtUtils
 {
-QStringList getFiles(QDir dir, bool recursive)
-{
-    dir = QDir(dir.canonicalPath());
-
-    QStringList files;
-    foreach (const QString &file, naturalSort(dir.entryList(QDir::Files)))
-        files.append(dir.absoluteFilePath(file));
-
-    if (!recursive) return files;
-
-    foreach (const QString &folder, naturalSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
-        QDir subdir(dir);
-        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
-        files.append(getFiles(subdir, true));
-    }
-    return files;
-}
-
-QStringList getFiles(const QString &regexp)
-{
-    QFileInfo fileInfo(regexp);
-    QDir dir(fileInfo.dir());
-    QRegExp re(fileInfo.fileName());
-    re.setPatternSyntax(QRegExp::Wildcard);
-
-    QStringList files;
-    foreach (const QString &fileName, dir.entryList(QDir::Files))
-        if (re.exactMatch(fileName))
-            files.append(dir.filePath(fileName));
-    return files;
-}
-
 QStringList readLines(const QString &file)
 {
     QStringList lines;
@@ -34,8 +34,6 @@
 namespace QtUtils
 {
     /**** File Utilities ****/
-    QStringList getFiles(QDir dir, bool recursive);
-    QStringList getFiles(const QString &regexp);
     QStringList readLines(const QString &file);
     void readFile(const QString &file, QStringList &lines);
     void readFile(const QString &file, QByteArray &data, bool uncompress = false);
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
+#include <openbr/core/qtutils.h>
 #include "utility.h"
 using namespace cv;
@@ -45,3 +46,35 @@ QImage br::toQImage(const Mat &amp;mat)
     return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
 }
+
+QStringList br::getFiles(QDir dir, bool recursive)
+{
+    dir = QDir(dir.canonicalPath());
+
+    QStringList files;
+    foreach (const QString &file, QtUtils::naturalSort(dir.entryList(QDir::Files)))
+        files.append(dir.absoluteFilePath(file));
+
+    if (!recursive) return files;
+
+    foreach (const QString &folder, QtUtils::naturalSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
+        QDir subdir(dir);
+        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
+        files.append(getFiles(subdir, true));
+    }
+    return files;
+}
+
+QStringList br::getFiles(const QString &regexp)
+{
+    QFileInfo fileInfo(regexp);
+    QDir dir(fileInfo.dir());
+    QRegExp re(fileInfo.fileName());
+    re.setPatternSyntax(QRegExp::Wildcard);
+
+    QStringList files;
+    foreach (const QString &fileName, dir.entryList(QDir::Files))
+        if (re.exactMatch(fileName))
+            files.append(dir.filePath(fileName));
+    return files;
+}
@@ -2,6 +2,9 @@
 #define BR_UTILITY_H
 #include <QImage>
+#include <QStringList>
+#include <QDir>
+
 #include <opencv2/core/core.hpp>
 #include <openbr/openbr_export.h>
@@ -9,6 +12,8 @@ namespace br
 {
 BR_EXPORT QImage toQImage(const cv::Mat &mat);
+BR_EXPORT QStringList getFiles(QDir dir, bool recursive);
+BR_EXPORT QStringList getFiles(const QString &regexp);
 } // namespace br
@@ -18,6 +18,7 @@
 #include <openbr/plugins/openbr_internal.h>
 #include <openbr/core/qtutils.h>
+#include <openbr/gui/utility.h>
 namespace br
 {
@@ -67,7 +68,7 @@ class EmptyGallery : public Gallery
             templates.append(future.result());
         // Add root folder
-        foreach (const QString &fileName, QtUtils::getFiles(file.name, false))
+        foreach (const QString &fileName, getFiles(file.name, false))
             templates.append(File(fileName, dir.dirName()));
         if (!regexp.isEmpty()) {
@@ -112,7 +113,7 @@ class EmptyGallery : public Gallery
     static TemplateList getTemplates(const QDir &dir)
     {
-        const QStringList files = QtUtils::getFiles(dir, true);
+        const QStringList files = getFiles(dir, true);
         TemplateList templates; templates.reserve(files.size());
         foreach (const QString &file, files)
             templates.append(File(file, dir.dirName()));