Various bug fixes

Scott Klum
1 parent e19e4805
Showing 4 changed files with 22 additions and 22 deletions
sdk/core/plot.cpp
sdk/openbr_plugin.cpp
sdk/plugins/stasm.cpp
sdk/plugins/validate.cpp
@@ -122,7 +122,7 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
     maskFile.insert("rows", scores.rows);
     maskFile.insert("columns", scores.cols);
     const Mat masks = BEE::readMask(maskFile);
-    if (scores.size() != masks.size()) qFatal("Simmat %i /Mask %i size mismatch.", scores.size(), mask.size());
+    if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch.");
     // Make comparisons
     QList<Comparison> comparisons; comparisons.reserve(scores.rows*scores.cols);
@@ -383,31 +383,25 @@ QStringList FileList::names() const
     return names;
 }
-typedef QPair<QString,int> MetadataPair;
-static bool comparator( const MetadataPair &l, const MetadataPair &r)
-{
-    return l.first < r.first;
-}
-
 void FileList::sort(const QString& key)
 {
     if (size() <= 1) return;
-    QList<MetadataPair> metadata;
+    QList<QString> metadata;
+    FileList sortedList;
     for (int i = 0; i < size(); i++) {
-        MetadataPair pair = qMakePair(at(i).get(key).toString(), i);
-        metadata.append(pair);
+        if (at(i).contains(key)) {
+            metadata.append(at(i).get(key).toString());
+        }
+        else sortedList.push_back(at(i));
     }
-    std::sort(metadata.begin(), metadata.end(), comparator);
-
-    FileList newList;
-
-    for (int i = 0; i < metadata.size(); i++)
-        newList.append(at(metadata[i].second));
+    typedef QPair<QString,int> Pair;
+    foreach (const Pair &pair, Common::Sort(metadata, true))
+        sortedList.prepend(at(pair.second));
-    *this = newList;
+    *this = sortedList;
 }
 QList<float> FileList::labels() const
@@ -52,9 +52,11 @@ class StasmTransform : public UntrainableTransform
                      qPrintable(src.file.name), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
                      src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/"));
-        if (nlandmarks == 0) qWarning("Unable to detect Stasm landmarks");
-
-        dst = src;
+        if (nlandmarks == 0) {
+            qWarning("Unable to detect Stasm landmarks");
+            dst.file.setBool("FTE");
+            dst.m() = Mat();
+        }
         for (int i = 0; i < nlandmarks; i++)
             dst.file.appendLandmark(QPointF(landmarks[2 * i], landmarks[2 * i + 1]));
@@ -103,12 +103,16 @@ 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, "");
             if (metadata.isEmpty()) continue;
             foreach (const QString &value, Globals->filters[key]) {
-                if (metadata == value) continue;
-                return -std::numeric_limits<float>::max();
+                if (metadata == value) {
+                    keep = true;
+                    break;
+                }
             }
+            if (!keep) return -std::numeric_limits<float>::max();
         }
         return 0;
     }