[Robotvision-commit] SF.net SVN: robotvision:[25] vision/src/main.cpp

[<bre...@us...>]

Revision: 25
          http://robotvision.svn.sourceforge.net/robotvision/?rev=25&view=rev
Author:   brendasegal
Date:     2010-06-06 19:11:40 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
I just fixed a bug if the loaded video was wrong and I also added Lucy's videos/images to the list of media.  Config files are also loaded immediately.

Modified Paths:
--------------
    vision/src/main.cpp

Modified: vision/src/main.cpp
===================================================================
--- vision/src/main.cpp	2010-06-03 04:17:18 UTC (rev 24)
+++ vision/src/main.cpp	2010-06-06 19:11:40 UTC (rev 25)
@@ -885,11 +885,13 @@
 
 		IplImage *frame;
 
+
+
 		if (!capture) {
 
 			printf("Cannot open video file!\n");
 
-			return (1);
+			exit(0);
 
 		}
 
@@ -907,7 +909,7 @@
 
 			if (frame == NULL) {
 				puts("unable to load the frame");
-				return 0;
+				exit(0);
 			}
 
 			elipse retElipse;
@@ -971,6 +973,11 @@
 
 int main(int argc, char** argv) {
 
+	readFile("config/buoy.txt", 1);
+	readFile("config/pipe.txt", 2);
+	readFile("config/hedge.txt", 3);
+
+
 	if(argc<=1){
 
 		char readuser[100];
@@ -1055,8 +1062,8 @@
 			}
 			else if(strcmp(readuser, "4")==0){
 
-				printf("\nVideos\n******\nets2007buoy.avi\nets2007pipe.avi\npipe3.avi\ncuauvFinalForward.avi\n");
-				printf("\nImages\n******\nbuoy.jpg\npipe.png\ntest2.png\ntest3.png\ntest4.png\ntest5.png\ntest6.png\n");
+				printf("\nVideos\n******\nets2007buoy.avi\nets2007pipe.avi\npipe3.avi\ncuauvFinalForward.avi\nwire2.avi\n");
+				printf("\nImages\n******\nbuoy.jpg\npipe.png\ntest2.png\ntest3.png\ntest4.png\ntest5.png\ntest6.png\nwire.png\nwire2.png\nwire3.png\nwire4.png\nwire5.png\n");
 				printf("\nConfig Files\n************\npipe.txt\nhedge.txt\nbuoy.txt\n");
 			}
 			else if(strcmp(readuser, "5")==0){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.