diff --git a/CHANGELOG.md b/CHANGELOG.md index 828766e..5259d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ 0.3.0 - ??/??/?? ================ * YouTubeFacesDBTransform implements Dr. Wolf's experimental protocol +* NEC3 refactored 0.2.0 - 2/23/13 =============== diff --git a/sdk/openbr_plugin.cpp b/sdk/openbr_plugin.cpp index fe00e26..3b5ed91 100644 --- a/sdk/openbr_plugin.cpp +++ b/sdk/openbr_plugin.cpp @@ -452,6 +452,7 @@ TemplateList TemplateList::fromGallery(const br::File &gallery) foreach (const br::File &file, gallery.split()) { QScopedPointer 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); @@ -1239,10 +1240,10 @@ Transform *Transform::make(QString str, QObject *parent) if (Globals->abbreviations.contains(str)) return make(Globals->abbreviations[str], parent); - { // Check for use of '!' as shorthand for Chain(...) + { // Check for use of '!' as shorthand for Expand(...) QStringList words = parse(str, '!'); if (words.size() > 1) - return make("Chain([" + words.join(",") + "])", parent); + return make("Expand([" + words.join(",") + "])", parent); } { // Check for use of '+' as shorthand for Pipe(...) diff --git a/sdk/openbr_plugin.h b/sdk/openbr_plugin.h index 83a901a..33ed8d1 100644 --- a/sdk/openbr_plugin.h +++ b/sdk/openbr_plugin.h @@ -393,6 +393,17 @@ struct TemplateList : public QList