Distance gallery and output incremental operations from Globals->blockSize

For galleries, add a property to Gallery indicating the number of templates that will be read per block (for galleries that do incremental reads--really just galGallery and memGallery). For outputs, add two properties indicating the rows and columns of blocks to use (i.e. support non-square output blocks). For both classes, default these properties to Globals->blockSize

Distance gallery and output incremental operations from Globals->blockSize
For galleries, add a property to Gallery indicating the number of templates that will be read per block (for galleries that do incremental reads--really just galGallery and memGallery). For outputs, add two properties indicating the rows and columns of blocks to use (i.e. support non-square output blocks). For both classes, default these properties to Globals->blockSize
Charles Otto
1 parent 4fb48f36
Showing 4 changed files with 26 additions and 11 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/gallery.cpp
openbr/plugins/output.cpp
@@ -1101,13 +1101,19 @@ void Output::initialize(const FileList &amp;targetFiles, const FileList &amp;queryFiles)
 {
     this->targetFiles = targetFiles;
     this->queryFiles = queryFiles;
+    if (this->blockRows == -1)
+        blockRows = Globals->blockSize;
+
+    if (this->blockCols == -1)
+        blockCols = Globals->blockSize;
+
     selfSimilar = (queryFiles == targetFiles) && (targetFiles.size() > 1) && (queryFiles.size() > 1);
 }
 void Output::setBlock(int rowBlock, int columnBlock)
 {
-    offset = QPoint((columnBlock == -1) ? 0 : Globals->blockSize*columnBlock,
-                    (rowBlock == -1) ? 0 : Globals->blockSize*rowBlock);
+    offset = QPoint((columnBlock == -1) ? 0 : blockCols*columnBlock,
+                    (rowBlock == -1) ? 0 : blockRows*rowBlock);
     if (!next.isNull()) next->setBlock(rowBlock, columnBlock);
 }
@@ -996,6 +996,11 @@ class BR_EXPORT Output : public Object
     Q_OBJECT
 public:
+    Q_PROPERTY(int blockRows READ get_blockRows WRITE set_blockRows RESET reset_blockRows STORED false)
+    Q_PROPERTY(int blockCols READ get_blockCols WRITE set_blockCols RESET reset_blockCols STORED false)
+    BR_PROPERTY(int, blockRows, -1)
+    BR_PROPERTY(int, blockCols, -1)
+
     FileList targetFiles; /*!< \brief List of files representing the gallery templates. */
     FileList queryFiles; /*!< \brief List of files representing the probe templates. */
     bool selfSimilar; /*!< \brief \c true if the \em targetFiles == \em queryFiles, \c false otherwise. */
@@ -1074,9 +1079,11 @@ public:
  */
 class BR_EXPORT Gallery : public Object
 {
-    Q_OBJECT
-
+    Q_OBJECT    
 public:
+    Q_PROPERTY(int readBlockSize READ get_readBlockSize WRITE set_readBlockSize RESET reset_readBlockSize STORED false)
+    BR_PROPERTY(int, readBlockSize, Globals->blockSize)
+
     virtual ~Gallery() {}
     TemplateList read(); /*!< \brief Retrieve all the stored templates. */
     FileList files(); /*!< \brief Retrieve all the stored template files. */
@@ -123,7 +123,7 @@ class galGallery : public Gallery
             gallery.seek(0);
         TemplateList templates;
-        while ((templates.size() < Globals->blockSize) && !stream.atEnd()) {
+        while ((templates.size() < readBlockSize) && !stream.atEnd()) {
             Template m;
             stream >> m;
             templates.append(m);
@@ -348,8 +348,8 @@ class memGallery : public Gallery
             MemoryGalleries::aligned[file] = true;
         }
-        TemplateList templates = MemoryGalleries::galleries[file].mid(block*Globals->blockSize, Globals->blockSize);
-        *done = (templates.size() < Globals->blockSize);
+        TemplateList templates = MemoryGalleries::galleries[file].mid(block*readBlockSize, readBlockSize);
+        *done = (templates.size() < readBlockSize);
         block = *done ? 0 : block+1;
         return templates;
     }
@@ -215,9 +215,11 @@ class mtxOutput : public Output
         this->rowBlock = rowBlock;
         this->columnBlock = columnBlock;
-        blockScores = cv::Mat(std::min(queryFiles.size()-rowBlock*Globals->blockSize, Globals->blockSize),
-                              std::min(targetFiles.size()-columnBlock*Globals->blockSize, Globals->blockSize),
-                              CV_32FC1);
+
+        int matrixRows  = std::min(queryFiles.size()-rowBlock*this->blockRows, blockRows);
+        int matrixCols  = std::min(targetFiles.size()-columnBlock*this->blockCols, blockCols);
+
+        blockScores = cv::Mat(matrixRows, matrixCols, CV_32FC1);
     }
     void setRelative(float value, int i, int j)
@@ -237,7 +239,7 @@ class mtxOutput : public Output
         if (!f.open(QFile::ReadWrite))
             qFatal("Unable to open %s for modifying.", qPrintable(file));
         for (int i=0; i<blockScores.rows; i++) {
-            f.seek(headerSize + sizeof(float)*(quint64(rowBlock*Globals->blockSize+i)*targetFiles.size()+(columnBlock*Globals->blockSize)));
+            f.seek(headerSize + sizeof(float)*(quint64(rowBlock*this->blockRows+i)*targetFiles.size()+(columnBlock*this->blockCols)));
             f.write((const char*)blockScores.row(i).data, sizeof(float)*blockScores.cols);
         }
         f.close();