Changeset 1530

Timestamp:

Feb 2, 2007, 2:58:05 PM (14 years ago)

Author:

fredrik

Message:

 

Location:

trunk/src/org/proteios/gui

Files:

• importer/PeakListImporterEditor.java (modified) (4 diffs)
• query/CombinedProteinHitsReportEditor.java (modified) (3 diffs)

trunk/src/org/proteios/gui/importer/PeakListImporterEditor.java

@@ -14 +14 @@
 import javax.swing.tree.TreePath;
 import javax.swing.border.EtchedBorder;
+import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JTextField;
 import javax.swing.JCheckBox;
@@ -93 +95 @@
     confirmation = new Confirmation(this);
     workquery.add(confirmation, java.awt.BorderLayout.SOUTH);
-    mpPanel=new JPanel();
-    mpCheckBox = new JCheckBox("Check if microtitre plate (otherwise MALDI target)");
-    //mpCheckBox.setBackground(new java.awt.Color(255, 255, 255));
-    mpCheckBox.setSelected(true);
-    mpPanel.add(mpCheckBox);
-    query_panel.add(mpPanel);
+
+    JPanel platetypePanel = new JPanel();
+    
+    JLabel platetypeLabel = new JLabel("Peak list origin");
+    platetypePanel.add(platetypeLabel);
+    
+    maldiButton = new JRadioButton("MALDI target");
+    platetypePanel.add(maldiButton);
+    
+    esiButton = new JRadioButton("Microtitre plate",true);
+    platetypePanel.add(esiButton);
+      
+    ButtonGroup bg = new ButtonGroup();
+    bg.add(maldiButton);
+    bg.add(esiButton);
+    
+    query_panel.add(platetypePanel);
     
     idPanel=new JPanel();
@@ -144 +157 @@
   {
     setVisible(false);
-    tree.importPeakLists(node,dc,importFiles,textField.getText(),delimiterField.getText(),mpCheckBox.isSelected());
+    tree.importPeakLists(node,dc,importFiles,textField.getText(),delimiterField.getText(),esiButton.isSelected());
     dispose();
   }
@@ -236 +249 @@
   private JTextField textField;
   private JTextField delimiterField;
-  private JCheckBox mpCheckBox;
+  private JRadioButton maldiButton, esiButton;
   private final JPanel query_panel = new JPanel();
-  private JPanel mpPanel,idPanel,delimiterPanel;
+  private JPanel idPanel,delimiterPanel;
   private JPanel workquery;
   private final CardLayout card_layout = new CardLayout();

trunk/src/org/proteios/gui/query/CombinedProteinHitsReportEditor.java

@@ -84 +84 @@
   {
     setBackground(new java.awt.Color(102, 204, 255));
-    setBorder(new javax.swing.border.TitledBorder("Settings for gel report"));
+    setBorder(new javax.swing.border.TitledBorder("Settings for combined gel report"));
     setMinimumSize(new java.awt.Dimension(72, 90));
     setPreferredSize(new java.awt.Dimension(116, 90));
@@ -144 +144 @@
     textPanel.setBackground(new java.awt.Color(255, 255, 255));
     
-    JLabel textLabel = new JLabel("Edit settings for the combined gel summary report");
-    textLabel.setBackground(new java.awt.Color(255, 255, 255));
-    textPanel.add(textLabel);
+    //JLabel textLabel = new JLabel("Edit settings for the combined gel summary report");
+    //textLabel.setBackground(new java.awt.Color(255, 255, 255));
+    //textPanel.add(textLabel);
+    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);
+    noteLabel.setBackground(new java.awt.Color(255, 255, 255));
+    textPanel.add(noteLabel);
     main.add(textPanel);
     /* End of text label */
@@ -203 +206 @@
     datePanel2.add(dateCheckBox2);
     
-    dateText2 = new JTextField("2006-03-06");
+    dateText2 = new JTextField("2007-01-15");
     dateText2.setEnabled(false);
     dateText2.setBackground(new java.awt.Color(255, 255, 255));