X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=uchime_main.cpp;h=0465c720a6645c1ecd5a1d29155cbb0855748436;hb=1e8d08e96f4fe99604a6b3502568de464bf60891;hp=40e7f44546668bb7d22d1a0b4e8800f29fc89e56;hpb=fd98ee6efb944d38bbd61fc36ea9fea2557e3830;p=mothur.git

diff --git a/uchime_main.cpp b/uchime_main.cpp
index 40e7f44..0465c72 100644
--- a/uchime_main.cpp
+++ b/uchime_main.cpp
@@ -1,3 +1,5 @@
+//uchime by Robert C. Edgar http://drive5.com/uchime This code is donated to the public domain.
+
 #include "myutils.h"
 #include "chime.h"
 #include "seqdb.h"
@@ -107,11 +109,7 @@ int uchime_main(int argc, char *argv[])
 		return 0;
 		}
 
-	//printf("uchime v" MY_VERSION ".%s\n", SVN_VERSION);
-	//printf("by Robert C. Edgar\n");
-	//printf("http://drive5.com/uchime\n");
-	//printf("This code is donated to the public domain.\n");
-	//printf("\n");
+		
 	if (!optset_w)
 		opt_w = 8;
 	
@@ -203,10 +201,16 @@ int uchime_main(int argc, char *argv[])
 
 		WriteChimeHit(g_fUChime, Hit);
 
-		ProgressStep(i, QuerySeqCount, "%u/%u chimeras found (%.1f%%)", HitCount, i, Pct(HitCount, i+1));
-		
+		//ProgressStep(i, QuerySeqCount, "%u/%u chimeras found (%.1f%%)", HitCount, i, Pct(HitCount, i+1));
+			//report progress
+			if((i+1) % 100 == 0){	m->mothurOut("Processing sequence: " + toString(i+1) + ", " + toString(HitCount) + " chimeras found."); m->mothurOutEndLine();		}
+		}
+		if (!m->control_pressed) { 
+			//report progress
+			if((QuerySeqCount) % 100 != 0){	m->mothurOut("Processing sequence: " + toString(QuerySeqCount) + ", " + toString(HitCount) + " chimeras found."); m->mothurOutEndLine();		}
 		}
 
+
 	Log("\n");
 	Log("%s: %u/%u chimeras found (%.1f%%)\n",
 	  opt_input.c_str(), HitCount, QuerySeqCount, Pct(HitCount, QuerySeqCount));