X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=d0f2328dcac255baf5ce587abfb8b03d0dd61f0a;hb=5247711ab4a6453614e2a9fb9307e6bae6a7b4a9;hp=080fce9b8873698002479fcbd58c6b58cba21b1a;hpb=a17368a2ea84c23fc5e65b8ea3c08086926758e4;p=jalview.git diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index 080fce9..d0f2328 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -24,6 +24,7 @@ package jalview.jbgui; import jalview.datamodel.SequenceI; import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; +import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -33,6 +34,8 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -43,8 +46,11 @@ import javax.swing.JInternalFrame; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -64,8 +70,9 @@ public abstract class GStructureChooser extends JPanel implements protected JComboBox cmb_filterOption = new JComboBox(); - protected AlignmentPanel ap; + + protected StringBuilder errorWarning = new StringBuilder(); protected JLabel lbl_result = new JLabel( MessageManager.getString("label.select")); @@ -80,7 +87,7 @@ public abstract class GStructureChooser extends JPanel implements private JPanel pnl_actions = new JPanel(); - private JPanel pnl_filter = new JPanel(); + private JPanel pnl_main = new JPanel(); private JPanel pnl_idInput = new JPanel(new FlowLayout()); @@ -90,6 +97,8 @@ public abstract class GStructureChooser extends JPanel implements private JPanel pnl_fileChooserBL = new JPanel(new BorderLayout()); + private JPanel pnl_locPDB = new JPanel(new BorderLayout()); + protected JPanel pnl_switchableViews = new JPanel(new CardLayout()); protected CardLayout layout_switchableViews = (CardLayout) (pnl_switchableViews @@ -112,12 +121,18 @@ public abstract class GStructureChooser extends JPanel implements protected ImageIcon errorImage = new ImageIcon(getClass().getResource( "/images/error.png")); + protected ImageIcon warningImage = new ImageIcon(getClass().getResource( + "/images/warning.gif")); + + protected JLabel lbl_warning = new JLabel(warningImage); + protected JLabel lbl_loading = new JLabel(loadingImage); protected JLabel lbl_pdbManualFetchStatus = new JLabel(errorImage); protected JLabel lbl_fromFileStatus = new JLabel(errorImage); + protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel(); protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel(); @@ -128,14 +143,22 @@ public abstract class GStructureChooser extends JPanel implements protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID"; - // protected JList jList_FoundStructures = new - // JList(); + protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB"; protected JTable tbl_summary = new JTable(); protected JScrollPane scrl_foundStructures = new JScrollPane( tbl_summary); + protected JTable tbl_local_pdb = new JTable(); + + protected JScrollPane scrl_localPDB = new JScrollPane(tbl_local_pdb); + + private JTabbedPane pnl_filter = new JTabbedPane(); + + private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences( + PreferenceSource.STRUCTURE_CHOOSER); + public GStructureChooser() { try @@ -157,6 +180,21 @@ public abstract class GStructureChooser extends JPanel implements */ private void jbInit() throws Exception { + tbl_summary.setAutoCreateRowSorter(true); + tbl_local_pdb.setAutoCreateRowSorter(true); + tbl_local_pdb.addMouseListener(new MouseAdapter() + { + public void mouseClicked(MouseEvent e) + { + updateCurrentView(); + } + + public void mouseReleased(MouseEvent e) + { + updateCurrentView(); + } + }); + btn_view.setFont(new java.awt.Font("Verdana", 0, 12)); btn_view.setText(MessageManager.getString("action.view")); btn_view.addActionListener(new java.awt.event.ActionListener() @@ -191,22 +229,14 @@ public abstract class GStructureChooser extends JPanel implements scrl_foundStructures .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrl_localPDB.setPreferredSize(new Dimension(500, 300)); + scrl_localPDB + .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + cmb_filterOption.setFont(new java.awt.Font("Verdana", 0, 12)); chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12)); chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12)); - cmb_filterOption.addItemListener(this); - chk_invertFilter.addItemListener(this); - - pnl_actions.add(chk_rememberSettings); - pnl_actions.add(btn_view); - pnl_actions.add(btn_cancel); - - // pnl_filter.add(lbl_result); - pnl_filter.add(cmb_filterOption); - pnl_filter.add(lbl_loading); - pnl_filter.add(chk_invertFilter); - lbl_loading.setVisible(false); txt_search.setToolTipText(MessageManager .getString("label.enter_pdb_id")); @@ -232,24 +262,64 @@ public abstract class GStructureChooser extends JPanel implements txt_search_ActionPerformed(); } }); - pnl_idInput.add(txt_search); - pnl_idInput.add(lbl_pdbManualFetchStatus); + + cmb_filterOption.addItemListener(this); + chk_invertFilter.addItemListener(this); + + pnl_actions.add(chk_rememberSettings); + pnl_actions.add(btn_view); + pnl_actions.add(btn_cancel); + + // pnl_filter.add(lbl_result); + pnl_main.add(cmb_filterOption); + pnl_main.add(lbl_loading); + pnl_main.add(chk_invertFilter); + lbl_loading.setVisible(false); + pnl_fileChooser.add(btn_pdbFromFile); pnl_fileChooser.add(lbl_fromFileStatus); - pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH); pnl_fileChooserBL.add(pnl_fileChooser, BorderLayout.CENTER); + pnl_idInput.add(txt_search); + pnl_idInput.add(lbl_pdbManualFetchStatus); pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH); pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER); + + final String foundStructureSummary = MessageManager + .getString("label.found_structures_summary"); + + ChangeListener changeListener = new ChangeListener() + { + public void stateChanged(ChangeEvent changeEvent) + { + JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent + .getSource(); + int index = sourceTabbedPane.getSelectedIndex(); + if (sourceTabbedPane.getTitleAt(index) + .equals(foundStructureSummary)) + { + tabRefresh(); + } + } + }; + pnl_filter.addChangeListener(changeListener); + pnl_filter.setPreferredSize(new Dimension(500, 300)); + pnl_filter.add(foundStructureSummary, scrl_foundStructures); + pnl_filter.add( + MessageManager.getString("label.configure_displayed_columns"), + pdbDocFieldPrefs); + + pnl_locPDB.add(scrl_localPDB); pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE); pnl_switchableViews.add(pnl_idInputBL, VIEWS_ENTER_ID); - pnl_switchableViews.add(scrl_foundStructures, VIEWS_FILTER); + pnl_switchableViews.add(pnl_filter, VIEWS_FILTER); + pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB); this.setLayout(mainLayout); - this.add(pnl_filter, java.awt.BorderLayout.NORTH); + this.add(pnl_main, java.awt.BorderLayout.NORTH); this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER); this.add(pnl_actions, java.awt.BorderLayout.SOUTH); @@ -389,10 +459,14 @@ public abstract class GStructureChooser extends JPanel implements public class AssciateSeqPanel extends JPanel implements ItemListener { private JComboBox cmb_assSeq = new JComboBox(); + + private JLabel lbl_associateSeq = new JLabel(); + public AssciateSeqPanel() { this.setLayout(new FlowLayout()); this.add(cmb_assSeq); + this.add(lbl_associateSeq); cmb_assSeq.setToolTipText(MessageManager .getString("info.associate_wit_sequence")); cmb_assSeq.addItemListener(this); @@ -400,7 +474,7 @@ public abstract class GStructureChooser extends JPanel implements public void loadCmbAssSeq() { - populateCmbAssociateSeqOptions(cmb_assSeq); + populateCmbAssociateSeqOptions(cmb_assSeq, lbl_associateSeq); } public JComboBox getCmb_assSeq() @@ -441,7 +515,9 @@ public abstract class GStructureChooser extends JPanel implements protected abstract void txt_search_ActionPerformed(); public abstract void populateCmbAssociateSeqOptions( - JComboBox cmb_assSeq); + JComboBox cmb_assSeq, JLabel lbl_associateSeq); public abstract void cmbAssSeqStateChanged(); + + public abstract void tabRefresh(); }