X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPCAPanel.java;h=6465ee839e13046ccf0d41040ba8c903c5992e01;hb=2ac5b6423fe366e093c8f12b0935aefc9aafbe5f;hp=026ca09ff3ce5f2b7d14513f2d46922651c2309a;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git

diff --git a/src/jalview/appletgui/PCAPanel.java b/src/jalview/appletgui/PCAPanel.java
index 026ca09..6465ee8 100755
--- a/src/jalview/appletgui/PCAPanel.java
+++ b/src/jalview/appletgui/PCAPanel.java
@@ -26,10 +26,10 @@ 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;
@@ -40,11 +40,27 @@ public class PCAPanel
 
   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()!=null && av.getSelectionGroup().getSize() > 3)
+    if (av.getSelectionGroup()!=null && av.getSelectionGroup().getSize(false) > 3)
     {
-      seqs = new Sequence[av.getSelectionGroup().getSize()];
-      for (int i = 0; i < av.getSelectionGroup().getSize(); i++)
+      seqs = new Sequence[av.getSelectionGroup().getSize(false)];
+      for (int i = 0; i < av.getSelectionGroup().getSize(false); i++)
       {
         seqs[i] = av.getSelectionGroup().getSequenceAt(i);
       }
@@ -74,7 +90,7 @@ public class PCAPanel
    */
   public void run()
   {
-              pca = new PCA(seqs);
+              pca = null;//new PCA(seqs);
               pca.run();
 
               // Now find the component coordinates
@@ -140,22 +156,38 @@ 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(ActionEvent actionEvent)
+  public void values_actionPerformed()
   {
 
     CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null);
@@ -170,5 +202,57 @@ public class PCAPanel
   {
     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);
+  }
 
 }