From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 21 May 2024 14:46:05 +0000 (+0100)
Subject: Merge branch 'feature/JAL-4159_pasimap' into spike/JAL-4159_pasimap_2113_series
X-Git-Tag: Release_2_11_4_0~31^2~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8919de1ee4d4a4222e9ca1bbb084bdf94943dd3;p=jalview.git

Merge branch 'feature/JAL-4159_pasimap' into spike/JAL-4159_pasimap_2113_series
loop in new progress bar and resolve formatting conflicts in PairwiseAlignPanel
---

b8919de1ee4d4a4222e9ca1bbb084bdf94943dd3
diff --cc src/jalview/gui/PairwiseAlignPanel.java
index 2d86827,af7913b..e737e52
--- a/src/jalview/gui/PairwiseAlignPanel.java
+++ b/src/jalview/gui/PairwiseAlignPanel.java
@@@ -107,10 -137,14 +137,16 @@@ System.out.println("Creating pap")
      float[][] alignmentScores = new float[seqs.length][seqs.length];
      double totscore = 0D;
      int count = seqs.length;
 +    suppressTextbox = count<10;
 +    discardAlignments = count<15;
      boolean first = true;
  
+     progress = 0;
+     firePropertyChange(TOTAL, 0, total);
+ 
+     suppressTextbox = count<10;
+     discardAlignments = count<15;
+ 
      for (int i = 1; i < count; i++)
      {
        // fill diagonal alignmentScores with Float.NaN
@@@ -138,9 -170,9 +174,9 @@@
  
          if (!first)
          {
-           System.out.println(DASHES);
+           jalview.bin.Console.outPrintln(DASHES);
            textarea.append(DASHES);
 -	  sb.append(DASHES);
 +          sb.append(DASHES);
          }
          first = false;
          if (discardAlignments) {
@@@ -149,16 -181,19 +185,17 @@@
          scores[i][j] = as.getMaxScore() / as.getASeq1().length;
          alignmentScores[i][j] = as.getAlignmentScore();
          totscore = totscore + scores[i][j];
 -
 -	if (suppressTextbox)
 -	{
 +        if (suppressTextbox)
 +        {
            textarea.append(as.getOutput());
 -	  sb.append(as.getOutput());
 -	}
 -	if (discardAlignments)
 -	{
 +          sb.append(as.getOutput());
 +        }
 +        if (discardAlignments)
 +        {
            sequences.add(as.getAlignedSeq1());
            sequences.add(as.getAlignedSeq2());
 -	}
 -
 -	firePropertyChange(PROGRESS, progress, ++progress);
 +        }
++        firePropertyChange(PROGRESS, progress, ++progress);
        }
      }
      alignmentScores[count - 1][count - 1] = Float.NaN;