X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=6710ed49ad262ffdf8087a9f896fe3f1b9f7d004;hb=47a3f3d338d24f2a92d8249eede1ed0a6fd43d87;hp=e01615acc80b96921d7fc73035d80a84ee11adaf;hpb=1d37661bae76ec6d499ff50a88ea249b8b33430e;p=jalview.git

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index e01615a..6710ed4 100755
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -27,10 +27,14 @@ import java.awt.event.*;
 public class FeatureSettings extends Panel implements ItemListener,
     MouseListener, MouseMotionListener
 {
-  final FeatureRenderer fr;
-  final AlignmentPanel ap;
-  final AlignViewport av;
-  final Frame frame;
+  FeatureRenderer fr;
+  AlignmentPanel ap;
+  AlignViewport av;
+  Frame frame;
+  Panel groupPanel;
+  Panel featurePanel = new Panel();
+  ScrollPane scrollPane;
+  boolean alignmentHasFeatures = false;
 
   public FeatureSettings(AlignViewport av, final AlignmentPanel ap)
   {
@@ -40,80 +44,256 @@ public class FeatureSettings extends Panel implements ItemListener,
 
     setTableData();
 
+    this.setLayout(new BorderLayout());
+    scrollPane = new ScrollPane();
+    scrollPane.add(featurePanel);
+    if (alignmentHasFeatures)
+      add(scrollPane, BorderLayout.CENTER);
+
+    if(groupPanel!=null)
+    {
+      groupPanel.setLayout(
+          new GridLayout( fr.featureGroups.size() / 4 + 1, 4));
+      groupPanel.validate();
+
+      add(groupPanel, BorderLayout.NORTH);
+    }
     frame = new Frame();
     frame.add(this);
-    int height = this.getComponentCount()*50;
-    if (height>400)
-      height = 400;
+    int height = featurePanel.getComponentCount()*50 +30;
 
-    jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 200,
+    height = Math.max(100, height);
+    height = Math.min(400, height);
+
+    jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 280,
                                      height);
   }
 
+  public void paint(Graphics g)
+  {
+    g.setColor(Color.black);
+    g.drawString("No Features added to this alignment!!", 10, 20);
+  }
+
   void setTableData()
   {
+    alignmentHasFeatures = false;
+
+    if(fr.featureGroups==null)
+      fr.featureGroups = new Hashtable();
+
     Vector allFeatures = new Vector();
-    Vector features;
-    Enumeration e;
-    SequenceFeature sf;
+    Vector allGroups = new Vector();
+    SequenceFeature[] tmpfeatures;
+    String group;
+
 
     for (int i = 0; i < av.alignment.getHeight(); i++)
     {
-      features = av.alignment.getSequenceAt(i).getSequenceFeatures();
-      if (features == null)
+      if (av.alignment.getSequenceAt(i).getSequenceFeatures() == null)
         continue;
 
-      e = features.elements();
-      while (e.hasMoreElements())
+      alignmentHasFeatures = true;
+
+      tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();
+      int index = 0;
+      while (index < tmpfeatures.length)
       {
-        sf = (SequenceFeature) e.nextElement();
-        if (!allFeatures.contains(sf.getType()))
+        if(tmpfeatures[index].getFeatureGroup()!=null)
+        {
+          group = tmpfeatures[index].featureGroup;
+          if(!allGroups.contains(group))
+           {
+             allGroups.addElement(group);
+
+             boolean visible = true;
+             if (fr.featureGroups.containsKey(group))
+             {
+               visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();
+             }
+
+             fr.featureGroups.put(group, new Boolean(visible));
+
+             if (groupPanel == null)
+             {
+               groupPanel = new Panel();
+             }
+
+             Checkbox check = new Checkbox(group, visible);
+             check.setFont(new Font("Serif", Font.BOLD, 12));
+             check.addItemListener(this);
+             groupPanel.add(check);
+           }
+        }
+
+        if (!allFeatures.contains(tmpfeatures[index].getType()))
         {
-          allFeatures.addElement(sf.getType());
+            allFeatures.addElement(tmpfeatures[index].getType());
         }
+         index ++;
       }
     }
 
-    int fSize = allFeatures.size();
+    resetTable(false);
+  }
+
+ //This routine adds and removes checkboxes depending on
+ //Group selection states
+  void resetTable(boolean groupsChanged)
+  {
+    SequenceFeature [] tmpfeatures;
+    String group=null, type;
+    Vector visibleChecks = new Vector();
+
+     for (int i = 0; i < av.alignment.getHeight(); i++)
+     {
+         if (av.alignment.getSequenceAt(i).getSequenceFeatures() == null)
+           continue;
+
+         tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();
+         int index = 0;
+         while (index < tmpfeatures.length)
+         {
+           group = tmpfeatures[index].featureGroup;
+
+           if (group==null || fr.featureGroups.get(group)==null ||
+               ((Boolean) fr.featureGroups.get(group)).booleanValue())
+           {
+             type = tmpfeatures[index].getType();
+             if(!visibleChecks.contains(type) )
+             {
+               visibleChecks.addElement(type);
+             }
+           }
+           index++;
+         }
+     }
+
+       Component[] comps;
+       int cSize = featurePanel.getComponentCount();
+       Checkbox check;
+       //This will remove any checkboxes which shouldn't be
+       //visible
+       for (int i = 0; i < cSize; i++)
+       {
+         comps = featurePanel.getComponents();
+         check = (Checkbox) comps[i];
+         if (!visibleChecks.contains(check.getLabel()))
+         {
+           featurePanel.remove(i);
+           cSize --;
+           i--;
+         }
+       }
+
+       if(fr.renderOrder!=null)
+       {
+         //First add the checks in the previous render order,
+         //in case the window has been closed and reopened
+         for(int ro=fr.renderOrder.length-1; ro>-1; ro--)
+         {
+              String item = fr.renderOrder[ro];
+
+              if(!visibleChecks.contains(item))
+                continue;
+
+              visibleChecks.removeElement(item);
+
+              addCheck(false, item);
+         }
+       }
 
-    String type;
-    this.setLayout(new GridLayout(fSize, 2, 10,5));
+       // now add checkboxes which should be visible,
+       // if they have not already been added
+       Enumeration en = visibleChecks.elements();
+       while(en.hasMoreElements())
+       {
+         addCheck(groupsChanged, en.nextElement().toString());
+       }
 
-    for (int i = 0; i < fSize; i++)
+
+   featurePanel.setLayout(new GridLayout(featurePanel.getComponentCount(), 1, 10,5));
+   featurePanel.validate();
+
+
+   if(scrollPane!=null)
+     scrollPane.validate();
+
+   itemStateChanged(null);
+  }
+
+  void addCheck(boolean groupsChanged, String type)
+  {
+    boolean addCheck;
+    Component [] comps = featurePanel.getComponents();
+    Checkbox check;
+    addCheck = true;
+    for (int i = 0; i < featurePanel.getComponentCount(); i++)
+    {
+      check = (Checkbox) comps[i];
+      if (check.getLabel().equals(type))
+      {
+        addCheck = false;
+        break;
+      }
+    }
+
+    if (addCheck)
     {
-      type = allFeatures.elementAt(i).toString();
-      Color col = fr.getColour(type);
-      boolean displayed = true;
-      if(fr.featuresDisplayed!=null)
-        displayed = fr.featuresDisplayed.contains(type);
+      boolean selected = false;
+      if (groupsChanged || av.featuresDisplayed.containsKey(type))
+      {
+        selected = true;
+      }
 
-      Checkbox check = new Checkbox(type, displayed);
+      check = new Checkbox(type, selected);
       check.addMouseListener(this);
       check.addMouseMotionListener(this);
-      check.setBackground(col);
+      check.setBackground(fr.getColour(type));
       check.addItemListener(this);
-      add(check);
+      featurePanel.add(check);
     }
-    validate();
   }
 
   public void itemStateChanged(ItemEvent evt)
   {
-    Component [] comps = this.getComponents();
-    int cSize = comps.length;
-
-    Object [][] data = new Object[cSize][3];
-
-    for(int i=0; i<cSize; i++)
+    if (evt != null)
     {
-      Checkbox check = (Checkbox)comps[i];
-      data[i][0] = check.getLabel();
-      data[i][1] = fr.getColour(check.getLabel());
-      data[i][2] = new Boolean(check.getState());
+      //Is the source a top level featureGroup?
+      Checkbox source = (Checkbox) evt.getSource();
+      if (fr.featureGroups.containsKey(source.getLabel()))
+      {
+        fr.featureGroups.put(source.getLabel(), new Boolean(source.getState()));
+        ap.seqPanel.seqCanvas.repaint();
+        if (ap.overviewPanel != null)
+          ap.overviewPanel.updateOverviewImage();
+
+        resetTable(true);
+        return;
+      }
     }
 
-    fr.setFeaturePriority(data);
-    ap.seqPanel.seqCanvas.repaint();
+      Component[] comps = featurePanel.getComponents();
+      int cSize = comps.length;
+
+      Object[][] tmp = new Object[cSize][3];
+      int tmpSize = 0;
+      for (int i = 0; i < cSize; i++)
+      {
+        Checkbox check = (Checkbox) comps[i];
+        tmp[tmpSize][0] = check.getLabel();
+        tmp[tmpSize][1] = fr.getColour(check.getLabel());
+        tmp[tmpSize][2] = new Boolean(check.getState());
+        tmpSize++;
+      }
+
+      Object[][]data = new Object[tmpSize][3];
+      System.arraycopy(tmp, 0, data,0, tmpSize);
+
+      fr.setFeaturePriority(data);
+      ap.seqPanel.seqCanvas.repaint();
+      if (ap.overviewPanel != null)
+        ap.overviewPanel.updateOverviewImage();
   }
 
   Checkbox selectedCheck;
@@ -138,15 +318,15 @@ public class FeatureSettings extends Panel implements ItemListener,
 
     if(height > this.getSize().height)
      {
-       comp = this.getComponent(this.getComponentCount()-1);
+       comp = featurePanel.getComponent(featurePanel.getComponentCount()-1);
      }
      else if(height < 0)
      {
-       comp = this.getComponent(0);
+       comp = featurePanel.getComponent(0);
      }
      else
      {
-       comp = this.getComponentAt(evt.getX(),
+       comp = featurePanel.getComponentAt(evt.getX(),
                                   evt.getY() +
                                   evt.getComponent().getLocation().y);
      }
@@ -154,25 +334,42 @@ public class FeatureSettings extends Panel implements ItemListener,
     if(comp!=null && comp instanceof Checkbox)
       target = (Checkbox)comp;
 
-    if (selectedCheck != null && target != null && selectedCheck != target)
+    if (   selectedCheck != null
+        && target != null
+        && selectedCheck != target)
     {
       int targetIndex = -1;
-      for(int i=0; i<this.getComponentCount(); i++)
+      for(int i=0; i<featurePanel.getComponentCount(); i++)
       {
-          if(target==this.getComponent(i))
+          if(target==featurePanel.getComponent(i))
           { targetIndex = i; break; }
       }
 
-
-      this.remove(selectedCheck);
-      this.add(selectedCheck, targetIndex);
-      validate();
+      featurePanel.remove(selectedCheck);
+      featurePanel.add(selectedCheck, targetIndex);
+      featurePanel.validate();
+      itemStateChanged(null);
     }
   }
 
+  public void setUserColour(String feature, Color col)
+  {
+    fr.setColour(feature, col);
+    featurePanel.removeAll();
+    resetTable(false);
+    ap.repaint();
+  }
 
   public void mouseEntered(MouseEvent evt){}
   public void mouseExited(MouseEvent evt){}
-  public void mouseClicked(MouseEvent evt){}
+  public void mouseClicked(MouseEvent evt)
+  {
+    Checkbox check = (Checkbox) evt.getSource();
+    if(evt.getClickCount()>1)
+    {
+       new UserDefinedColours(this, check.getLabel(),
+                              fr.getColour(check.getLabel()));
+    }
+  }
   public void mouseMoved(MouseEvent evt){}
 }