asdasdasd

src/hough.cpp

@@ -72,7 +72,7 @@ pair<double,double> calcThetaRange(double dx,double dy,double delta = 2*pi){
 
 void houghC1(Mat &gray, int minr, int maxr , int cannyt, vector<acmPoint> &output, unsigned int thNCirc, double thVNorm){
 	Mat edges,Ix,Iy;
-	double deltaTheta = 0.79/2; // 45 graus
+	double deltaTheta = 0.79/2; // 45/2 graus
 	int i,j,rad;
 	pair<double,double> dTheta;
 	set<acmPoint> outputMinHeap;

src/main.cpp

@@ -2,7 +2,20 @@
 
 void video_mode(char file[]) {
 
-    /*"./arquivoTeste/pass.flv"   "./arquivoTeste/embx.flv"*/
+    int globalMaxR,globalMinR; 
+    double thRestart;
+
+    printf("Digite minr maxr e thRestart ou -1 para valores padrões\n");
+    scanf(" %d",&globalMinR);
+    if(globalMinR == -1){
+    	globalMinR = 5;
+    	globalMaxR = 30;
+    	thRestart = 0.48;
+    }else{
+    	scanf(" %d %lf",&globalMaxR,&thRestart);
+    }
+
+
     VideoCapture cap(file); 
     if(!cap.isOpened()) 
         exit(1);
@@ -13,14 +26,11 @@ void video_mode(char file[]) {
     bool firstFrame = true;
     Rect roiRect,newRoiRect;
     acmPoint ballAt,newBall;
-
-    double thRestart = 0.35; //0.35;
 
     int countRestart = 0;
 
-    int globalMinR=5,globalMaxR=30;
     Rect inicRoi(130,175,25,25);
-
+    
     //Flags
     bool fAcertou = false;
     bool fPause = true;
@@ -29,19 +39,21 @@ void video_mode(char file[]) {
 
     while(1)
     {
-
-        cap >> frame;
+
+        if(!cap.grab()) break;        
+        cap.retrieve(frame,0);
+
 
         if(firstFrame){
-        	trackBall(grayAnt,frame,inicRoi,acmPoint(),newBall,newRoiRect,globalMinR,globalMaxR,false, fAcertou);
+        	trackBall(grayAnt,frame,inicRoi,acmPoint(),newBall,newRoiRect,globalMinR,globalMaxR,true, fAcertou);
         }else{
 
         	if(ballAt.score_final < thRestart){
         		countRestart++;        		
 			}else countRestart = 0;
 
 
-			if(countRestart == 4){
+			if(countRestart == 5){
 				trackBall(grayAnt,frame,roiRect,ballAt,newBall,newRoiRect,globalMinR,globalMaxR,true, fAcertou);
 				countRestart = 0;
 		    }

src/main.h

@@ -58,7 +58,12 @@ struct acmPoint{
 		inic = true;
 	}
 
-	void calculaScore(){ score_final =  0.2 * vnorm + 0.8 * vhistograma; }
+	void calculaScore(){
+		if(rad < 5)
+			score_final =  0.4 * vnorm + 0.6 * vhistograma;
+		else
+			score_final =  0.2 * vnorm + 0.8 * vhistograma;
+	}
 
 	inline bool operator< (const acmPoint &p) const{
 		return (score_final < p.score_final);

src/roi.cpp

@@ -25,7 +25,7 @@ void trackBall(const Mat &frameAtual, Mat &frameFuturo,const Rect &ROIat,const a
 int minr, int maxr, bool firstTime, bool filtraHistograma){
 	int deltaR=1;
 	int limMinR = 2;
-	double roiScale=3;
+	double roiScale=4;
 	Rect roiRect;
 	Mat frameFuturoGray;