X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fhmmer%2FHMMSearchThread.java;h=d3f8968814857621a35cdc0d1f823c65f51e9c86;hb=6dda78dd65a8f6f25356d9fe95078afbba4eadcd;hp=16c7c6843503d41fc7ddde666ba73cc4309bbc27;hpb=bd6ce8f5f9fc8e5bc8a6188d15987ce0ffd2c1ee;p=jalview.git diff --git a/src/jalview/hmmer/HMMSearchThread.java b/src/jalview/hmmer/HMMSearchThread.java index 16c7c68..d3f8968 100644 --- a/src/jalview/hmmer/HMMSearchThread.java +++ b/src/jalview/hmmer/HMMSearchThread.java @@ -48,8 +48,6 @@ public class HMMSearchThread extends HmmerCommand implements Runnable long barID; - SequenceI hmmSeq; - List params; File hmmTemp = null; @@ -97,7 +95,7 @@ public class HMMSearchThread extends HmmerCommand implements Runnable hmm = af.getSelectedHMM(); } - hmmSeq = af.getSelectedHMMSequence(); + SequenceI hmmSeq = af.getSelectedHMMSequence(); barID = System.currentTimeMillis(); af.setProgressBar(MessageManager.getString("status.running_hmmsearch"), barID); @@ -131,7 +129,7 @@ public class HMMSearchThread extends HmmerCommand implements Runnable } try { - importData(); + importData(hmmSeq); } catch (IOException | InterruptedException e) { // TODO Auto-generated catch block @@ -234,7 +232,11 @@ public class HMMSearchThread extends HmmerCommand implements Runnable { AlignmentI alignment = af.getViewport().getAlignment(); AlignmentI copy = new Alignment(alignment); - copy.getHMMConsensusSequences(true); + List hmms = copy.getHMMConsensusSequences(); + for (SequenceI seq : hmms) + { + copy.deleteSequence(seq); + } StockholmFile stoFile = new StockholmFile(copy); stoFile.setSeqs(copy.getSequencesArray()); String alignmentString = stoFile.print(); @@ -253,8 +255,11 @@ public class HMMSearchThread extends HmmerCommand implements Runnable /** * Imports the data from the temporary file to which the output of hmmsearch * is directed. + * + * @param hmmSeq */ - private void importData() throws IOException, InterruptedException + private void importData(SequenceI hmmSeq) + throws IOException, InterruptedException { BufferedReader br = new BufferedReader( new FileReader(inputAlignmentTemp));