X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=12876edb05e464d704cf1a736cad7ae595332d27;hb=8331ef1bf41fe86d0838c44eef0c39aa9b158ad7;hp=3f332b5fddfe0e32bd1bb09a8794938947d53bab;hpb=d03971168d7f0192862cf5b57602ecf3e341b457;p=jalview.git

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 3f332b5..12876ed 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) 2006 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
@@ -25,6 +25,9 @@ import java.awt.*;
 import java.util.*;
 
 import java.awt.image.*;
+import javax.swing.*;
+import javax.swing.JOptionPane;
+import java.awt.event.*;
 
 
 /**
@@ -40,11 +43,19 @@ public class FeatureRenderer
     float transparency = 1.0f;
     FontMetrics fm;
     int charOffset;
-    boolean drawText = true;
 
-    // The following vector holds the features which are
-    // to be added, in the correct order or rendering
-    Vector featuresDisplayed = null;
+    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.
@@ -54,30 +65,80 @@ public class FeatureRenderer
     public FeatureRenderer(AlignViewport av)
     {
         this.av = av;
-        initColours();
+    }
+
+    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 to get the accurate colour
-     * of the rendered sequence
+     * This is used by the Molecule Viewer and Overview to
+     * get the accurate colourof the rendered sequence
      */
-    BufferedImage bi;
-    public Color findFeatureColour(Color initialCol, SequenceI seq, int i)
+    public int findFeatureColour(int initialCol, SequenceI seq, int column)
     {
       if(!av.showSequenceFeatures)
         return initialCol;
 
-      if (bi == null)
-        bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+      if(seq!=lastSeq)
+      {
+        lastSeq = seq;
+        sequenceFeatures = lastSeq.getDatasetSequence().getSequenceFeatures();
+        if(sequenceFeatures==null)
+          return initialCol;
 
-      bi.setRGB(0,0, initialCol.getRGB());
+        sfSize = sequenceFeatures.length;
+      }
+
+      if(jalview.util.Comparison.isGap(lastSeq.getCharAt(column)))
+        return Color.white.getRGB();
+
+
+      //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);
+      }
 
-      drawText = false;
+      currentColour = null;
+
+      offscreenRender = true;
+
+      if(offscreenImage!=null)
+      {
+        offscreenImage.setRGB(0,0,initialCol);
+        drawSequence(offscreenImage.getGraphics(),
+                     lastSeq,
+                     column,column,0);
+
+        return offscreenImage.getRGB(0,0);
+      }
+      else
+      {
+        drawSequence(null,
+                    lastSeq,
+                    lastSeq.findPosition(column),
+                    -1, -1);
+
+        if (currentColour == null)
+          return initialCol;
+        else
+          return  ((Integer)currentColour).intValue();
+      }
 
-      drawSequence(bi.getGraphics(), seq, i, i, 0, 0, 1, 1);
-      drawText = true;
 
-      return new Color(bi.getRGB(0, 0));
     }
 
 
@@ -94,18 +155,44 @@ public class FeatureRenderer
      * @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 x1, int y1, int width, int height)
+                             int start, int end, int y1)
     {
-
-//System.out.println(start+" "+end+" "+x1+" "+y1);
-      if (seq.getDatasetSequence().getSequenceFeatures() == null
-          || seq.getDatasetSequence().getSequenceFeatures().size()==0)
+      if ( seq.getDatasetSequence().getSequenceFeatures() == null
+          || seq.getDatasetSequence().getSequenceFeatures().length==0)
         return;
 
-      fm = g.getFontMetrics();
+      if(g!=null)
+        fm = g.getFontMetrics();
+
+
+      if (av.featuresDisplayed == null
+          || renderOrder==null
+          || newFeatureAdded)
+       {
+         findAllFeatures();
+         if(av.featuresDisplayed.size()<1)
+           return;
 
-      if (transparency != 1)
+         sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
+         sfSize = sequenceFeatures.length;
+       }
+
+       if(lastSeq==null || seq!=lastSeq)
+      {
+        lastSeq = seq;
+        sequenceFeatures = seq.getDatasetSequence().getSequenceFeatures();
+        sfSize = sequenceFeatures.length;
+      }
+
+
+      if (transparency != 1 && g!=null)
       {
         Graphics2D g2 = (Graphics2D) g;
         g2.setComposite(
@@ -113,53 +200,86 @@ public class FeatureRenderer
                 AlphaComposite.SRC_OVER, transparency));
       }
 
-      String type;
-      SequenceFeature sf;
-      if (featuresDisplayed == null)
-        findAllFeatures();
+      if(!offscreenRender)
+      {
+        spos = lastSeq.findPosition(start);
+        epos = lastSeq.findPosition(end);
+      }
 
-      Enumeration e = featuresDisplayed.elements(), e2;
 
-      // Loop through each visible feature
-      while (e.hasMoreElements())
-      {
+      String type;
+      for(int renderIndex=0; renderIndex<renderOrder.length; renderIndex++)
+       {
+        type =  renderOrder[renderIndex];
+
+        if(type==null || !av.featuresDisplayed.containsKey(type))
+          continue;
 
-        type = e.nextElement().toString();
-        e2 = seq.getDatasetSequence().getSequenceFeatures().elements();
         // loop through all features in sequence to find
         // current feature to render
-          while (e2.hasMoreElements())
+        for (sfindex = 0; sfindex < sfSize; sfindex++)
         {
+          if(sequenceFeatures.length<=sfindex)
+          {
+            continue;
+          }
+          if (!sequenceFeatures[sfindex].type.equals(type))
+            continue;
 
-          sf = (SequenceFeature) e2.nextElement();
-          if (!type.equals(sf.getType()))
+          if (featureGroups != null
+              && sequenceFeatures[sfindex].featureGroup != null
+              &&
+              featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
+              &&
+              ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].featureGroup)).
+              booleanValue())
+          {
             continue;
+          }
 
-          if (sf.getBegin() > seq.getEnd())
+          if (!offscreenRender && (sequenceFeatures[sfindex].getBegin() > epos
+                            || sequenceFeatures[sfindex].getEnd() < spos))
             continue;
 
-          if (type.equals("disulfide bond"))
+          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"))
           {
 
             renderFeature(g, seq,
-                          seq.findIndex(sf.getBegin()) - 1,
-                          seq.findIndex(sf.getBegin()) - 1,
-                          type, start, end, x1, y1, width, height);
+                          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(sf.getEnd()) - 1,
-                          seq.findIndex(sf.getEnd()) - 1,
-                          type, start, end, x1, y1, width, height);
+                          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);
 
           }
           else
             renderFeature(g, seq,
-                          seq.findIndex(sf.getBegin()) - 1,
-                          seq.findIndex(sf.getEnd()) - 1,
-                          type, start, end, x1, y1, width, height);
+                          seq.findIndex(sequenceFeatures[sfindex].begin) - 1,
+                          seq.findIndex(sequenceFeatures[sfindex].end) - 1,
+                          getColour(sequenceFeatures[sfindex].type),
+                          start, end, y1);
+
+
         }
+
       }
 
-        if(transparency!=1.0f)
+        if(transparency!=1.0f && g!=null)
         {
           Graphics2D g2 = (Graphics2D) g;
           g2.setComposite(
@@ -169,74 +289,400 @@ public class FeatureRenderer
     }
 
 
+    char s;
+    int i;
     void renderFeature(Graphics g, SequenceI seq,
-                       int fstart, int fend, String type, int start, int end, int x1, int y1, int width, int height)
+                       int fstart, int fend, Color featureColour, int start, int end,  int y1)
     {
 
       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 (fstart < start)
+        { // fix for if the feature we have starts before the sequence start,
+          fstart = start; // but the feature end is still valid!!
+        }
 
-          if (fend >= end)
-          {
-            fend = end;
-          }
-          for (int i = fstart; i <= fend; i++)
+        if (fend >= end)
+        {
+          fend = end;
+        }
+          int pady = (y1 + av.charHeight) - av.charHeight / 5;
+          for (i = fstart; i <= fend; i++)
           {
-            char s = seq.getSequence().charAt(i);
+            s = seq.getCharAt(i);
 
             if (jalview.util.Comparison.isGap(s))
             {
               continue;
             }
 
-            g.setColor(getColour(type));
+            g.setColor(featureColour);
+
+            g.fillRect( (i - start) * av.charWidth, y1, av.charWidth,av.charHeight);
+
+            if(offscreenRender || !av.validCharWidth)
+              continue;
 
-            g.fillRect( (i - start) * width, y1, width, height);
+            g.setColor(Color.white);
+            charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+            g.drawString(String.valueOf(s),
+                         charOffset + (av.charWidth * (i - start)),
+                         pady);
 
-            if(drawText)
-           {
-             g.setColor(Color.white);
-             charOffset = (width - fm.charWidth(s)) / 2;
-             g.drawString(String.valueOf(s),
-                          charOffset + x1 + (width * (i - start)),
-                          (y1 + height) - height / 5); //pady = height / 5;
-           }
           }
-        }
+      }
     }
 
-    void findAllFeatures()
+
+    boolean newFeatureAdded = false;
+
+    public void featuresAdded()
     {
-      Vector features = new Vector();
-      SequenceFeature sf;
-      featuresDisplayed = new Vector();
-      Enumeration e;
+      findAllFeatures();
+    }
+
+   boolean findingFeatures = false;
+   synchronized void findAllFeatures()
+   {
+      newFeatureAdded = false;
+
+      if(findingFeatures)
+      {
+        newFeatureAdded = true;
+        return;
+      }
+
+      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();
       for (int i = 0; i < av.alignment.getHeight(); i++)
       {
-        features = av.alignment.getSequenceAt(i).getDatasetSequence().
-            getSequenceFeatures();
+        SequenceFeature [] features
+            = av.alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();
+
         if (features == null)
           continue;
 
-        e = features.elements();
-        while (e.hasMoreElements())
+        int index = 0;
+        while (index < features.length)
         {
-          sf = (SequenceFeature) e.nextElement();
-          if (!featuresDisplayed.contains(sf.getType()))
+          if (!av.featuresDisplayed.containsKey(features[index].getType()))
           {
-            featuresDisplayed.addElement(sf.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 (getColour(features[index].getType()) == null)
+              {
+                 featureColours.put(features[index].getType(),
+                                   ucs.createColourFromName(features[index].
+                    getType()));
+              }
+
+              av.featuresDisplayed.put(features[index].getType(),
+                                       new Integer(getColour(features[index].
+                  getType()).getRGB()));
+              allfeatures.addElement(features[index].getType());
+            }
           }
+          index++;
         }
       }
+
+      renderOrder = new String[allfeatures.size()];
+      Enumeration en = allfeatures.elements();
+      int i = allfeatures.size()-1;
+      while(en.hasMoreElements())
+      {
+        renderOrder[i] = en.nextElement().toString();
+        i--;
+      }
+
+      findingFeatures = false;
     }
 
     public Color getColour(String featureType)
     {
-      return (Color)featureColours.get(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";
+
+      if (lastFeatureGroupAdded == null)
+        if (features[0].featureGroup != null)
+          lastFeatureGroupAdded = features[0].featureGroup;
+        else
+          lastFeatureAdded = "Jalview";
+
+
+      Enumeration en;
+      if (featureGroups != null)
+      {
+        en = featureGroups.keys();
+        while (en.hasMoreElements())
+        {
+          source.addItem(en.nextElement().toString());
+        }
+      }
+
+      if (newFeatures)
+      {
+        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));
+        }
+
+      }
+      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);
+          }
+        });
+
+      }
+
+
+      Object [] options;
+      if(!newFeatures)
+        options = new Object[]{"Amend", "Delete", "Cancel"};
+      else
+        options = new Object[]{"OK", "Cancel"};
+
+      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");
+
+      jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
+
+      if (reply == JOptionPane.OK_OPTION
+          && name.getSelectedItem() != null
+          && source.getSelectedItem() != null)
+      {
+        //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", " ");
+      }
+
+      if(!newFeatures)
+      {
+        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;
+      }
+
+      if(name.getSelectedIndex()==-1)
+        findAllFeatures();
+
+
+      return true;
     }
 
     public void setColour(String featureType, Color col)
@@ -259,57 +705,29 @@ public class FeatureRenderer
       // 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
-      featuresDisplayed.clear();
-      for(int i=data.length-1; i>-1; i--)
-      {
-       String type = data[i][0].toString();
-       setColour(type, (Color)data[i][1]);
-       if( ((Boolean)data[i][2]).booleanValue() )
-         featuresDisplayed.addElement(type);
-      }
-    }
+      if(av.featuresDisplayed!=null)
+        av.featuresDisplayed.clear();
+      else
+        av.featuresDisplayed = new Hashtable();
+
+      renderOrder = new String[data.length];
+
+      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[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));
     }
 
+
+
+
 }