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

diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java
index c771693..248a54c 100755
--- a/src/jalview/gui/PairwiseAlignPanel.java
+++ b/src/jalview/gui/PairwiseAlignPanel.java
@@ -1,73 +1,160 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
-import jalview.datamodel.*;
-import jalview.jbgui.GPairwiseAlignPanel;
 import jalview.analysis.*;
+
+import jalview.datamodel.*;
+
+import jalview.jbgui.*;
+
 import java.awt.event.*;
-import javax.swing.*;
+
 import java.util.*;
 
 
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
 public class PairwiseAlignPanel extends GPairwiseAlignPanel
 {
-    Vector sequences = new Vector();
+
     AlignViewport av;
+    Vector sequences;
 
+    /**
+     * Creates a new PairwiseAlignPanel object.
+     *
+     * @param av DOCUMENT ME!
+     */
     public PairwiseAlignPanel(AlignViewport av)
     {
-      super();
-      this.av = av;
-      float scores[][] = new float[av.getAlignment().getHeight()][av.getAlignment().getHeight()];
-      double totscore = 0;
-      int count = av.getSelection().size();
+        super();
+        this.av = av;
 
-      int acount = 0;
-        for (int i = 1; i < count; i++)
+        sequences = new Vector();
+
+        SequenceI [] seqs;
+        String []  seqStrings = av.getViewAsString(true);
+
+        if(av.getSelectionGroup()==null)
         {
-          for (int j = 0; j < i; j++)
-          {
-            acount++;
-            AlignSeq as = new AlignSeq(av.getSelection().sequenceAt(i),av.getSelection().sequenceAt(j),"pep");
-            //tf.status.setText("Aligning " + as.getS1().getName() + " and " + as.getS2().getName() + " (" + acount + "/" + (count*(count-1)/2) + ")");
-
-            as.calcScoreMatrix();
-            as.traceAlignment();
-            as.printAlignment();
-            scores[i][j] = (float)as.getMaxScore()/(float)as.getASeq1().length;
-            totscore = totscore + scores[i][j];
-
-            textarea.append(as.getOutput());
-            sequences.add( as.getS1() );
-            sequences.add( as.getS2() );
-
-          }
+          seqs = av.alignment.getSequencesArray();
         }
-
-        if (count > 2)
+        else
         {
-          for (int i = 0; i < count;i++)
-            for (int j = 0; j < i; j++)
-              jalview.util.Format.print(System.out,"%7.3f",scores[i][j]/totscore);
+          seqs = av.getSelectionGroup().getSequencesInOrder(av.alignment);
         }
-      }
-
 
-  protected void viewInEditorButton_actionPerformed(ActionEvent e)
-  {
 
-      Sequence [] seq = new Sequence[sequences.size()];
+        float[][] scores = new float[seqs.length][seqs.length];
+        double totscore = 0;
+        int count = seqs.length;
 
-      for (int i=0;i<sequences.size();i++)
-       seq[i] = (Sequence) sequences.elementAt(i);
+        Sequence seq;
 
+        for (int i = 1; i < count; i++)
+        {
+            for (int j = 0; j < i; j++)
+            {
+
+                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());
+                seq = new Sequence(as.getS1().getName(),
+                                   as.getAStr1(),
+                                   as.getS1().getStart(),
+                                   as.getS1().getEnd()
+                );
+                sequences.add(seq);
+
+                seq = new Sequence(as.getS2().getName(),
+                                   as.getAStr2(),
+                                   as.getS2().getStart(),
+                                   as.getS2().getEnd() );
+                sequences.add(seq);
+            }
+        }
 
-      AlignFrame af = new AlignFrame(new Alignment(seq));
-      int newHeight = seq.length * af.viewport.getCharHeight() + 200;
-      if(newHeight>500)
-        newHeight=500;
+        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++)
+                {
+                    jalview.util.Format.print(System.out, "%7.3f",
+                        scores[i][j] / totscore);
+                }
+            }
+
+            System.out.println("\n");
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void viewInEditorButton_actionPerformed(ActionEvent e)
+    {
+        Sequence[] seq = new Sequence[sequences.size()];
 
-      Desktop.addInternalFrame(af, "Pairwise Aligned Sequences", 700,newHeight);
+        for (int i = 0; i < sequences.size(); i++)
+        {
+            seq[i] = (Sequence) sequences.elementAt(i);
+        }
 
-  }
+        AlignFrame af = new AlignFrame(new Alignment(seq),
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT);
 
+        Desktop.addInternalFrame(af, "Pairwise Aligned Sequences",
+            AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
+    }
 }