Use the wonderful File::getList

Austin Blanton
1 parent 7daada02
Showing 2 changed files with 7 additions and 3 deletions
openbr/core/eval.cpp
openbr/plugins/slidingwindow.cpp
@@ -435,9 +435,11 @@ QList&lt;Detection&gt; getDetections(QString key, const Template &amp;t, bool isList, bool
     QList<Detection> dets;
     if (isList) {
         QList<QRectF> rects = f.rects();
-        QList<float> confidences = QtUtils::toFloats(f.get<QStringList>("Confidences", QStringList()));
+        QList<float> confidences;
+        if (f.contains("Confidences"))
+            confidences = f.getList<float>("Confidences");
         if (!isTruth && rects.size() != confidences.size())
-            qFatal("You don't have enough confidence. I mean, your detections don't have confidence measures.");
+            qFatal("You don't have enough confidence. I mean, your detections don't all have confidence measures.");
         for (int i=0; i<rects.size(); i++) {
             if (isTruth)
                 dets.append(Detection(rects.at(i)));
@@ -116,7 +116,9 @@ private:
                     if (detect.file.get<QString>("Label") == "pos") {
                         dst.file.appendRect(OpenCVUtils::fromRect(window));
                         float confidence = detect.file.get<float>("Dist");
-                        QList<float> confidences = dst.file.get<QList<float> >("Confidences", QList<float>());
+                        QList<float> confidences;
+                        if (dst.file.contains("Confidences"))
+                            confidences = dst.file.getList<float>("Confidences");
                         confidences.append(confidence);
                         dst.file.set("Confidences", QtUtils::toVariantList(confidences));
                         if (takeLargestScale) return;