X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPairwiseAlignPanel.java;fp=src%2Fjalview%2Fgui%2FPairwiseAlignPanel.java;h=2d86827366a338eddf43e05c92bdf642fee8d4f9;hb=1624d4fc89f17c4a6cdb80b7d4cc37a095b6fe67;hp=a84c4492cc2844606126ef2d48095e98e9ed570d;hpb=b798682af83d8fb1d7c7f4b45388572899b31cac;p=jalview.git diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java index a84c449..2d86827 100755 --- a/src/jalview/gui/PairwiseAlignPanel.java +++ b/src/jalview/gui/PairwiseAlignPanel.java @@ -57,6 +57,10 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel private String alignmentOutput; + private boolean suppressTextbox; + + private boolean discardAlignments; + /** * Creates a new PairwiseAlignPanel object. * @@ -103,12 +107,14 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel float[][] alignmentScores = new float[seqs.length][seqs.length]; double totscore = 0D; int count = seqs.length; + suppressTextbox = count<10; + discardAlignments = count<15; boolean first = true; for (int i = 1; i < count; i++) { // fill diagonal alignmentScores with Float.NaN - alignmentScores[i-1][i-1] = Float.NaN; + alignmentScores[i - 1][i - 1] = Float.NaN; for (int j = 0; j < i; j++) { AlignSeq as = new AlignSeq(seqs[i], seqStrings[i], seqs[j], @@ -120,33 +126,42 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel } as.calcScoreMatrix(); - if (endGaps) - { + if (endGaps) + { as.traceAlignmentWithEndGaps(); - } else { - as.traceAlignment(); - } - as.scoreAlignment(); + } + else + { + as.traceAlignment(); + } + as.scoreAlignment(); if (!first) { System.out.println(DASHES); textarea.append(DASHES); - sb.append(DASHES); + sb.append(DASHES); } first = false; - as.printAlignment(System.out); + if (discardAlignments) { + as.printAlignment(System.out); + } scores[i][j] = as.getMaxScore() / as.getASeq1().length; alignmentScores[i][j] = as.getAlignmentScore(); totscore = totscore + scores[i][j]; - - textarea.append(as.getOutput()); - sb.append(as.getOutput()); - sequences.add(as.getAlignedSeq1()); - sequences.add(as.getAlignedSeq2()); + if (suppressTextbox) + { + textarea.append(as.getOutput()); + sb.append(as.getOutput()); + } + if (discardAlignments) + { + sequences.add(as.getAlignedSeq1()); + sequences.add(as.getAlignedSeq2()); + } } } - alignmentScores[count-1][count-1] = Float.NaN; + alignmentScores[count - 1][count - 1] = Float.NaN; this.scores = scores; this.alignmentScores = alignmentScores;