Dont add pdb format here

[jalview.git] / src / jalview / appletgui / PCAPanel.java

diff --git a/src/jalview/appletgui/PCAPanel.java b/src/jalview/appletgui/PCAPanel.java
index 0368d2a..6465ee8 100755 (executable)
--- a/src/jalview/appletgui/PCAPanel.java
+++ b/src/jalview/appletgui/PCAPanel.java
@@ -29,7 +29,7 @@ import jalview.datamodel.*;
 \r
 \r
 public class PCAPanel\r
-    extends Frame implements Runnable\r
+    extends Frame implements Runnable, ActionListener, ItemListener\r
 {\r
   PCA pca;\r
   int top;\r
@@ -57,10 +57,10 @@ public class PCAPanel
     }\r
 \r
     this.av = av;\r
-    if (av.getSelectionGroup()!=null && av.getSelectionGroup().getSize() > 3)\r
+    if (av.getSelectionGroup()!=null && av.getSelectionGroup().getSize(false) > 3)\r
     {\r
-      seqs = new Sequence[av.getSelectionGroup().getSize()];\r
-      for (int i = 0; i < av.getSelectionGroup().getSize(); i++)\r
+      seqs = new Sequence[av.getSelectionGroup().getSize(false)];\r
+      for (int i = 0; i < av.getSelectionGroup().getSize(false); i++)\r
       {\r
         seqs[i] = av.getSelectionGroup().getSequenceAt(i);\r
       }\r
@@ -90,7 +90,7 @@ public class PCAPanel
    */\r
   public void run()\r
   {\r
-              pca = new PCA(seqs);\r
+              pca = null;//new PCA(seqs);\r
               pca.run();\r
 \r
               // Now find the component coordinates\r
@@ -156,22 +156,38 @@ public class PCAPanel
     rc.paint(rc.getGraphics());\r
   }\r
 \r
-  protected void xCombobox_actionPerformed(ActionEvent e)\r
+  public void actionPerformed(ActionEvent evt)\r
+  {\r
+    values_actionPerformed();\r
+  }\r
+\r
+  public void itemStateChanged(ItemEvent evt)\r
+  {\r
+    if(evt.getSource()==xCombobox)\r
+      xCombobox_actionPerformed();\r
+    else if(evt.getSource()==yCombobox)\r
+      yCombobox_actionPerformed();\r
+    else if(evt.getSource()==zCombobox)\r
+      zCombobox_actionPerformed();\r
+  }\r
+\r
+\r
+  protected void xCombobox_actionPerformed()\r
   {\r
     doDimensionChange();\r
   }\r
 \r
-  protected void yCombobox_actionPerformed(ActionEvent e)\r
+  protected void yCombobox_actionPerformed()\r
   {\r
     doDimensionChange();\r
   }\r
 \r
-  protected void zCombobox_actionPerformed(ActionEvent e)\r
+  protected void zCombobox_actionPerformed()\r
   {\r
     doDimensionChange();\r
   }\r
 \r
-  public void values_actionPerformed(ActionEvent actionEvent)\r
+  public void values_actionPerformed()\r
   {\r
 \r
     CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null);\r
@@ -214,48 +230,18 @@ public class PCAPanel
     jLabel3.setText("z=");\r
     jPanel2.setBackground(Color.white);\r
     zCombobox.setFont(new java.awt.Font("Verdana", 0, 12));\r
-    zCombobox.addItemListener(new java.awt.event.ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent e)\r
-      {\r
-        zCombobox_actionPerformed(null);\r
-      }\r
-    });\r
+    zCombobox.addItemListener(this);\r
     yCombobox.setFont(new java.awt.Font("Verdana", 0, 12));\r
-    yCombobox.addItemListener(new java.awt.event.ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent e)\r
-      {\r
-        yCombobox_actionPerformed(null);\r
-      }\r
-    });\r
+    yCombobox.addItemListener(this);\r
     xCombobox.setFont(new java.awt.Font("Verdana", 0, 12));\r
-    xCombobox.addItemListener(new java.awt.event.ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent e)\r
-      {\r
-        xCombobox_actionPerformed(null);\r
-      }\r
-    });\r
+    xCombobox.addItemListener(this);\r
     this.setMenuBar(menuBar1);\r
     menu1.setLabel("File");\r
     menu2.setLabel("View");\r
     labels.setLabel("Labels");\r
-    labels.addItemListener(new ItemListener()\r
-    {\r
-      public void itemStateChanged(ItemEvent itemEvent)\r
-      {\r
-        labels_itemStateChanged(itemEvent);\r
-      }\r
-    });\r
+    labels.addItemListener(this);\r
     values.setLabel("Output Values...");\r
-    values.addActionListener(new ActionListener()\r
-    {\r
-      public void actionPerformed(ActionEvent actionEvent)\r
-      {\r
-        values_actionPerformed(actionEvent);\r
-      }\r
-    });\r
+    values.addActionListener(this);\r
     this.add(jPanel2, BorderLayout.SOUTH);\r
     jPanel2.add(jLabel1, null);\r
     jPanel2.add(xCombobox, null);\r