X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=f57845daf8ce2bd7d0debbca156e078fc788530a;hb=9876fdccf311378e690c1f9e18db52675d427b89;hp=3968fdeb068e80c524c0f285d8bdce985cff1f76;hpb=cb5d856b1304448cae13a333cbd9017f81520d90;p=jalview.git
diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index 3968fde..f57845d 100755
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -1,30 +1,45 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview 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 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview 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 Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.jbgui;
import jalview.util.MessageManager;
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComboBox;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
public class GPCAPanel extends JInternalFrame
{
@@ -54,6 +69,8 @@ public class GPCAPanel extends JInternalFrame
JMenu saveMenu = new JMenu();
+ protected JMenu scoreMatrixMenu = new JMenu();
+
JMenuItem eps = new JMenuItem();
JMenuItem png = new JMenuItem();
@@ -190,7 +207,8 @@ public class GPCAPanel extends JInternalFrame
outputPoints_actionPerformed(e);
}
});
- outputProjPoints.setText(MessageManager.getString("label.output_transformed_points") + "...");
+ outputProjPoints.setText(MessageManager
+ .getString("label.output_transformed_points"));
outputProjPoints.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -205,7 +223,7 @@ public class GPCAPanel extends JInternalFrame
print_actionPerformed(e);
}
});
- viewMenu.setText(MessageManager.getString("aciton.view"));
+ viewMenu.setText(MessageManager.getString("action.view"));
viewMenu.addMenuListener(new MenuListener()
{
public void menuSelected(MenuEvent e)
@@ -221,6 +239,23 @@ public class GPCAPanel extends JInternalFrame
{
}
});
+ scoreMatrixMenu.setText(MessageManager
+ .getString("label.select_score_model"));
+ scoreMatrixMenu.addMenuListener(new MenuListener()
+ {
+ public void menuSelected(MenuEvent e)
+ {
+ scoreMatrix_menuSelected();
+ }
+
+ public void menuDeselected(MenuEvent e)
+ {
+ }
+
+ public void menuCanceled(MenuEvent e)
+ {
+ }
+ });
showLabels.setText(MessageManager.getString("label.show_labels"));
showLabels.addActionListener(new ActionListener()
{
@@ -230,7 +265,7 @@ public class GPCAPanel extends JInternalFrame
}
});
print.setText(MessageManager.getString("action.print"));
- bgcolour.setText(MessageManager.getString("label.background_colour") + "...");
+ bgcolour.setText(MessageManager.getString("action.background_colour"));
bgcolour.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -246,9 +281,11 @@ public class GPCAPanel extends JInternalFrame
originalSeqData_actionPerformed(e);
}
});
- associateViewsMenu.setText(MessageManager.getString("label.associate_nodes_with"));
+ associateViewsMenu.setText(MessageManager
+ .getString("label.associate_nodes_with"));
calcSettings.setText(MessageManager.getString("action.change_params"));
- nuclSetting.setText(MessageManager.getString("label.nucleotide_matrix"));
+ nuclSetting
+ .setText(MessageManager.getString("label.nucleotide_matrix"));
protSetting.setText(MessageManager.getString("label.protein_matrix"));
nuclSetting.addActionListener(new ActionListener()
{
@@ -268,7 +305,8 @@ public class GPCAPanel extends JInternalFrame
protSetting_actionPerfomed(arg0);
}
});
- jvVersionSetting.setText(MessageManager.getString("label.jalview_pca_calculation"));
+ jvVersionSetting.setText(MessageManager
+ .getString("label.jalview_pca_calculation"));
jvVersionSetting.addActionListener(new ActionListener()
{
@Override
@@ -280,6 +318,7 @@ public class GPCAPanel extends JInternalFrame
calcSettings.add(jvVersionSetting);
calcSettings.add(nuclSetting);
calcSettings.add(protSetting);
+ calcSettings.add(scoreMatrixMenu);
statusPanel.setLayout(statusPanelLayout);
statusBar.setFont(new java.awt.Font("Verdana", 0, 12));
// statusPanel.setBackground(Color.lightGray);
@@ -312,6 +351,12 @@ public class GPCAPanel extends JInternalFrame
viewMenu.add(associateViewsMenu);
}
+ protected void scoreMatrix_menuSelected()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
protected void resetButton_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub