diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 47791fe..94fc737 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -137,6 +137,8 @@ QVariant File::parse(const QString &value) if (ok) return point; const QRectF rect = QtUtils::toRect(value, &ok); if (ok) return rect; + const int i = value.toInt(&ok); + if (ok) return i; const float f = value.toFloat(&ok); if (ok) return f; return value; diff --git a/openbr/plugins/algorithms.cpp b/openbr/plugins/algorithms.cpp index 0fe6d65..1c09600 100644 --- a/openbr/plugins/algorithms.cpp +++ b/openbr/plugins/algorithms.cpp @@ -44,7 +44,7 @@ class AlgorithmsInitializer : public Initializer Globals->abbreviations.insert("AgeEstimation", "AgeRegression"); Globals->abbreviations.insert("FaceRecognition2", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+(Gradient+Bin(0,360,9,true))/(Blur(1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2,true)+Bin(0,10,10,true))+Merge+Integral+RecursiveIntegralSampler(4,2,8,LDA(.98)+Normalize(L1))+Cat+PCA(768)+Normalize(L1)+Quantize:UCharL1"); Globals->abbreviations.insert("CropFace", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.25,0.35)"); - Globals->abbreviations.insert("4SF", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.33,0.45)+(Grid(10,10)+SIFTDescriptor(12)+ByRow)/(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))+PCA(0.95)+Normalize(L2)+Dup(12)+RndSubspace(0.05,1)+LDA(0.98)+Cat+PCA(0.95)+Normalize(L1)+Quantize:NegativeLogPlusOne(ByteL1)"); + Globals->abbreviations.insert("4SF", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.33,0.45)+(Grid(10,10)+SIFTDescriptor(12)+ByRow)/(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))+PCA(0.95)+Cat+Normalize(L2)+Dup(12)+RndSubspace(0.05,1)+LDA(0.98)+Cat+PCA(0.95)+Normalize(L1)+Quantize:NegativeLogPlusOne(ByteL1)"); // Video Globals->abbreviations.insert("DisplayVideo", "Stream(FPSLimit(30)+Show(false,[FrameNumber])+Discard)"); diff --git a/openbr/plugins/gallery.cpp b/openbr/plugins/gallery.cpp index a57aae2..f4fa0ff 100644 --- a/openbr/plugins/gallery.cpp +++ b/openbr/plugins/gallery.cpp @@ -506,38 +506,55 @@ BR_REGISTER(Gallery, csvGallery) * \brief Treats each line as a file. * \author Josh Klontz \cite jklontz * - * The entire line is treated as the file path. + * The entire line is treated as the file path. An optional label may be specified using a space ' ' separator: * +\verbatim + + +... + +\endverbatim + * or +\verbatim +