Updated how the homography is validated (which should be more robust now). Added new parameters Homography/allCornersVisible, Homography/minAngle and General/autoPauseOnDetection.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@377 620bd6b2-0a58-f614-fd9a-1bd335dccda9

include/find_object/DetectionInfo.h

@@ -18,7 +18,24 @@
 class DetectionInfo
 {
 public:
-	enum TimeStamp{kTimeKeypointDetection, kTimeDescriptorExtraction, kTimeIndexing, kTimeMatching, kTimeHomography, kTimeTotal};
+	enum TimeStamp{
+		kTimeKeypointDetection,
+		kTimeDescriptorExtraction,
+		kTimeIndexing,
+		kTimeMatching,
+		kTimeHomography,
+		kTimeTotal
+	};
+	enum RejectedCode{
+		kRejectedUndef,
+		kRejectedLowMatches,
+		kRejectedLowInliers,
+		kRejectedSuperposed,
+		kRejectedAllInliers,
+		kRejectedNotValid,
+		kRejectedCornersOutside,
+		kRejectedByAngle
+	};
 
 public:
 	DetectionInfo() :
@@ -27,6 +44,7 @@ public:
 	{}
 
 public:
+	// Those maps have the same size
 	QMultiMap<int, QTransform> objDetected_;
 	QMultiMap<int, QSize> objDetectedSizes_; // Object ID <width, height> match the number of detected objects
 	QMultiMap<int, QString > objDetectedFilenames_; // Object ID <filename> match the number of detected objects
@@ -40,8 +58,12 @@ public:
 	cv::Mat sceneDescriptors_;
 	QMultiMap<int, int> sceneWords_;
 	QMap<int, QMultiMap<int, int> > matches_; // ObjectID Map< ObjectDescriptorIndex, SceneDescriptorIndex >, match the number of objects
+
+	// Those maps have the same size
 	QMultiMap<int, QMultiMap<int, int> > rejectedInliers_; // ObjectID Map< ObjectDescriptorIndex, SceneDescriptorIndex >
 	QMultiMap<int, QMultiMap<int, int> > rejectedOutliers_; // ObjectID Map< ObjectDescriptorIndex, SceneDescriptorIndex >
+	QMultiMap<int, RejectedCode> rejectedCodes_; // ObjectID rejected code
+
 	float minMatchedDistance_;
 	float maxMatchedDistance_;
 };

include/find_object/Settings.h

@@ -193,6 +193,7 @@ class FINDOBJECT_EXP Settings
 	PARAMETER(General, vocabularyIncremental, bool, false, "The vocabulary is created incrementally. When new objects are added, their descriptors are compared to those already in vocabulary to find if the visual word already exist or not. \"NearestNeighbor/nndrRatio\" is used to compare descriptors.");
 	PARAMETER(General, vocabularyUpdateMinWords, int, 2000, "When the vocabulary is incremental (see \"General/vocabularyIncremental\"), after X words added to vocabulary, the internal index is updated with new words. This parameter lets avoiding to reconstruct the whole nearest neighbor index after each time descriptors of an object are added to vocabulary. 0 means no incremental update.");
 	PARAMETER(General, sendNoObjDetectedEvents, bool, false, "When there are no objects detected, send an empty object detection event.");
+	PARAMETER(General, autoPauseOnDetection, bool, false, "Auto pause the camera when an object is detected.");
 
 	PARAMETER(Homography, homographyComputed, bool, true, "Compute homography? On ROS, this is required to publish objects detected.");
 	PARAMETER(Homography, method, QString, "1:LMEDS;RANSAC", "Type of the robust estimation algorithm: least-median algorithm or RANSAC algorithm.");
@@ -200,6 +201,8 @@ class FINDOBJECT_EXP Settings
 	PARAMETER(Homography, minimumInliers, int, 10, "Minimum inliers to accept the homography. Value must be >= 4.");
 	PARAMETER(Homography, ignoreWhenAllInliers, bool, false, "Ignore homography when all features are inliers (sometimes when the homography doesn't converge, it returns the best homography with all features as inliers).");
 	PARAMETER(Homography, rectBorderWidth, int, 4, "Homography rectangle border width.");
+	PARAMETER(Homography, allCornersVisible, bool, false, "All corners of the detected object must be visible in the scene.");
+	PARAMETER(Homography, minAngle, int, 0, "(Degrees) Homography minimum angle. Set 0 to disable. When the angle is very small, this is a good indication that the homography is wrong. A good value is over 60 degrees.");
 
 public:
 	virtual ~Settings(){}