better reduction support

Josh Klontz
1 parent 05383a8c
Showing 3 changed files with 15 additions and 3 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/gallery.cpp
@@ -452,6 +452,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
     foreach (const br::File &file, gallery.split()) {
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
+        if (gallery.getBool("reduce")) newTemplates = newTemplates.reduced();
         const int crossValidate = gallery.getInt("crossValidate");
         if (crossValidate > 0) srand(0);
  
@@ -393,6 +393,17 @@ struct TemplateList : public QList&lt;Template&gt;
                 labelCounts[file.label()]++;
         return labelCounts;
     }
+
+    /*!
+     * \brief Merge all the templates together.
+     */
+    TemplateList reduced() const
+    {
+        Template reduced;
+        foreach (const Template &t, *this)
+            reduced.merge(t);
+        return TemplateList() << reduced;
+    }
 };
  
 /*!
@@ -135,7 +135,7 @@ BR_REGISTER(Gallery, EmptyGallery)
  
 /*!
  * \ingroup galleries
- * \brief Treats the gallery as a single image.
+ * \brief Treats the gallery as a br::Format.
  * \author Josh Klontz \cite jklontz
  */
 class DefaultGallery : public Gallery
@@ -150,8 +150,8 @@ class DefaultGallery : public Gallery
  
     void write(const Template &t)
     {
-        QtUtils::touchDir(QFileInfo(file.name));
-        OpenCVUtils::saveImage(t, file.name);
+        QScopedPointer<Format> format(Factory<Format>::make(file));
+        format->write(t);
     }
 };
 BR_REGISTER(Gallery, DefaultGallery)