X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=pcrseqscommand.h;h=420a5ebc3e4b0cb527a3c2c692797c0b627c3b46;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=03092bca2a70da8428e77f5599e6ab200c2b8960;hpb=91a27e0483827c06c21c4fe89558923bbfe86573;p=mothur.git diff --git a/pcrseqscommand.h b/pcrseqscommand.h index 03092bc..420a5eb 100644 --- a/pcrseqscommand.h +++ b/pcrseqscommand.h @@ -45,7 +45,7 @@ private: bool getOligos(vector >&, vector >&, vector >&); bool abort, keepprimer, keepdots; string fastafile, oligosfile, taxfile, groupfile, namefile, ecolifile, outputDir, nomatch; - int start, end, pdiffs, processors, length; + int start, end, processors, length; vector revPrimer, outputNames; vector primers; @@ -315,11 +315,11 @@ static DWORD WINAPI MyPcrThreadFunction(LPVOID lpParam){ pDataArray->m->mothurOut("[ERROR]: seqs are not the same length as ecoli seq. When using ecoli option your sequences must be aligned and the same length as the ecoli sequence.\n"); pDataArray->m->control_pressed = true; break; }else { if (pDataArray->keepdots) { - currSeq.filterToPos(start); - currSeq.filterFromPos(end); + currSeq.filterToPos(pDataArray->start); + currSeq.filterFromPos(pDataArray->end); }else { - string seqString = currSeq.getAligned().substr(0, end); - seqString = seqString.substr(start); + string seqString = currSeq.getAligned().substr(0, pDataArray->end); + seqString = seqString.substr(pDataArray->start); currSeq.setAligned(seqString); } } @@ -331,17 +331,17 @@ static DWORD WINAPI MyPcrThreadFunction(LPVOID lpParam){ if (pDataArray->end != -1) { if (pDataArray->end > currSeq.getAligned().length()) { pDataArray->m->mothurOut("[ERROR]: end is longer than your sequence length, aborting.\n"); pDataArray->m->control_pressed = true; break; } else { - if (pDataArray->keepdots) { currSeq.filterFromPos(end); } + if (pDataArray->keepdots) { currSeq.filterFromPos(pDataArray->end); } else { - string seqString = currSeq.getAligned().substr(0, end); + string seqString = currSeq.getAligned().substr(0, pDataArray->end); currSeq.setAligned(seqString); } } } if (pDataArray->start != -1) { - if (pDataArray->keepdots) { currSeq.filterToPos(start); } + if (pDataArray->keepdots) { currSeq.filterToPos(pDataArray->start); } else { - string seqString = currSeq.getAligned().substr(start); + string seqString = currSeq.getAligned().substr(pDataArray->start); currSeq.setAligned(seqString); } }