X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=337a23b9abfb0c2f2a1727c184882b54c45882c8;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=d45edd6de507feb963ed2b6470ee9018d03ddc76;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index d45edd6..337a23b 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -39,6 +39,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 +58,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 +73,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 +143,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 +244,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 +309,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 +390,10 @@ public class GPCAPanel extends JInternalFrame { } + + protected void jvVersionSetting_actionPerfomed(ActionEvent arg0) + { + // TODO Auto-generated method stub + + } }