X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=edfbf99036604f37c139c71f308678d75dd0f826;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=d7e1ba48883eafc9865b9cb52002c8568b7a608b;hpb=fbd03b3f123f3462c5fe685c988e5c4ae601558c;p=jalview.git diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index d7e1ba4..edfbf99 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.jbgui; @@ -39,6 +40,8 @@ public class GPCAPanel extends JInternalFrame protected JComboBox zCombobox = new JComboBox(); + protected JButton resetButton = new JButton(); + FlowLayout flowLayout1 = new FlowLayout(); BorderLayout borderLayout1 = new BorderLayout(); @@ -56,8 +59,9 @@ public class GPCAPanel extends JInternalFrame JMenuItem print = new JMenuItem(); JMenuItem outputValues = new JMenuItem(); - + JMenuItem outputPoints = new JMenuItem(); + JMenuItem outputProjPoints = new JMenuItem(); protected JMenu viewMenu = new JMenu(); @@ -70,6 +74,20 @@ public class GPCAPanel extends JInternalFrame protected JMenu associateViewsMenu = new JMenu(); + protected JMenu calcSettings = new JMenu(); + + protected JCheckBoxMenuItem nuclSetting = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem protSetting = new JCheckBoxMenuItem(); + + protected JCheckBoxMenuItem jvVersionSetting = new JCheckBoxMenuItem(); + + protected JLabel statusBar = new JLabel(); + + protected GridLayout statusPanelLayout = new GridLayout(); + + protected JPanel statusPanel = new JPanel(); + public GPCAPanel() { try @@ -126,6 +144,16 @@ public class GPCAPanel extends JInternalFrame xCombobox_actionPerformed(e); } }); + resetButton.setFont(new java.awt.Font("Verdana", 0, 12)); + resetButton.setText("Reset"); + resetButton.addActionListener(new java.awt.event.ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + resetButton_actionPerformed(e); + } + }); fileMenu.setText("File"); saveMenu.setText("Save as"); eps.setText("EPS"); @@ -217,15 +245,58 @@ public class GPCAPanel extends JInternalFrame } }); associateViewsMenu.setText("Associate Nodes With"); - this.getContentPane().add(jPanel2, BorderLayout.SOUTH); + calcSettings.setText("Change Parameters"); + nuclSetting.setText("Nucleotide matrix"); + protSetting.setText("Protein matrix"); + nuclSetting.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent arg0) + { + nuclSetting_actionPerfomed(arg0); + } + }); + protSetting.addActionListener(new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent arg0) + { + protSetting_actionPerfomed(arg0); + } + }); + jvVersionSetting.setText("Jalview PCA Calculation"); + jvVersionSetting.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent arg0) + { + jvVersionSetting_actionPerfomed(arg0); + } + }); + calcSettings.add(jvVersionSetting); + calcSettings.add(nuclSetting); + calcSettings.add(protSetting); + statusPanel.setLayout(statusPanelLayout); + statusBar.setFont(new java.awt.Font("Verdana", 0, 12)); + // statusPanel.setBackground(Color.lightGray); + // statusBar.setBackground(Color.lightGray); + // statusPanel.add(statusBar, null); + JPanel panelBar = new JPanel(new BorderLayout()); + panelBar.add(jPanel2, BorderLayout.NORTH); + panelBar.add(statusPanel, BorderLayout.SOUTH); + this.getContentPane().add(panelBar, 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); + jPanel2.add(resetButton, null); jMenuBar1.add(fileMenu); jMenuBar1.add(viewMenu); + jMenuBar1.add(calcSettings); fileMenu.add(saveMenu); fileMenu.add(outputValues); fileMenu.add(print); @@ -239,16 +310,34 @@ public class GPCAPanel extends JInternalFrame viewMenu.add(associateViewsMenu); } + protected void resetButton_actionPerformed(ActionEvent e) + { + // TODO Auto-generated method stub + + } + + protected void protSetting_actionPerfomed(ActionEvent arg0) + { + // TODO Auto-generated method stub + + } + + protected void nuclSetting_actionPerfomed(ActionEvent arg0) + { + // TODO Auto-generated method stub + + } + protected void outputPoints_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void outputProjPoints_actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - + } protected void xCombobox_actionPerformed(ActionEvent e) @@ -302,4 +391,10 @@ public class GPCAPanel extends JInternalFrame { } + + protected void jvVersionSetting_actionPerfomed(ActionEvent arg0) + { + // TODO Auto-generated method stub + + } }