X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=5e65f1e23ac186f5de13599d194dcddbb5644deb;hb=c95df1d1e8746c6fa31b94c2bf8505f25a30c168;hp=26836cdcf294610733210facd185e6cdd506679a;hpb=de468b0bf50850a89c6a8a7acfa4ff5b689ffed1;p=jalview.git

diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java
index 26836cd..5e65f1e 100755
--- a/src/jalview/appletgui/PairwiseAlignPanel.java
+++ b/src/jalview/appletgui/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
@@ -42,38 +42,78 @@ public class PairwiseAlignPanel
     catch (Exception e)
     {
       e.printStackTrace();
-  }
+    }
     this.ap = ap;
-    float scores[][] = new float[ap.av.alignment.getHeight()][ap.av.alignment.
-        getHeight()];
+    sequences = new Vector();
+
+    SequenceI[] seqs;
+    String[] seqStrings = ap.av.getViewAsString(true);
+
+    if (ap.av.getSelectionGroup() == null)
+    {
+      seqs = ap.av.alignment.getSequencesArray();
+    }
+    else
+    {
+      seqs = ap.av.getSelectionGroup().getSequencesInOrder(ap.av.alignment);
+    }
+
+    float scores[][] = new float[seqs.length][seqs.length];
     double totscore = 0;
-    int count = ap.av.getSelectionGroup().getSize();
+    int count = ap.av.getSelectionGroup().getSize(false);
+
+    Sequence seq;
 
-    int acount = 0;
     for (int i = 1; i < count; i++)
     {
       for (int j = 0; j < i; j++)
       {
-        acount++;
-        AlignSeq as = new AlignSeq(ap.av.getSelectionGroup().getSequenceAt(i),
-                                   ap.av.getSelectionGroup().getSequenceAt(j),
-                                   "pep");
+
+        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];
 
         textarea.append(as.getOutput());
-        sequences.addElement(new Sequence(as.getS1().getName(), as.getAStr1()));
-        sequences.addElement(new Sequence(as.getS2().getName(), as.getAStr2()));
-
+        seq = new Sequence(as.getS1().getName(),
+                           as.getAStr1(),
+                           as.getS1().getStart(),
+                           as.getS1().getEnd()
+            );
+        sequences.addElement(seq);
+
+        seq = new Sequence(as.getS2().getName(),
+                           as.getAStr2(),
+                           as.getS2().getStart(),
+                           as.getS2().getEnd());
+        sequences.addElement(seq);
       }
     }
 
     if (count > 2)
     {
+      System.out.println(
+          "Pairwise alignment scaled similarity score matrix\n");
+
+      for (int i = 0; i < count; i++)
+      {
+        jalview.util.Format.print(System.out, "%s \n",
+                                  ("" + i) + " " +
+                                  seqs[i].getName());
+      }
+
+      System.out.println("\n");
+
       for (int i = 0; i < count; i++)
       {
         for (int j = 0; j < i; j++)
@@ -82,9 +122,10 @@ public class PairwiseAlignPanel
                                     scores[i][j] / totscore);
         }
       }
+
+      System.out.println("\n");
     }
   }
-
   public void actionPerformed(ActionEvent evt)
   {
     if(evt.getSource()==viewInEditorButton)
@@ -102,8 +143,9 @@ public class PairwiseAlignPanel
     }
 
     new AlignFrame(new Alignment(seq),
-                                   ap.alignFrame.applet,
-                                   "Pairwise Aligned Sequences");
+                                   ap.av.applet,
+                                   "Pairwise Aligned Sequences",
+                                   false);
 
   }
   protected ScrollPane scrollPane = new ScrollPane();