factored out metadata comparison

Josh Klontz
1 parent f7dff58c
Showing 2 changed files with 26 additions and 11 deletions
sdk/openbr_plugin.cpp
sdk/plugins/quality.cpp
@@ -1139,8 +1139,6 @@ private:
         }
     }
-
-
     void store(QDataStream &stream) const
     {
         const int size = transforms.size();
@@ -1312,15 +1310,6 @@ void Distance::compare(const TemplateList &amp;target, const TemplateList &amp;query, Ou
 float Distance::compare(const Template &target, const Template &query) const
 {
-    if (!Globals->demographicFilters.isEmpty()) // If statement is faster than iterating over an empty list of filters
-        foreach (const QString &filter, Globals->demographicFilters.keys()) {
-            const QString targetMetadata = target.file.getString(filter, "");
-            if (targetMetadata.isEmpty()) continue;
-            const QRegExp re(Globals->demographicFilters[filter]);
-            if (re.indexIn(targetMetadata) == -1)
-                return -std::numeric_limits<float>::max();
-        }
-
     return _compare(target, query);
 }
@@ -262,6 +262,32 @@ class UnitDistance : public Distance
 BR_REGISTER(Distance, UnitDistance)
+/*!
+ * \ingroup distances
+ * \brief Check target metadata before matching templates.
+ * \author Josh Klontz \cite jklontz
+ */
+class MetadataDistance : public Distance
+{
+    Q_OBJECT
+    Q_PROPERTY(Distance *distance READ get_distance WRITE set_distance RESET reset_distance)
+    BR_PROPERTY(Distance*, distance, make("Dist(L2)"))
+
+    float _compare(const Template &a, const Template &b) const
+    {
+        foreach (const QString &filter, Globals->demographicFilters.keys()) {
+            const QString metadata = a.file.getString(filter, "");
+            if (metadata.isEmpty()) continue;
+            const QRegExp re(Globals->demographicFilters[filter]);
+            if (re.indexIn(metadata) == -1)
+                return -std::numeric_limits<float>::max();
+        }
+        return distance->compare(a, b);
+    }
+};
+
+BR_REGISTER(Distance, MetadataDistance)
+
 } // namespace br
 #include "quality.moc"