Merge pull request #24 from biometrics/file_refactoring

File refactoring

Merge pull request #24 from biometrics/file_refactoring
File refactoring
jklontz
2 parents e2fb91d8 b9e7e4b2
Showing 32 changed files with 303 additions and 364 deletions
CHANGELOG.md
app/examples/age_estimation.cpp
app/examples/face_recognition.cpp
app/examples/gender_estimation.cpp
app/openbr-gui/classifier.cpp
app/openbr-gui/gallerytoolbar.cpp
app/openbr-gui/templatemetadata.cpp
app/openbr-gui/templateviewer.cpp
sdk/core/bee.cpp
sdk/core/core.cpp
sdk/core/plot.cpp
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/cascade.cpp
sdk/plugins/crop.cpp
sdk/plugins/draw.cpp
sdk/plugins/eigen3.cpp
sdk/plugins/eyes.cpp
sdk/plugins/format.cpp
sdk/plugins/gallery.cpp
@@ -4,7 +4,8 @@
 * Enrolling files/folders are now sorted naturally instead of alpha numerically
 * YouTubeFacesDBTransform implements Dr. Wolf's experimental protocol
 * NEC3 refactored
-* Updated transform API to add support for time-varying transforms
+* Updated transform API to add support for time-varying transforms per issue (#23)
+* Refactored File class to improve point and rect storage (#22)
 0.2.0 - 2/23/13
 ===============
@@ -31,7 +31,7 @@ static void printTemplate(const br::Template &amp;t)
 {
     printf("%s age: %d\n",
            qPrintable(t.file.fileName()),
-           t.file.getInt("Label"));
+           t.file.get<int>("Label"));
 }
 int main(int argc, char *argv[])
@@ -30,10 +30,9 @@
 static void printTemplate(const br::Template &t)
 {
-    printf("%s eyes: (%d, %d) (%d, %d)\n",
-           qPrintable(t.file.fileName()),
-           t.file.getInt("Affine_0_X"), t.file.getInt("Affine_0_Y"),
-           t.file.getInt("Affine_1_X"), t.file.getInt("Affine_1_Y"));
+    const QPoint firstEye = t.file.get<QPoint>("Affine_0");
+    const QPoint secondEye = t.file.get<QPoint>("Affine_1");
+    printf("%s eyes: (%d, %d) (%d, %d)\n", qPrintable(t.file.fileName()), firstEye.x(), firstEye.y(), secondEye.x(), secondEye.y());
 }
 int main(int argc, char *argv[])
@@ -31,7 +31,7 @@ static void printTemplate(const br::Template &amp;t)
 {
     printf("%s gender: %s\n",
            qPrintable(t.file.fileName()),
-           t.file.getInt("Label") == 1 ? "Female" : "Male");
+           t.file.get<int>("Label") == 1 ? "Female" : "Male");
 }
 int main(int argc, char *argv[])
@@ -39,19 +39,18 @@ void Classifier::_classify(File file)
 {
     QString key, value;
     foreach (const File &f, Enroll(file.flat(), File("[algorithm=" + algorithm + "]"))) {
-        qDebug() << f.flat();
         if (!f.contains("Label"))
             continue;
         if (algorithm == "GenderClassification") {
             key = "Gender";
-            value = (f.getInt("Label", 0) == 0 ? "Male" : "Female");
+            value = (f.get<int>("Label", 0) == 0 ? "Male" : "Female");
         } else if (algorithm == "AgeRegression") {
             key = "Age";
-            value = QString::number(int(f.getFloat("Label", 0)+0.5)) + " Years";
+            value = QString::number(int(f.get<float>("Label", 0)+0.5)) + " Years";
         } else {
             key = algorithm;
-            value = f.getString("Label");
+            value = f.get<QString>("Label");
         }
         break;
     }
@@ -117,7 +117,7 @@ void br::GalleryToolBar::checkWebcam()
 void br::GalleryToolBar::enrollmentFinished()
 {
     if (files.isEmpty()) {
-        if (input.getBool("enrollAll") && !tbWebcam.isChecked()) {
+        if (input.get<bool>("enrollAll", false) && !tbWebcam.isChecked()) {
             QMessageBox msgBox;
             msgBox.setText("Quality test failed.");
             msgBox.setInformativeText("Enroll anyway?");
@@ -127,7 +127,7 @@ void br::GalleryToolBar::enrollmentFinished()
             if (ret == QMessageBox::Ok) {
                 br::File file = input;
-                file.setBool("enrollAll", false);
+                file.set("enrollAll", false);
                 enroll(file);
             }
         }
@@ -28,7 +28,7 @@ void br::TemplateMetadata::setFile(const br::File &amp;file)
 {
     if (file.isNull()) lFile.clear();
     else               lFile.setText("<b>File:</b> " + file.fileName());
-    lQuality.setText(QString("<b>Quality:</b> %1").arg(file.getBool("FTE") ? "Low" : "High"));
+    lQuality.setText(QString("<b>Quality:</b> %1").arg(file.get<bool>("FTE", false) ? "Low" : "High"));
     foreach (const ConditionalClassifier &classifier, conditionalClassifiers)
         if (classifier.action->isVisible()) classifier.classifier->classify(file);
 }
@@ -39,10 +39,8 @@ void TemplateViewer::setFile(const File &amp;file_)
     // Update landmarks
     landmarks.clear();
-    if (file.contains("Affine_0_X") && file.contains("Affine_0_Y"))
-        landmarks.append(QPointF(file.getFloat("Affine_0_X"), file.getFloat("Affine_0_Y")));
-    if (file.contains("Affine_1_X") && file.contains("Affine_1_Y"))
-        landmarks.append(QPointF(file.getFloat("Affine_1_X"), file.getFloat("Affine_1_Y")));
+    if (file.contains("Affine_0")) landmarks.append(file.get<QPointF>("Affine_0"));
+    if (file.contains("Affine_1")) landmarks.append(file.get<QPointF>("Affine_1"));
     while (landmarks.size() < NumLandmarks)
         landmarks.append(QPointF());
     nearestLandmark = -1;
@@ -71,7 +71,7 @@ FileList BEE::readSigset(const QString &amp;sigset, bool ignoreMetadata)
                     newFile.append(file);
                     file = newFile;
                 } else if (!ignoreMetadata) {
-                    file.insert(key, value);
+                    file.set(key, value);
                 }
             }
@@ -99,7 +99,7 @@ void BEE::writeSigset(const QString &amp;sigset, const br::FileList &amp;files, bool ign
         QStringList metadata;
         if (!ignoreMetadata)
             foreach (const QString &key, file.localKeys())
-                metadata.append(key+"=\""+file.getString(key, "?")+"\"");
+                metadata.append(key+"=\""+file.get<QString>(key, "?")+"\"");
         lines.append("\t<biometric-signature name=\"" + file.subject() +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
@@ -113,19 +113,19 @@ Mat readMatrix(const br::File &amp;matrix)
 {
     // Special case matrix construction
     if (matrix == "Identity") {
-        int rows = matrix.getInt("rows", -1);
-        int columns = matrix.getInt("columns", -1);
-        const int size = matrix.getInt("size", -1);
+        int rows = matrix.get<int>("rows", -1);
+        int columns = matrix.get<int>("columns", -1);
+        const int size = matrix.get<int>("size", -1);
         if (size != -1) {
             if (rows == -1) rows = size;
             if (columns == -1) columns = size;
         }
-        const int step = matrix.getInt("step", 1);
+        const int step = matrix.get<int>("step", 1);
         if (rows    % step != 0) qFatal("Step does not divide rows evenly.");
         if (columns % step != 0) qFatal("Step does not divide columns evenly.");
         if (sizeof(T) == sizeof(BEE::Mask_t)) {
-            const bool selfSimilar = matrix.getBool("selfSimilar");
+            const bool selfSimilar = matrix.get<bool>("selfSimilar", false);
             Mat m(rows, columns, CV_8UC1);
             m.setTo(BEE::NonMatch);
@@ -171,8 +171,8 @@ Mat readMatrix(const br::File &amp;matrix)
     file.close();
     Mat result;
-    if (isDistance ^ matrix.getBool("negate")) m.convertTo(result, -1, -1);
-    else                                       result = m.clone();
+    if (isDistance ^ matrix.get<bool>("negate", false)) m.convertTo(result, -1, -1);
+    else                                                result = m.clone();
     return result;
 }
@@ -194,7 +194,7 @@ struct AlgorithmCore
     void compare(File targetGallery, File queryGallery, File output)
     {
-        if (output.exists() && output.getBool("cache")) return;
+        if (output.exists() && output.get<bool>("cache", false)) return;
         if (queryGallery == ".") queryGallery = targetGallery;
         QScopedPointer<Gallery> t, q;
@@ -316,14 +316,14 @@ void br::Train(const File &amp;input, const File &amp;model)
 {
     qDebug("Training on %s%s", qPrintable(input.flat()),
                                model.isNull() ? "" : qPrintable(" to " + model.flat()));
-    AlgorithmManager::getAlgorithm(model.getString("algorithm"))->train(input, model);
+    AlgorithmManager::getAlgorithm(model.get<QString>("algorithm"))->train(input, model);
 }
 FileList br::Enroll(const File &input, const File &gallery)
 {
     qDebug("Enrolling %s%s", qPrintable(input.flat()),
                              gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
-    return AlgorithmManager::getAlgorithm(gallery.getString("algorithm"))->enroll(input, gallery);
+    return AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
 }
 void br::Compare(const File &targetGallery, const File &queryGallery, const File &output)
@@ -331,7 +331,7 @@ void br::Compare(const File &amp;targetGallery, const File &amp;queryGallery, const File
     qDebug("Comparing %s and %s%s", qPrintable(targetGallery.flat()),
                                     qPrintable(queryGallery.flat()),
                                     output.isNull() ? "" : qPrintable(" to " + output.flat()));
-    AlgorithmManager::getAlgorithm(output.getString("algorithm"))->compare(targetGallery, queryGallery, output);
+    AlgorithmManager::getAlgorithm(output.get<QString>("algorithm"))->compare(targetGallery, queryGallery, output);
 }
 void br::Convert(const File &src, const File &dst)
@@ -119,8 +119,8 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
     // Read files
     const Mat scores = BEE::readSimmat(simmat);
     File maskFile(mask);
-    maskFile.insert("rows", scores.rows);
-    maskFile.insert("columns", scores.cols);
+    maskFile.set("rows", scores.rows);
+    maskFile.set("columns", scores.cols);
     const Mat masks = BEE::readMask(maskFile);
     if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch.");
@@ -416,7 +416,7 @@ struct RPlot
             }
         }
-        const QString &smooth = destination.getString("smooth", "");
+        const QString &smooth = destination.get<QString>("smooth", "");
         major.smooth = !smooth.isEmpty() && (major.header == smooth) && (major.size > 1);
         minor.smooth = !smooth.isEmpty() && (minor.header == smooth) && (minor.size > 1);
         if (major.smooth) major.size = 1;
@@ -58,10 +58,10 @@ QString File::hash() const
     return QtUtils::shortTextHash(flat());
 }
-void File::append(const QHash<QString, QVariant> &metadata)
+void File::append(const QMap<QString,QVariant> &metadata)
 {
     foreach (const QString &key, metadata.keys())
-        insert(key, metadata[key]);
+        set(key, metadata[key]);
 }
 void File::append(const File &other)
@@ -70,7 +70,7 @@ void File::append(const File &amp;other)
         if (name.isEmpty()) {
             name = other.name;
         } else {
-            if (!contains("separator")) insert("separator", ";");
+            if (!contains("separator")) set("separator", ";");
             name += value("separator").toString() + other.name;
         }
     }
@@ -110,29 +110,6 @@ QVariant File::value(const QString &amp;key) const
     return m_metadata.contains(key) ? m_metadata.value(key) : Globals->property(qPrintable(key));
 }
-QString File::subject(int label)
-{
-    return Globals->classes.key(label, QString::number(label));
-}
-
-float File::label() const
-{
-    const QVariant variant = value("Label");
-    if (variant.isNull()) return -1;
-
-    if (Globals->classes.contains(variant.toString()))
-        return Globals->classes.value(variant.toString());
-
-    bool ok;
-    const float val = variant.toFloat(&ok);
-    return ok ? val : -1;
-}
-
-void File::remove(const QString &key)
-{
-    m_metadata.remove(key);
-}
-
 void File::set(const QString &key, const QVariant &value)
 {
     if (key == "Label") {
@@ -153,155 +130,90 @@ void File::set(const QString &amp;key, const QVariant &amp;value)
     m_metadata.insert(key, value);
 }
-QVariant File::get(const QString &key) const
-{
-    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
-    return value(key);
-}
-
-QVariant File::get(const QString &key, const QVariant &defaultValue) const
-{
-    if (!contains(key)) return defaultValue;
-    return value(key);
-}
-
-bool File::getBool(const QString &key) const
-{
-    if (!contains(key)) return false;
-    QString v = value(key).toString();
-    if (v.isEmpty() || (v == "true")) return true;
-    if (v == "false") return false;
-    return v.toInt();
-}
-
-void File::setBool(const QString &key, bool value)
-{
-    if (value) m_metadata.insert(key, QVariant());
-    else       m_metadata.remove(key);
-}
-
-int File::getInt(const QString &key) const
-{
-    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
-    bool ok; int result = value(key).toInt(&ok);
-    if (!ok) qFatal("Invalid conversion from: %s", qPrintable(getString(key)));
-    return result;
-}
-
-int File::getInt(const QString &key, int defaultValue) const
-{
-    if (!contains(key)) return defaultValue;
-    bool ok; int result = value(key).toInt(&ok);
-    if (!ok) return defaultValue;
-    return result;
-}
-
-float File::getFloat(const QString &key) const
-{
-    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
-    bool ok; float result = value(key).toFloat(&ok);
-    if (!ok) qFatal("Invalid conversion from: %s", qPrintable(getString(key)));
-    return result;
-}
-
-float File::getFloat(const QString &key, float defaultValue) const
+QString File::subject(int label)
 {
-    if (!contains(key)) return defaultValue;
-    bool ok; float result = value(key).toFloat(&ok);
-    if (!ok) return defaultValue;
-    return result;
+    return Globals->classes.key(label, QString::number(label));
 }
-QString File::getString(const QString &key) const
+float File::label() const
 {
-    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
-    return value(key).toString();
-}
+    const QVariant variant = value("Label");
+    if (variant.isNull()) return -1;
-QString File::getString(const QString &key, const QString &defaultValue) const
-{
-    if (!contains(key)) return defaultValue;
-    return value(key).toString();
-}
+    if (Globals->classes.contains(variant.toString()))
+        return Globals->classes.value(variant.toString());
-QList<QPointF> File::landmarks() const
-{
-    QList<QPointF> landmarks;
-    foreach (const QVariant &landmark, value("Landmarks").toList())
-        landmarks.append(landmark.toPointF());
-    return landmarks;
+    bool ok;
+    const float val = variant.toFloat(&ok);
+    return ok ? val : -1;
 }
-QList<QPointF> File::namedLandmarks() const
+QList<QPointF> File::namedPoints() const
 {
     QList<QPointF> landmarks;
-    QStringList keys = localMetadata().keys();
-    foreach (const QString &key, keys) {
-        if (!key.endsWith("_X"))
-            continue;
-        QString keyBaseName = key.left(key.size()-2);
-        if (!keys.contains(keyBaseName+"_Y") ||
-            keys.contains(keyBaseName+"_Width") ||
-            keys.contains(keyBaseName+"_Height") ||
-            keys.contains(keyBaseName+"_Radius"))
-            continue;
-        landmarks.append(QPointF(getFloat(keyBaseName+"_X"), getFloat(keyBaseName+"_Y")));
+    foreach (const QString &key, localMetadata().keys()) {
+        const QVariant &variant = m_metadata[key];
+        if (variant.canConvert<QPointF>())
+            landmarks.append(variant.value<QPointF>());
     }
     return landmarks;
 }
-void File::appendLandmark(const QPointF &landmark)
+QList<QPointF> File::points() const
 {
-    QList<QVariant> newLandmarks = m_metadata["Landmarks"].toList();
-    newLandmarks.append(landmark);
-    m_metadata["Landmarks"] = newLandmarks;
+    QList<QPointF> points;
+    foreach (const QVariant &point, m_metadata["Points"].toList())
+        points.append(point.toPointF());
+    return points;
 }
-void File::appendLandmarks(const QList<QPointF> &landmarks)
+void File::appendPoint(const QPointF &point)
 {
-    QList<QVariant> newLandmarks = m_metadata["Landmarks"].toList();
-    foreach (const QPointF &landmark, landmarks)
-        newLandmarks.append(landmark);
-    m_metadata["Landmarks"] = newLandmarks;
+    QList<QVariant> newPoints = m_metadata["Points"].toList();
+    newPoints.append(point);
+    m_metadata["Points"] = newPoints;
 }
-void File::setLandmarks(const QList<QPointF> &landmarks)
+void File::appendPoints(const QList<QPointF> &points)
 {
-    QList<QVariant> landmarkList; landmarkList.reserve(landmarks.size());
-    foreach (const QPointF &landmark, landmarks)
-        landmarkList.append(landmark);
-    m_metadata["Landmarks"] = landmarkList;
+    QList<QVariant> newPoints = m_metadata["Points"].toList();
+    foreach (const QPointF &point, points)
+        newPoints.append(point);
+    m_metadata["Points"] = newPoints;
 }
-QList<QRectF> File::ROIs() const
+QList<QRectF> File::namedRects() const
 {
-    QList<QRectF> ROIs;
-    foreach (const QVariant &ROI, value("ROIs").toList())
-        ROIs.append(ROI.toRect());
-    return ROIs;
+    QList<QRectF> rects;
+    foreach (const QString &key, localMetadata().keys()) {
+        const QVariant &variant = m_metadata[key];
+        if (variant.canConvert<QRectF>())
+            rects.append(variant.value<QRectF>());
+    }
+    return rects;
 }
-void File::appendROI(const QRectF &ROI)
+QList<QRectF> File::rects() const
 {
-    QList<QVariant> newROIs = m_metadata["ROIs"].toList();
-    newROIs.append(ROI);
-    m_metadata["ROIs"] = newROIs;
+    QList<QRectF> rects;
+    foreach (const QVariant &rect, m_metadata["Rects"].toList())
+        rects.append(rect.toRect());
+    return rects;
 }
-void File::appendROIs(const QList<QRectF> &ROIs)
+void File::appendRect(const QRectF &rect)
 {
-    QList<QVariant> newROIs = m_metadata["ROIs"].toList();
-    foreach (const QRectF &ROI, ROIs)
-        newROIs.append(ROI);
-    m_metadata["ROIs"] = newROIs;
+    QList<QVariant> newRects = m_metadata["Rects"].toList();
+    newRects.append(rect);
+    m_metadata["Rects"] = newRects;
 }
-void File::setROIs(const QList<QRectF> &ROIs)
+void File::appendRects(const QList<QRectF> &rects)
 {
-    QList<QVariant> ROIList; ROIList.reserve(ROIs.size());
-    foreach (const QRectF &ROI, ROIs)
-        ROIList.append(ROI);
-    m_metadata["ROIs"] = ROIList;
+    QList<QVariant> newRects = m_metadata["Rects"].toList();
+    foreach (const QRectF &rect, rects)
+        newRects.append(rect);
+    m_metadata["Rects"] = newRects;
 }
 /* File - private methods */
@@ -325,10 +237,10 @@ void File::init(const QString &amp;file)
             QStringList words = QtUtils::parse(parameters[i], '=');
             QtUtils::checkArgsSize("File", words, 1, 2);
             if (words.size() < 2) {
-                if (unnamed) insertParameter(i, words[0]);
-                else         insert(words[0], QVariant());
+                if (unnamed) setParameter(i, words[0]);
+                else         set(words[0], QVariant());
             } else {
-                insert(words[0], words[1]);
+                set(words[0], words[1]);
             }
         }
         name = name.left(index);
@@ -391,9 +303,8 @@ void FileList::sort(const QString&amp; key)
     FileList sortedList;
     for (int i = 0; i < size(); i++) {
-        if (at(i).contains(key)) {
-            metadata.append(at(i).get(key).toString());
-        }
+        if (at(i).contains(key))
+            metadata.append(at(i).get<QString>(key));
         else sortedList.push_back(at(i));
     }
@@ -416,7 +327,7 @@ QList&lt;int&gt; FileList::crossValidationPartitions() const
 {
     QList<int> crossValidationPartitions; crossValidationPartitions.reserve(size());
     foreach (const File &f, *this)
-        crossValidationPartitions.append(f.getInt("Cross_Validation_Partition", 0));
+        crossValidationPartitions.append(f.get<int>("Cross_Validation_Partition", 0));
     return crossValidationPartitions;
 }
@@ -424,7 +335,7 @@ int FileList::failures() const
 {
     int failures = 0;
     foreach (const File &file, *this)
-        if (file.getBool("FTO") || file.getBool("FTE"))
+        if (file.get<bool>("FTO", false) || file.get<bool>("FTE", false))
             failures++;
     return failures;
 }
@@ -447,9 +358,9 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
     foreach (const br::File &file, gallery.split()) {
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
-        newTemplates = newTemplates.mid(gallery.getInt("pos", 0), gallery.getInt("length", -1));
-        if (gallery.getBool("reduce")) newTemplates = newTemplates.reduced();
-        const int crossValidate = gallery.getInt("crossValidate");
+        newTemplates = newTemplates.mid(gallery.get<int>("pos", 0), gallery.get<int>("length", -1));
+        if (gallery.get<bool>("reduce", false)) newTemplates = newTemplates.reduced();
+        const int crossValidate = gallery.get<int>("crossValidate");
         if (crossValidate > 0) srand(0);
         // If file is a Format not a Gallery
@@ -460,11 +371,11 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
         for (int i=0; i<newTemplates.size(); i++) {
             newTemplates[i].file.append(gallery.localMetadata());
             newTemplates[i].file.append(file.localMetadata());
-            newTemplates[i].file.insert("Index", i+templates.size());
-            if (crossValidate > 0) newTemplates[i].file.insert("Cross_Validation_Partition", rand()%crossValidate);
+            newTemplates[i].file.set("Index", i+templates.size());
+            if (crossValidate > 0) newTemplates[i].file.set("Cross_Validation_Partition", rand()%crossValidate);
         }
-        if (!templates.isEmpty() && gallery.getBool("merge")) {
+        if (!templates.isEmpty() && gallery.get<bool>("merge", false)) {
             if (newTemplates.size() != templates.size())
                 qFatal("Inputs must be the same size in order to merge.");
             for (int i=0; i<templates.size(); i++)
@@ -1136,7 +1047,7 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
         const int selectedLabel = selectedLabels[i];
         QList<int> indices;
         for (int j=0; j<allLabels.size(); j++)
-            if ((allLabels[j] == selectedLabel) && (!templates.value(j).file.getBool("FTE")))
+            if ((allLabels[j] == selectedLabel) && (!templates.value(j).file.get<bool>("FTE", false)))
                 indices.append(j);
         std::random_shuffle(indices.begin(), indices.end());
@@ -1320,7 +1231,7 @@ static void _project(const Transform *transform, const Template *src, Template *
     } catch (...) {
         qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
         *dst = Template(src->file);
-        dst->file.setBool("FTE");
+        dst->file.set("FTE", true);
     }
 }
@@ -1331,7 +1242,7 @@ static void _backProject(const Transform *transform, const Template *dst, Templa
     } catch (...) {
         qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
         *src = Template(dst->file);
-        src->file.setBool("FTE");
+        src->file.set("FTE", true);
     }
 }
@@ -128,8 +128,6 @@ void reset_##NAME() { NAME = DEFAULT; }
  *
  * Key             | Value          | Description
  * ---             | ----           | -----------
- * path            | QString        | Resolve complete file paths from file names
- * enrollAll       | bool           | Enroll zero or more templates per file
  * separator       | QString        | Seperate #name into multiple files
  * Index           | int            | Index of a template in a template list
  * Label           | float          | Classification/Regression class
@@ -145,8 +143,8 @@ void reset_##NAME() { NAME = DEFAULT; }
  * Roll            | float          | Pose
  * Pitch           | float          | Pose
  * Yaw             | float          | Pose
- * Landmarks       | QList<QPointF> | Landmark list
- * ROIs            | QList<Rect>    | Region Of Interest (ROI) list
+ * Points          | QList<QPointF> | List of unnamed points
+ * Rects           | QList<Rect>    | List of unnamed rects
  * Age             | QString        | Age used for demographic filtering
  * _*              | *              | Reserved for internal use
  */
@@ -156,24 +154,26 @@ struct BR_EXPORT File
     File() {}
     File(const QString &file) { init(file); } /*!< \brief Construct a file from a string. */
-    File(const QString &file, const QVariant &label) { init(file); insert("Label", label); } /*!< \brief Construct a file from a string and assign a label. */
+    File(const QString &file, const QVariant &label) { init(file); set("Label", label); } /*!< \brief Construct a file from a string and assign a label. */
     File(const char *file) { init(file); } /*!< \brief Construct a file from a c-style string. */
     inline operator QString() const { return name; } /*!< \brief Returns #name. */
     QString flat() const; /*!< \brief A stringified version of the file with metadata. */
     QString hash() const; /*!< \brief A hash of the file. */
-    inline void clear() { name.clear(); m_metadata.clear(); } /*!< \brief Clears the file's name and metadata. */
     inline QList<QString> localKeys() const { return m_metadata.keys(); } /*!< \brief Returns the private metadata keys. */
-    inline QHash<QString,QVariant> localMetadata() const { return m_metadata; } /*!< \brief Returns the private metadata. */
-    inline void insert(const QString &key, const QVariant &value) { set(key, value); } /*!< \brief Equivalent to set(). */
-    void append(const QHash<QString,QVariant> &localMetadata); /*!< \brief Add new metadata fields. */
+    inline QMap<QString,QVariant> localMetadata() const { return m_metadata; } /*!< \brief Returns the private metadata. */
+
+    void append(const QMap<QString,QVariant> &localMetadata); /*!< \brief Add new metadata fields. */
     void append(const File &other); /*!< \brief Append another file using \c separator. */
+    inline File &operator+=(const QMap<QString,QVariant> &other) { append(other); return *this; } /*!< \brief Add new metadata fields. */
+    inline File &operator+=(const File &other) { append(other); return *this; } /*!< \brief Append another file using \c separator. */
+
     QList<File> split() const; /*!< \brief Split the file using \c separator. */
     QList<File> split(const QString &separator) const; /*!< \brief Split the file. */
-    inline void insertParameter(int index, const QVariant &value) { insert("_Arg" + QString::number(index), value); } /*!< \brief Insert a keyless value. */
-    inline bool containsParameter(int index) const { return m_metadata.contains("_Arg" + QString::number(index)); } /*!< \brief Check for the existence of a keyless value. */
-    inline QVariant parameter(int index) const { return m_metadata.value("_Arg" + QString::number(index)); } /*!< \brief Retrieve a keyless value. */
+    inline void setParameter(int index, const QVariant &value) { set("_Arg" + QString::number(index), value); } /*!< \brief Insert a keyless value. */
+    inline bool containsParameter(int index) const { return contains("_Arg" + QString::number(index)); } /*!< \brief Check for the existence of a keyless value. */
+    inline QVariant getParameter(int index) const { return get<QVariant>("_Arg" + QString::number(index)); } /*!< \brief Retrieve a keyless value. */
     inline bool operator==(const char* other) const { return name == other; } /*!< \brief Compare name to c-style string. */
     inline bool operator==(const File &other) const { return (name == other.name) && (m_metadata == other.m_metadata); } /*!< \brief Compare name and metadata for equality. */
@@ -182,8 +182,6 @@ struct BR_EXPORT File
     inline bool operator<=(const File &other) const { return name <= other.name; } /*!< \brief Compare name. */
     inline bool operator>(const File &other) const { return name > other.name; } /*!< \brief Compare name. */
     inline bool operator>=(const File &other) const { return name >= other.name; } /*!< \brief Compare name. */
-    inline File &operator+=(const QHash<QString,QVariant> &other) { append(other); return *this; } /*!< \brief Add new metadata fields. */
-    inline File &operator+=(const File &other) { append(other); return *this; } /*!< \brief Append another file using \c separator. */
     inline bool isNull() const { return name.isEmpty() && m_metadata.isEmpty(); } /*!< \brief Returns \c true if name and metadata are empty, \c false otherwise. */
     inline bool isTerminal() const { return name == "terminal"; } /*!< \brief Returns \c true if #name is "terminal", \c false otherwise. */
@@ -196,42 +194,53 @@ struct BR_EXPORT File
     bool contains(const QString &key) const; /*!< \brief Returns \c true if the key has an associated value, \c false otherwise. */
     QVariant value(const QString &key) const; /*!< \brief Returns the value for the specified key. */
+    void set(const QString &key, const QVariant &value); /*!< \brief Insert or overwrite the metadata key with the specified value. */
+    inline void remove(const QString &key) { m_metadata.remove(key); } /*!< \brief Remove the metadata key. */
+
+    /*!< \brief Returns a value for the key, throwing an error if the key does not exist. */
+    template <typename T>
+    T get(const QString &key) const
+    {
+        if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
+        QVariant variant = value(key);
+        if (!variant.canConvert<T>()) qFatal("Can't convert: %s", qPrintable(key));
+        return variant.value<T>();
+    }
+
+    /*!< \brief Returns a value for the key, returning \em defaultValue if the key does not exist or can't be converted. */
+    template <typename T>
+    T get(const QString &key, const T &defaultValue) const
+    {
+        if (!contains(key)) return defaultValue;
+        QVariant variant = value(key);
+        if (!variant.canConvert<T>()) return defaultValue;
+        return variant.value<T>();
+    }
+
     static QString subject(int label); /*!< \brief Looks up the subject for the provided label. */
     inline QString subject() const { return subject(label()); } /*!< \brief Looks up the subject from the file's label. */
-    inline bool failed() const { return getBool("FTE") || getBool("FTO"); } /*!< \brief Returns \c true if the file failed to open or enroll, \c false otherwise. */
-
-    void remove(const QString &key); /*!< \brief Remove the metadata key. */
-    void set(const QString &key, const QVariant &value); /*!< \brief Insert or overwrite the metadata key with the specified value. */
-    QVariant get(const QString &key) const; /*!< \brief Returns a QVariant for the key, throwing an error if the key does not exist. */
-    QVariant get(const QString &key, const QVariant &value) const; /*!< \brief Returns a QVariant for the key, returning \em defaultValue if the key does not exist. */
     float label() const; /*!< \brief Convenience function for retrieving the file's \c Label. */
-    inline void setLabel(float label) { insert("Label", label); } /*!< \brief Convenience function for setting the file's \c Label. */
-    bool getBool(const QString &key) const; /*!< \brief Returns a boolean value for the key. */
-    void setBool(const QString &key, bool value = true); /*!< \brief Sets a boolean value for the key. */
-    int getInt(const QString &key) const; /*!< \brief Returns an int value for the key, throwing an error if the key does not exist. */
-    int getInt(const QString &key, int defaultValue) const; /*!< \brief Returns an int value for the key, returning \em defaultValue if the key does not exist. */
-    float getFloat(const QString &key) const; /*!< \brief Returns a float value for the key, throwing an error if the key does not exist. */
-    float getFloat(const QString &key, float defaultValue) const; /*!< \brief Returns a float value for the key, returning \em defaultValue if the key does not exist. */
-    QString getString(const QString &key) const; /*!< \brief Returns a string value for the key, throwing an error if the key does not exist. */
-    QString getString(const QString &key, const QString &defaultValue) const; /*!< \brief Returns a string value for the key, returning \em defaultValue if the key does not exist. */
-
-    QList<QPointF> landmarks() const; /*!< \brief Returns the file's landmark list. */
-    QList<QPointF> namedLandmarks() const; /*!< \brief Returns landmarks derived from metadata keys. */
-    void appendLandmark(const QPointF &landmark); /*!< \brief Adds a landmark to the file's landmark list. */
-    void appendLandmarks(const QList<QPointF> &landmarks); /*!< \brief Adds landmarks to the file's landmark list. */
-    inline void clearLandmarks() { m_metadata["Landmarks"] = QList<QVariant>(); } /*!< \brief Clears the file's landmark list. */
-    void setLandmarks(const QList<QPointF> &landmarks); /*!< \brief Assigns the file's landmark list. */
-
-    QList<QRectF> ROIs() const; /*!< \brief Returns the file's ROI list. */
-    void appendROI(const QRectF &ROI); /*!< \brief Adds a ROI to the file's ROI list. */
-    void appendROIs(const QList<QRectF> &ROIs); /*!< \brief Adds ROIs to the file's ROI list. */
-    inline void clearROIs() { m_metadata["ROIs"] = QList<QVariant>(); } /*!< \brief Clears the file's landmark list. */
-    void setROIs(const QList<QRectF> &ROIs); /*!< \brief Assigns the file's landmark list. */
+    inline void setLabel(float label) { set("Label", label); } /*!< \brief Convenience function for setting the file's \c Label. */
+    inline bool failed() const { return get<bool>("FTE", false) || get<bool>("FTO", false); } /*!< \brief Returns \c true if the file failed to open or enroll, \c false otherwise. */
+
+    QList<QPointF> namedPoints() const; /*!< \brief Returns points convertible from metadata keys. */
+    QList<QPointF> points() const; /*!< \brief Returns the file's points list. */
+    void appendPoint(const QPointF &point); /*!< \brief Adds a point to the file's point list. */
+    void appendPoints(const QList<QPointF> &points); /*!< \brief Adds landmarks to the file's landmark list. */
+    inline void clearPoints() { m_metadata["Points"] = QList<QVariant>(); } /*!< \brief Clears the file's landmark list. */
+    inline void setPoints(const QList<QPointF> &points) { clearPoints(); appendPoints(points); } /*!< \brief Overwrites the file's landmark list. */
+
+    QList<QRectF> namedRects() const; /*!< \brief Returns rects convertible from metadata values. */
+    QList<QRectF> rects() const; /*!< \brief Returns the file's rects list. */
+    void appendRect(const QRectF &rect); /*!< \brief Adds a rect to the file's rect list. */
+    void appendRects(const QList<QRectF> &rects); /*!< \brief Adds rects to the file's rect list. */
+    inline void clearRects() { m_metadata["Rects"] = QList<QVariant>(); } /*!< \brief Clears the file's rect list. */
+    inline void setRects(const QList<QRectF> &rects) { clearRects(); appendRects(rects); } /*!< \brief Overwrites the file's rect list. */
 private:
-    QHash<QString,QVariant> m_metadata;
-    BR_EXPORT friend QDataStream &operator<<(QDataStream &stream, const File &file); /*!< */
-    BR_EXPORT friend QDataStream &operator>>(QDataStream &stream, File &file); /*!< */
+    QMap<QString,QVariant> m_metadata;
+    BR_EXPORT friend QDataStream &operator<<(QDataStream &stream, const File &file);
+    BR_EXPORT friend QDataStream &operator>>(QDataStream &stream, File &file);
     void init(const QString &file);
 };
@@ -75,15 +75,15 @@ class CascadeTransform : public UntrainableTransform
     {
         CascadeClassifier *cascade = cascadeResource.acquire();
         vector<Rect> rects;
-        cascade->detectMultiScale(src, rects, 1.2, 5, src.file.getBool("enrollAll") ? 0 : CV_HAAR_FIND_BIGGEST_OBJECT, Size(minSize, minSize));
+        cascade->detectMultiScale(src, rects, 1.2, 5, src.file.get<bool>("enrollAll", false) ? 0 : CV_HAAR_FIND_BIGGEST_OBJECT, Size(minSize, minSize));
         cascadeResource.release(cascade);
-        if (!src.file.getBool("enrollAll") && rects.empty())
+        if (!src.file.get<bool>("enrollAll", false) && rects.empty())
             rects.push_back(Rect(0, 0, src.m().cols, src.m().rows));
         foreach (const Rect &rect, rects) {
             dst += src;
-            dst.file.appendROI(OpenCVUtils::fromRect(rect));
+            dst.file.appendRect(OpenCVUtils::fromRect(rect));
         }
     }
 };
@@ -26,7 +26,7 @@ namespace br
 /*!
  * \ingroup transforms
- * \brief Crops the regions of interest.
+ * \brief Crops the rectangular regions of interest.
  * \author Josh Klontz \cite jklontz
  */
 class ROITransform : public UntrainableTransform
@@ -35,8 +35,8 @@ class ROITransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        foreach (const QRectF ROI, src.file.ROIs())
-            dst += src.m()(OpenCVUtils::toRect(ROI));
+        foreach (const QRectF &rect, src.file.rects())
+            dst += src.m()(OpenCVUtils::toRect(rect));
     }
 };
@@ -47,19 +47,19 @@ class DrawTransform : public UntrainableTransform
         const Scalar verboseColor(255, 255, 0);
         dst = src.m().clone();
-        QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.landmarks());
+        QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.points());
         if (unnamed) {
             foreach (const Point2f &landmark, landmarks)
                 circle(dst, landmark, 3, color, -1);
         }
         if (named) {
-            QList<Point2f> namedLandmarks = OpenCVUtils::toPoints(src.file.namedLandmarks());
+            QList<Point2f> namedLandmarks = OpenCVUtils::toPoints(src.file.namedPoints());
             foreach (const Point2f &landmark, namedLandmarks)
                 circle(dst, landmark, 3, color);
         }
         if (ROI) {
-            QList<Rect> ROIs = OpenCVUtils::toRects(src.file.ROIs());
+            QList<Rect> ROIs = OpenCVUtils::toRects(src.file.rects());
             foreach (const Rect ROI, ROIs)
                 rectangle(dst, ROI, color);
         }
@@ -154,11 +154,11 @@ class EditTransform : public UntrainableTransform
     {
         (void) event;
         if (flags) {
-            QList<QRectF> ROIs = currentTemplate.file.ROIs();
-            for (int i=ROIs.size()-1; i>=0; i--)
-                if (ROIs[i].contains(x,y))
-                    ROIs.removeAt(i);
-            currentTemplate.file.setROIs(ROIs);
+            QList<QRectF> rects = currentTemplate.file.rects();
+            for (int i=rects.size()-1; i>=0; i--)
+                if (rects[i].contains(x,y))
+                    rects.removeAt(i);
+            currentTemplate.file.setRects(rects);
         }
         Template temp;
@@ -228,7 +228,7 @@ class DFFSTransform : public Transform
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        dst.file.insert("DFFS", sqrt(pca.residualReconstructionError((*cvtFloat)(src))));
+        dst.file.set("DFFS", sqrt(pca.residualReconstructionError((*cvtFloat)(src))));
     }
     void store(QDataStream &stream) const
@@ -147,7 +147,7 @@ public:
 private:
     void project(const Template &src, Template &dst) const
     {
-        Rect roi = OpenCVUtils::toRect(src.file.ROIs().first());
+        Rect roi = OpenCVUtils::toRect(src.file.rects().first());
         Mat gray;
         OpenCVUtils::cvtGray(src.m()(roi), gray);
@@ -183,12 +183,10 @@ private:
         float second_eye_y = (right_rect.y + maxLoc.y)*gray.rows/height+roi.y;
         dst = src;
-        dst.file.appendLandmark(QPointF(first_eye_x, first_eye_y));
-        dst.file.appendLandmark(QPointF(second_eye_x, second_eye_y));
-        dst.file.insert("ASEF_Right_Eye_X", first_eye_x);
-        dst.file.insert("ASEF_Right_Eye_Y", first_eye_y);
-        dst.file.insert("ASEF_Left_Eye_X", second_eye_x);
-        dst.file.insert("ASEF_Left_Eye_Y", second_eye_y);
+        dst.file.appendPoint(QPointF(first_eye_x, first_eye_y));
+        dst.file.appendPoint(QPointF(second_eye_x, second_eye_y));
+        dst.file.set("ASEF_Right_Eye", QPointF(first_eye_x, first_eye_y));
+        dst.file.set("ASEF_Left_Eye", QPointF(second_eye_x, second_eye_y));
     }
 };
@@ -217,11 +217,11 @@ class DefaultFormat : public Format
         } else {
             QString fileName = file.name;
             if (!QFileInfo(fileName).exists()) {
-                fileName = file.getString("path") + "/" + file.name;
+                fileName = file.get<QString>("path") + "/" + file.name;
                 if (!QFileInfo(fileName).exists()) {
                     fileName = file.fileName();
                     if (!QFileInfo(fileName).exists()) {
-                        fileName = file.getString("path") + "/" + file.fileName();
+                        fileName = file.get<QString>("path") + "/" + file.fileName();
                         if (!QFileInfo(fileName).exists()) return t;
                     }
                 }
@@ -604,7 +604,7 @@ class xmlFormat : public Format
                            (e.tagName() == "RPROFILE")) {
                     // Ignore these other image fields for now
                 } else {
-                    t.file.insert(e.tagName(), e.text());
+                    t.file.set(e.tagName(), e.text());
                 }
                 fileNode = fileNode.nextSibling();
@@ -614,11 +614,11 @@ class xmlFormat : public Format
         // Calculate age
         if (t.file.contains("DOB")) {
-            const QDate dob = QDate::fromString(t.file.getString("DOB").left(10), "yyyy-MM-dd");
+            const QDate dob = QDate::fromString(t.file.get<QString>("DOB").left(10), "yyyy-MM-dd");
             const QDate current = QDate::currentDate();
             int age = current.year() - dob.year();
             if (current.month() < dob.month()) age--;
-            t.file.insert("Age", age);
+            t.file.set("Age", age);
         }
         return t;
@@ -22,13 +22,13 @@
 #include <QSqlQuery>
 #include <QSqlRecord>
 #endif // BR_EMBEDDED
+#include <opencv2/highgui/highgui.hpp>
 #include <openbr_plugin.h>
 #include "NaturalStringCompare.h"
 #include "core/bee.h"
 #include "core/opencvutils.h"
 #include "core/qtutils.h"
-#include <opencv2/highgui/highgui.hpp>
 namespace br
 {
@@ -47,7 +47,7 @@ class galGallery : public Gallery
     void init()
     {
         gallery.setFileName(file);
-        if (file.getBool("remove"))
+        if (file.get<bool>("remove", false))
             gallery.remove();
         QtUtils::touchDir(gallery);
         if (!gallery.open(QFile::ReadWrite | QFile::Append))
@@ -339,20 +339,33 @@ class csvGallery : public Gallery
     {
         if (files.isEmpty()) return;
-        QStringList keys;
+        QMap<QString,QVariant> samples;
         foreach (const File &file, files)
             foreach (const QString &key, file.localKeys())
-                if (!keys.contains(key)) keys += key;
-        qSort(keys);
+                if (!samples.contains(key))
+                    samples.insert(key, file.value(key));
+
+        QStringList lines;
+        lines.reserve(files.size()+1);
+
+        { // Make header
+            QStringList words;
+            words.append("File");
+            foreach (const QString &key, samples.keys())
+                words.append(getCSVElement(key, samples[key], true));
+            lines.append(words.join(","));
+        }
-        const int rows = files.size();
-        const int columns = keys.size();
-        QSharedPointer<Output> output(Output::make(file, keys, files));
+        // Make table
+        foreach (const File &file, files) {
+            QStringList words;
+            words.append(file.name);
+            foreach (const QString &key, samples.keys())
+                words.append(getCSVElement(key, file.value(key), false));
+            lines.append(words.join(","));
+        }
-        for (int i=0; i<rows; i++)
-            for (int j=0; j<columns; j++)
-                if (keys[j] == "Label") output->setRelative(files[i].label(), i, j);
-                else                    output->setRelative(files[i].getFloat(keys[j], std::numeric_limits<float>::quiet_NaN()), i, j);
+        QtUtils::writeFile(file, lines);
     }
     TemplateList readBlock(bool *done)
@@ -377,6 +390,25 @@ class csvGallery : public Gallery
     {
         files.append(t.file);
     }
+
+    static QString getCSVElement(const QString &key, const QVariant &value, bool header)
+    {
+        if (value.canConvert<QString>()) {
+            if (header) return key;
+            else        return value.value<QString>();
+        } else if (value.canConvert<QPointF>()) {
+            const QPointF point = value.value<QPointF>();
+            if (header) return key+"_X,"+key+"_Y";
+            else        return QString::number(point.x())+","+QString::number(point.y());
+        } else if (value.canConvert<QRectF>()) {
+            const QRectF rect = value.value<QRectF>();
+            if (header) return key+"_X,"+key+"_Y,"+key+"_Width,"+key+"_Height";
+            else        return QString::number(rect.x())+","+QString::number(rect.y())+","+QString::number(rect.width())+","+QString::number(rect.height());
+        } else {
+            if (header) return key;
+            else        return QString::number(std::numeric_limits<float>::quiet_NaN());
+        }
+    }
 };
 BR_REGISTER(Gallery, csvGallery)
@@ -465,9 +497,9 @@ class dbGallery : public Gallery
     TemplateList readBlock(bool *done)
     {
         TemplateList templates;
-        br::File import = file.getString("import", "");
-        QString query = file.getString("query");
-        QString subset = file.getString("subset", "");
+        br::File import = file.get<QString>("import", "");
+        QString query = file.get<QString>("query");
+        QString subset = file.get<QString>("subset", "");
 #ifndef BR_EMBEDDED
         QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
@@ -174,7 +174,7 @@ class VarianceChangeDetectorTransform : public UntrainableTransform
         int *buffer = new int[bins];
         float bestRatio = -std::numeric_limits<float>::max();
-        QRect bestROI;
+        QRectF bestRect;
         const int rows = m.rows;
         const int cols = m.cols/bins;
@@ -202,7 +202,7 @@ class VarianceChangeDetectorTransform : public UntrainableTransform
                     if (ratio > bestRatio) {
                         bestRatio = ratio;
-                        bestROI = QRect(j*radius, i*radius, scale*radius, scale*radius);
+                        bestRect = QRect(j*radius, i*radius, scale*radius, scale*radius);
                     }
                 }
             }
@@ -210,7 +210,7 @@ class VarianceChangeDetectorTransform : public UntrainableTransform
         }
         delete[] buffer;
-        dst.file.appendROI(bestROI);
+        dst.file.appendRect(bestRect);
         dst.file.setLabel(bestRatio);
     }
 };
@@ -54,13 +54,13 @@ class KeyPointDetectorTransform : public UntrainableTransform
             featureDetector->detect(src, keyPoints);
         } catch (...) {
             qWarning("Key point detection failed for file %s", qPrintable(src.file.name));
-            dst.file.setBool("FTE");
+            dst.file.set("FTE", true);
         }
-        QList<Rect> ROIs;
+        QList<Rect> rects;
         foreach (const KeyPoint &keyPoint, keyPoints)
-            ROIs.append(Rect(keyPoint.pt.x, keyPoint.pt.y, keyPoint.size, keyPoint.size));
-        dst.file.setROIs(OpenCVUtils::fromRects(ROIs));
+            rects.append(Rect(keyPoint.pt.x, keyPoint.pt.y, keyPoint.size, keyPoint.size));
+        dst.file.setRects(OpenCVUtils::fromRects(rects));
     }
 };
@@ -92,10 +92,10 @@ class KeyPointDescriptorTransform : public UntrainableTransform
     {
         std::vector<KeyPoint> keyPoints;
         if (size == -1) {
-            foreach (const QRectF &ROI, src.file.ROIs())
+            foreach (const QRectF &ROI, src.file.rects())
                 keyPoints.push_back(KeyPoint(ROI.x(), ROI.y(), (ROI.width() + ROI.height())/2));
         } else {
-            foreach (const QPointF &landmark, src.file.landmarks())
+            foreach (const QPointF &landmark, src.file.points())
                 keyPoints.push_back(KeyPoint(landmark.x(), landmark.y(), size));
         }
         descriptorExtractor->compute(src, keyPoints, dst);
@@ -166,7 +166,7 @@ class SIFTDescriptorTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         std::vector<KeyPoint> keyPoints;
-        foreach (const QPointF &val, src.file.landmarks())
+        foreach (const QPointF &val, src.file.points())
             keyPoints.push_back(KeyPoint(val.x(), val.y(), size));
         Mat m;
@@ -200,7 +200,7 @@ class GridTransform : public UntrainableTransform
             for (float j=column_step/2; j<src.m().cols; j+=column_step)
                 landmarks.append(QPointF(i,j));
         dst = src;
-        dst.file.setLandmarks(landmarks);
+        dst.file.setPoints(landmarks);
     }
 };
@@ -31,24 +31,24 @@ static TemplateList Expanded(const TemplateList &amp;templates)
     TemplateList expanded;
     foreach (const Template &t, templates) {
         if (t.isEmpty()) {
-            if (!t.file.getBool("enrollAll"))
+            if (!t.file.get<bool>("enrollAll", false))
                 expanded.append(t);
             continue;
         }
-        const bool fte = t.file.getBool("FTE");
-        QList<QPointF> landmarks = t.file.landmarks();
-        QList<QRectF> ROIs = t.file.ROIs();
-        if (landmarks.size() % t.size() != 0) qFatal("Uneven landmark count.");
-        if (ROIs.size() % t.size() != 0) qFatal("Uneven ROI count.");
-        const int landmarkStep = landmarks.size() / t.size();
-        const int ROIStep = ROIs.size() / t.size();
+        const bool fte = t.file.get<bool>("FTE", false);
+        QList<QPointF> points = t.file.points();
+        QList<QRectF> rects = t.file.rects();
+        if (points.size() % t.size() != 0) qFatal("Uneven point count.");
+        if (rects.size() % t.size() != 0) qFatal("Uneven rect count.");
+        const int pointStep = points.size() / t.size();
+        const int rectStep = rects.size() / t.size();
         for (int i=0; i<t.size(); i++) {
-            if (!fte || !t.file.getBool("enrollAll")) {
+            if (!fte || !t.file.get<bool>("enrollAll", false)) {
                 expanded.append(Template(t.file, t[i]));
-                expanded.last().file.setROIs(ROIs.mid(i*ROIStep, ROIStep));
-                expanded.last().file.setLandmarks(landmarks.mid(i*landmarkStep, landmarkStep));
+                expanded.last().file.setRects(rects.mid(i*rectStep, rectStep));
+                expanded.last().file.setPoints(points.mid(i*pointStep, pointStep));
             }
         }
     }
@@ -233,7 +233,7 @@ class PipeTransform : public CompositeTransform
             } catch (...) {
                 qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->objectName()));
                 src = Template(src.file);
-                src.file.setBool("FTE");
+                src.file.set("FTE", true);
             }
         }
     }
@@ -247,7 +247,7 @@ class PipeTransform : public CompositeTransform
             } catch (...) {
                 qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
-                dst.file.setBool("FTE");
+                dst.file.set("FTE", true);
             }
         }
     }
@@ -310,7 +310,7 @@ protected:
            } catch (...) {
                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                dst = Template(src.file);
-               dst.file.setBool("FTE");
+               dst.file.set("FTE", true);
            }
        }
    }
@@ -396,7 +396,7 @@ class ForkTransform : public CompositeTransform
             } catch (...) {
                 qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
-                dst.file.setBool("FTE");
+                dst.file.set("FTE", true);
             }
         }
     }
@@ -453,7 +453,7 @@ protected:
             } catch (...) {
                 qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
-                dst.file.setBool("FTE");
+                dst.file.set("FTE", true);
             }
         }
     }
@@ -648,7 +648,7 @@ class FTETransform : public Transform
         foreach (const Template &t, projectedData) {
             if (!t.file.contains(transform->objectName()))
                 qFatal("Matrix metadata missing key %s.", qPrintable(transform->objectName()));
-            vals.append(t.file.getFloat(transform->objectName()));
+            vals.append(t.file.get<float>(transform->objectName()));
         }
         float q1, q3;
         Common::Median(vals, &q1, &q3);
@@ -660,11 +660,11 @@ class FTETransform : public Transform
     {
         Template projectedSrc;
         transform->project(src, projectedSrc);
-        const float val = projectedSrc.file.getFloat(transform->objectName());
+        const float val = projectedSrc.file.get<float>(transform->objectName());
         dst = src;
-        dst.file.insert(transform->objectName(), val);
-        dst.file.insert("FTE", (val < min) || (val > max));
+        dst.file.set(transform->objectName(), val);
+        dst.file.set("FTE", (val < min) || (val > max));
     }
 };
@@ -44,7 +44,7 @@ class OpenTransform : public UntrainableMetaTransform
             dst.append(t);
             dst.file.append(t.file.localMetadata());
         }
-        dst.file.insert("FTO", dst.isEmpty());
+        dst.file.set("FTO", dst.isEmpty());
     }
 };
@@ -282,7 +282,7 @@ class RenameTransform : public UntrainableMetaTransform
     {
         dst = src;
         if (dst.file.localKeys().contains(find)) {
-            dst.file.insert(replace, dst.file.get(find));
+            dst.file.set(replace, dst.file.value(find));
             dst.file.remove(find);
         }
     }
@@ -308,7 +308,7 @@ class RenameFirstTransform : public UntrainableMetaTransform
         dst = src;
         foreach (const QString &key, find)
             if (dst.file.localKeys().contains(key)) {
-                dst.file.insert(replace, dst.file.get(key));
+                dst.file.set(replace, dst.file.value(key));
                 dst.file.remove(key);
                 break;
             }
@@ -106,7 +106,7 @@ class meltOutput : public MatrixOutput
         const bool genuineOnly = file.contains("Genuine") && !file.contains("Impostor");
         const bool impostorOnly = file.contains("Impostor") && !file.contains("Genuine");
-        QHash<QString,QVariant> args = file.localMetadata();
+        QMap<QString,QVariant> args = file.localMetadata();
         args.remove("Genuine");
         args.remove("Impostor");
@@ -165,9 +165,9 @@ class rrOutput : public MatrixOutput
     ~rrOutput()
     {
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
-        const int limit = file.getInt("limit", 20);
-        const bool byLine = file.getBool("byLine");
-        const float threshold = file.getFloat("threshold", -std::numeric_limits<float>::max());
+        const int limit = file.get<int>("limit", 20);
+        const bool byLine = file.get<bool>("byLine", false);
+        const float threshold = file.get<float>("threshold", -std::numeric_limits<float>::max());
         QStringList lines;
@@ -279,7 +279,7 @@ class rankOutput : public MatrixOutput
             typedef QPair<float,int> Pair;
             int rank = 1;
             foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) {
-                if(targetFiles[pair.second].getString("Label") == queryFiles[i].getString("Label")) {
+                if(targetFiles[pair.second].get<QString>("Label") == queryFiles[i].get<QString>("Label")) {
                     ranks.append(rank);
                     positions.append(pair.second);
                     scores.append(pair.first);
@@ -347,10 +347,10 @@ class tailOutput : public Output
     void initialize(const FileList &targetFiles, const FileList &queryFiles)
     {
         Output::initialize(targetFiles, queryFiles);
-        threshold = file.getFloat("threshold", -std::numeric_limits<float>::max());
-        atLeast = file.getInt("atLeast", 1);
-        atMost = file.getInt("atMost", std::numeric_limits<int>::max());
-        args = file.getBool("args");
+        threshold = file.get<float>("threshold", -std::numeric_limits<float>::max());
+        atLeast = file.get<int>("atLeast", 1);
+        atMost = file.get<int>("atMost", std::numeric_limits<int>::max());
+        args = file.get<bool>("args", false);
         lastValue = -std::numeric_limits<float>::max();
     }
@@ -462,9 +462,9 @@ class histOutput : public Output
     void initialize(const FileList &targetFiles, const FileList &queryFiles)
     {
         Output::initialize(targetFiles, queryFiles);
-        min = file.getFloat("min", -5);
-        max = file.getFloat("max", 5);
-        step = file.getFloat("step", 0.1);
+        min = file.get<float>("min", -5);
+        max = file.get<float>("max", 5);
+        step = file.get<float>("step", 0.1);
         bins = QVector<int>((max-min)/step, 0);
     }
@@ -120,7 +120,7 @@ class PerPixelClassifierTransform : public MetaTransform
                     uchar *psrc = src[n].ptr();
                     ptemp[n] = psrc[index];
                 }
-                cv::Mat labelMat = src.file.get("labels").value<cv::Mat>();
+                cv::Mat labelMat = src.file.value("labels").value<cv::Mat>();
                 uchar* plabel = labelMat.ptr();
                 temp.file.setLabel(plabel[index]);
@@ -53,8 +53,8 @@ class ImpostorUniquenessMeasureTransform : public Transform
     {
         dst = src;
         float ium = calculateIUM(src, impostors);
-        dst.file.insert("Impostor_Uniqueness_Measure", ium);
-        dst.file.insert("Impostor_Uniqueness_Measure_Bin", ium < mean-stddev ? 0 : (ium < mean+stddev ? 1 : 2));
+        dst.file.set("Impostor_Uniqueness_Measure", ium);
+        dst.file.set("Impostor_Uniqueness_Measure_Bin", ium < mean-stddev ? 0 : (ium < mean+stddev ? 1 : 2));
     }
     void store(QDataStream &stream) const
@@ -155,7 +155,7 @@ class RndPointTransform : public Transform
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        dst.file.appendLandmark(QPointF(src.m().cols * x, src.m().rows * y));
+        dst.file.appendPoint(QPointF(src.m().cols * x, src.m().rows * y));
     }
 };
@@ -148,7 +148,7 @@ class RectFromLandmarksTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.file.landmarks().isEmpty()) {
+        if (src.file.points().isEmpty()) {
             qWarning("No landmarks");
             dst = src;
             return;
@@ -160,12 +160,12 @@ class RectFromLandmarksTransform : public UntrainableTransform
         maxX = maxY = -std::numeric_limits<int>::max();
         foreach(int index, indices) {
-            if (src.file.landmarks().size() > index+1) {
-                if (src.file.landmarks()[index].x() < minX) minX = src.file.landmarks()[index].x();
-                if (src.file.landmarks()[index].x() > maxX) maxX = src.file.landmarks()[index].x();
-                if (src.file.landmarks()[index].y() < minY) minY = src.file.landmarks()[index].y();
-                if (src.file.landmarks()[index].y() > maxY) maxY = src.file.landmarks()[index].y();
-                dst.file.appendLandmark(src.file.landmarks()[index]);
+            if (src.file.points().size() > index+1) {
+                if (src.file.points()[index].x() < minX) minX = src.file.points()[index].x();
+                if (src.file.points()[index].x() > maxX) maxX = src.file.points()[index].x();
+                if (src.file.points()[index].y() < minY) minY = src.file.points()[index].y();
+                if (src.file.points()[index].y() > maxY) maxY = src.file.points()[index].y();
+                dst.file.appendPoint(src.file.points()[index]);
             }
         }
@@ -67,17 +67,14 @@ class AffineTransform : public UntrainableTransform
         else           dstPoints[2] = Point2f(x3*width, y3*height);
         Point2f srcPoints[3];
-        if (src.file.contains("Affine_0_X") &&
-            src.file.contains("Affine_0_Y") &&
-            src.file.contains("Affine_1_X") &&
-            src.file.contains("Affine_1_Y") &&
-            (src.file.contains("Affine_2_X") || twoPoints) &&
-            (src.file.contains("Affine_2_Y") || twoPoints)) {
-            srcPoints[0] = Point2f(src.file.getFloat("Affine_0_X"), src.file.getFloat("Affine_0_Y"));
-            srcPoints[1] = Point2f(src.file.getFloat("Affine_1_X"), src.file.getFloat("Affine_1_Y"));
-            if (!twoPoints) srcPoints[2] = Point2f(src.file.getFloat("Affine_2_X"), src.file.getFloat("Affine_2_Y"));
+        if (src.file.contains("Affine_0") &&
+            src.file.contains("Affine_1") &&
+            (src.file.contains("Affine_2") || twoPoints)) {
+            srcPoints[0] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_0"));
+            srcPoints[1] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_1"));
+            if (!twoPoints) srcPoints[2] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_2"));
         } else {
-            const QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.landmarks());
+            const QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.points());
             if ((landmarks.size() < 2) || (!twoPoints && (landmarks.size() < 3))) {
                 resize(src, dst, Size(width, height));
@@ -87,14 +84,9 @@ class AffineTransform : public UntrainableTransform
                 srcPoints[1] = landmarks[1];
                 if (!twoPoints) srcPoints[2] = landmarks[2];
-                dst.file.insert("Affine_0_X", landmarks[0].x);
-                dst.file.insert("Affine_0_Y", landmarks[0].y);
-                dst.file.insert("Affine_1_X", landmarks[1].x);
-                dst.file.insert("Affine_1_Y", landmarks[1].y);
-                if (!twoPoints) {
-                    dst.file.insert("Affine_2_X", landmarks[2].x);
-                    dst.file.insert("Affine_2_Y", landmarks[2].y);
-                }
+                dst.file.set("Affine_0", OpenCVUtils::fromPoint(landmarks[0]));
+                dst.file.set("Affine_1", OpenCVUtils::fromPoint(landmarks[1]));
+                if (!twoPoints) dst.file.set("Affine_2", OpenCVUtils::fromPoint(landmarks[2]));
             }
         }
         if (twoPoints) srcPoints[2] = getThirdAffinePoint(srcPoints[0], srcPoints[1]);
@@ -22,7 +22,7 @@ class CrossValidateTransform : public MetaTransform
         int numPartitions = 0;
         QList<int> partitions; partitions.reserve(data.size());
         foreach (const File &file, data.files()) {
-            partitions.append(file.getInt("Cross_Validation_Partition", 0));
+            partitions.append(file.get<int>("Cross_Validation_Partition", 0));
             numPartitions = std::max(numPartitions, partitions.last()+1);
         }
@@ -48,7 +48,7 @@ class CrossValidateTransform : public MetaTransform
     void project(const Template &src, Template &dst) const
     {
-        transforms[src.file.getInt("Cross_Validation_Partition", 0)]->project(src, dst);
+        transforms[src.file.get<int>("Cross_Validation_Partition", 0)]->project(src, dst);
     }
     void store(QDataStream &stream) const
@@ -82,8 +82,8 @@ class CrossValidateDistance : public Distance
     float compare(const Template &a, const Template &b) const
     {
-        const int partitionA = a.file.getInt("Cross_Validation_Partition", 0);
-        const int partitionB = b.file.getInt("Cross_Validation_Partition", 0);
+        const int partitionA = a.file.get<int>("Cross_Validation_Partition", 0);
+        const int partitionB = b.file.get<int>("Cross_Validation_Partition", 0);
         return (partitionA != partitionB) ? -std::numeric_limits<float>::max() : 0;
     }
 };
@@ -104,7 +104,7 @@ class FilterDistance : public Distance
         (void) b; // Query template isn't checked
         foreach (const QString &key, Globals->filters.keys()) {
             bool keep = false;
-            const QString metadata = a.file.getString(key, "");
+            const QString metadata = a.file.get<QString>(key, "");
             if (metadata.isEmpty()) continue;
             foreach (const QString &value, Globals->filters[key]) {
                 if (metadata == value) {
@@ -189,11 +189,11 @@ class GaborJetTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        const QList<QPointF> landmarks = src.file.landmarks();
-        dst = Mat(landmarks.size(), kReals.size(), CV_32FC1);
-        for (int i=0; i<landmarks.size(); i++)
+        const QList<QPointF> points = src.file.points();
+        dst = Mat(points.size(), kReals.size(), CV_32FC1);
+        for (int i=0; i<points.size(); i++)
             for (int j=0; j<kReals.size(); j++)
-                    dst.m().at<float>(i,j) = response(src, landmarks[i], kReals[j], kImaginaries[j], component);
+                    dst.m().at<float>(i,j) = response(src, points[i], kReals[j], kImaginaries[j], component);
     }
 };