Changeset 1530


Ignore:
Timestamp:
Feb 2, 2007, 2:58:05 PM (14 years ago)
Author:
fredrik
Message:
 
Location:
trunk/src/org/proteios/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/proteios/gui/importer/PeakListImporterEditor.java

    r1472 r1530  
    1414import javax.swing.tree.TreePath;
    1515import javax.swing.border.EtchedBorder;
     16import javax.swing.ButtonGroup;
    1617import javax.swing.JPanel;
     18import javax.swing.JRadioButton;
    1719import javax.swing.JTextField;
    1820import javax.swing.JCheckBox;
     
    9395    confirmation = new Confirmation(this);
    9496    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);
    101114   
    102115    idPanel=new JPanel();
     
    144157  {
    145158    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());
    147160    dispose();
    148161  }
     
    236249  private JTextField textField;
    237250  private JTextField delimiterField;
    238   private JCheckBox mpCheckBox;
     251  private JRadioButton maldiButton, esiButton;
    239252  private final JPanel query_panel = new JPanel();
    240   private JPanel mpPanel,idPanel,delimiterPanel;
     253  private JPanel idPanel,delimiterPanel;
    241254  private JPanel workquery;
    242255  private final CardLayout card_layout = new CardLayout();
  • trunk/src/org/proteios/gui/query/CombinedProteinHitsReportEditor.java

    r1496 r1530  
    8484  {
    8585    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"));
    8787    setMinimumSize(new java.awt.Dimension(72, 90));
    8888    setPreferredSize(new java.awt.Dimension(116, 90));
     
    144144    textPanel.setBackground(new java.awt.Color(255, 255, 255));
    145145   
    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);
    149152    main.add(textPanel);
    150153    /* End of text label */
     
    203206    datePanel2.add(dateCheckBox2);
    204207   
    205     dateText2 = new JTextField("2006-03-06");
     208    dateText2 = new JTextField("2007-01-15");
    206209    dateText2.setEnabled(false);
    207210    dateText2.setBackground(new java.awt.Color(255, 255, 255));
Note: See TracChangeset for help on using the changeset viewer.