Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents 21d91264 acace558
Showing 3 changed files with 33 additions and 6 deletions
openbr/plugins/gui.cpp
openbr/plugins/slidingwindow.cpp
scripts/pedestrianBaselineLBP.sh
@@ -510,6 +510,30 @@ BR_REGISTER(Transform, ShowTransform)
 /*!
  * \ingroup transforms
+ * \brief Show the training data
+ * \author Josh Klontz \cite jklontz
+ */
+class ShowTrainingTransform : public Transform
+{
+    Q_OBJECT
+    Q_PROPERTY(br::Transform *show READ get_show WRITE set_show RESET reset_show STORED false)
+    BR_PROPERTY(br::Transform*, show, make("Show"))
+
+    void train(const TemplateList &data)
+    {
+        TemplateList dst;
+        show->project(data, dst);
+    }
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+    }
+};
+BR_REGISTER(Transform, ShowTrainingTransform)
+
+/*!
+ * \ingroup transforms
  * \brief Manual selection of landmark locations
  * \author Scott Klum \cite sklum
  */
@@ -257,10 +257,10 @@ BR_REGISTER(Transform, BuildScalesTransform)
 /*!
  * \ingroup transforms
- * \brief Sample detection bounding boxes from integral images
+ * \brief Sample detection bounding boxes from without resizing
  * \author Josh Klontz \cite jklontz
  */
-class IntegralDetector : public Transform
+class Detector : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(br::Transform *transform READ get_transform WRITE set_transform RESET reset_transform)
@@ -268,7 +268,10 @@ class IntegralDetector : public Transform
     void train(const TemplateList &data)
     {
-        transform->train(cropTrainingSamples(data, getAspectRatio(data)));
+        const float aspectRatio = getAspectRatio(data);
+        TemplateList cropped = cropTrainingSamples(data, aspectRatio);
+        cropped.first().file.set("aspectRatio", aspectRatio);
+        transform->train(cropped);
     }
     void project(const Template &src, Template &dst) const
@@ -277,7 +280,7 @@ class IntegralDetector : public Transform
     }
 };
-BR_REGISTER(Transform, IntegralDetector)
+BR_REGISTER(Transform, Detector)
 /*!
  * \ingroup transforms
@@ -12,8 +12,8 @@ fi
 ALG="Open+Cvt(Gray)+Rename(neg,0)+BuildScales(Blur(2)+LBP(1,2)+SlidingWindow(Hist(59)+Cat+LDA(isBinary=true),windowWidth=10,takeLargestScale=false,threshold=2),windowWidth=10,takeLargestScale=false,minScale=4)+ConsolidateDetections+Discard"
-# Josh's new algorithm in progress
-# ALG2="Open+Cvt(Gray)+Gradient+Bin(0,360,9,true)+Merge+Integral+IntegralDetector"
+# Josh's new algorithm (in progress)
+# ALG2="Open+Cvt(Gray)+Detector(Gradient+Bin(0,360,9,true)+Merge+Integral+SlidingWindow(Identity))"
 br -useGui 0 \
    -algorithm "${ALG}" \