Commit 1a79e0980550c7486bdac1eaf407fc9fec4d6c30
1 parent
a85b4ebf
made .rr simple mode more consistent
Showing
1 changed file
with
2 additions
and
2 deletions
openbr/plugins/output.cpp
| @@ -268,7 +268,7 @@ class rrOutput : public MatrixOutput | @@ -268,7 +268,7 @@ class rrOutput : public MatrixOutput | ||
| 268 | 268 | ||
| 269 | for (int i=0; i<queryFiles.size(); i++) { | 269 | for (int i=0; i<queryFiles.size(); i++) { |
| 270 | QStringList files; | 270 | QStringList files; |
| 271 | - if (simple) files.append(queryFiles[i]); | 271 | + if (simple) files.append(queryFiles[i].fileName()); |
| 272 | 272 | ||
| 273 | typedef QPair<float,int> Pair; | 273 | typedef QPair<float,int> Pair; |
| 274 | foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true, limit)) { | 274 | foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true, limit)) { |
| @@ -276,7 +276,7 @@ class rrOutput : public MatrixOutput | @@ -276,7 +276,7 @@ class rrOutput : public MatrixOutput | ||
| 276 | if (pair.first < threshold) break; | 276 | if (pair.first < threshold) break; |
| 277 | File target = targetFiles[pair.second]; | 277 | File target = targetFiles[pair.second]; |
| 278 | target.set("Score", QString::number(pair.first)); | 278 | target.set("Score", QString::number(pair.first)); |
| 279 | - if (simple) files.append(target.baseName() + " " + QString::number(pair.first)); | 279 | + if (simple) files.append(target.fileName() + " " + QString::number(pair.first)); |
| 280 | else files.append(target.flat()); | 280 | else files.append(target.flat()); |
| 281 | } | 281 | } |
| 282 | } | 282 | } |