X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPairwiseAlignPanel.java;h=248a54c4ba013bb37b28942ab6bd2b654341e975;hb=b3b59df08fc4183bb35e4ed5a54841a990b71346;hp=f52a1d8a6bd48175fd0870998c190d3965400943;hpb=7c05496d1da22f21ce5ae1a199afb9b16c8777ea;p=jalview.git

diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java
index f52a1d8..248a54c 100755
--- a/src/jalview/gui/PairwiseAlignPanel.java
+++ b/src/jalview/gui/PairwiseAlignPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel
         sequences = new Vector();
 
         SequenceI [] seqs;
-        String []  seqStrings = av.getSelectionAsString();
+        String []  seqStrings = av.getViewAsString(true);
 
         if(av.getSelectionGroup()==null)
         {
@@ -70,20 +70,25 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel
         double totscore = 0;
         int count = seqs.length;
 
-        int acount = 0;
         Sequence seq;
 
         for (int i = 1; i < count; i++)
         {
             for (int j = 0; j < i; j++)
             {
-                acount++;
 
                 AlignSeq as = new AlignSeq(seqs[i], seqStrings[i],
                         seqs[j], seqStrings[j], "pep");
 
+                if(as.s1str.length()==0 || as.s2str.length()==0)
+                {
+                  continue;
+                }
+
                 as.calcScoreMatrix();
                 as.traceAlignment();
+
+
                 as.printAlignment(System.out);
                 scores[i][j] = (float) as.getMaxScore() / (float) as.getASeq1().length;
                 totscore = totscore + scores[i][j];
@@ -91,7 +96,8 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel
                 textarea.append(as.getOutput());
                 seq = new Sequence(as.getS1().getName(),
                                    as.getAStr1(),
-                    as.getS1().getStart(), as.getS1().getEnd()
+                                   as.getS1().getStart(),
+                                   as.getS1().getEnd()
                 );
                 sequences.add(seq);
 
@@ -144,8 +150,11 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel
             seq[i] = (Sequence) sequences.elementAt(i);
         }
 
-        AlignFrame af = new AlignFrame(new Alignment(seq));
+        AlignFrame af = new AlignFrame(new Alignment(seq),
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT);
+
         Desktop.addInternalFrame(af, "Pairwise Aligned Sequences",
-            AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);
+            AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
     }
 }