diff c/Motion.cpp @ 804:17e54690af8a dev

work in progress, not fully functional yet
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 01 Jun 2016 17:57:49 -0400
parents 6022350f8173
children
line wrap: on
line diff
--- a/c/Motion.cpp	Wed Jun 01 01:55:45 2016 -0400
+++ b/c/Motion.cpp	Wed Jun 01 17:57:49 2016 -0400
@@ -22,11 +22,11 @@
 
 /******************** FeatureTrajectory ********************/
 
-FeatureTrajectory::FeatureTrajectory(const unsigned int& frameNum, const cv::Point2f& p, const Mat& homography)
+FeatureTrajectory::FeatureTrajectory(const unsigned int& frameNum, const cv::Point2f& p)
   : firstInstant(frameNum), lastInstant(frameNum) {
   positions = TrajectoryPoint2fPtr(new TrajectoryPoint2f());
   velocities = TrajectoryPoint2fPtr(new TrajectoryPoint2f());
-  addPoint(frameNum, p, homography);
+  addPoint(frameNum, p);
 }
 
 FeatureTrajectory::FeatureTrajectory(TrajectoryPoint2fPtr& _positions, TrajectoryPoint2fPtr& _velocities) {
@@ -93,11 +93,8 @@
   return connected;
 }
 
-void FeatureTrajectory::addPoint(const unsigned int& frameNum, const Point2f& p, const Mat& homography) {
-  Point2f pp = p;
-  if (!homography.empty())
-    pp = project(p, homography);
-  positions->add(frameNum, pp);
+void FeatureTrajectory::addPoint(const unsigned int& frameNum, const Point2f& p) {
+  positions->add(frameNum, p);
   if (frameNum < firstInstant)
     firstInstant = frameNum;
   if (frameNum > lastInstant)
@@ -128,12 +125,12 @@
 void FeatureTrajectory::draw(Mat& img, const Mat& homography, const Scalar& color) const {
   Point2f p1, p2;
   if (!homography.empty())
-    p1 = project((*positions)[0], homography);
+    p1 = project<double>((*positions)[0], homography);
   else
     p1 = (*positions)[0];
   for (unsigned int i=1; i<positions->size(); i++) {
     if (!homography.empty())
-      p2 = project((*positions)[i], homography);
+      p2 = project<double>((*positions)[i], homography);
     else
       p2 = (*positions)[i];
     line(img, p1, p2, color, 1);