JAL-1668 added filtering and sorting capabilites

[jalview.git] / src / jalview / jbgui / GStructureChooser.java

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 9569006..7224b78 100644 (file)
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -9,10 +9,12 @@ import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -22,6 +24,7 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 
@@ -39,7 +42,7 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected AlignmentPanel ap;
 
-  protected JLabel resultLabel = new JLabel("View : ");
+  protected JLabel resultLabel = new JLabel("Select : ");
 
   protected JButton ok = new JButton();
 
@@ -70,6 +73,12 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JCheckBox rememberSettings = new JCheckBox("Don't ask me again");
 
+  protected JCheckBox invertFilter = new JCheckBox("Invert");
+
+  protected ImageIcon loadingImage = new ImageIcon(getClass().getResource(
+          "/images/loading.gif"));
+
+  protected JLabel loadingImageLabel = new JLabel(loadingImage);
 
   protected static final String VIEWS_FILTER = "VIEWS_FILTER";
 
@@ -79,14 +88,19 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JList<PDBResponseSummary> jListFoundStructures = new JList<PDBResponseSummary>();
 
+  // protected JScrollPane foundStructuresScroller = new JScrollPane(
+  // jListFoundStructures);
+
+  protected JTable summaryTable = new JTable();
   protected JScrollPane foundStructuresScroller = new JScrollPane(
-          jListFoundStructures);
+          summaryTable);
 
   public GStructureChooser()
   {
     try
     {
       jbInit();
+      mainFrame.setVisible(false);
       mainFrame.invalidate();
       mainFrame.pack();
     } catch (Exception e)
@@ -97,9 +111,8 @@ public abstract class GStructureChooser extends JPanel implements
 
   private void jbInit() throws Exception
   {
-
     ok.setFont(new java.awt.Font("Verdana", 0, 12));
-    ok.setText(MessageManager.getString("action.ok"));
+    ok.setText(MessageManager.getString("action.view"));
     ok.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -135,14 +148,25 @@ public abstract class GStructureChooser extends JPanel implements
     foundStructuresScroller
             .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
+    filterOptionsComboBox.setFont(new java.awt.Font("Verdana", 0, 12));
+    invertFilter.setFont(new java.awt.Font("Verdana", 0, 12));
+    rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12));
+
+    filterOptionsComboBox.addItemListener(this);
+    invertFilter.addItemListener(this);
+
     actionPanel.add(rememberSettings);
     actionPanel.add(ok);
     actionPanel.add(cancel);
 
-    filterOptionsComboBox.addItemListener(this);
 
     filterPanel.add(resultLabel);
     filterPanel.add(filterOptionsComboBox);
+    loadingImageLabel.setVisible(false);
+
+    filterPanel.add(loadingImageLabel);
+
+    filterPanel.add(invertFilter);
 
     idInputPanel.setLayout(new FlowLayout());
     idInputPanel.add(search);
@@ -167,10 +191,21 @@ public abstract class GStructureChooser extends JPanel implements
     Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400);
   }
 
+  
+  private ImageIcon scaleImageIcone(ImageIcon imageIcon, int width, int height)
+  {
+    Image image = imageIcon.getImage(); // transform it
+
+    Image newimg = image.getScaledInstance(width, height,
+            java.awt.Image.SCALE_SMOOTH); // scale it the smooth way
+
+    return new ImageIcon(newimg);
+  }
+  
   @Override
   public void itemStateChanged(ItemEvent e)
   {
-    stateChanged();
+    stateChanged(e);
   }
 
   public class FilterOptions
@@ -188,6 +223,13 @@ public abstract class GStructureChooser extends JPanel implements
       this.view = view;
     }
 
+    // public FilterOptions(PDBDocField field, String view)
+    // {
+    // this.name = "Best " + field.getName();
+    // this.value = field.getCode();
+    // this.view = view;
+    // }
+
     public String getName()
     {
       return name;
@@ -224,7 +266,7 @@ public abstract class GStructureChooser extends JPanel implements
     }
   }
 
-  protected abstract void stateChanged();
+  protected abstract void stateChanged(ItemEvent e);
 
   protected abstract void updateCurrentView();