X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flowdata.cpp;h=5dc7dc3e6c780171f1ee5cacdb1d766864f18a18;hb=4b54ce99af7db8019ea907cd7c2edf789369ada9;hp=39c1f8317a306c1a49488625725cbea7a4c6bd4e;hpb=902e0fcab76e75009ac43d3f4537e08182628d6f;p=mothur.git

diff --git a/flowdata.cpp b/flowdata.cpp
index 39c1f83..5dc7dc3 100644
--- a/flowdata.cpp
+++ b/flowdata.cpp
@@ -19,14 +19,14 @@ FlowData::~FlowData(){	/*	do nothing	*/	}
 
 //**********************************************************************************************************************
 
-FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP) : 
-			numFlows(numFlows), signalIntensity(signal), noiseIntensity(noise), maxHomoP(maxHomoP){
+FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP, string baseFlow) : 
+			numFlows(numFlows), signalIntensity(signal), noiseIntensity(noise), maxHomoP(maxHomoP), baseFlow(baseFlow){
 
 	try {
 		m = MothurOut::getInstance();
 
 		flowData.assign(numFlows, 0);
-		baseFlow = "TACG";
+//		baseFlow = "TACG";
 		seqName = "";
 		locationString = "";
 	}
@@ -42,17 +42,15 @@ FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP) :
 bool FlowData::getNext(ifstream& flowFile){
 	
 	try {
-		
-		string lengthString;
-		string flowString;
-		
-		flowFile >> seqName >> endFlow;		
-		for(int i=0;i<numFlows;i++)	{	flowFile >> flowData[i];	}
-		
-		updateEndFlow();
-		translateFlow();
-		
-		m->gobble(flowFile);
+        seqName = getSequenceName(flowFile);
+		flowFile >> endFlow;	
+        if (!m->control_pressed) {
+            for(int i=0;i<numFlows;i++)	{	flowFile >> flowData[i]; 	}
+            updateEndFlow(); 
+            translateFlow();
+            m->gobble(flowFile);
+		}
+            
 		if(flowFile){	return 1;	}
 		else		{	return 0;	}
 	}
@@ -62,6 +60,26 @@ bool FlowData::getNext(ifstream& flowFile){
 	}
 	
 }
+//********************************************************************************************************************
+string FlowData::getSequenceName(ifstream& flowFile) {
+	try {
+		string name = "";
+		
+        flowFile >> name;
+		
+		if (name.length() != 0) { 
+            for (int i = 0; i < name.length(); i++) {
+                if (name[i] == ':') { name[i] = '_'; m->changedSeqNames = true; }
+            }
+        }else{ m->mothurOut("Error in reading your flowfile, at position " + toString(flowFile.tellg()) + ". Blank name."); m->mothurOutEndLine(); m->control_pressed = true;  }
+        
+		return name;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "FlowData", "getSequenceName");
+		exit(1);
+	}
+}
 
 //**********************************************************************************************************************
 
@@ -138,7 +156,8 @@ void FlowData::capFlows(int mF){
 	try{
 		
 		maxFlows = mF;
-		if(endFlow > maxFlows){	endFlow = maxFlows;	}		
+		if(endFlow > maxFlows){	endFlow = maxFlows;	}	
+        translateFlow();
 		
 	}
 	catch(exception& e) {
@@ -219,7 +238,7 @@ string FlowData::getName(){
 		return seqName;
 	}
 	catch(exception& e) {
-		m->errorOut(e, "FlowData", "getSequence");
+		m->errorOut(e, "FlowData", "getName");
 		exit(1);
 	}
 }