diff c/feature-based-tracking.cpp @ 136:0f790de9437e

renamed Feature to Motion files and added code to test blob db
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 18 Aug 2011 22:25:21 -0400
parents 32d2722d4028
children 445e773c9be3
line wrap: on
line diff
--- a/c/feature-based-tracking.cpp	Thu Aug 18 01:03:38 2011 -0400
+++ b/c/feature-based-tracking.cpp	Thu Aug 18 22:25:21 2011 -0400
@@ -1,10 +1,11 @@
-#include "Feature.hpp"
+#include "Motion.hpp"
 #include "Parameters.hpp"
 #include "cvutils.hpp"
 #include "utils.hpp"
 
 #include "src/Trajectory.h"
 #include "src/TrajectoryDBAccessList.h"
+#include "src/TrajectoryDBAccessBlob.h"
 
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
@@ -117,9 +118,10 @@
     }
   
   // database
-  TrajectoryDBAccessList<Point2f> trajectoryDB;
-  trajectoryDB.connect("test.sqlite");
-  trajectoryDB.createTable();
+  TrajectoryDBAccess<Point2f>* trajectoryDB = new TrajectoryDBAccessList<Point2f>();
+  //TrajectoryDBAccess<Point2f>* trajectoryDB = new TrajectoryDBAccessBlob<Point2f>();
+  trajectoryDB->connect("test.sqlite");
+  trajectoryDB->createTable();
 
   vector<KeyPoint> prevKpts, currKpts;
   vector<Point2f> prevPts, currPts, newPts;
@@ -167,7 +169,7 @@
 	    if (iter->feature->length() >= params.minFeatureTime) {
 	      iter->feature->setId(savedFeatureId);
 	      savedFeatureId++;
-	      iter->feature->write(trajectoryDB);
+	      iter->feature->write(*trajectoryDB);
 	    }
 	    iter = featurePointMatches.erase(iter);
 	  } else
@@ -216,7 +218,7 @@
       //currDesc.copyTo(prevDesc);
     }  
   
-  trajectoryDB.disconnect();
+  trajectoryDB->disconnect();
   return 0;
 }