[chronojump] kneeAngle: improvements on copying to csv file

[Xavier de Blas <xaviblas src gnome org>]

commit 49572ae38dad8d46d520d8fda4ffe26976c079fe
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sun Apr 4 02:15:46 2010 +0800

    kneeAngle: improvements on copying to csv file

 src/angle/kneeAngle.cpp |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/src/angle/kneeAngle.cpp b/src/angle/kneeAngle.cpp
index 3e6af29..d7fa7fa 100644
--- a/src/angle/kneeAngle.cpp
+++ b/src/angle/kneeAngle.cpp
@@ -316,6 +316,7 @@ int main(int argc,char **argv)
 	CvPoint notFoundPoint;
 	notFoundPoint.x = 0; notFoundPoint.y = 0;
 	int lowestAngleFrame = 0;
+	int lowestAngleFrameReally = 0; //related to framesCountReally
 
 
 	char *label = new char[150];
@@ -334,6 +335,7 @@ int main(int argc,char **argv)
 	double avgKneeBackDistance = 0;
 	int framesDetected = 0;
 	int framesCount = 0;
+	int framesCountReally = 0; //do not trust on capture info. This is a counter on iterations
 	//show a counting message every n frames:
 	int framesCountShowMessage = 0;
 	int framesCountShowMessageAt = 100;
@@ -479,7 +481,7 @@ int main(int argc,char **argv)
 		//when we go back, we doesn't always land where we want, this is safe:
 		double capturedFrame = cvGetCaptureProperty( capture, CV_CAP_PROP_POS_FRAMES);
 		framesCount = capturedFrame +1;
-
+	
 		if(!frame)
 			break;
 		if(startAt > framesCount) {
@@ -524,6 +526,8 @@ int main(int argc,char **argv)
 				eraseGuiResult(gui, true);
 		}
 
+		framesCountReally ++;
+
 
 		/* 
 		 * 2
@@ -758,6 +762,7 @@ imageGuiResult(gui, "returned", font);
 					cvCopy(frame_copy,result);
 					storeResultImage = true;
 					lowestAngleFrame = framesCount;
+					lowestAngleFrameReally = framesCountReally;
 
 					//store thresholds	
 					thresholdAtMinAngle = threshold;
@@ -1886,7 +1891,9 @@ imageGuiResult(gui, "returned", font);
 		float angle;
 		while(!fileEnd) {
 			fscanf(fdatapre,"%f;%f\n",&height, &angle);
-			fprintf(fdatapost, "%f;%f\n", 100 * height / validationRectHMax, angle);
+			//skip undetected (-1.000) angles
+			if(angle > 0)
+				fprintf(fdatapost, "%f;%f\n", 100 * height / validationRectHMax, angle);
 			endChar = getc(fdatapre);
 			if(endChar == EOF) 
 				fileEnd = true;
@@ -1894,10 +1901,15 @@ imageGuiResult(gui, "returned", font);
 				ungetc(endChar, fdatapre);
 
 			//do not continue if we copied frame with minimum angle (only store 'going-down' phase)
+			//cannot use the == because sometimes last decimals change
 //			if(angle == minThetaMarked)
 //				fileEnd = true;
+			if(++i == lowestAngleFrameReally)
+				fileEnd = true;
 		}
 
+		printf("i:%d, lowestAngleFrameReally:%d\n", i, lowestAngleFrameReally);
+
 		fclose(fdatapre);
 		fclose(fdatapost);