fixed angle calculations

svn path=/trunk/externals/pix_opencv/; revision=13712

1 files changed, 60 insertions, 48 deletions

diff --git a/pix_opencv_of_hs.cc b/pix_opencv_of_hs.cc
index fca8c75..c18bb14 100755
--- a/pix_opencv_of_hs.cc
+++ b/pix_opencv_of_hs.cc
@@ -81,7 +81,7 @@ pix_opencv_of_hs :: ~pix_opencv_of_hs()
 void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
 {
   int px,py;
-  double meanangle=0.0, meanx=0.0, meany=0.0, maxamp=0.0, maxangle=0.0;
+  double globangle=0.0, globx=0.0, globy=0.0, maxamp=0.0, maxangle=0.0;
   int nbblocks=0;
   CvPoint orig, dest;
   double angle=0.0;
@@ -128,6 +128,9 @@ void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
                        cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03) );
 
   nbblocks = 0;
+  globangle = 0;
+  globx = 0;
+  globy = 0;
   for( py=0; py<x_velsize.height; py++ )
   {
     for( px=0; px<x_velsize.width; px++ )
@@ -136,8 +139,8 @@ void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
         orig.y = (py*comp_ysize)/x_velsize.height;
         dest.x = (int)(orig.x + cvGet2D(x_velx, py, px).val[0]);
         dest.y = (int)(orig.y + cvGet2D(x_vely, py, px).val[0]);
-        angle = -atan2( (double) cvGet2D(x_vely, py, px).val[0], (double) cvGet2D(x_velx, py, px).val[0] );
-        hypotenuse = sqrt( pow(orig.y - dest.y, 2) + pow(orig.x - dest.x, 2) );
+        angle = -atan2( (double) (dest.y-orig.y), (double) (dest.x-orig.x) );
+        hypotenuse = sqrt( pow(dest.y-orig.y, 2) + pow(dest.x-orig.x, 2) );
 
         /* Now draw the tips of the arrow. I do some scaling so that the
         * tips look proportional to the main line of the arrow.
@@ -152,8 +155,9 @@ void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
           orig.x = (int) (dest.x - (6) * cos(angle - M_PI / 4));
           orig.y = (int) (dest.y + (6) * sin(angle - M_PI / 4));
           cvLine( rgb, orig, dest, CV_RGB(0,0,255), 1, CV_AA, 0 );
-          meanx = (meanx*nbblocks+cvGet2D(x_velx, py, px).val[0])/(nbblocks+1);
-          meany = (meanx*nbblocks+cvGet2D(x_vely, py, px).val[0])/(nbblocks+1);
+
+          globx = globx+cvGet2D(x_velx, py, px).val[0];
+          globy = globy+cvGet2D(x_vely, py, px).val[0];
           if ( hypotenuse > maxamp )
           {
              maxamp = hypotenuse;
@@ -166,26 +170,26 @@ void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
       }
   }
 
-  meanangle=-atan2( meany, meanx );
-  // post( "pdp_opencv_of_bm : meanangle : %f", (meanangle*180)/M_PI );
-
   if ( nbblocks >= x_minblocks )
   {
+      globangle=-atan2( globy, globx );
+      // post( "pdp_opencv_of_bm : globangle : %f", (globangle*180)/M_PI );
+
       orig.x = (int) (comp_xsize/2);
       orig.y = (int) (comp_ysize/2);
-      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(meanangle));
-      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(meanangle));
+      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(globangle));
+      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(globangle));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle + M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle + M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle + M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle + M_PI / 4));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle - M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle - M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle - M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle - M_PI / 4));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
 
       // outputs the average angle of movement
-      meanangle = (meanangle*180)/M_PI;
-      SETFLOAT(&x_list[0], meanangle);
+      globangle = (globangle*180)/M_PI;
+      SETFLOAT(&x_list[0], globangle);
       outlet_list( m_meanout, 0, 1, x_list );
 
       // outputs the amplitude and angle of the maximum movement
@@ -204,7 +208,7 @@ void pix_opencv_of_hs :: processRGBAImage(imageStruct &image)
 void pix_opencv_of_hs :: processRGBImage(imageStruct &image)
 { 
   int px,py;
-  double meanangle=0.0, meanx=0.0, meany=0.0, maxamp=0.0, maxangle=0.0;
+  double globangle=0.0, globx=0.0, globy=0.0, maxamp=0.0, maxangle=0.0;
   int nbblocks=0;
   CvPoint orig, dest;
   double angle=0.0;
@@ -251,6 +255,9 @@ void pix_opencv_of_hs :: processRGBImage(imageStruct &image)
                        cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03) );
 
   nbblocks = 0;
+  globangle = 0;
+  globx = 0;
+  globy = 0;
   for( py=0; py<x_velsize.height; py++ )
   {
     for( px=0; px<x_velsize.width; px++ )
@@ -260,8 +267,8 @@ void pix_opencv_of_hs :: processRGBImage(imageStruct &image)
         orig.y = (py*comp_ysize)/x_velsize.height;
         dest.x = (int)(orig.x + cvGet2D(x_velx, py, px).val[0]);
         dest.y = (int)(orig.y + cvGet2D(x_vely, py, px).val[0]);
-        angle = -atan2( (double) cvGet2D(x_vely, py, px).val[0], (double) cvGet2D(x_velx, py, px).val[0] );
-        hypotenuse = sqrt( pow(orig.y - dest.y, 2) + pow(orig.x - dest.x, 2) );
+        angle = -atan2( (double) (dest.y-orig.y), (double) (dest.x-orig.x) );
+        hypotenuse = sqrt( pow(dest.y-orig.y, 2) + pow(dest.x-orig.x, 2) );
 
         /* Now draw the tips of the arrow. I do some scaling so that the
         * tips look proportional to the main line of the arrow.
@@ -276,8 +283,9 @@ void pix_opencv_of_hs :: processRGBImage(imageStruct &image)
           orig.x = (int) (dest.x - (6) * cos(angle - M_PI / 4));
           orig.y = (int) (dest.y + (6) * sin(angle - M_PI / 4));
           cvLine( rgb, orig, dest, CV_RGB(0,0,255), 1, CV_AA, 0 );
-          meanx = (meanx*nbblocks+cvGet2D(x_velx, py, px).val[0])/(nbblocks+1);
-          meany = (meanx*nbblocks+cvGet2D(x_vely, py, px).val[0])/(nbblocks+1);
+
+          globx = globx+cvGet2D(x_velx, py, px).val[0];
+          globy = globy+cvGet2D(x_vely, py, px).val[0];
           if ( hypotenuse > maxamp )
           {
              maxamp = hypotenuse;
@@ -290,26 +298,26 @@ void pix_opencv_of_hs :: processRGBImage(imageStruct &image)
       }
   }
 
-  meanangle=-atan2( meany, meanx );
-  // post( "pdp_opencv_of_bm : meanangle : %f", (meanangle*180)/M_PI );
-
   if ( nbblocks >= x_minblocks )
   {
+      globangle=-atan2( globy, globx );
+      // post( "pdp_opencv_of_bm : globangle : %f", (globangle*180)/M_PI );
+
       orig.x = (int) (comp_xsize/2);
       orig.y = (int) (comp_ysize/2);
-      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(meanangle));
-      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(meanangle));
+      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(globangle));
+      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(globangle));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle + M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle + M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle + M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle + M_PI / 4));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle - M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle - M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle - M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle - M_PI / 4));
       cvLine( rgb, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
 
       // outputs the average angle of movement
-      meanangle = (meanangle*180)/M_PI;
-      SETFLOAT(&x_list[0], meanangle);
+      globangle = (globangle*180)/M_PI;
+      SETFLOAT(&x_list[0], globangle);
       outlet_list( m_meanout, 0, 1, x_list );
 
       // outputs the amplitude and angle of the maximum movement
@@ -332,7 +340,7 @@ void pix_opencv_of_hs :: processYUVImage(imageStruct &image)
 void pix_opencv_of_hs :: processGrayImage(imageStruct &image)
 { 
   int px,py;
-  double meanangle=0.0, meanx=0.0, meany=0.0, maxamp=0.0, maxangle=0.0;
+  double globangle=0.0, globx=0.0, globy=0.0, maxamp=0.0, maxangle=0.0;
   int nbblocks=0;
   CvPoint orig, dest;
   double angle=0.0;
@@ -375,6 +383,9 @@ void pix_opencv_of_hs :: processGrayImage(imageStruct &image)
                        cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03) );
 
   nbblocks = 0;
+  globangle = 0;
+  globx = 0;
+  globy = 0;
   for( py=0; py<x_velsize.height; py++ )
   {
     for( px=0; px<x_velsize.width; px++ )
@@ -384,8 +395,8 @@ void pix_opencv_of_hs :: processGrayImage(imageStruct &image)
         orig.y = (py*comp_ysize)/x_velsize.height;
         dest.x = (int)(orig.x + cvGet2D(x_velx, py, px).val[0]);
         dest.y = (int)(orig.y + cvGet2D(x_vely, py, px).val[0]);
-        angle = -atan2( (double) cvGet2D(x_vely, py, px).val[0], (double) cvGet2D(x_velx, py, px).val[0] );
-        hypotenuse = sqrt( pow(orig.y - dest.y, 2) + pow(orig.x - dest.x, 2) );
+        angle = -atan2( (double) (dest.y-orig.y), (double) (dest.x-orig.x) );
+        hypotenuse = sqrt( pow(dest.y-orig.y, 2) + pow(dest.x-orig.x, 2) );
 
         /* Now draw the tips of the arrow. I do some scaling so that the
         * tips look proportional to the main line of the arrow.
@@ -400,8 +411,9 @@ void pix_opencv_of_hs :: processGrayImage(imageStruct &image)
           orig.x = (int) (dest.x - (6) * cos(angle - M_PI / 4));
           orig.y = (int) (dest.y + (6) * sin(angle - M_PI / 4));
           cvLine( grey, orig, dest, CV_RGB(0,0,255), 1, CV_AA, 0 );
-          meanx = (meanx*nbblocks+cvGet2D(x_velx, py, px).val[0])/(nbblocks+1);
-          meany = (meanx*nbblocks+cvGet2D(x_vely, py, px).val[0])/(nbblocks+1);
+
+          globx = globx+cvGet2D(x_velx, py, px).val[0];
+          globy = globx+cvGet2D(x_vely, py, px).val[0];
           if ( hypotenuse > maxamp )
           {
              maxamp = hypotenuse;
@@ -414,26 +426,26 @@ void pix_opencv_of_hs :: processGrayImage(imageStruct &image)
       }
   }
 
-  meanangle=-atan2( meany, meanx );
-  // post( "pdp_opencv_of_bm : meanangle : %f", (meanangle*180)/M_PI );
-
   if ( nbblocks >= x_minblocks )
   {
+      globangle=-atan2( globy, globx );
+      // post( "pdp_opencv_of_bm : globangle : %f", (globangle*180)/M_PI );
+
       orig.x = (int) (comp_xsize/2);
       orig.y = (int) (comp_ysize/2);
-      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(meanangle));
-      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(meanangle));
+      dest.x = (int) (orig.x+((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*cos(globangle));
+      dest.y = (int) (orig.y-((comp_xsize>comp_ysize)?comp_ysize/2:comp_xsize/2)*sin(globangle));
       cvLine( grey, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle + M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle + M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle + M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle + M_PI / 4));
       cvLine( grey, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
-      orig.x = (int) (dest.x - (6) * cos(meanangle - M_PI / 4));
-      orig.y = (int) (dest.y + (6) * sin(meanangle - M_PI / 4));
+      orig.x = (int) (dest.x - (6) * cos(globangle - M_PI / 4));
+      orig.y = (int) (dest.y + (6) * sin(globangle - M_PI / 4));
       cvLine( grey, orig, dest, CV_RGB(255,255,255), 3, CV_AA, 0 );
 
       // outputs the average angle of movement
-      meanangle = (meanangle*180)/M_PI;
-      SETFLOAT(&x_list[0], meanangle);
+      globangle = (globangle*180)/M_PI;
+      SETFLOAT(&x_list[0], globangle);
       outlet_list( m_meanout, 0, 1, x_list );
 
       // outputs the amplitude and angle of the maximum movement