Merge branch 'master' of https://github.com/biometrics/openbr

Brendan Klare
2 parents f0af46eb e34a4ded
Showing 21 changed files with 410 additions and 119 deletions
CMakeLists.txt
openbr/core/core.cpp
openbr/core/fuse.cpp
openbr/gui/progress.cpp
openbr/gui/utility.cpp
openbr/gui/utility.h
openbr/janus
openbr/janus.cpp
openbr/openbr.cpp
openbr/openbr.h
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/distance.cpp
openbr/plugins/gallery.cpp
openbr/plugins/gui.cpp
openbr/plugins/independent.cpp
openbr/plugins/misc.cpp
openbr/plugins/quality.cpp
openbr/plugins/slidingwindow.cpp
openbr/plugins/validate.cpp
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.9)
 # Global settings
 set(BR_SHARE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/share/openbr")
+set(BR_SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
 set(CMAKE_AUTOMOC ON)
 set(CPACK_PACKAGE_NAME "OpenBR")
 set(CPACK_PACKAGE_VENDOR "OpenBiometrics")
@@ -117,7 +118,7 @@ if(BUILD_TESTING)
 endif()
 # Build the SDK
-include_directories(.)
+include_directories(BEFORE .) # Find the local headers first
 add_subdirectory(openbr)
 # Build applications
@@ -138,6 +139,14 @@ install(FILES CHANGELOG.md LICENSE.txt README.md DESTINATION .)
 install(DIRECTORY share DESTINATION .)
 install(DIRECTORY ${BR_THIRDPARTY_SHARE} DESTINATION share)
+# install brpy
+option(BR_INSTALL_BRPY "Install brpy, the Python wrapper to the C API (requires Python)")
+if(${BR_INSTALL_BRPY})
+  find_package(PythonInterp REQUIRED)
+  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import site, sys; sys.stdout.write(site.getsitepackages()[-1])" OUTPUT_VARIABLE PYTHON_SITE_DIR)
+  install(DIRECTORY ${BR_SCRIPTS_DIR}/brpy DESTINATION ${PYTHON_SITE_DIR})
+endif()
+
 # Package
 set(CPACK_PACKAGE_EXECUTABLES "OpenBR" "OpenBR")
 set(CPACK_CREATE_DESKTOP_LINKS "OpenBR")
@@ -56,11 +56,6 @@ struct AlgorithmCore
         TemplateList data(TemplateList::fromGallery(input));
-        // set the Train bool metadata, in case a Transform's project
-        // needs to know if it's called during train or enroll
-        for (int i=0; i<data.size(); i++)
-            data[i].file.set("Train", true);
-
         if (transform.isNull()) qFatal("Null transform.");
         qDebug("%d Training Files", data.size());
@@ -153,9 +148,12 @@ struct AlgorithmCore
         if (data.empty())
             return files;
+        // Store steps for ProgressCounter
+        Globals->currentStep = 0;
+        Globals->totalSteps = data.length();
+
         // Trust me, this makes complete sense.
         // We're just going to make a pipe with a placeholder first transform
-        Globals->totalSteps = data.length();
         QString pipeDesc = "Identity+GalleryOutput("+gallery.flat()+")+ProgressCounter("+QString::number(data.length())+")+Discard";
         QScopedPointer<Transform> basePipe(Transform::make(pipeDesc,NULL));
@@ -430,6 +428,13 @@ void br::Compare(const File &amp;targetGallery, const File &amp;queryGallery, const File
     AlgorithmManager::getAlgorithm(output.get<QString>("algorithm"))->compare(targetGallery, queryGallery, output);
 }
+void br::CompareTemplateLists(const TemplateList &target, const TemplateList &query, Output *output)
+{
+    QString alg = output->file.get<QString>("algorithm");
+    QSharedPointer<Distance> dist = Distance::fromAlgorithm(alg);
+    dist->compare(target, query, output);
+}
+
 void br::PairwiseCompare(const File &targetGallery, const File &queryGallery, const File &output)
 {
     AlgorithmManager::getAlgorithm(output.get<QString>("algorithm"))->pairwiseCompare(targetGallery, queryGallery, output);
@@ -456,7 +461,7 @@ void br::Convert(const File &amp;fileType, const File &amp;inputFile, const File &amp;output
         if ((targetFiles.size() != m.cols || queryFiles.size() != m.rows)
             && (m.cols != 1 || targetFiles.size() != m.rows || queryFiles.size() != m.rows))
-            qFatal("Similarity matrix and file size mismatch.");
+            qFatal("Similarity matrix (%d, %d) and header (%d, %d) size mismatch.", m.rows, m.cols, queryFiles.size(), targetFiles.size());
         QSharedPointer<Output> o(Factory<Output>::make(outputFile));
         o->initialize(targetFiles, queryFiles);
@@ -30,6 +30,9 @@ using namespace cv;
 static void normalizeMatrix(Mat &matrix, const Mat &mask, const QString &method)
 {
+    if (matrix.rows != mask.rows && matrix.cols != mask.cols)
+        qFatal("Similarity matrix (%d, %d) and mask (%d, %d) size mismatch.", matrix.rows, matrix.cols, mask.rows, mask.cols);
+
     if (method == "None") return;
     QList<float> vals; vals.reserve(matrix.rows*matrix.cols);
@@ -26,7 +26,7 @@ br::Progress::Progress(QWidget *parent)
 void br::Progress::checkProgress()
 {
     const int progress = 100 * br_progress();
-    const bool visible = progress >= 0;
+    const bool visible = progress >= 0 && progress < 100;
     if (visible) {
         showMessage(br_most_recent_message());
-#include <QImage>
 #include <limits>
 #include <vector>
 #include <opencv2/imgproc/imgproc.hpp>
+#include "utility.h"
 using namespace cv;
-/**** STATIC ****/
-QImage toQImage(const Mat &mat)
+QImage br::toQImage(const Mat &mat)
 {
     // Convert to 8U depth
     Mat mat8u;
@@ -3,7 +3,13 @@
 #include <QImage>
 #include <opencv2/core/core.hpp>
+#include <openbr/openbr_export.h>
-QImage toQImage(const cv::Mat &mat);
+namespace br
+{
+
+BR_EXPORT QImage toQImage(const cv::Mat &mat);
+
+} // namespace br
 #endif // BR_UTILITY_H
-Subproject commit b79bdf71d86b1d5967fa636c6727bebf898cf2ed
+Subproject commit 0eaa00f19256fee2f24033ff68b526ea6320624d
@@ -80,7 +80,7 @@ janus_error janus_finalize_template(janus_incomplete_template incomplete_templat
             templateBytes = currentTemplateBytes;
         if (templateBytes != currentTemplateBytes)
             return JANUS_UNKNOWN_ERROR;
-        if (*bytes + templateBytes > JANUS_MAX_TEMPLATE_SIZE)
+        if (*bytes + templateBytes > janus_max_template_size())
             break;
         memcpy(pos, m.data, templateBytes);
         *bytes += templateBytes;
@@ -94,21 +94,49 @@ janus_error janus_finalize_template(janus_incomplete_template incomplete_templat
     return JANUS_SUCCESS;
 }
-janus_error janus_verify(const janus_template a, const janus_template b, float *similarity)
+janus_error janus_verify(const janus_template a, const size_t a_bytes, const janus_template b, const size_t b_bytes, double *similarity)
 {
-    size_t a_bytes, a_templates, b_bytes, b_templates;
-    a_bytes     = *(reinterpret_cast<size_t*>(a)+0);
+    (void) a_bytes;
+    (void) b_bytes;
+
+    size_t a_template_bytes, a_templates, b_template_bytes, b_templates;
+    a_template_bytes = *(reinterpret_cast<size_t*>(a)+0);
     a_templates = *(reinterpret_cast<size_t*>(a)+1);
-    b_bytes     = *(reinterpret_cast<size_t*>(b)+0);
+    b_template_bytes = *(reinterpret_cast<size_t*>(b)+0);
     b_templates = *(reinterpret_cast<size_t*>(b)+1);
-    if (a_bytes != b_bytes)
+    if (a_template_bytes != b_template_bytes)
         return JANUS_UNKNOWN_ERROR;
     float dist = 0;
     for (size_t i=0; i<a_templates; i++)
         for (size_t j=0; j<b_templates; j++)
-            dist += distance->compare(cv::Mat(1, a_bytes, CV_8UC1, a+2*sizeof(size_t)+i*a_bytes),
-                                      cv::Mat(1, b_bytes, CV_8UC1, b+2*sizeof(size_t)+i*b_bytes));
+            dist += distance->compare(cv::Mat(1, a_template_bytes, CV_8UC1, a+2*sizeof(size_t)+i*a_template_bytes),
+                                      cv::Mat(1, b_template_bytes, CV_8UC1, b+2*sizeof(size_t)+i*b_template_bytes));
     *similarity = a_templates * b_templates / dist;
     return JANUS_SUCCESS;
 }
+
+struct janus_incomplete_gallery_type
+{
+    QList< QPair<janus_template, janus_template_id> > templates;
+};
+
+janus_error janus_initialize_gallery(janus_incomplete_gallery *incomplete_gallery)
+{
+    *incomplete_gallery = new janus_incomplete_gallery_type();
+    return JANUS_SUCCESS;
+}
+
+janus_error janus_add_template(const janus_template template_, const size_t bytes, const janus_template_id template_id, janus_incomplete_gallery incomplete_gallery)
+{
+    (void) bytes;
+    incomplete_gallery->templates.append(QPair<janus_template, janus_template_id>(template_, template_id));
+    return JANUS_SUCCESS;
+}
+
+janus_error janus_finalize_gallery(janus_incomplete_gallery incomplete_gallery, const char *gallery_file)
+{
+    (void) incomplete_gallery;
+    (void) gallery_file;
+    return JANUS_SUCCESS;
+}
@@ -53,6 +53,12 @@ void br_compare(const char *target_gallery, const char *query_gallery, const cha
     Compare(File(target_gallery), File(query_gallery), File(output));
 }
+void br_compare_n(int num_targets, const char *target_galleries[], const char *query_gallery, const char *output)
+{
+    if (num_targets > 1) Compare(QtUtils::toStringList(num_targets, target_galleries).join(";")+"(separator=;)", File(query_gallery), File(output));
+    else                 Compare(File(target_galleries[0]), File(query_gallery), File(output));
+}
+
 void br_pairwise_compare(const char *target_gallery, const char *query_gallery, const char *output)
 {
     PairwiseCompare(File(target_gallery), File(query_gallery), File(output));
@@ -323,6 +329,14 @@ unsigned char *br_unload_img(br_template tmpl)
     return t->m().data;
 }
+br_template_list br_template_list_from_buffer(const char *buf, int len)
+{
+    QByteArray arr(buf, len);
+    TemplateList *tl = new TemplateList();
+    *tl = TemplateList::fromBuffer(arr);
+    return (br_template_list)tl;
+}
+
 void br_free_template(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -335,6 +349,12 @@ void br_free_template_list(br_template_list tl)
     delete realTL;
 }
+void br_free_output(br_matrix_output output)
+{
+    MatrixOutput *matOut = reinterpret_cast<MatrixOutput*>(output);
+    delete matOut;
+}
+
 int br_img_rows(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -359,6 +379,12 @@ bool br_img_is_empty(br_template tmpl)
     return t->m().empty();
 }
+const char* br_get_filename(br_template tmpl)
+{
+    Template *t = reinterpret_cast<Template*>(tmpl);
+    return t->file.name.toStdString().c_str();
+}
+
 void br_set_filename(br_template tmpl, const char *filename)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -391,6 +417,21 @@ void br_enroll_template_list(br_template_list tl)
     Enroll(*realTL);
 }
+br_matrix_output br_compare_template_lists(br_template_list target, br_template_list query)
+{
+    TemplateList *targetTL = reinterpret_cast<TemplateList*>(target);
+    TemplateList *queryTL = reinterpret_cast<TemplateList*>(query);
+    MatrixOutput *output = MatrixOutput::make(targetTL->files(), queryTL->files());
+    CompareTemplateLists(*targetTL, *queryTL, output);
+    return (br_matrix_output)output;
+}
+
+float br_get_matrix_output_at(br_matrix_output output, int row, int col)
+{
+    MatrixOutput *matOut = reinterpret_cast<MatrixOutput*>(output);
+    return matOut->data.at<float>(row, col);
+}
+
 br_template br_get_template(br_template_list tl, int index)
 {
     TemplateList *realTL = reinterpret_cast<TemplateList*>(tl);
@@ -412,7 +453,7 @@ br_gallery br_make_gallery(const char *gallery)
 br_template_list br_load_from_gallery(br_gallery gallery)
 {
     Gallery *gal = reinterpret_cast<Gallery*>(gallery);
-    TemplateList *tl = static_cast<TemplateList*>(malloc(sizeof(TemplateList)));
+    TemplateList *tl = new TemplateList();
     *tl = gal->read();
     return (br_template_list)tl;
 }
@@ -102,6 +102,12 @@ BR_EXPORT void br_combine_masks(int num_input_masks, const char *input_masks[], 
  */
 BR_EXPORT void br_compare(const char *target_gallery, const char *query_gallery, const char *output = "");
+/*!
+ * \brief Convenience function for comparing to multiple targets.
+ * \see br_compare
+ */
+BR_EXPORT void br_compare_n(int num_targets, const char *target_galleries[], const char *query_gallery, const char *output);
+
 BR_EXPORT void br_pairwise_compare(const char *target_gallery, const char *query_gallery, const char *output = "");
 /*!
@@ -437,6 +443,7 @@ BR_EXPORT void br_slave_process(const char * baseKey);
 typedef void* br_template;
 typedef void* br_template_list;
 typedef void* br_gallery;
+typedef void* br_matrix_output;
 /*!
   * \brief Load an image from a string buffer.
   *   Easy way to pass an image in memory from another programming language to openbr.
@@ -452,6 +459,12 @@ BR_EXPORT br_template br_load_img(const char *data, int len);
   */
 BR_EXPORT unsigned char* br_unload_img(br_template tmpl);
 /*!
+  * \brief Deserialize a br::TemplateList from a buffer.
+  *        Can be the buffer for a .gal file,
+  *        since they are just a TemplateList serialized to disk.
+  */
+BR_EXPORT br_template_list br_template_list_from_buffer(const char *buf, int len);
+/*!
   * \brief Free a br::Template's memory.
   */
 BR_EXPORT void br_free_template(br_template tmpl);
@@ -460,6 +473,10 @@ BR_EXPORT void br_free_template(br_template tmpl);
   */
 BR_EXPORT void br_free_template_list(br_template_list tl);
 /*!
+  * \brief Free a br::Output's memory.
+  */
+BR_EXPORT void br_free_output(br_matrix_output output);
+/*!
   * \brief Get the number of rows in an image.
   * \param tmpl Pointer to a br::Template.
   */
@@ -479,7 +496,11 @@ BR_EXPORT int br_img_channels(br_template tmpl);
   */
 BR_EXPORT bool br_img_is_empty(br_template tmpl);
 /*!
-  * \brief Set the filename for a template.
+  * \brief Get the filename for a br::Template
+  */
+BR_EXPORT const char* br_get_filename(br_template tmpl);
+/*!
+  * \brief Set the filename for a br::Template.
   */
 BR_EXPORT void br_set_filename(br_template tmpl, const char *filename);
 /*!
@@ -493,10 +514,19 @@ BR_EXPORT const char* br_get_metadata_string(br_template, const char *key);
 BR_EXPORT br_template_list br_enroll_template(br_template tmpl);
 /*!
   * \brief Enroll a br::TemplateList from the C API!
-  * \param tmpl Pointer to a br::TemplateList.
+  * \param tl Pointer to a br::TemplateList.
   */
 BR_EXPORT void br_enroll_template_list(br_template_list tl);
 /*!
+  * \brief Compare br::TemplateLists from the C API!
+  * \return Pointer to a br::MatrixOutput.
+  */
+BR_EXPORT br_matrix_output br_compare_template_lists(br_template_list target, br_template_list query);
+/*!
+  * \brief Get a value in the br::MatrixOutput.
+  */
+BR_EXPORT float br_get_matrix_output_at(br_matrix_output output, int row, int col);
+/*!
   * \brief Get a pointer to a br::Template at a specified index.
   * \param tl Pointer to a br::TemplateList.
   * \param index The index of the br::Template.
@@ -863,7 +863,7 @@ void br::Context::printStatus()
     const float p = progress();
     if (p < 1) {
         int s = timeRemaining();
-        fprintf(stderr, "%05.2f%%  REMAINING=%s  COUNT=%g  \r", 100 * p, QtUtils::toTime(s/1000.0f).toStdString().c_str(), totalSteps);
+        fprintf(stderr, "%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
     }
 }
@@ -332,6 +332,20 @@ private:
     void init(const QString &file);
 };
+/*!< \brief Specialization for boolean type. */
+template <>
+inline bool File::get<bool>(const QString &key, const bool &defaultValue) const
+{
+    return getBool(key, defaultValue);
+}
+
+/*!< \brief Specialization for boolean type. */
+template <>
+inline bool File::get<bool>(const QString &key) const
+{
+    return getBool(key);
+}
+
 BR_EXPORT QDebug operator<<(QDebug dbg, const File &file); /*!< \brief Prints br::File::flat() to \c stderr. */
 BR_EXPORT QDataStream &operator<<(QDataStream &stream, const File &file); /*!< \brief Serializes the file to a stream. */
 BR_EXPORT QDataStream &operator>>(QDataStream &stream, File &file); /*!< \brief Deserializes the file from a stream. */
@@ -469,7 +483,7 @@ struct TemplateList : public QList&lt;Template&gt;
     }
     /*!
-     * \brief Returns a #br::TemplateList containing templates with one matrix at the specified index \em index.
+     * \brief Returns a list of #br::TemplateList with each #br::Template in a given #br::TemplateList containing the number of matrices specified by \em partitionSizes.
      */
     QList<TemplateList> partition(const QList<int> &partitionSizes) const
     {
@@ -1329,6 +1343,11 @@ BR_EXPORT void Enroll(TemplateList &amp;tmpl);
  * \see br_compare
  */
 BR_EXPORT void Compare(const File &targetGallery, const File &queryGallery, const File &output);
+/*!
+ * \brief High-level function for comparing templates.
+ */
+BR_EXPORT void CompareTemplateLists(const TemplateList &target, const TemplateList &query, Output *output);
+
 /*!
  * \brief High-level function for doing a series of pairwise comparisons.
@@ -179,58 +179,93 @@ BR_REGISTER(Distance, PipeDistance)
 /*!
  * \ingroup distances
- * \brief Computes an operation on distances across multiple matrices of compared templates
+ * \brief Fuses similarity scores across multiple matrices of compared templates
  * \author Scott Klum \cite sklum
  * \note Operation: Mean, sum, min, max are supported.
  */
-class OperationDistance : public Distance
+class FuseDistance : public Distance
 {
     Q_OBJECT
     Q_ENUMS(Operation)
-    Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
+    Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false)
     Q_PROPERTY(Operation operation READ get_operation WRITE set_operation RESET reset_operation STORED false)
+    Q_PROPERTY(QList<float> weights READ get_weights WRITE set_weights RESET reset_weights STORED false)
+
+    QList<br::Distance*> distances;
 public:
     /*!< */
     enum Operation {Mean, Sum, Max, Min};
 private:
-    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+    BR_PROPERTY(QString, description, "IdenticalDistance")
     BR_PROPERTY(Operation, operation, Mean)
+    BR_PROPERTY(QList<float>, weights, QList<float>())
     void train(const TemplateList &src)
     {
-        distance->train(src);
+        // Partition the templates by matrix
+        QList<int> split;
+        for (int i=0; i<src.at(0).size(); i++) split.append(1);
+
+        QList<TemplateList> partitionedSrc = src.partition(split);
+
+        while (distances.size() < partitionedSrc.size())
+            distances.append(make(description));
+
+        // Train on each of the partitions
+        for (int i=0; i<distances.size(); i++)
+            distances[i]->train(partitionedSrc[i]);
     }
     float compare(const Template &a, const Template &b) const
     {
         if (a.size() != b.size()) qFatal("Comparison size mismatch");
-        QList<float> distances;
-        for (int i = 0; i < a.size(); i++)
-            distances.append(distance->compare(a[i],b[i]));
+        QList<float> scores;
+        for (int i=0; i<distances.size(); i++) {
+            float weight;
+            weights.isEmpty() ? weight = 1. : weight = weights[i];
+            scores.append(weight*distances[i]->compare(Template(a.file, a[i]),Template(b.file, b[i])));
+        }
         switch (operation) {
           case Mean:
-            return std::accumulate(distances.begin(),distances.end(),0.0)/(float)distances.size();
+            return std::accumulate(scores.begin(),scores.end(),0.0)/(float)scores.size();
             break;
           case Sum:
-            return std::accumulate(distances.begin(),distances.end(),0.0);
+            return std::accumulate(scores.begin(),scores.end(),0.0);
             break;
           case Min:
-            return *std::min_element(distances.begin(),distances.end());
+            return *std::min_element(scores.begin(),scores.end());
             break;
           case Max:
-            return *std::max_element(distances.begin(),distances.end());
+            return *std::max_element(scores.begin(),scores.end());
             break;
           default:
             qFatal("Invalid operation.");
         }
     }
+
+    void store(QDataStream &stream) const
+    {
+        stream << distances.size();
+        foreach (Distance *distance, distances)
+            distance->store(stream);
+    }
+
+    void load(QDataStream &stream)
+    {
+        int numDistances;
+        stream >> numDistances;
+        while (distances.size() < numDistances)
+            distances.append(make(description));
+        foreach (Distance *distance, distances)
+            distance->load(stream);
+    }
 };
-BR_REGISTER(Distance, OperationDistance)
+BR_REGISTER(Distance, FuseDistance)
 /*!
  * \ingroup distances
@@ -99,12 +99,12 @@ class galGallery : public Gallery
     void init()
     {
         gallery.setFileName(file);
-        if (file.get<bool>("remove", false))
+        if (file.get<bool>("remove"))
             gallery.remove();
         QtUtils::touchDir(gallery);
         QFile::OpenMode mode = QFile::ReadWrite;
-        if (file.contains("append"))
+        if (file.get<bool>("append"))
             mode |= QFile::Append;
         if (!gallery.open(mode))
@@ -13,6 +13,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include "openbr_internal.h"
+#include "openbr/gui/utility.h"
 using namespace cv;
@@ -121,45 +122,6 @@ public slots:
     }
 };
-QImage toQImage(const Mat &mat)
-{
-    // Convert to 8U depth
-    Mat mat8u;
-    if (mat.depth() != CV_8U) {
-        double globalMin = std::numeric_limits<double>::max();
-        double globalMax = -std::numeric_limits<double>::max();
-
-        std::vector<Mat> mv;
-        split(mat, mv);
-        for (size_t i=0; i<mv.size(); i++) {
-            double min, max;
-            minMaxLoc(mv[i], &min, &max);
-            globalMin = std::min(globalMin, min);
-            globalMax = std::max(globalMax, max);
-        }
-        assert(globalMax >= globalMin);
-
-        double range = globalMax - globalMin;
-        if (range != 0) {
-            double scale = 255 / range;
-            convertScaleAbs(mat, mat8u, scale, -(globalMin * scale));
-        } else {
-            // Monochromatic
-            mat8u = Mat(mat.size(), CV_8UC1, Scalar((globalMin+globalMax)/2));
-        }
-    } else {
-        mat8u = mat;
-    }
-
-    // Convert to 3 channels
-    Mat mat8uc3;
-    if      (mat8u.channels() == 4) cvtColor(mat8u, mat8uc3, CV_BGRA2RGB);
-    else if (mat8u.channels() == 3) cvtColor(mat8u, mat8uc3, CV_BGR2RGB);
-    else if (mat8u.channels() == 1) cvtColor(mat8u, mat8uc3, CV_GRAY2RGB);
-
-    return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
-}
-
 class DisplayWindow : public QLabel
 {
     Q_OBJECT
@@ -156,8 +156,8 @@ class IndependentTransform : public MetaTransform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<templatesList.size(); i++)
-	  futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
-	futures.waitForFinished();
+            futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
+        futures.waitForFinished();
     }
     void project(const Template &src, Template &dst) const
@@ -514,28 +514,16 @@ class ProgressCounterTransform : public TimeVaryingTransform
     void projectUpdate(const TemplateList &src, TemplateList &dst)
     {
         dst = src;
-        qint64 elapsed = timer.elapsed();
-        calls++;
-        set_calls++;
-        // updated every 10 seconds
-        if (elapsed > 5 * 1000) {
-            float f_elapsed = elapsed / 1000.0f;
-            // remaining calls (according to our input variable)
-            int remaining = totalTemplates - calls;
-            // calls / second
-            float speed = set_calls / f_elapsed;
-
-            float p = 100 * float(calls) / totalTemplates;
-
-            // seconds remaining
-            int s = float(remaining) / speed;
-            fprintf(stderr, "%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g  \r", p, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(s).toStdString().c_str(), float(calls));
+        qint64 elapsed = timer.elapsed();
+        // updated every second
+        if (elapsed > 1000) {
+            Globals->printStatus();
             timer.start();
-            set_calls = 0;
         }
+        Globals->currentStep++;
         return;
     }
@@ -548,24 +536,18 @@ class ProgressCounterTransform : public TimeVaryingTransform
     void finalize(TemplateList & data)
     {
         (void) data;
-        float p = 100 * float(calls) / totalTemplates;
-        qDebug("%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g  \r", p, QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), float(calls));
+        float p = br_progress();
+        qDebug("%05.2f%%  ELAPSED=%s  REMAINING=%s  COUNT=%g/%g  \r", p*100., QtUtils::toTime(Globals->startTime.elapsed()/1000.0f).toStdString().c_str(), QtUtils::toTime(0).toStdString().c_str(), Globals->currentStep, Globals->totalSteps);
     }
     void init()
     {
-        calls = 0;
-        set_calls = 0;
         timer.start();
     }
 public:
     ProgressCounterTransform() : TimeVaryingTransform(false,false) {}
-    bool initialized;
     QElapsedTimer timer;
-    qint64 calls;
-    qint64 set_calls;
-
 };
 BR_REGISTER(Transform, ProgressCounterTransform)
@@ -173,7 +173,7 @@ class MatchProbabilityDistance : public Distance
             for (int j=0; j<i; j++) {
                 const float score = matrixOutput.data()->data.at<float>(i, j);
                 if (score == -std::numeric_limits<float>::max()) continue;
-                if (crossModality) if(src[i].file.get<QString>("MODALITY") == src[j].file.get<QString>("MODALITY")) continue;
+                if (crossModality && src[i].file.get<QString>("MODALITY") == src[j].file.get<QString>("MODALITY")) continue;
                 if (labels[i] == labels[j]) genuineScores.append(score);
                 else                        impostorScores.append(score);
             }
@@ -211,6 +211,65 @@ protected:
 BR_REGISTER(Distance, MatchProbabilityDistance)
+class ZScoreDistance : public Distance
+{
+    Q_OBJECT
+    Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
+    Q_PROPERTY(bool crossModality READ get_crossModality WRITE set_crossModality RESET reset_crossModality STORED false)
+    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+    BR_PROPERTY(bool, crossModality, false)
+
+    float min, max;
+    double mean, stddev;
+
+    void train(const TemplateList &src)
+    {
+        distance->train(src);
+
+        QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(src.size()), FileList(src.size())));
+        distance->compare(src, src, matrixOutput.data());
+
+        QList<float> scores;
+        scores.reserve(src.size()*src.size());
+        for (int i=0; i<src.size(); i++) {
+            for (int j=0; j<i; j++) {
+                const float score = matrixOutput.data()->data.at<float>(i, j);
+                if (score == -std::numeric_limits<float>::max()) continue;
+                if (crossModality && src[i].file.get<QString>("MODALITY") == src[j].file.get<QString>("MODALITY")) continue;
+                scores.append(score);
+            }
+        }
+
+        Common::MinMax(scores, &min, &max);
+        Common::MeanStdDev(scores, &mean, &stddev);
+
+        if (stddev == 0) qFatal("Stddev is 0.");
+    }
+
+    float compare(const Template &target, const Template &query) const
+    {
+        float score = distance->compare(target,query);
+        if      (score == -std::numeric_limits<float>::max()) score = (min - mean) / stddev;
+        else if (score ==  std::numeric_limits<float>::max()) score = (max - mean) / stddev;
+        else                                                  score = (score - mean) / stddev;
+        return score;
+    }
+
+    void store(QDataStream &stream) const
+    {
+        distance->store(stream);
+        stream << min << max << mean << stddev;
+    }
+
+    void load(QDataStream &stream)
+    {
+        distance->load(stream);
+        stream >> min >> max >> mean >> stddev;
+    }
+};
+
+BR_REGISTER(Distance, ZScoreDistance)
+
 /*!
  * \ingroup distances
  * \brief Match Probability modification for heat maps \cite klare12
@@ -216,7 +216,7 @@ static TemplateList cropTrainingSamples(const TemplateList &amp;data, const float as
 /*!
  * \ingroup transforms
- * \brief .
+ * \brief Document me
  * \author Austin Blanton \cite imaus10
  */
 class BuildScalesTransform : public Transform
@@ -104,15 +104,13 @@ class CrossValidateTransform : public MetaTransform
         // since it is assumed that the allPartitions
         // flag is only used during comparison
         // (i.e. only used when making a mask)
-        if (src.file.getBool("Train", false)) dst = src;
-        else {
-            // If we want to duplicate templates but use the same training data
-            // for all partitions (i.e. transforms.size() == 1), we need to
-            // restrict the partition
-            int partition = src.file.get<int>("Partition", 0);
-            partition = (partition >= transforms.size()) ? 0 : partition;
-            transforms[partition]->project(src, dst);
-        }
+
+        // If we want to duplicate templates but use the same training data
+        // for all partitions (i.e. transforms.size() == 1), we need to
+        // restrict the partition
+        int partition = src.file.get<int>("Partition", 0);
+        partition = (partition >= transforms.size()) ? 0 : partition;
+        transforms[partition]->project(src, dst);
     }
     void store(QDataStream &stream) const
+from ctypes import *
+import os
+
+def _string_args(n):
+	s  = []
+	for i in range(n):
+		s.append(c_char_p)
+	return s
+
+def _var_string_args(n):
+	s = [c_int, POINTER(c_char_p)]
+	s.extend(_string_args(n))
+	return s
+
+def init_brpy(br_loc='/usr/local/lib'):
+    """Takes the ctypes lib object for br and initializes all function inputs and outputs"""
+    br_loc += '/libopenbr.%s'
+    if os.path.exists(br_loc % 'dylib'):
+        br = cdll.LoadLibrary(br_loc % 'dylib')
+    elif os.path.exists(br_loc % 'so'):
+        br = cdll.LoadLibrary(br_loc % 'so')
+    else:
+        raise ValueError('Neither .so nor .dylib libopenbr found in %s' % br_loc)
+
+    plot_args = _var_string_args(1) + [c_bool]
+    br.br_about.restype = c_char_p
+    br.br_cat.argtypes = _var_string_args(1)
+    br.br_cluster.argtypes = [c_int, POINTER(c_char_p), c_float, c_char_p]
+    br.br_combine_masks.argtypes = _var_string_args(2)
+    br.br_compare.argtypes = _string_args(3)
+    br.br_compare_n.argtypes = [c_int, POINTER(c_char_p)] + _string_args(2)
+    br.br_pairwise_compare.argtypes = _string_args(3)
+    br.br_convert.argtypes = _string_args(3)
+    br.br_enroll.argtypes = _string_args(2)
+    br.br_enroll_n.argtypes = _var_string_args(1)
+    br.br_eval.argtypes = _string_args(3)
+    br.br_eval.restype = c_float
+    br.br_eval_classification.argtypes = _string_args(4)
+    br.br_eval_clustering.argtypes = _string_args(2)
+    br.br_eval_detection.argtypes = _string_args(3)
+    br.br_eval_detection.restype = c_float
+    br.br_eval_landmarking.argtypes = _string_args(3) + [c_int, c_int]
+    br.br_eval_landmarking.restype = c_float
+    br.br_eval_regression.argtypes = _string_args(4)
+    br.br_fuse.argtypes = _var_string_args(3)
+    br.br_initialize.argtypes = _var_string_args(1)
+    br.br_is_classifier.argtypes = [c_char_p]
+    br.br_is_classifier.restype = c_bool
+    br.br_make_mask.argtypes = _string_args(3)
+    br.br_make_pairwise_mask.argtypes = _string_args(3)
+    br.br_most_recent_message.restype = c_char_p
+    br.br_objects.argtypes = _string_args(2) + [c_bool]
+    br.br_objects.restype = c_char_p
+    br.br_plot.argtypes = plot_args
+    br.br_plot.restype = c_bool
+    br.br_plot_detection.argtypes = plot_args
+    br.br_plot_detection.restype = c_bool
+    br.br_plot_landmarking.argtypes = plot_args
+    br.br_plot_landmarking.restype = c_bool
+    br.br_plot_metadata.argtypes = plot_args
+    br.br_plot_metadata.restype = c_bool
+    br.br_progress.restype = c_float
+    br.br_read_pipe.argtypes = [c_char_p, POINTER(c_int), POINTER(POINTER(c_char_p))]
+    br.br_scratch_path.restype = c_char_p
+    br.br_sdk_path.restype = c_char_p
+    br.br_get_header.argtypes = [c_char_p, POINTER(c_char_p), POINTER(c_char_p)]
+    br.br_set_header.argtypes = _string_args(3)
+    br.br_set_property.argtypes = _string_args(2)
+    br.br_time_remaining.restype = c_int
+    br.br_train.argtypes = _string_args(2)
+    br.br_train_n.argtypes = _var_string_args(1)
+    br.br_version.restype = c_char_p
+    br.br_slave_process.argtypes = [c_char_p]
+    br.br_load_img.argtypes = [c_char_p, c_int]
+    br.br_load_img.restype = c_void_p
+    br.br_unload_img.argtypes = [c_void_p]
+    br.br_unload_img.restype = POINTER(c_ubyte)
+    br.br_template_list_from_buffer.argtypes = [c_char_p, c_int]
+    br.br_template_list_from_buffer.restype = c_void_p
+    br.br_free_template.argtypes = [c_void_p]
+    br.br_free_template_list.argtypes = [c_void_p]
+    br.br_free_output.argtypes = [c_void_p]
+    br.br_img_rows.argtypes = [c_void_p]
+    br.br_img_rows.restype = c_int
+    br.br_img_cols.argtypes = [c_void_p]
+    br.br_img_cols.restype = c_int
+    br.br_img_channels.argtypes = [c_void_p]
+    br.br_img_channels.restype = c_int
+    br.br_img_is_empty.argtypes = [c_void_p]
+    br.br_img_is_empty.restype = c_bool
+    br.br_get_filename.argtypes = [c_void_p]
+    br.br_get_filename.restype = c_char_p
+    br.br_set_filename.argtypes = [c_void_p, c_char_p]
+    br.br_get_metadata_string.argtypes = [c_void_p, c_char_p]
+    br.br_get_metadata_string.restype = c_char_p
+    br.br_enroll_template.argtypes = [c_void_p]
+    br.br_enroll_template.restype = c_void_p
+    br.br_enroll_template_list.argtypes = [c_void_p]
+    br.br_enroll_template_list.restype = c_void_p
+    br.br_compare_template_lists.argtypes = [c_void_p, c_void_p]
+    br.br_compare_template_lists.restype = c_void_p
+    br.br_get_matrix_output_at.argtypes = [c_void_p, c_int, c_int]
+    br.br_get_matrix_output_at.restype = c_float
+    br.br_get_template.argtypes = [c_void_p, c_int]
+    br.br_get_template.restype = c_void_p
+    br.br_num_templates.argtypes = [c_void_p]
+    br.br_num_templates.restype = c_int
+    br.br_make_gallery.argtypes = [c_char_p]
+    br.br_make_gallery.restype = c_void_p
+    br.br_load_from_gallery.argtypes = [c_void_p]
+    br.br_load_from_gallery.restype = c_void_p
+    br.br_add_to_gallery.argtypes = [c_void_p, c_void_p]
+    br.br_close_gallery.argtypes = [c_void_p]
+
+    return br