Changeset 1530
- Timestamp:
- Feb 2, 2007, 2:58:05 PM (15 years ago)
- Location:
- trunk/src/org/proteios/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/proteios/gui/importer/PeakListImporterEditor.java
r1472 r1530 14 14 import javax.swing.tree.TreePath; 15 15 import javax.swing.border.EtchedBorder; 16 import javax.swing.ButtonGroup; 16 17 import javax.swing.JPanel; 18 import javax.swing.JRadioButton; 17 19 import javax.swing.JTextField; 18 20 import javax.swing.JCheckBox; … … 93 95 confirmation = new Confirmation(this); 94 96 workquery.add(confirmation, java.awt.BorderLayout.SOUTH); 95 mpPanel=new JPanel(); 96 mpCheckBox = new JCheckBox("Check if microtitre plate (otherwise MALDI target)"); 97 //mpCheckBox.setBackground(new java.awt.Color(255, 255, 255)); 98 mpCheckBox.setSelected(true); 99 mpPanel.add(mpCheckBox); 100 query_panel.add(mpPanel); 97 98 JPanel platetypePanel = new JPanel(); 99 100 JLabel platetypeLabel = new JLabel("Peak list origin"); 101 platetypePanel.add(platetypeLabel); 102 103 maldiButton = new JRadioButton("MALDI target"); 104 platetypePanel.add(maldiButton); 105 106 esiButton = new JRadioButton("Microtitre plate",true); 107 platetypePanel.add(esiButton); 108 109 ButtonGroup bg = new ButtonGroup(); 110 bg.add(maldiButton); 111 bg.add(esiButton); 112 113 query_panel.add(platetypePanel); 101 114 102 115 idPanel=new JPanel(); … … 144 157 { 145 158 setVisible(false); 146 tree.importPeakLists(node,dc,importFiles,textField.getText(),delimiterField.getText(), mpCheckBox.isSelected());159 tree.importPeakLists(node,dc,importFiles,textField.getText(),delimiterField.getText(),esiButton.isSelected()); 147 160 dispose(); 148 161 } … … 236 249 private JTextField textField; 237 250 private JTextField delimiterField; 238 private J CheckBox mpCheckBox;251 private JRadioButton maldiButton, esiButton; 239 252 private final JPanel query_panel = new JPanel(); 240 private JPanel mpPanel,idPanel,delimiterPanel;253 private JPanel idPanel,delimiterPanel; 241 254 private JPanel workquery; 242 255 private final CardLayout card_layout = new CardLayout(); -
trunk/src/org/proteios/gui/query/CombinedProteinHitsReportEditor.java
r1496 r1530 84 84 { 85 85 setBackground(new java.awt.Color(102, 204, 255)); 86 setBorder(new javax.swing.border.TitledBorder("Settings for gel report"));86 setBorder(new javax.swing.border.TitledBorder("Settings for combined gel report")); 87 87 setMinimumSize(new java.awt.Dimension(72, 90)); 88 88 setPreferredSize(new java.awt.Dimension(116, 90)); … … 144 144 textPanel.setBackground(new java.awt.Color(255, 255, 255)); 145 145 146 JLabel textLabel = new JLabel("Edit settings for the combined gel summary report"); 147 textLabel.setBackground(new java.awt.Color(255, 255, 255)); 148 textPanel.add(textLabel); 146 //JLabel textLabel = new JLabel("Edit settings for the combined gel summary report"); 147 //textLabel.setBackground(new java.awt.Color(255, 255, 255)); 148 //textPanel.add(textLabel); 149 JTextArea noteLabel = new JTextArea("Note: This report requires that protein identification searches have been performed in\nthe same database, including an identical random / reverse part.",2,1); 150 noteLabel.setBackground(new java.awt.Color(255, 255, 255)); 151 textPanel.add(noteLabel); 149 152 main.add(textPanel); 150 153 /* End of text label */ … … 203 206 datePanel2.add(dateCheckBox2); 204 207 205 dateText2 = new JTextField("200 6-03-06");208 dateText2 = new JTextField("2007-01-15"); 206 209 dateText2.setEnabled(false); 207 210 dateText2.setBackground(new java.awt.Color(255, 255, 255));
Note: See TracChangeset
for help on using the changeset viewer.