comments and version wget ping timeout fix for when www connection is unavailable...
[jalview.git] / src / jalview / gui / FeatureRenderer.java
index 568b945..b643efb 100755 (executable)
@@ -23,6 +23,9 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
 import javax.swing.*;
 
 import jalview.datamodel.*;
@@ -35,6 +38,7 @@ import jalview.datamodel.*;
  */
 public class FeatureRenderer
 {
+  AlignmentPanel ap;
   AlignViewport av;
   Color resBoxColour;
   float transparency = 1.0f;
@@ -45,30 +49,74 @@ public class FeatureRenderer
 
   // A higher level for grouping features of a
   // particular type
-  Hashtable featureGroups = null;
+  Hashtable featureGroups = new Hashtable();
 
   // This is actually an Integer held in the hashtable,
   // Retrieved using the key feature type
   Object currentColour;
 
   String[] renderOrder;
+  PropertyChangeSupport changeSupport=new PropertyChangeSupport(this);
+
+  Vector allfeatures;
 
   /**
    * Creates a new FeatureRenderer object.
    *
-   * @param av DOCUMENT ME!
+   * @param av
+   *          DOCUMENT ME!
    */
-  public FeatureRenderer(AlignViewport av)
+  public FeatureRenderer(AlignmentPanel ap)
   {
-    this.av = av;
+    this.ap = ap;
+    this.av = ap.av;
   }
 
+  public class FeatureRendererSettings implements Cloneable {
+    String[] renderOrder;
+    Hashtable featureGroups;
+    Hashtable featureColours;
+    float transparency;
+    Hashtable featureOrder;
+    public FeatureRendererSettings(String[] renderOrder,
+            Hashtable featureGroups, Hashtable featureColours,
+            float transparency, Hashtable featureOrder)
+    {
+      super();
+      this.renderOrder = renderOrder;
+      this.featureGroups = featureGroups;
+      this.featureColours = featureColours;
+      this.transparency = transparency;
+      this.featureOrder = featureOrder;
+    }
+    public FeatureRendererSettings(FeatureRenderer fr)
+    {
+      this.renderOrder = fr.renderOrder;
+      this.featureGroups = fr.featureGroups;
+      this.featureColours = fr.featureColours;
+      this.transparency = fr.transparency;
+      this.featureOrder = fr.featureOrder;
+    }
+  }
+  public FeatureRendererSettings getSettings()
+  {
+    return new FeatureRendererSettings(this);
+  }
+  public void transferSettings(FeatureRendererSettings fr)
+  {
+    this.renderOrder = fr.renderOrder;
+    this.featureGroups = fr.featureGroups;
+    this.featureColours = fr.featureColours;
+    this.transparency = fr.transparency;
+    this.featureOrder = fr.featureOrder;
+  }
   public void transferSettings(FeatureRenderer fr)
   {
-    renderOrder = fr.renderOrder;
-    featureGroups = fr.featureGroups;
-    featureColours = fr.featureColours;
-    transparency = fr.transparency;
+    this.renderOrder = fr.renderOrder;
+    this.featureGroups = fr.featureGroups;
+    this.featureColours = fr.featureColours;
+    this.transparency = fr.transparency;
+    this.featureOrder = fr.featureOrder;
   }
 
   BufferedImage offscreenImage;
@@ -80,8 +128,8 @@ public class FeatureRenderer
   }
 
   /**
-   * This is used by the Molecule Viewer and Overview to
-   * get the accurate colourof the rendered sequence
+   * This is used by the Molecule Viewer and Overview to get the accurate
+   * colourof the rendered sequence
    */
   public int findFeatureColour(int initialCol, SequenceI seq, int column)
   {
@@ -94,20 +142,32 @@ public class FeatureRenderer
     {
       lastSeq = seq;
       sequenceFeatures = lastSeq.getDatasetSequence().getSequenceFeatures();
-      if (sequenceFeatures == null)
+      if (sequenceFeatures!=null)
       {
-        return initialCol;
+        sfSize = sequenceFeatures.length;
       }
+    }
 
-      sfSize = sequenceFeatures.length;
+    if (sequenceFeatures!=lastSeq.getDatasetSequence().getSequenceFeatures()) {
+      sequenceFeatures = lastSeq.getDatasetSequence().getSequenceFeatures();
+      if (sequenceFeatures != null)
+      {
+        sfSize = sequenceFeatures.length;
+      }
+    }
+
+    if (sequenceFeatures == null || sfSize==0)
+    {
+      return initialCol;
     }
 
+
     if (jalview.util.Comparison.isGap(lastSeq.getCharAt(column)))
     {
       return Color.white.getRGB();
     }
 
-    //Only bother making an offscreen image if transparency is applied
+    // Only bother making an offscreen image if transparency is applied
     if (transparency != 1.0f && offscreenImage == null)
     {
       offscreenImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
@@ -148,15 +208,24 @@ public class FeatureRenderer
   /**
    * DOCUMENT ME!
    *
-   * @param g DOCUMENT ME!
-   * @param seq DOCUMENT ME!
-   * @param sg DOCUMENT ME!
-   * @param start DOCUMENT ME!
-   * @param end DOCUMENT ME!
-   * @param x1 DOCUMENT ME!
-   * @param y1 DOCUMENT ME!
-   * @param width DOCUMENT ME!
-   * @param height DOCUMENT ME!
+   * @param g
+   *          DOCUMENT ME!
+   * @param seq
+   *          DOCUMENT ME!
+   * @param sg
+   *          DOCUMENT ME!
+   * @param start
+   *          DOCUMENT ME!
+   * @param end
+   *          DOCUMENT ME!
+   * @param x1
+   *          DOCUMENT ME!
+   * @param y1
+   *          DOCUMENT ME!
+   * @param width
+   *          DOCUMENT ME!
+   * @param height
+   *          DOCUMENT ME!
    */
   // String type;
   // SequenceFeature sf;
@@ -164,9 +233,10 @@ public class FeatureRenderer
   SequenceFeature[] sequenceFeatures;
   int sfSize, sfindex, spos, epos;
 
-  public void drawSequence(Graphics g, SequenceI seq,
+  synchronized public void drawSequence(Graphics g, SequenceI seq,
                            int start, int end, int y1)
   {
+
     if (seq.getDatasetSequence().getSequenceFeatures() == null
         || seq.getDatasetSequence().getSequenceFeatures().length == 0)
     {
@@ -189,14 +259,13 @@ public class FeatureRenderer
       }
 
       sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
-      sfSize = sequenceFeatures.length;
     }
 
-    if (lastSeq == null || seq != lastSeq)
+    if (lastSeq == null || seq != lastSeq
+        || seq.getDatasetSequence().getSequenceFeatures()!=sequenceFeatures)
     {
       lastSeq = seq;
       sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
-      sfSize = sequenceFeatures.length;
     }
 
     if (transparency != 1 && g != null)
@@ -213,6 +282,7 @@ public class FeatureRenderer
       epos = lastSeq.findPosition(end);
     }
 
+    sfSize = sequenceFeatures.length;
     String type;
     for (int renderIndex = 0; renderIndex < renderOrder.length; renderIndex++)
     {
@@ -227,10 +297,6 @@ public class FeatureRenderer
       // current feature to render
       for (sfindex = 0; sfindex < sfSize; sfindex++)
       {
-        if (sequenceFeatures.length <= sfindex)
-        {
-          continue;
-        }
         if (!sequenceFeatures[sfindex].type.equals(type))
         {
           continue;
@@ -239,7 +305,8 @@ public class FeatureRenderer
         if (featureGroups != null
             && sequenceFeatures[sfindex].featureGroup != null
             &&
-            featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
+            sequenceFeatures[sfindex].featureGroup.length()!=0
+            && featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
             &&
             ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].
                                             featureGroup)).
@@ -350,7 +417,11 @@ public class FeatureRenderer
   }
 
   boolean newFeatureAdded = false;
-
+  /**
+   * Called when alignment in associated view has new/modified features
+   * to discover and display.
+   *
+   */
   public void featuresAdded()
   {
     lastSeq=null;
@@ -358,8 +429,30 @@ public class FeatureRenderer
   }
 
   boolean findingFeatures = false;
-  synchronized void findAllFeatures()
+  /**
+   * search the alignment for all new features, give them a colour and display
+   * them. Then fires a PropertyChangeEvent on the changeSupport object.
+   *
+   */
+  void findAllFeatures()
   {
+    synchronized (firing)
+    {
+        if (firing.equals(Boolean.FALSE)) {
+          firing=Boolean.TRUE;
+          findAllFeatures(true); // add all new features as visible
+          changeSupport.firePropertyChange("changeSupport",null,null);
+          firing=Boolean.FALSE;
+      }
+    }
+  }
+  /**
+   * Searches alignment for all features and updates colours
+   *
+   * @param newMadeVisible
+   *          if true newly added feature types will be rendered immediatly
+   */
+  synchronized void findAllFeatures(boolean newMadeVisible) {
     newFeatureAdded = false;
 
     if (findingFeatures)
@@ -369,17 +462,23 @@ public class FeatureRenderer
     }
 
     findingFeatures = true;
-    jalview.schemes.UserColourScheme ucs = new
-        jalview.schemes.UserColourScheme();
 
     if (av.featuresDisplayed == null)
     {
       av.featuresDisplayed = new Hashtable();
     }
 
-    av.featuresDisplayed.clear();
-
-    Vector allfeatures = new Vector();
+    allfeatures = new Vector();
+    Vector oldfeatures = new Vector();
+    if (renderOrder!=null)
+    {
+      for (int i=0; i<renderOrder.length; i++) {
+        if (renderOrder[i]!=null)
+        {
+          oldfeatures.addElement(renderOrder[i]);
+        }
+      }
+    }
     for (int i = 0; i < av.alignment.getHeight(); i++)
     {
       SequenceFeature[] features
@@ -396,70 +495,152 @@ public class FeatureRenderer
       {
         if (!av.featuresDisplayed.containsKey(features[index].getType()))
         {
-          if (! (features[index].begin == 0 && features[index].end == 0))
+
+          if(featureGroups.containsKey(features[index].getType()))
           {
-            // If beginning and end are 0, the feature is for the whole sequence
-            // and we don't want to render the feature in the normal way
+            boolean visible = ( (Boolean) featureGroups.get(
+                features[index].featureGroup)).booleanValue();
 
-            if (getColour(features[index].getType()) == null)
+            if(!visible)
             {
-              featureColours.put(features[index].getType(),
-                                 ucs.createColourFromName(features[index].
-                  getType()));
+              index++;
+              continue;
             }
+          }
 
-            av.featuresDisplayed.put(features[index].getType(),
+
+          if (! (features[index].begin == 0 && features[index].end == 0))
+          {
+            // If beginning and end are 0, the feature is for the whole sequence
+            // and we don't want to render the feature in the normal way
+
+            if (newMadeVisible && !oldfeatures.contains(features[index].getType())) {
+              // this is a new feature type on the alignment. Mark it for
+              // display.
+              av.featuresDisplayed.put(features[index].getType(),
                                      new Integer(getColour(features[index].
                 getType()).getRGB()));
-            allfeatures.addElement(features[index].getType());
-          }
+              setOrder(features[index].getType(),0);
+            }
+           }
+        }
+        if (!allfeatures.contains(features[index].getType()))
+        {
+          allfeatures.addElement(features[index].getType());
         }
         index++;
       }
     }
-
+    updateRenderOrder(allfeatures);
+    findingFeatures = false;
+  }
+  protected Boolean firing=Boolean.FALSE;
+  /**
+   * replaces the current renderOrder with the unordered features in allfeatures.
+   * The ordering of any types in both renderOrder and allfeatures is preserved,
+   * and all new feature types are rendered on top of the existing types, in
+   * the order given by getOrder or the order given in allFeatures.
+   * Note. this operates directly on the featureOrder hash for efficiency. TODO:
+   * eliminate the float storage for computing/recalling the persistent ordering
+   *
+   * @param allFeatures
+   */
+  private void updateRenderOrder(Vector allFeatures) {
+    Vector allfeatures = new Vector(allFeatures);
+    String[] oldRender = renderOrder;
     renderOrder = new String[allfeatures.size()];
+    boolean initOrders=(featureOrder==null);
+    int opos=0;
+    if (oldRender!=null && oldRender.length>0)
+    {
+      for (int j=0; j<oldRender.length; j++)
+      {
+        if (oldRender[j]!=null)
+          {
+            if (initOrders)
+            {
+              setOrder(oldRender[j], (1-(1+(float)j)/(float) oldRender.length));
+            }
+            if (allfeatures.contains(oldRender[j])) {
+              renderOrder[opos++]  = oldRender[j]; // existing features always
+                                                    // appear below new features
+              allfeatures.removeElement(oldRender[j]);
+            }
+          }
+        }
+    }
+    if (allfeatures.size()==0) {
+      // no new features - leave order unchanged.
+      return;
+    }
+    int i=allfeatures.size()-1;
+    int iSize=i;
+    boolean sort=false;
+    String[] newf = new String[allfeatures.size()];
+    float[] sortOrder = new float[allfeatures.size()];
     Enumeration en = allfeatures.elements();
-    int i = allfeatures.size() - 1;
+    // sort remaining elements
     while (en.hasMoreElements())
     {
-      renderOrder[i] = en.nextElement().toString();
+      newf[i] = en.nextElement().toString();
+      if (initOrders || !featureOrder.containsKey(newf[i]))
+      {
+        int denom = initOrders ? allfeatures.size() : featureOrder.size();
+          // new unordered feature - compute persistent ordering at head of
+          // existing features.
+        setOrder(newf[i], i/(float) denom);
+      }
+      // set order from newly found feature from persisted ordering.
+      sortOrder[i] = 2-((Float) featureOrder.get(newf[i])).floatValue();
+      if (i<iSize)
+      {
+        // only sort if we need to
+        sort = sort || sortOrder[i]>sortOrder[i+1];
+      }
       i--;
     }
-
-    findingFeatures = false;
+    if (iSize>1 && sort)
+      jalview.util.QuickSort.sort(sortOrder, newf);
+    sortOrder=null;
+    System.arraycopy(newf, 0, renderOrder, opos, newf.length);
   }
-
   public Color getColour(String featureType)
   {
-    Color colour = (Color) featureColours.get(featureType);
-    return colour;
+    if (!featureColours.containsKey(featureType))
+    {
+      jalview.schemes.UserColourScheme ucs = new
+          jalview.schemes.UserColourScheme();
+      Color col = ucs.createColourFromName(featureType);
+      featureColours.put(featureType, col);
+      return col;
+    }
+    else
+      return (Color) featureColours.get(featureType);
   }
 
   static String lastFeatureAdded;
   static String lastFeatureGroupAdded;
   static String lastDescriptionAdded;
 
-  public boolean createNewFeatures(SequenceI[] sequences,
-                                   SequenceFeature[] features)
-  {
-    return amendFeatures(sequences, features, true, null);
-  }
-
   int featureIndex = 0;
   boolean amendFeatures(final SequenceI[] sequences,
                         final SequenceFeature[] features,
                         boolean newFeatures,
                         final AlignmentPanel ap)
   {
+
+    featureIndex = 0;
+
     JPanel bigPanel = new JPanel(new BorderLayout());
-    final JComboBox name = new JComboBox();
-    final JComboBox source = new JComboBox();
+    final JComboBox overlaps;
+    final JTextField name = new JTextField(25);
+    final JTextField source = new JTextField(25);
     final JTextArea description = new JTextArea(3, 25);
     final JSpinner start = new JSpinner();
     final JSpinner end = new JSpinner();
     start.setPreferredSize(new Dimension(80, 20));
     end.setPreferredSize(new Dimension(80, 20));
+
     final JPanel colour = new JPanel();
     colour.setBorder(BorderFactory.createEtchedBorder());
     colour.setMaximumSize(new Dimension(40, 10));
@@ -467,27 +648,93 @@ public class FeatureRenderer
     {
       public void mousePressed(MouseEvent evt)
       {
-        colour.setBackground(
-            JColorChooser.showDialog(Desktop.desktop,
-                                     "Select Feature Colour",
-                                     colour.getBackground()));
+        Color col = JColorChooser.showDialog(Desktop.desktop,
+                                             "Select Feature Colour",
+                                             colour.getBackground());
+        if (col != null)
+          colour.setBackground(col);
+
       }
     });
 
-    JPanel panel = new JPanel(new GridLayout(3, 2));
-    panel.add(new JLabel("Sequence Feature Name: ", JLabel.RIGHT));
-    panel.add(name);
-    panel.add(new JLabel("Feature Group: ", JLabel.RIGHT));
-    panel.add(source);
-    panel.add(new JLabel("Feature Colour: ", JLabel.RIGHT));
     JPanel tmp = new JPanel();
+    JPanel panel = new JPanel(new GridLayout(3, 1));
+
+    ///////////////////////////////////////
+    ///MULTIPLE FEATURES AT SELECTED RESIDUE
+    if(!newFeatures && features.length>1)
+    {
+     panel = new JPanel(new GridLayout(4, 1));
+     tmp = new JPanel();
+     tmp.add(new JLabel("Select Feature: "));
+     overlaps = new JComboBox();
+     for(int i=0; i<features.length; i++)
+     {
+       overlaps.addItem(features[i].getType()
+        +"/"+features[i].getBegin()+"-"+features[i].getEnd()
+        +" ("+features[i].getFeatureGroup()+")");
+     }
+
+     tmp.add(overlaps);
+
+     overlaps.addItemListener(new ItemListener()
+     {
+       public void itemStateChanged(ItemEvent e)
+       {
+         int index = overlaps.getSelectedIndex();
+         if (index != -1)
+         {
+           featureIndex = index;
+           name.setText(features[index].getType());
+           description.setText(features[index].getDescription());
+           source.setText(features[index].getFeatureGroup());
+           start.setValue(new Integer(features[index].getBegin()));
+           end.setValue(new Integer(features[index].getEnd()));
+
+           SearchResults highlight = new SearchResults();
+           highlight.addResult(sequences[0],
+                               features[index].getBegin(),
+                               features[index].getEnd());
+
+           ap.seqPanel.seqCanvas.highlightSearchResults(highlight);
+
+         }
+         Color col = getColour(name.getText());
+         if (col == null)
+         {
+           col = new
+               jalview.schemes.UserColourScheme()
+               .createColourFromName(name.getText());
+         }
+
+         colour.setBackground(col);
+       }
+     });
+
+
+     panel.add(tmp);
+    }
+    //////////
+    //////////////////////////////////////
+
+    tmp = new JPanel();
+    panel.add(tmp);
+    tmp.add(new JLabel("Name: ", JLabel.RIGHT));
+    tmp.add(name);
+
+    tmp = new JPanel();
+    panel.add(tmp);
+    tmp.add(new JLabel("Group: ", JLabel.RIGHT));
+    tmp.add(source);
+
+    tmp = new JPanel();
+    panel.add(tmp);
+    tmp.add(new JLabel("Colour: ", JLabel.RIGHT));
     tmp.add(colour);
     colour.setPreferredSize(new Dimension(150, 15));
-    panel.add(tmp);
-    name.setEditable(true);
-    source.setEditable(true);
 
     bigPanel.add(panel, BorderLayout.NORTH);
+
     panel = new JPanel();
     panel.add(new JLabel("Description: ", JLabel.RIGHT));
     description.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
@@ -530,97 +777,26 @@ public class FeatureRenderer
       }
       else
       {
-        lastFeatureAdded = "Jalview";
+        lastFeatureGroupAdded = "Jalview";
       }
     }
 
-    Enumeration en;
-    if (featureGroups != null)
+    if(newFeatures)
     {
-      en = featureGroups.keys();
-      while (en.hasMoreElements())
-      {
-        source.addItem(en.nextElement().toString());
-      }
+      name.setText(lastFeatureAdded);
+      source.setText(lastFeatureGroupAdded);
     }
-
-    if (newFeatures)
+    else
     {
-      if (av.featuresDisplayed != null)
-      {
-        en = av.featuresDisplayed.keys();
-        while (en.hasMoreElements())
-        {
-          name.addItem(en.nextElement().toString());
-        }
-      }
-
-      name.setSelectedItem(lastFeatureAdded);
-      source.setSelectedItem(lastFeatureGroupAdded);
-      description.setText(
-          lastDescriptionAdded == null ?
-          features[0].description : lastDescriptionAdded);
-
-      if (getColour(lastFeatureAdded) != null)
-      {
-        colour.setBackground(getColour(lastFeatureAdded));
-      }
-      else
-      {
-        colour.setBackground(new Color(60, 160, 115));
-      }
-
+      name.setText(features[0].getType());
+      source.setText(features[0].getFeatureGroup());
     }
-    else if (!newFeatures)
-    {
-      featureIndex = 0;
-      for (int f = 0; f < features.length; f++)
-      {
-        name.addItem(features[f].getType().toString());
-      }
-
-      description.setText(features[0].getDescription());
-      source.setSelectedItem(features[0].getFeatureGroup());
-      start.setValue(new Integer(features[0].getBegin()));
-      end.setValue(new Integer(features[0].getEnd()));
-      colour.setBackground(
-          getColour(name.getSelectedItem().toString()));
-      name.addItemListener(new ItemListener()
-      {
-        public void itemStateChanged(ItemEvent e)
-        {
-          int index = name.getSelectedIndex();
-          if (index != -1)
-          {
-            featureIndex = index;
-            description.setText(features[index].getDescription());
-            source.setSelectedItem(features[index].getFeatureGroup());
-            start.setValue(new Integer(features[index].getBegin()));
-            end.setValue(new Integer(features[index].getEnd()));
-            colour.setBackground(
-                getColour(name.getSelectedItem().toString()));
-
-            SearchResults highlight = new SearchResults();
-            highlight.addResult(sequences[0],
-                                features[index].getBegin(),
-                                features[index].getEnd());
-
-            ap.seqPanel.seqCanvas.highlightSearchResults(highlight);
-
-          }
-          Color col = getColour(name.getSelectedItem().toString());
-          if (col == null)
-          {
-            col = new
-                jalview.schemes.UserColourScheme()
-                .createColourFromName(name.getSelectedItem().toString());
-          }
 
-          colour.setBackground(col);
-        }
-      });
+    start.setValue(new Integer(features[0].getBegin()));
+    end.setValue(new Integer(features[0].getEnd()));
+    description.setText(features[0].getDescription());
+    colour.setBackground(getColour(name.getText()));
 
-    }
 
     Object[] options;
     if (!newFeatures)
@@ -650,16 +826,17 @@ public class FeatureRenderer
 
     jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
 
-    if (reply == JOptionPane.OK_OPTION
-        && name.getSelectedItem() != null
-        && source.getSelectedItem() != null)
+    if (reply == JOptionPane.OK_OPTION && name.getText().length()>0)
     {
-      //This ensures that the last sequence
-      //is refreshed and new features are rendered
+      // This ensures that the last sequence
+      // is refreshed and new features are rendered
       lastSeq = null;
-      lastFeatureAdded = name.getSelectedItem().toString();
-      lastFeatureGroupAdded = source.getSelectedItem().toString();
+      lastFeatureAdded = name.getText().trim();
+      lastFeatureGroupAdded = source.getText().trim();
       lastDescriptionAdded = description.getText().replaceAll("\n", " ");
+
+      if(lastFeatureGroupAdded.length()<1)
+        lastFeatureGroupAdded = null;
     }
 
     if (!newFeatures)
@@ -675,7 +852,11 @@ public class FeatureRenderer
         sf.type = lastFeatureAdded;
         sf.featureGroup = lastFeatureGroupAdded;
         sf.description = lastDescriptionAdded;
+
         setColour(sf.type, colour.getBackground());
+        av.featuresDisplayed.put(sf.type,
+                                 new Integer(colour.getBackground().getRGB()));
+
         try
         {
           sf.begin = ( (Integer) start.getValue()).intValue();
@@ -687,16 +868,16 @@ public class FeatureRenderer
         ffile.parseDescriptionHTML(sf, false);
       }
     }
-    else
+    else //NEW FEATURES ADDED
     {
       if (reply == JOptionPane.OK_OPTION
-          && name.getSelectedItem() != null
-          && source.getSelectedItem() != null)
+          && lastFeatureAdded.length()>0)
       {
         for (int i = 0; i < sequences.length; i++)
         {
           features[i].type = lastFeatureAdded;
-          features[i].featureGroup = lastFeatureGroupAdded;
+          if (lastFeatureGroupAdded!=null)
+            features[i].featureGroup = lastFeatureGroupAdded;
           features[i].description = lastDescriptionAdded;
           sequences[i].addSequenceFeature(features[i]);
           ffile.parseDescriptionHTML(features[i], false);
@@ -707,20 +888,22 @@ public class FeatureRenderer
           av.featuresDisplayed = new Hashtable();
         }
 
-        if (featureGroups == null)
+        if (lastFeatureGroupAdded != null)
         {
-          featureGroups = new Hashtable();
+          if (featureGroups == null)
+            featureGroups = new Hashtable();
+          featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
         }
 
-        featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
-
         Color col = colour.getBackground();
         setColour(lastFeatureAdded, colour.getBackground());
+        av.featuresDisplayed.put(lastFeatureAdded,
+                                   new Integer(col.getRGB()));
+
+        findAllFeatures(false);
 
-        av.featuresDisplayed.put(lastFeatureGroupAdded,
-                                 new Integer(col.getRGB()));
+        ap.paintAlignment(true);
 
-        findAllFeatures();
 
         return true;
       }
@@ -730,10 +913,7 @@ public class FeatureRenderer
       }
     }
 
-    if (name.getSelectedIndex() == -1)
-    {
-      findAllFeatures();
-    }
+    ap.paintAlignment(true);
 
     return true;
   }
@@ -752,21 +932,40 @@ public class FeatureRenderer
   {
     return transparency;
   }
-
+  /**
+   * Replace current ordering with new ordering
+   * @param data { String(Type), Colour(Type), Boolean(Displayed) }
+   */
   public void setFeaturePriority(Object[][] data)
   {
-    // The feature table will display high priority
-    // features at the top, but theses are the ones
-    // we need to render last, so invert the data
-    if (av.featuresDisplayed != null)
-    {
-      av.featuresDisplayed.clear();
+    setFeaturePriority(data, true);
+  }
+  /**
+   *
+   * @param data { String(Type), Colour(Type), Boolean(Displayed) }
+   * @param visibleNew when true current featureDisplay list will be cleared
+   */
+  public void setFeaturePriority(Object[][] data, boolean visibleNew)
+  {
+    if (visibleNew)
+      {
+      if (av.featuresDisplayed != null)
+      {
+        av.featuresDisplayed.clear();
+      }
+      else
+      {
+        av.featuresDisplayed = new Hashtable();
+      }
     }
-    else
+    if (data==null)
     {
-      av.featuresDisplayed = new Hashtable();
+      return;
     }
 
+    // The feature table will display high priority
+    // features at the top, but theses are the ones
+    // we need to render last, so invert the data
     renderOrder = new String[data.length];
 
     if (data.length > 0)
@@ -785,5 +984,58 @@ public class FeatureRenderer
     }
 
   }
+  Hashtable featureOrder=null;
+  /**
+   * analogous to colour - store a normalized ordering for all feature types in
+   * this rendering context.
+   *
+   * @param type
+   *          Feature type string
+   * @param position
+   *          normalized priority - 0 means always appears on top, 1 means
+   *          always last.
+   */
+  public float setOrder(String type, float position)
+  {
+    if (featureOrder==null)
+    {
+      featureOrder = new Hashtable();
+    }
+    featureOrder.put(type, new Float(position));
+    return position;
+  }
+  /**
+   * get the global priority (0 (top) to 1 (bottom))
+   *
+   * @param type
+   * @return [0,1] or -1 for a type without a priority
+   */
+  public float getOrder(String type) {
+    if (featureOrder!=null)
+    {
+      if (featureOrder.containsKey(type))
+      {
+        return ((Float)featureOrder.get(type)).floatValue();
+      }
+    }
+    return -1;
+  }
+
+  /**
+   * @param listener
+   * @see java.beans.PropertyChangeSupport#addPropertyChangeListener(java.beans.PropertyChangeListener)
+   */
+  public void addPropertyChangeListener(PropertyChangeListener listener)
+  {
+    changeSupport.addPropertyChangeListener(listener);
+  }
 
+  /**
+   * @param listener
+   * @see java.beans.PropertyChangeSupport#removePropertyChangeListener(java.beans.PropertyChangeListener)
+   */
+  public void removePropertyChangeListener(PropertyChangeListener listener)
+  {
+    changeSupport.removePropertyChangeListener(listener);
+  }
 }