X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=seqsummarycommand.h;h=dcae434d42d08e38f223292a5c2647428e1d9475;hb=b302d221847b504388ec044c6929e9dde42f9bb1;hp=d37d6f43b50b3b567d267ab82dd83db459f126df;hpb=5d00ef3e809832f08efdd691a9eace8ac20feb07;p=mothur.git diff --git a/seqsummarycommand.h b/seqsummarycommand.h index d37d6f4..dcae434 100644 --- a/seqsummarycommand.h +++ b/seqsummarycommand.h @@ -62,11 +62,11 @@ private: // This is passed by void pointer so it can be any data type // that can be passed using a single void pointer (LPVOID). struct seqSumData { - vector* startPosition; - vector* endPosition; - vector* seqLength; - vector* ambigBases; - vector* longHomoPolymer; + vector startPosition; + vector endPosition; + vector seqLength; + vector ambigBases; + vector longHomoPolymer; string filename; string sumFile; unsigned long long start; @@ -78,12 +78,7 @@ struct seqSumData { seqSumData(){} - seqSumData(vector* s, vector* e, vector* l, vector* a, vector* h, string f, string sf, MothurOut* mout, unsigned long long st, unsigned long long en, string na, map nam) { - startPosition = s; - endPosition = e; - seqLength = l; - ambigBases = a; - longHomoPolymer = h; + seqSumData(string f, string sf, MothurOut* mout, unsigned long long st, unsigned long long en, string na, map nam) { filename = f; sumFile = sf; m = mout; @@ -137,11 +132,11 @@ static DWORD WINAPI MySeqSumThreadFunction(LPVOID lpParam){ //for each sequence this sequence represents for (int i = 0; i < num; i++) { - pDataArray->startPosition->push_back(current.getStartPos()); - pDataArray->endPosition->push_back(current.getEndPos()); - pDataArray->seqLength->push_back(current.getNumBases()); - pDataArray->ambigBases->push_back(current.getAmbigBases()); - pDataArray->longHomoPolymer->push_back(current.getLongHomoPolymer()); + pDataArray->startPosition.push_back(current.getStartPos()); + pDataArray->endPosition.push_back(current.getEndPos()); + pDataArray->seqLength.push_back(current.getNumBases()); + pDataArray->ambigBases.push_back(current.getAmbigBases()); + pDataArray->longHomoPolymer.push_back(current.getLongHomoPolymer()); } outSummary << current.getName() << '\t';