Added some new features ("update objects" button and region selection) described in issue 2.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@74 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-01-28 01:00:23 +00:00
parent a1c6ec7509
commit 27652b4f8f
11 changed files with 364 additions and 99 deletions
@@ -118,8 +118,8 @@ int main(int argc, char * argv[])
 		// PROCESS NEAREST NEIGHBOR RESULTS
 		////////////////////////////
 		// Set gui data
-		objWidget.setData(objectKeypoints, objectDescriptors, objectImg);
-		sceneWidget.setData(sceneKeypoints, sceneDescriptors, sceneImg);
+		objWidget.setData(objectKeypoints, objectDescriptors, objectImg, "SURF", "SURF");
+		sceneWidget.setData(sceneKeypoints, sceneDescriptors, sceneImg, "SURF", "SURF");

 		// Find correspondences by NNDR (Nearest Neighbor Distance Ratio)
 		float nndrRatio = 0.6;