X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=634dbedae985fed6de65e73ef909d673811aad68;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=405fe9871999c467a6520e040d3a26affc52bf4b;hpb=391968dd70ca76090306df9b5852bbef10ab4ede;p=jalview.git

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 405fe98..634dbed 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,12 +18,14 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.*;
+import java.util.*;
 
 import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+import javax.swing.*;
 
-import java.util.*;
-
+import jalview.datamodel.*;
 
 /**
  * DOCUMENT ME!
@@ -33,406 +35,754 @@ import java.util.*;
  */
 public class FeatureRenderer
 {
-    AlignViewport av;
-    Color resBoxColour;
-    float transparency = 1.0f;
-    FontMetrics fm;
-    int charOffset;
-
-    // A higher level for grouping features of a
-   // particular type
-    Hashtable featureGroups = null;
-
+  AlignViewport av;
+  Color resBoxColour;
+  float transparency = 1.0f;
+  FontMetrics fm;
+  int charOffset;
+
+  Hashtable featureColours = new Hashtable();
+
+  // A higher level for grouping features of a
+  // particular type
+  Hashtable featureGroups = null;
+
+  // This is actually an Integer held in the hashtable,
+  // Retrieved using the key feature type
+  Object currentColour;
+
+  String[] renderOrder;
+
+  /**
+   * Creates a new FeatureRenderer object.
+   *
+   * @param av DOCUMENT ME!
+   */
+  public FeatureRenderer(AlignViewport av)
+  {
+    this.av = av;
+  }
+
+  public void transferSettings(FeatureRenderer fr)
+  {
+    renderOrder = fr.renderOrder;
+    featureGroups = fr.featureGroups;
+    featureColours = fr.featureColours;
+    transparency = fr.transparency;
+  }
+
+  BufferedImage offscreenImage;
+  boolean offscreenRender = false;
+  public Color findFeatureColour(Color initialCol, SequenceI seq, int res)
+  {
+    return new Color(findFeatureColour(initialCol.getRGB(),
+                                       seq, res));
+  }
+
+  /**
+   * 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)
+  {
+    if (!av.showSequenceFeatures)
+    {
+      return initialCol;
+    }
 
-    // This is actually an Integer held in the hashtable,
-    // Retrieved using the key feature type
-    Object currentColour;
+    if (seq != lastSeq)
+    {
+      lastSeq = seq;
+      sequenceFeatures = lastSeq.getDatasetSequence().getSequenceFeatures();
+      if (sequenceFeatures == null)
+      {
+        return initialCol;
+      }
 
-    String [] renderOrder;
+      sfSize = sequenceFeatures.length;
+    }
 
+    if (jalview.util.Comparison.isGap(lastSeq.getCharAt(column)))
+    {
+      return Color.white.getRGB();
+    }
 
-    /**
-     * Creates a new FeatureRenderer object.
-     *
-     * @param av DOCUMENT ME!
-     */
-    public FeatureRenderer(AlignViewport av)
+    //Only bother making an offscreen image if transparency is applied
+    if (transparency != 1.0f && offscreenImage == null)
     {
-        this.av = av;
-        initColours();
+      offscreenImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
     }
 
+    currentColour = null;
+
+    offscreenRender = true;
 
-    public Color findFeatureColour(Color initialCol, SequenceI seq, int i)
+    if (offscreenImage != null)
     {
-      if(!av.showSequenceFeatures)
-        return initialCol;
+      offscreenImage.setRGB(0, 0, initialCol);
+      drawSequence(offscreenImage.getGraphics(),
+                   lastSeq,
+                   column, column, 0);
 
-        lastSequence = seq;
-        sequenceFeatures = lastSequence.getDatasetSequence().getSequenceFeatures();
-        if(sequenceFeatures==null)
-          return initialCol;
+      return offscreenImage.getRGB(0, 0);
+    }
+    else
+    {
+      drawSequence(null,
+                   lastSeq,
+                   lastSeq.findPosition(column),
+                   -1, -1);
 
-        sfSize = sequenceFeatures.length;
+      if (currentColour == null)
+      {
+        return initialCol;
+      }
+      else
+      {
+        return ( (Integer) currentColour).intValue();
+      }
+    }
 
-      if(jalview.util.Comparison.isGap(lastSequence.getCharAt(i)))
-        return Color.white;
+  }
+
+  /**
+   * 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;
+  SequenceI lastSeq;
+  SequenceFeature[] sequenceFeatures;
+  int sfSize, sfindex, spos, epos;
+
+  public void drawSequence(Graphics g, SequenceI seq,
+                           int start, int end, int y1)
+  {
+    if (seq.getDatasetSequence().getSequenceFeatures() == null
+        || seq.getDatasetSequence().getSequenceFeatures().length == 0)
+    {
+      return;
+    }
 
-      currentColour = null;
+    if (g != null)
+    {
+      fm = g.getFontMetrics();
+    }
 
-      drawSequence(null, lastSequence, lastSequence.findPosition(i), -1,-1, -1, -1);
+    if (av.featuresDisplayed == null
+        || renderOrder == null
+        || newFeatureAdded)
+    {
+      findAllFeatures();
+      if (av.featuresDisplayed.size() < 1)
+      {
+        return;
+      }
 
-      if(currentColour==null)
-        return initialCol;
+      sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
+      sfSize = sequenceFeatures.length;
+    }
 
-      return new Color( ((Integer)currentColour).intValue() );
+    if (lastSeq == null || seq != lastSeq)
+    {
+      lastSeq = seq;
+      sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
+      sfSize = sequenceFeatures.length;
     }
-    /**
-     * This is used by the Molecule Viewer to get the accurate colour
-     * of the rendered sequence
-     */
 
-    boolean overview = false;
+    if (transparency != 1 && g != null)
+    {
+      Graphics2D g2 = (Graphics2D) g;
+      g2.setComposite(
+          AlphaComposite.getInstance(
+              AlphaComposite.SRC_OVER, transparency));
+    }
 
-    int white = Color.white.getRGB();
-    public int findFeatureColour(int initialCol, int seqIndex, int column)
+    if (!offscreenRender)
     {
-      if(!av.showSequenceFeatures)
-        return initialCol;
+      spos = lastSeq.findPosition(start);
+      epos = lastSeq.findPosition(end);
+    }
 
-      if(seqIndex!=lastSequenceIndex)
-      {
-        lastSequence = av.alignment.getSequenceAt(seqIndex);
-        lastSequenceIndex = seqIndex;
-        sequenceFeatures = lastSequence.getDatasetSequence().getSequenceFeatures();
-        if(sequenceFeatures==null)
-          return initialCol;
+    String type;
+    for (int renderIndex = 0; renderIndex < renderOrder.length; renderIndex++)
+    {
+      type = renderOrder[renderIndex];
 
-        sfSize = sequenceFeatures.length;
+      if (type == null || !av.featuresDisplayed.containsKey(type))
+      {
+        continue;
       }
 
+      // loop through all features in sequence to find
+      // current feature to render
+      for (sfindex = 0; sfindex < sfSize; sfindex++)
+      {
+        if (sequenceFeatures.length <= sfindex)
+        {
+          continue;
+        }
+        if (!sequenceFeatures[sfindex].type.equals(type))
+        {
+          continue;
+        }
 
-      if(jalview.util.Comparison.isGap(lastSequence.getCharAt(column)))
-        return Color.white.getRGB();
+        if (featureGroups != null
+            && sequenceFeatures[sfindex].featureGroup != null
+            &&
+            featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
+            &&
+            ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].
+                                            featureGroup)).
+            booleanValue())
+        {
+          continue;
+        }
 
-      currentColour = null;
+        if (!offscreenRender && (sequenceFeatures[sfindex].getBegin() > epos
+                                 || sequenceFeatures[sfindex].getEnd() < spos))
+        {
+          continue;
+        }
 
-      drawSequence(null, lastSequence, lastSequence.findPosition(column), -1,-1, -1, -1);
+        if (offscreenRender && offscreenImage == null)
+        {
+          if (sequenceFeatures[sfindex].begin <= start &&
+              sequenceFeatures[sfindex].end >= start)
+          {
+            currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].
+                type);
+          }
+        }
+        else if (sequenceFeatures[sfindex].type.equals("disulfide bond"))
+        {
 
-      if(currentColour==null)
-        return initialCol;
+          renderFeature(g, seq,
+                        seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
+                        seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
+                        new Color( ( (Integer) av.featuresDisplayed.get(
+                            sequenceFeatures[sfindex].type)).intValue()),
+                        start, end, y1);
+          renderFeature(g, seq,
+                        seq.findIndex(sequenceFeatures[sfindex].end) - 1,
+                        seq.findIndex(sequenceFeatures[sfindex].end) - 1,
+                        new Color( ( (Integer) av.featuresDisplayed.get(
+                            sequenceFeatures[sfindex].type)).intValue()),
+                        start, end, y1);
 
-      return  ((Integer)currentColour).intValue();
-    }
-
-
-    /**
-     * 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;
-    int lastSequenceIndex=-1;
-    SequenceI lastSequence;
-    SequenceFeature [] sequenceFeatures;
-    int sfSize, sfindex, spos, epos;
-
-    public void drawSequence(Graphics g, SequenceI seq,
-                             int start, int end, int y1, int width, int height)
-    {
-      if (   seq.getDatasetSequence().getSequenceFeatures() == null
-          || seq.getDatasetSequence().getSequenceFeatures().length==0)
-        return;
+        }
+        else
+        {
+          renderFeature(g, seq,
+                        seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
+                        seq.findIndex(sequenceFeatures[sfindex].end) - 1,
+                        getColour(sequenceFeatures[sfindex].type),
+                        start, end, y1);
+        }
 
+      }
 
-      if(g!=null)
-        fm = g.getFontMetrics();
+    }
 
+    if (transparency != 1.0f && g != null)
+    {
+      Graphics2D g2 = (Graphics2D) g;
+      g2.setComposite(
+          AlphaComposite.getInstance(
+              AlphaComposite.SRC_OVER, 1.0f));
+    }
+  }
 
-      if (av.featuresDisplayed == null || renderOrder==null)
-       {
-         findAllFeatures();
-         sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
-         sfSize = sequenceFeatures.length;
-       }
+  char s;
+  int i;
+  void renderFeature(Graphics g, SequenceI seq,
+                     int fstart, int fend, Color featureColour, int start,
+                     int end, int y1)
+  {
 
-       if(lastSequence==null || seq!=lastSequence)
-      {
-        lastSequence = seq;
-        sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
-        sfSize = sequenceFeatures.length;
+    if ( ( (fstart <= end) && (fend >= start)))
+    {
+      if (fstart < start)
+      { // fix for if the feature we have starts before the sequence start,
+        fstart = start; // but the feature end is still valid!!
       }
 
-
-      if (transparency != 1 && g!=null)
+      if (fend >= end)
       {
-        Graphics2D g2 = (Graphics2D) g;
-        g2.setComposite(
-            AlphaComposite.getInstance(
-                AlphaComposite.SRC_OVER, transparency));
+        fend = end;
       }
-
-      if(!overview)
+      int pady = (y1 + av.charHeight) - av.charHeight / 5;
+      for (i = fstart; i <= fend; i++)
       {
-        spos = lastSequence.findPosition(start);
-        epos = lastSequence.findPosition(end);
-      }
-
-      String type;
-      for(int renderIndex=0; renderIndex<renderOrder.length; renderIndex++)
-       {
-        type =  renderOrder[renderIndex];
+        s = seq.getCharAt(i);
 
-        // loop through all features in sequence to find
-        // current feature to render
-        for (sfindex = 0; sfindex < sfSize; sfindex++)
+        if (jalview.util.Comparison.isGap(s))
         {
-          if (!sequenceFeatures[sfindex].type.equals(type))
-            continue;
-
-          if (featureGroups != null
-              && sequenceFeatures[sfindex].featureGroup != null
-              &&
-              featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
-              &&
-              ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].featureGroup)).
-              booleanValue())
-          {
-            continue;
-          }
+          continue;
+        }
 
-          if (!overview && (sequenceFeatures[sfindex].getBegin() > epos
-                            || sequenceFeatures[sfindex].getEnd() < spos))
-            continue;
+        g.setColor(featureColour);
 
-          if (overview)
-          {
+        g.fillRect( (i - start) * av.charWidth, y1, av.charWidth, av.charHeight);
 
-            if (sequenceFeatures[sfindex].begin - 1 <= start &&
-                sequenceFeatures[sfindex].end + 1 >= start)
-            {
-              currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].
-                  type);
-            }
+        if (offscreenRender || !av.validCharWidth)
+        {
+          continue;
+        }
 
-          }
-          else if (sequenceFeatures[sfindex].type.equals("disulfide bond"))
-          {
+        g.setColor(Color.white);
+        charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+        g.drawString(String.valueOf(s),
+                     charOffset + (av.charWidth * (i - start)),
+                     pady);
 
-            renderFeature(g, seq,
-                          seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
-                          seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
-                          new Color( ( (Integer) av.featuresDisplayed.get(
-                sequenceFeatures[sfindex].type)).intValue()),
-                          start, end, y1, width, height);
-            renderFeature(g, seq,
-                          seq.findIndex(sequenceFeatures[sfindex].end) - 1,
-                          seq.findIndex(sequenceFeatures[sfindex].end) - 1,
-                          new Color( ( (Integer) av.featuresDisplayed.get(
-                sequenceFeatures[sfindex].type)).intValue()),
-                          start, end, y1, width, height);
+      }
+    }
+  }
 
-          }
-          else
-            renderFeature(g, seq,
-                          seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
-                          seq.findIndex(sequenceFeatures[sfindex].end) - 1,
-                          getColour(sequenceFeatures[sfindex].type),
-                          start, end, y1, width, height);
+  boolean newFeatureAdded = false;
 
+  public void featuresAdded()
+  {
+    findAllFeatures();
+  }
 
-        }
+  boolean findingFeatures = false;
+  synchronized void findAllFeatures()
+  {
+    newFeatureAdded = false;
 
-      }
+    if (findingFeatures)
+    {
+      newFeatureAdded = true;
+      return;
+    }
 
-        if(transparency!=1.0f && g!=null)
-        {
-          Graphics2D g2 = (Graphics2D) g;
-          g2.setComposite(
-              AlphaComposite.getInstance(
-                  AlphaComposite.SRC_OVER, 1.0f));
-        }
+    findingFeatures = true;
+    jalview.schemes.UserColourScheme ucs = new
+        jalview.schemes.UserColourScheme();
+
+    if (av.featuresDisplayed == null)
+    {
+      av.featuresDisplayed = new Hashtable();
     }
 
+    av.featuresDisplayed.clear();
 
-    char s;
-    int i;
-    void renderFeature(Graphics g, SequenceI seq,
-                       int fstart, int fend, Color featureColour, int start, int end,  int y1, int width, int height)
+    Vector allfeatures = new Vector();
+    for (int i = 0; i < av.alignment.getHeight(); i++)
     {
+      SequenceFeature[] features
+          = av.alignment.getSequenceAt(i).getDatasetSequence().
+          getSequenceFeatures();
 
-      if (((fstart <= end) && (fend >= start)))
+      if (features == null)
       {
-        if (fstart < start)
-        { // fix for if the feature we have starts before the sequence start,
-          fstart = start; // but the feature end is still valid!!
-        }
+        continue;
+      }
 
-        if (fend >= end)
+      int index = 0;
+      while (index < features.length)
+      {
+        if (!av.featuresDisplayed.containsKey(features[index].getType()))
         {
-          fend = end;
-        }
-
-          for (i = fstart; i <= fend; i++)
+          if (! (features[index].begin == 0 && features[index].end == 0))
           {
-            s = seq.getSequence().charAt(i);
+            // 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 (jalview.util.Comparison.isGap(s))
+            if (getColour(features[index].getType()) == null)
             {
-              continue;
+              featureColours.put(features[index].getType(),
+                                 ucs.createColourFromName(features[index].
+                  getType()));
             }
 
-            g.setColor(featureColour);
+            av.featuresDisplayed.put(features[index].getType(),
+                                     new Integer(getColour(features[index].
+                getType()).getRGB()));
+            allfeatures.addElement(features[index].getType());
+          }
+        }
+        index++;
+      }
+    }
 
-            g.fillRect( (i - start) * width, y1, width, height);
+    renderOrder = new String[allfeatures.size()];
+    Enumeration en = allfeatures.elements();
+    int i = allfeatures.size() - 1;
+    while (en.hasMoreElements())
+    {
+      renderOrder[i] = en.nextElement().toString();
+      i--;
+    }
 
-            g.setColor(Color.white);
-            charOffset = (width - fm.charWidth(s)) / 2;
-            g.drawString(String.valueOf(s),
-                         charOffset + (width * (i - start)),
-                         (y1 + height) - height / 5); //pady = height / 5;
+    findingFeatures = false;
+  }
+
+  public Color getColour(String featureType)
+  {
+    Color colour = (Color) featureColours.get(featureType);
+    return colour;
+  }
+
+  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)
+  {
+    JPanel bigPanel = new JPanel(new BorderLayout());
+    final JComboBox name = new JComboBox();
+    final JComboBox source = new JComboBox();
+    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));
+    colour.addMouseListener(new MouseAdapter()
+    {
+      public void mousePressed(MouseEvent evt)
+      {
+        colour.setBackground(
+            JColorChooser.showDialog(Desktop.desktop,
+                                     "Select Feature Colour",
+                                     colour.getBackground()));
+      }
+    });
+
+    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();
+    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));
+    description.setLineWrap(true);
+    panel.add(new JScrollPane(description));
+
+    if (!newFeatures)
+    {
+      bigPanel.add(panel, BorderLayout.SOUTH);
+
+      panel = new JPanel();
+      panel.add(new JLabel(" Start:", JLabel.RIGHT));
+      panel.add(start);
+      panel.add(new JLabel("  End:", JLabel.RIGHT));
+      panel.add(end);
+      bigPanel.add(panel, BorderLayout.CENTER);
+    }
+    else
+    {
+      bigPanel.add(panel, BorderLayout.CENTER);
+    }
 
-          }
+    if (lastFeatureAdded == null)
+    {
+      if (features[0].type != null)
+      {
+        lastFeatureAdded = features[0].type;
+      }
+      else
+      {
+        lastFeatureAdded = "feature_1";
       }
     }
 
-    void findAllFeatures()
+    if (lastFeatureGroupAdded == null)
     {
-      av.featuresDisplayed = new Hashtable();
-      for (int i = 0; i < av.alignment.getHeight(); i++)
+      if (features[0].featureGroup != null)
+      {
+        lastFeatureGroupAdded = features[0].featureGroup;
+      }
+      else
       {
-        SequenceFeature [] features = av.alignment.getSequenceAt(i).getDatasetSequence().
-            getSequenceFeatures();
+        lastFeatureAdded = "Jalview";
+      }
+    }
 
-        if (features == null)
-          continue;
+    Enumeration en;
+    if (featureGroups != null)
+    {
+      en = featureGroups.keys();
+      while (en.hasMoreElements())
+      {
+        source.addItem(en.nextElement().toString());
+      }
+    }
 
-        int index = 0;
-        while (index < features.length)
+    if (newFeatures)
+    {
+      if (av.featuresDisplayed != null)
+      {
+        en = av.featuresDisplayed.keys();
+        while (en.hasMoreElements())
         {
-          if (!av.featuresDisplayed.containsKey(features[index].getType()))
-          {
-            av.featuresDisplayed.put(features[index].getType(),
-                                  new Integer( getColour(features[index].getType()).getRGB()) );
-          }
-          index++;
+          name.addItem(en.nextElement().toString());
         }
       }
 
-      renderOrder = new String[av.featuresDisplayed.size()];
-      Enumeration en = av.featuresDisplayed.keys();
-      int i = 0;
-      while(en.hasMoreElements())
+      name.setSelectedItem(lastFeatureAdded);
+      source.setSelectedItem(lastFeatureGroupAdded);
+      description.setText(
+          lastDescriptionAdded == null ?
+          features[0].description : lastDescriptionAdded);
+
+      if (getColour(lastFeatureAdded) != null)
       {
-        renderOrder[i] = en.nextElement().toString();
-        i++;
+        colour.setBackground(getColour(lastFeatureAdded));
+      }
+      else
+      {
+        colour.setBackground(new Color(60, 160, 115));
       }
-    }
 
-    public Color getColour(String featureType)
+    }
+    else if (!newFeatures)
     {
-      return (Color)featureColours.get(featureType);
+      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);
+        }
+      });
+
     }
 
-    public void addNewFeature(String name, Color col)
+    Object[] options;
+    if (!newFeatures)
     {
+      options = new Object[]
+          {
+          "Amend", "Delete", "Cancel"};
+    }
+    else
+    {
+      options = new Object[]
+          {
+          "OK", "Cancel"};
+    }
 
-      setColour(name, col);
-      if(av.featuresDisplayed==null)
-        av.featuresDisplayed = new Hashtable();
+    String title = newFeatures ? "Create New Sequence Feature(s)" :
+        "Amend/Delete Features for "
+        + sequences[0].getName();
 
+    int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,
+        bigPanel,
+        title,
+        JOptionPane.YES_NO_CANCEL_OPTION,
+        JOptionPane.QUESTION_MESSAGE,
+        null,
+        options, "OK");
 
-      av.featuresDisplayed.put(name, "NOGROUP");
-    }
+    jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
 
-    public void setColour(String featureType, Color col)
+    if (reply == JOptionPane.OK_OPTION
+        && name.getSelectedItem() != null
+        && source.getSelectedItem() != null)
     {
-      featureColours.put(featureType, col);
+      //This ensures that the last sequence
+      //is refreshed and new features are rendered
+      lastSeq = null;
+      lastFeatureAdded = name.getSelectedItem().toString();
+      lastFeatureGroupAdded = source.getSelectedItem().toString();
+      lastDescriptionAdded = description.getText().replaceAll("\n", " ");
     }
 
-    public void setTransparency(float value)
+    if (!newFeatures)
     {
-      transparency = value;
+      SequenceFeature sf = features[featureIndex];
+
+      if (reply == JOptionPane.NO_OPTION)
+      {
+        sequences[0].getDatasetSequence().deleteFeature(sf);
+      }
+      else if (reply == JOptionPane.YES_OPTION)
+      {
+        sf.type = lastFeatureAdded;
+        sf.featureGroup = lastFeatureGroupAdded;
+        sf.description = lastDescriptionAdded;
+        setColour(sf.type, colour.getBackground());
+        try
+        {
+          sf.begin = ( (Integer) start.getValue()).intValue();
+          sf.end = ( (Integer) end.getValue()).intValue();
+        }
+        catch (NumberFormatException ex)
+        {}
+
+        ffile.parseDescriptionHTML(sf, false);
+      }
+    }
+    else
+    {
+      if (reply == JOptionPane.OK_OPTION
+          && name.getSelectedItem() != null
+          && source.getSelectedItem() != null)
+      {
+        for (int i = 0; i < sequences.length; i++)
+        {
+          features[i].type = lastFeatureAdded;
+          features[i].featureGroup = lastFeatureGroupAdded;
+          features[i].description = lastDescriptionAdded;
+          sequences[i].addSequenceFeature(features[i]);
+          ffile.parseDescriptionHTML(features[i], false);
+        }
+
+        if (av.featuresDisplayed == null)
+        {
+          av.featuresDisplayed = new Hashtable();
+        }
+
+        if (featureGroups == null)
+        {
+          featureGroups = new Hashtable();
+        }
+
+        featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
+
+        Color col = colour.getBackground();
+        setColour(lastFeatureAdded, colour.getBackground());
+
+        av.featuresDisplayed.put(lastFeatureGroupAdded,
+                                 new Integer(col.getRGB()));
+
+        findAllFeatures();
+
+        return true;
+      }
+      else
+      {
+        return false;
+      }
     }
 
-    public float getTransparency()
+    if (name.getSelectedIndex() == -1)
     {
-      return transparency;
+      findAllFeatures();
     }
 
-    public void setFeaturePriority(Object [][] data)
+    return true;
+  }
+
+  public void setColour(String featureType, Color col)
+  {
+    featureColours.put(featureType, col);
+  }
+
+  public void setTransparency(float value)
+  {
+    transparency = value;
+  }
+
+  public float getTransparency()
+  {
+    return transparency;
+  }
+
+  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)
     {
-      // 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
       av.featuresDisplayed.clear();
+    }
+    else
+    {
+      av.featuresDisplayed = new Hashtable();
+    }
 
-      renderOrder = new String[data.length];
+    renderOrder = new String[data.length];
 
-      if(data.length>0)
-      for(int i=data.length-1; i>-1; i--)
+    if (data.length > 0)
+    {
+      for (int i = 0; i < data.length; i++)
       {
-       String type = data[i][0].toString();
-       setColour(type, (Color)data[i][1]);
-       if( ((Boolean)data[i][2]).booleanValue() )
-       {
-         av.featuresDisplayed.put(type, new Integer(getColour(type).getRGB()));
-       }
-       renderOrder[i] = type;
-      }
+        String type = data[i][0].toString();
+        setColour(type, (Color) data[i][1]);
+        if ( ( (Boolean) data[i][2]).booleanValue())
+        {
+          av.featuresDisplayed.put(type, new Integer(getColour(type).getRGB()));
+        }
 
+        renderOrder[data.length - i - 1] = type;
+      }
     }
 
-    Hashtable featureColours = new Hashtable();
-    void initColours()
-    {
-      featureColours.put("active site", new Color(255, 75, 0));
-      featureColours.put("binding site", new Color(245, 85, 0));
-      featureColours.put("calcium-binding region", new Color(235, 95, 0));
-      featureColours.put("chain", new Color(225, 105, 0));
-      featureColours.put("coiled-coil region", new Color(215, 115, 0));
-      featureColours.put("compositionally biased region", new Color(205, 125, 0));
-      featureColours.put("cross-link", new Color(195, 135, 0));
-      featureColours.put("disulfide bond", new Color(230,230,0));
-      featureColours.put("DNA-binding region", new Color(175, 155, 0));
-      featureColours.put("domain", new Color(165, 165, 0));
-      featureColours.put("glycosylation site", new Color(155, 175, 0));
-      featureColours.put("helix", new Color(145, 185, 0));
-      featureColours.put("initiator methionine", new Color(135, 195, 5));
-      featureColours.put("lipid moiety-binding region", new Color(125, 205, 15));
-      featureColours.put("metal ion-binding site", new Color(115, 215, 25));
-      featureColours.put("modified residue", new Color(105, 225, 35));
-      featureColours.put("mutagenesis site", new Color(95, 235, 45));
-      featureColours.put("non-consecutive residues", new Color(85, 245, 55));
-      featureColours.put("non-terminal residue", new Color(75, 255, 65));
-      featureColours.put("nucleotide phosphate-binding region",new Color(65, 245, 75));
-      featureColours.put("peptide", new Color(55, 235, 85));
-      featureColours.put("propeptide", new Color(45, 225, 95));
-      featureColours.put("region of interest", new Color(35, 215, 105));
-      featureColours.put("repeat", new Color(25, 205, 115));
-      featureColours.put("selenocysteine", new Color(15, 195, 125));
-      featureColours.put("sequence conflict", new Color(5, 185, 135));
-      featureColours.put("sequence variant", new Color(0, 175, 145));
-      featureColours.put("short sequence motif", new Color(0, 165, 155));
-      featureColours.put("signal peptide", new Color(0, 155, 165));
-      featureColours.put("site", new Color(0, 145, 175));
-      featureColours.put("splice variant", new Color(0, 135, 185));
-      featureColours.put("strand", new Color(0, 125, 195));
-      featureColours.put("topological domain", new Color(0, 115, 205));
-      featureColours.put("transit peptide", new Color(0, 105, 215));
-      featureColours.put("transmembrane region", new Color(0, 95, 225));
-      featureColours.put("turn", new Color(0, 85, 235));
-      featureColours.put("unsure residue", new Color(0, 75, 245));
-      featureColours.put("zinc finger region", new Color(0, 65, 255));
-    }
+  }
 
 }