From 9e9e9d5d22cb2b165808e53603942f492df62125 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Thu, 4 Apr 2013 18:36:47 -0400 Subject: [PATCH] Changes that should be undone --- openbr/core/plot.cpp | 2 +- openbr/plugins/draw.cpp | 2 +- openbr/plugins/gui.cpp | 5 ++--- openbr/plugins/misc.cpp | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp index b89706a..36e69ec 100644 --- a/openbr/core/plot.cpp +++ b/openbr/core/plot.cpp @@ -255,7 +255,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) lines.append(QString("KDEImpostor,%1,%2").arg(QString::number(f), QString::number(Common::KernelDensityEstimation(sampledImpostorScores, f, hImpostor)))); // Write Cumulative Match Characteristic (CMC) curve - const int Max_Retrieval = 100; + const int Max_Retrieval = 200; const int Report_Retrieval = 5; float reportRetrievalRate = -1; for (int i=1; i<=Max_Retrieval; i++) { diff --git a/openbr/plugins/draw.cpp b/openbr/plugins/draw.cpp index e35a4ff..b41570b 100644 --- a/openbr/plugins/draw.cpp +++ b/openbr/plugins/draw.cpp @@ -51,7 +51,7 @@ class DrawTransform : public UntrainableTransform const QList pointsList = OpenCVUtils::toPoints(named ? src.file.namedPoints() : src.file.points()); for (int i=0; isetPixmap(input); window->setFixedSize(input.size()); + // wait for enter key } void createWindow() @@ -101,6 +102,7 @@ public: // Connect our signals to the proxy's slots connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection); connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap))); + // connect gui newPoint to this setPoint } ~Show2Transform() @@ -273,9 +275,6 @@ protected: }; BR_REGISTER(Transform, FPSCalc) - - - } // namespace br #include "gui.moc" diff --git a/openbr/plugins/misc.cpp b/openbr/plugins/misc.cpp index fd682f7..e46a8be 100644 --- a/openbr/plugins/misc.cpp +++ b/openbr/plugins/misc.cpp @@ -108,9 +108,10 @@ class PrintTransform : public UntrainableMetaTransform void project(const Template &src, Template &dst) const { dst = src; - const QString nameString = src.file.flat(); + const QString nameString = src.file.name; const QString dataString = data ? OpenCVUtils::matrixToString(src)+"\n" : QString(); const QString nTemplates = size ? QString::number(src.size()) : QString(); + qDebug() << "Dimensionality: " << src.first().cols; if (error) qDebug("%s\n%s\n%s", qPrintable(nameString), qPrintable(dataString), qPrintable(nTemplates)); else printf("%s\n%s\n%s", qPrintable(nameString), qPrintable(dataString), qPrintable(nTemplates)); } -- libgit2 0.21.4