X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=94e8dcaefb9a3790622559f6d82b420a87b55af2;hb=4ea6a00274e0a209a7dbec074f04a21ec1a80b28;hp=e677f4db9e6aa7d075e3941f1d46a15746a0ff7b;hpb=6403e604c7be86f97af2f1900772f3fb31abfd58;p=jalview.git diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index e677f4d..94e8dca 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -1,13 +1,13 @@ /* - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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 @@ -38,9 +38,9 @@ public class GPCAPanel extends JInternalFrame protected JComboBox yCombobox = new JComboBox(); protected JComboBox zCombobox = new JComboBox(); - + protected JButton resetButton = new JButton(); - + FlowLayout flowLayout1 = new FlowLayout(); BorderLayout borderLayout1 = new BorderLayout(); @@ -73,9 +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 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 @@ -132,7 +143,7 @@ public class GPCAPanel extends JInternalFrame xCombobox_actionPerformed(e); } }); - resetButton.setFont(new java.awt.Font("Verdana",0,12)); + resetButton.setFont(new java.awt.Font("Verdana", 0, 12)); resetButton.setText("Reset"); resetButton.addActionListener(new java.awt.event.ActionListener() { @@ -238,7 +249,7 @@ public class GPCAPanel extends JInternalFrame protSetting.setText("Protein matrix"); nuclSetting.addActionListener(new ActionListener() { - + @Override public void actionPerformed(ActionEvent arg0) { @@ -247,17 +258,34 @@ public class GPCAPanel extends JInternalFrame }); protSetting.addActionListener(new ActionListener() { - + @Override public void actionPerformed(ActionEvent arg0) { protSetting_actionPerfomed(arg0); } - });calcSettings.add(nuclSetting); + }); + 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); - - - this.getContentPane().add(jPanel2, BorderLayout.SOUTH); + 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); @@ -284,19 +312,19 @@ public class GPCAPanel extends JInternalFrame 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) @@ -362,4 +390,10 @@ public class GPCAPanel extends JInternalFrame { } + + protected void jvVersionSetting_actionPerfomed(ActionEvent arg0) + { + // TODO Auto-generated method stub + + } }