Removed personal changes

Scott Klum
1 parent 8f0492db
Showing 5 changed files with 12 additions and 28 deletions
openbr/core/bee.cpp
openbr/core/plot.cpp
openbr/plugins/draw.cpp
openbr/plugins/gallery.cpp
openbr/plugins/output.cpp
@@ -112,7 +112,7 @@ void BEE::writeSigset(const QString &amp;sigset, const br::FileList &amp;files, bool ign
                 metadata.append("Rects=\"["+landmarks.join(",")+"]\"");
             }
         }
-        lines.append("\t<biometric-signature name=\"" + file.baseName() +"\">");
+        lines.append("\t<biometric-signature name=\"" + file.get<QString>("Label",file.baseName()) +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
     }
@@ -228,7 +228,7 @@ bool Plot(const QStringList &amp;files, const File &amp;destination, bool show)
                             QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") +
                             (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
                             (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
-                            QString(" + scale_x_log10(labels=percent, limits=c(min(DET$X),1)) + scale_y_continuous(labels=percent) + annotation_logticks(sides=\"b\")\n\n")));
+                            QString(" + scale_x_log10(labels=percent, limits=c(min(DET$X),1)) + scale_y_log10(labels=percent) + annotation_logticks()\n\n")));
  
     p.file.write(qPrintable(QString("qplot(X, Y, data=DET%1").arg((p.major.smooth || p.minor.smooth) ? ", geom=\"smooth\", method=loess, level=0.99" : ", geom=\"line\"") +
                             (p.major.size > 1 ? QString(", colour=factor(%1)").arg(p.major.header) : QString()) +
@@ -48,11 +48,11 @@ class DrawTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         const Scalar color(0,255,0);
-        const Scalar verboseColor(0, 0, 0);
+        const Scalar verboseColor(255, 255, 0);
         dst.m() = inPlace ? src.m() : src.m().clone();
  
         if (points) {
-            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.points());
+            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.namedPoints() + src.file.points());
             for (int i=0; i<pointsList.size(); i++) {
                 const Point2f &point = pointsList[i];
                 circle(dst, point, 3, color, -1);
@@ -119,7 +119,6 @@ class galGallery : public Gallery
     {
         if (t.isEmpty() && t.file.isNull())
             return;
-        if (t.file.baseName() != "204765279_PCSOdata")
             stream << t;
     }
 };
@@ -186,7 +185,7 @@ class EmptyGallery : public Gallery
         if (file.name.isEmpty()) return;
  
         const QString newFormat = file.get<QString>("newFormat",QString());
-        QString destination = file.name + "/fold_" + QString::number(t.file.get<int>("Partition")) + "/target/" + (file.getBool("preservePath") ? t.file.path()+"/" : QString());
+        QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.path()+"/" : QString());
         destination += (newFormat.isEmpty() ? t.file.fileName() : t.file.baseName()+newFormat);
  
         QMutexLocker diskLocker(&diskLock); // Windows prefers to crash when writing to disk in parallel
@@ -76,29 +76,14 @@ class csvOutput : public MatrixOutput
     {
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
         QStringList lines;
-        if (Globals->crossValidate == 0) {
-            for (int i=0; i<queryFiles.size(); i++) {
-                QStringList words;
-                for (int j=0; j<targetFiles.size(); j++)
-                    words.append(queryFiles[i].name+","+targetFiles[j].baseName() + "," + toString(i,j)); // The toString idiom is used to output match scores - see MatrixOutput
-                lines.append(words.join("\n"));
-            }
-            QtUtils::writeFile(file.name, lines);
-        } else {
-            for (int k=0; k<Globals->crossValidate; k++) {
-                lines.clear();
-                for (int i=0; i<queryFiles.size(); i++) {
-                    int queryPartition = queryFiles[i].get<int>("Partition");
-                    if (queryPartition != k) continue;
-                    QStringList words;
-                    QList<int> targetPartitions = targetFiles.crossValidationPartitions();
-                    for (int j=0; j<targetFiles.size(); j++)
-                        if (queryPartition == targetPartitions[j]) words.append(queryFiles[i].name+","+targetFiles[j].baseName() + "," + toString(i,j)); // The toString idiom is used to output match scores - see MatrixOutput
-                        lines.append(words.join("\n"));
-                }
-                QtUtils::writeFile(file.name.arg(QString::number(k)), lines);
-            }
+        lines.append("File," + targetFiles.names().join(","));
+        for (int i=0; i<queryFiles.size(); i++) {
+            QStringList words;
+            for (int j=0; j<targetFiles.size(); j++)
+                words.append(toString(i,j));  // The toString idiom is used to output match scores - see MatrixOutput
+            lines.append(queryFiles[i].name+","+words.join(","));
         }
+        QtUtils::writeFile(file, lines);
     }
 };