Peter M. Groen / openbr

Commit 9e9e9d5d22cb2b165808e53603942f492df62125

Authored by Scott Klum
1 parent 7ae74c55

Changes that should be undone

Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
openbr/core/plot.cpp
  View file @9e9e9d5
... ... @@ -255,7 +255,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv)
255 255 lines.append(QString("KDEImpostor,%1,%2").arg(QString::number(f), QString::number(Common::KernelDensityEstimation(sampledImpostorScores, f, hImpostor))));
256 256  
257 257 // Write Cumulative Match Characteristic (CMC) curve
258   - const int Max_Retrieval = 100;
  258 + const int Max_Retrieval = 200;
259 259 const int Report_Retrieval = 5;
260 260 float reportRetrievalRate = -1;
261 261 for (int i=1; i<=Max_Retrieval; i++) {
... ...
openbr/plugins/draw.cpp
  View file @9e9e9d5
... ... @@ -51,7 +51,7 @@ class DrawTransform : public UntrainableTransform
51 51 const QList<Point2f> pointsList = OpenCVUtils::toPoints(named ? src.file.namedPoints() : src.file.points());
52 52 for (int i=0; i<pointsList.size(); i++) {
53 53 const Point2f &point = pointsList[i];
54   - circle(dst, point, 3, color);
  54 + circle(dst, point, 1, color, -1);
55 55 if (verbose) putText(dst, QString::number(i).toStdString(), point, FONT_HERSHEY_SIMPLEX, 0.5, verboseColor, 1);
56 56 }
57 57 }
... ...
openbr/plugins/gui.cpp
  View file @9e9e9d5
... ... @@ -67,6 +67,7 @@ public slots:
67 67 {
68 68 window->setPixmap(input);
69 69 window->setFixedSize(input.size());
  70 + // wait for enter key
70 71 }
71 72  
72 73 void createWindow()
... ... @@ -101,6 +102,7 @@ public:
101 102 // Connect our signals to the proxy's slots
102 103 connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection);
103 104 connect(this, SIGNAL(updateImage(QPixmap)), gui,SLOT(showImage(QPixmap)));
  105 + // connect gui newPoint to this setPoint
104 106 }
105 107  
106 108 ~Show2Transform()
... ... @@ -273,9 +275,6 @@ protected:
273 275 };
274 276 BR_REGISTER(Transform, FPSCalc)
275 277  
276   -
277   -
278   -
279 278 } // namespace br
280 279  
281 280 #include "gui.moc"
... ...
openbr/plugins/misc.cpp
  View file @9e9e9d5
... ... @@ -108,9 +108,10 @@ class PrintTransform : public UntrainableMetaTransform
108 108 void project(const Template &src, Template &dst) const
109 109 {
110 110 dst = src;
111   - const QString nameString = src.file.flat();
  111 + const QString nameString = src.file.name;
112 112 const QString dataString = data ? OpenCVUtils::matrixToString(src)+"\n" : QString();
113 113 const QString nTemplates = size ? QString::number(src.size()) : QString();
  114 + qDebug() << "Dimensionality: " << src.first().cols;
114 115 if (error) qDebug("%s\n%s\n%s", qPrintable(nameString), qPrintable(dataString), qPrintable(nTemplates));
115 116 else printf("%s\n%s\n%s", qPrintable(nameString), qPrintable(dataString), qPrintable(nTemplates));
116 117 }
... ...