Peter M. Groen / openbr

Commit 1272d94c8bef878d35de0bc71939213748a925c0

Authored by Charles Otto
1 parent 68af96c3

Update mtxOutput to take the gallery names as parameters

Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
openbr/plugins/misc.cpp
  View file @1272d94
@@ -662,7 +662,7 @@ class OutputTransform : public TimeVaryingTransform @@ -662,7 +662,7 @@ class OutputTransform : public TimeVaryingTransform
662 fragmentsPerCol = 1; 662 fragmentsPerCol = 1;
663 } 663 }
664 664
665 - output = QSharedPointer<Output>(Output::make(outputString, targetFiles, queryFiles)); 665 + output = QSharedPointer<Output>(Output::make(outputString+"[targetGallery="+targetName+",queryGallery="+queryName+"]", targetFiles, queryFiles));
666 output->blockRows = fragmentsPerCol; 666 output->blockRows = fragmentsPerCol;
667 output->blockCols = fragmentsPerRow; 667 output->blockCols = fragmentsPerRow;
668 output->initialize(targetFiles, queryFiles); 668 output->initialize(targetFiles, queryFiles);
openbr/plugins/output.cpp
  View file @1272d94
@@ -175,6 +175,12 @@ BR_REGISTER(Output, meltOutput) @@ -175,6 +175,12 @@ BR_REGISTER(Output, meltOutput)
175 class mtxOutput : public Output 175 class mtxOutput : public Output
176 { 176 {
177 Q_OBJECT 177 Q_OBJECT
  178 +
  179 + Q_PROPERTY(QString targetGallery READ get_targetGallery WRITE set_targetGallery RESET reset_targetGallery STORED false)
  180 + Q_PROPERTY(QString queryGallery READ get_queryGallery WRITE set_queryGallery RESET reset_queryGallery STORED false)
  181 + BR_PROPERTY(QString, targetGallery, "Unknown_Target")
  182 + BR_PROPERTY(QString, queryGallery, "Unknown_Query")
  183 +
178 int headerSize, rowBlock, columnBlock; 184 int headerSize, rowBlock, columnBlock;
179 cv::Mat blockScores; 185 cv::Mat blockScores;
180 186
@@ -194,9 +200,9 @@ class mtxOutput : public Output @@ -194,9 +200,9 @@ class mtxOutput : public Output
194 const int endian = 0x12345678; 200 const int endian = 0x12345678;
195 QByteArray header; 201 QByteArray header;
196 header.append("S2\n"); 202 header.append("S2\n");
197 - header.append(qPrintable(targetFiles.first().get<QString>("Gallery", "Unknown_Target"))); 203 + header.append(qPrintable(targetGallery));
198 header.append("\n"); 204 header.append("\n");
199 - header.append(qPrintable(queryFiles.first().get<QString>("Gallery", "Unknown_Query"))); 205 + header.append(qPrintable(queryGallery));
200 header.append("\nMF "); 206 header.append("\nMF ");
201 header.append(qPrintable(QString::number(queryFiles.size()))); 207 header.append(qPrintable(QString::number(queryFiles.size())));
202 header.append(" "); 208 header.append(" ");