Added newFormat to EmptyGallery

Scott Klum
1 parent cfa577b5
Showing 4 changed files with 8 additions and 14 deletions
openbr/openbr_plugin.cpp
openbr/plugins/cascade.cpp
openbr/plugins/format.cpp
openbr/plugins/gallery.cpp
@@ -433,22 +433,11 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
                         // of target images to every partition
                         newTemplates[i].file.set("Partition", -1);
                     } else {
-                        const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.get<QString>("Subject").toLatin1(), QCryptographicHash::Md5);
-                        // Select the right 8 hex characters so that it can be represented as a 64 bit integer without overflow
-                        newTemplates[i].file.set("Partition", md5.toHex().right(8).toULongLong(0, 16) % crossValidate);
-                    }
-<<<<<<< HEAD
-=======
-                } else if (newTemplates[i].file.getBool("allPartitions")) {
-                    // The allPartitions flag is used to add an extended set
-                    // of target images to every partition
-                    newTemplates[i].file.set("Partition", -1);
-                } else {
                     // Direct use of "Label" is not general -cao
                     const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.get<QString>("Label").toLatin1(), QCryptographicHash::Md5);
                     // Select the right 8 hex characters so that it can be represented as a 64 bit integer without overflow
                     newTemplates[i].file.set("Partition", md5.toHex().right(8).toULongLong(0, 16) % crossValidate);
->>>>>>> c2b1835e05d3b229db72d8829fb9ebf7e3cf31d8
+                    }
                 }
             }
         }
@@ -84,6 +84,7 @@ class CascadeTransform : public UntrainableMetaTransform
         foreach (const Template &t, src) {
             const bool enrollAll = t.file.getBool("enrollAll");
+            qDebug() << enrollAll;
             for (int i=0; i<t.size(); i++) {
                 const Mat &m = t[i];
                 vector<Rect> rects;
@@ -236,6 +236,7 @@ class DefaultFormat : public Format
             videoWriter.file = file;
             videoWriter.write(t);
         } else if (t.size() == 1) {
+            QtUtils::touchDir(QDir(file.path()));
             imwrite(file.name.toStdString(), t);
         }
     }
@@ -135,7 +135,7 @@ class EmptyGallery : public Gallery
 {
     Q_OBJECT
     Q_PROPERTY(QString regexp READ get_regexp WRITE set_regexp RESET reset_regexp STORED false)
-    BR_PROPERTY(QString, regexp, "")
+    BR_PROPERTY(QString, regexp, QString())
     void init()
     {
@@ -184,7 +184,10 @@ class EmptyGallery : public Gallery
         // Enrolling a null file is used as an idiom to initialize an algorithm
         if (file.name.isEmpty()) return;
-        const QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.name : t.file.fileName());
+        const QString newFormat = file.get<QString>("newFormat",QString());
+        QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.path()+"/" : QString());
+        destination += (newFormat.isEmpty() ? t.file.fileName() : t.file.baseName()+newFormat);
+
         QMutexLocker diskLocker(&diskLock); // Windows prefers to crash when writing to disk in parallel
         if (t.isNull()) {
             QtUtils::copyFile(t.file.resolved(), destination);