X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPCAPanel.java;h=6465ee839e13046ccf0d41040ba8c903c5992e01;hb=7bc213bae5828287329a3490faba291706599b03;hp=1dd05e0e9afe1f82d92d2554a3cfa8e77c1e98e3;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/appletgui/PCAPanel.java b/src/jalview/appletgui/PCAPanel.java
index 1dd05e0..6465ee8 100755
--- a/src/jalview/appletgui/PCAPanel.java
+++ b/src/jalview/appletgui/PCAPanel.java
@@ -26,86 +26,111 @@ import java.awt.event.*;
 
 import jalview.analysis.*;
 import jalview.datamodel.*;
-import jalview.jbappletgui.*;
+
 
 public class PCAPanel
-    extends GPCAPanel implements Runnable
+    extends Frame implements Runnable, ActionListener, ItemListener
 {
   PCA pca;
   int top;
   RotatableCanvas rc;
   AlignViewport av;
+  SequenceI [] seqs;
 
-  public void run()
-  {
-    // do stuff
-  }
 
-  public PCAPanel(AlignViewport av, SequenceI[] s)
+  public PCAPanel(AlignViewport av)
   {
+    try
+    {
+      jbInit();
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
+    for (int i = 1; i < 8; i++)
+    {
+      xCombobox.addItem("dim " + i);
+      yCombobox.addItem("dim " + i);
+      zCombobox.addItem("dim " + i);
+    }
 
     this.av = av;
-    if (av.getSelectionGroup().getSize() > 3)
+    if (av.getSelectionGroup()!=null && av.getSelectionGroup().getSize(false) > 3)
     {
-      s = new Sequence[av.getSelectionGroup().getSize()];
-      for (int i = 0; i < s.length; i++)
+      seqs = new Sequence[av.getSelectionGroup().getSize(false)];
+      for (int i = 0; i < av.getSelectionGroup().getSize(false); i++)
       {
-        s[i] = av.getSelectionGroup().getSequenceAt(i);
+        seqs[i] = av.getSelectionGroup().getSequenceAt(i);
       }
     }
-
-    if (s == null)
+    else
     {
-      s = new Sequence[av.getAlignment().getHeight()];
+      seqs = new Sequence[av.getAlignment().getHeight()];
       for (int i = 0; i < av.getAlignment().getHeight(); i++)
       {
-        s[i] = av.getAlignment().getSequenceAt(i);
+        seqs[i] = av.getAlignment().getSequenceAt(i);
       }
     }
 
-//////////////////////This part was done in PCATHread originally. Is it too slow???
-    pca = new PCA(s);
-    pca.run();
+    rc = new RotatableCanvas(av);
+    add(rc, BorderLayout.CENTER);
 
-    // Now find the component coordinates
-    int ii = 0;
-    while (ii < s.length && s[ii] != null)
-    {
-      ii++;
-    }
+    jalview.bin.JalviewLite.addFrame(this, "Principal component analysis",
+                                       400, 400);
 
-    double[][] comps = new double[ii][ii];
 
-    for (int i = 0; i < ii; i++)
-    {
-      if (pca.getEigenvalue(i) > 1e-4)
-      {
-        comps[i] = pca.component(i);
-      }
-    }
+    Thread worker = new Thread(this);
+    worker.start();
+  }
 
-    //////////////////
+  /**
+   * DOCUMENT ME!
+   */
+  public void run()
+  {
+              pca = null;//new PCA(seqs);
+              pca.run();
 
-    xCombobox.select(0);
-    yCombobox.select(1);
-    zCombobox.select(2);
+              // Now find the component coordinates
+              int ii = 0;
 
-    top = pca.getM().rows - 1;
+              while ((ii < seqs.length) && (seqs[ii] != null))
+              {
+                  ii++;
+              }
 
-    Vector points = new Vector();
-    float[][] scores = pca.getComponents(top - 1, top - 2, top - 3, 100);
+              double[][] comps = new double[ii][ii];
 
-    for (int i = 0; i < pca.getM().rows; i++)
-    {
-      SequencePoint sp = new SequencePoint(s[i], scores[i]);
-      points.addElement(sp);
-    }
+              for (int i = 0; i < ii; i++)
+              {
+                  if (pca.getEigenvalue(i) > 1e-4)
+                  {
+                      comps[i] = pca.component(i);
+                  }
+              }
 
-    rc = new RotatableCanvas(av, points, pca.getM().rows);
+              //////////////////
+              xCombobox.select(0);
+              yCombobox.select(1);
+              zCombobox.select(2);
 
-    //rc.printPoints();
+              top = pca.getM().rows - 1;
 
-    add(rc, BorderLayout.CENTER);
+              Vector points = new Vector();
+              float[][] scores = pca.getComponents(top - 1, top - 2, top - 3, 100);
+
+              for (int i = 0; i < pca.getM().rows; i++)
+              {
+                  SequencePoint sp = new SequencePoint(seqs[i], scores[i]);
+                  points.addElement(sp);
+              }
+
+              rc.setPoints(points, pca.getM().rows);
+              rc.repaint();
+              seqs = null;
+              this.repaint();
   }
 
   void doDimensionChange()
@@ -131,19 +156,103 @@ public class PCAPanel
     rc.paint(rc.getGraphics());
   }
 
-  protected void xCombobox_actionPerformed(ActionEvent e)
+  public void actionPerformed(ActionEvent evt)
+  {
+    values_actionPerformed();
+  }
+
+  public void itemStateChanged(ItemEvent evt)
+  {
+    if(evt.getSource()==xCombobox)
+      xCombobox_actionPerformed();
+    else if(evt.getSource()==yCombobox)
+      yCombobox_actionPerformed();
+    else if(evt.getSource()==zCombobox)
+      zCombobox_actionPerformed();
+  }
+
+
+  protected void xCombobox_actionPerformed()
   {
     doDimensionChange();
   }
 
-  protected void yCombobox_actionPerformed(ActionEvent e)
+  protected void yCombobox_actionPerformed()
   {
     doDimensionChange();
   }
 
-  protected void zCombobox_actionPerformed(ActionEvent e)
+  protected void zCombobox_actionPerformed()
   {
     doDimensionChange();
   }
 
+  public void values_actionPerformed()
+  {
+
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null);
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(frame, "PCA details", 500, 500);
+
+      cap.setText(pca.getDetails());
+  }
+
+  public void labels_itemStateChanged(ItemEvent itemEvent)
+  {
+    rc.showLabels( labels.getState() );
+  }
+  Panel jPanel2 = new Panel();
+  Label jLabel1 = new Label();
+  Label jLabel2 = new Label();
+  Label jLabel3 = new Label();
+  protected Choice xCombobox = new Choice();
+  protected Choice yCombobox = new Choice();
+  protected Choice zCombobox = new Choice();
+  FlowLayout flowLayout1 = new FlowLayout();
+  BorderLayout borderLayout1 = new BorderLayout();
+  MenuBar menuBar1 = new MenuBar();
+  Menu menu1 = new Menu();
+  Menu menu2 = new Menu();
+  protected CheckboxMenuItem labels = new CheckboxMenuItem();
+  MenuItem values = new MenuItem();
+
+  private void jbInit()
+      throws Exception
+  {
+    this.setLayout(borderLayout1);
+    jPanel2.setLayout(flowLayout1);
+    jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
+    jLabel1.setText("x=");
+    jLabel2.setFont(new java.awt.Font("Verdana", 0, 12));
+    jLabel2.setText("y=");
+    jLabel3.setFont(new java.awt.Font("Verdana", 0, 12));
+    jLabel3.setText("z=");
+    jPanel2.setBackground(Color.white);
+    zCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
+    zCombobox.addItemListener(this);
+    yCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
+    yCombobox.addItemListener(this);
+    xCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
+    xCombobox.addItemListener(this);
+    this.setMenuBar(menuBar1);
+    menu1.setLabel("File");
+    menu2.setLabel("View");
+    labels.setLabel("Labels");
+    labels.addItemListener(this);
+    values.setLabel("Output Values...");
+    values.addActionListener(this);
+    this.add(jPanel2, BorderLayout.SOUTH);
+    jPanel2.add(jLabel1, null);
+    jPanel2.add(xCombobox, null);
+    jPanel2.add(jLabel2, null);
+    jPanel2.add(yCombobox, null);
+    jPanel2.add(jLabel3, null);
+    jPanel2.add(zCombobox, null);
+    menuBar1.add(menu1);
+    menuBar1.add(menu2);
+    menu2.add(labels);
+    menu1.add(values);
+  }
+
 }