X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=c90fb475d7d1dde0dd1bbc05e48d25b78bf6c9b4;hb=94e19634c669879ab63bbb82d5489c200cdb18f8;hp=7ad5f4d0608f2dd1bab2a28df66b0ae7993a622a;hpb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;p=jalview.git

diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java
index 7ad5f4d..c90fb47 100755
--- a/src/jalview/appletgui/FeatureRenderer.java
+++ b/src/jalview/appletgui/FeatureRenderer.java
@@ -22,6 +22,9 @@ import java.util.*;
 
 import java.awt.*;
 
+import java.awt.event.*;
+
+
 import jalview.datamodel.*;
 
 /**
@@ -80,85 +83,361 @@ public class FeatureRenderer
     transparency = fr.transparency;
   }
 
-  public Color findFeatureColour(Color initialCol, SequenceI seq, int i)
+
+  static String lastFeatureAdded;
+  static String lastFeatureGroupAdded;
+  static String lastDescriptionAdded;
+
+  int featureIndex = 0;
+  boolean deleteFeature = false;
+  Panel colourPanel;
+  boolean amendFeatures(final SequenceI[] sequences,
+                        final SequenceFeature[] features,
+                        boolean newFeatures,
+                        final AlignmentPanel ap)
   {
-    overview = true;
-    if (!av.showSequenceFeatures)
+    Panel bigPanel = new Panel(new BorderLayout());
+    final TextField name = new TextField(16);
+    final TextField source = new TextField(16);
+    final TextArea description = new TextArea(3, 35);
+    final TextField start = new TextField(8);
+    final TextField end = new TextField(8);
+    final Choice overlaps;
+    Button deleteButton = new Button("Delete");
+    deleteFeature = false;
+
+    colourPanel = new Panel(null);
+    colourPanel.setSize(110,15);
+    final FeatureRenderer fr = this;
+
+    Panel panel = new Panel(new GridLayout(3, 1));
+
+    Panel tmp;
+
+    ///////////////////////////////////////
+    ///MULTIPLE FEATURES AT SELECTED RESIDUE
+    if(!newFeatures && features.length>1)
     {
-      return initialCol;
+     panel = new Panel(new GridLayout(4, 1));
+     tmp = new Panel();
+     tmp.add(new Label("Select Feature: "));
+     overlaps = new Choice();
+     for(int i=0; i<features.length; i++)
+     {
+       String item = features[i].getType()
+        +"/"+features[i].getBegin()+"-"+features[i].getEnd();
+
+       if(features[i].getFeatureGroup()!=null)
+         item += " ("+features[i].getFeatureGroup()+")";
+
+       overlaps.addItem(item);
+     }
+
+     tmp.add(overlaps);
+
+     overlaps.addItemListener(new java.awt.event.ItemListener()
+     {
+       public void itemStateChanged(java.awt.event.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.setText(features[index].getBegin()+"");
+           end.setText(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());
+         }
+
+         colourPanel.setBackground(col);
+       }
+     });
+
+
+     panel.add(tmp);
     }
+    //////////
+    //////////////////////////////////////
 
-    lastSequence = seq;
-    sequenceFeatures = lastSequence.getSequenceFeatures();
-    if (sequenceFeatures == null)
+
+    tmp = new Panel();
+    panel.add(tmp);
+    tmp.add(new Label("Name: ", Label.RIGHT));
+    tmp.add(name);
+
+    tmp = new Panel();
+    panel.add(tmp);
+    tmp.add(new Label("Group: ",Label.RIGHT));
+    tmp.add(source);
+
+    tmp = new Panel();
+    panel.add(tmp);
+    tmp.add(new Label("Colour: ", Label.RIGHT));
+    tmp.add(colourPanel);
+
+    bigPanel.add(panel, BorderLayout.NORTH);
+
+    panel = new Panel();
+    panel.add(new Label("Description: ", Label.RIGHT));
+    panel.add(new ScrollPane().add(description));
+
+    if (!newFeatures)
     {
-      return initialCol;
+      bigPanel.add(panel, BorderLayout.SOUTH);
+
+      panel = new Panel();
+      panel.add(new Label(" Start:", Label.RIGHT));
+      panel.add(start);
+      panel.add(new Label("  End:", Label.RIGHT));
+      panel.add(end);
+      bigPanel.add(panel, BorderLayout.CENTER);
+    }
+    else
+    {
+      bigPanel.add(panel, BorderLayout.CENTER);
     }
 
-    sfSize = sequenceFeatures.length;
+    if (lastFeatureAdded == null)
+    {
+      if (features[0].type != null)
+      {
+        lastFeatureAdded = features[0].type;
+      }
+      else
+      {
+        lastFeatureAdded = "feature_1";
+      }
+    }
 
-    if (jalview.util.Comparison.isGap(lastSequence.getCharAt(i)))
+    if (lastFeatureGroupAdded == null)
     {
-      return Color.white;
+      if (features[0].featureGroup != null)
+      {
+        lastFeatureGroupAdded = features[0].featureGroup;
+      }
+      else
+      {
+        lastFeatureAdded = "Jalview";
+      }
     }
 
-    currentColour = null;
 
-    drawSequence(null, lastSequence, lastSequence.findPosition(i), -1, -1);
+    String title = newFeatures ? "Create New Sequence Feature(s)" :
+        "Amend/Delete Features for "
+        + sequences[0].getName();
 
-    if (currentColour == null)
+    final JVDialog dialog = new JVDialog(ap.alignFrame,
+                               title,
+                               true,
+                               385,240);
+
+    dialog.setMainPanel(bigPanel);
+
+    if(newFeatures)
     {
-      return initialCol;
+      name.setText(lastFeatureAdded);
+      source.setText(lastFeatureGroupAdded);
+    }
+    else
+    {
+      dialog.ok.setLabel("Amend");
+      dialog.buttonPanel.add(deleteButton, 1);
+      deleteButton.addActionListener(new ActionListener()
+          {
+            public void actionPerformed(ActionEvent evt)
+            {
+              deleteFeature = true;
+              dialog.setVisible(false);
+            }
+          });
+      name.setText(features[0].getType());
+      source.setText(features[0].getFeatureGroup());
     }
 
-    return new Color( ( (Integer) currentColour).intValue());
+    start.setText(features[0].getBegin()+"");
+    end.setText(features[0].getEnd()+"");
+    description.setText(features[0].getDescription());
+
+    Color col = getColour(name.getText());
+    if (col == null)
+    {
+      col = new
+          jalview.schemes.UserColourScheme()
+          .createColourFromName(name.getText());
+    }
+
+    colourPanel.setBackground(col);
+
+    dialog.setResizable(true);
+
+
+    colourPanel.addMouseListener(new java.awt.event.MouseAdapter()
+    {
+      public void mousePressed(java.awt.event.MouseEvent evt)
+      {
+        new UserDefinedColours(fr, ap.alignFrame);
+      }
+    });
+
+    dialog.setVisible(true);
+
+    jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
+
+    if (dialog.accept)
+    {
+      //This ensures that the last sequence
+      //is refreshed and new features are rendered
+      lastSeq = null;
+      lastFeatureAdded = name.getText().trim();
+      lastFeatureGroupAdded = source.getText().trim();
+      lastDescriptionAdded = description.getText().replace('\n', ' ');
+    }
+
+    if(lastFeatureGroupAdded !=null && lastFeatureGroupAdded.length()<1)
+      lastFeatureGroupAdded = null;
+
+
+    if (!newFeatures)
+    {
+      SequenceFeature sf = features[featureIndex];
+
+      if (dialog.accept)
+      {
+        sf.type = lastFeatureAdded;
+        sf.featureGroup = lastFeatureGroupAdded;
+        sf.description = lastDescriptionAdded;
+        setColour(sf.type, colourPanel.getBackground());
+        try
+        {
+          sf.begin = Integer.parseInt(start.getText());
+          sf.end =  Integer.parseInt(end.getText());
+        }
+        catch (NumberFormatException ex)
+        {}
+
+        ffile.parseDescriptionHTML(sf, false);
+      }
+      if (deleteFeature)
+      {
+        sequences[0].deleteFeature(sf);
+      }
+
+    }
+    else
+    {
+      if (dialog.accept && name.getText().length()>0)
+      {
+        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();
+        }
+
+        col = colourPanel.getBackground();
+        setColour(lastFeatureAdded, col);
+
+        if(lastFeatureGroupAdded!=null)
+        {
+          featureGroups.put(lastFeatureGroupAdded, new Boolean(true));
+          av.featuresDisplayed.put(lastFeatureGroupAdded,
+                                   new Integer(col.getRGB()));
+        }
+        findAllFeatures();
+
+        String [] tro = new String[renderOrder.length];
+        tro[0] = renderOrder[renderOrder.length-1];
+        System.arraycopy(renderOrder,0,tro,1,renderOrder.length-1);
+        renderOrder = tro;
+
+        ap.paintAlignment(true);
+
+        return true;
+      }
+      else
+      {
+        return false;
+      }
+    }
+
+    findAllFeatures();
+
+    ap.paintAlignment(true);
+
+    return true;
   }
 
-  /**
-   * This is used by the Molecule Viewer to get the accurate colour
-   * of the rendered sequence
-   */
-  boolean overview = false;
 
-  int white = Color.white.getRGB();
-  public int findFeatureColour(int initialCol, int seqIndex, int column)
+  public Color findFeatureColour(Color initialCol, SequenceI seq, int i)
   {
+    overview = true;
     if (!av.showSequenceFeatures)
     {
       return initialCol;
     }
 
-    if (seqIndex != lastSequenceIndex)
+    lastSeq = seq;
+    sequenceFeatures = lastSeq.getSequenceFeatures();
+    if (sequenceFeatures == null)
     {
-      lastSequence = av.alignment.getSequenceAt(seqIndex);
-      lastSequenceIndex = seqIndex;
-      sequenceFeatures = lastSequence.getSequenceFeatures();
-      if (sequenceFeatures == null)
-      {
-        return initialCol;
-      }
-
-      sfSize = sequenceFeatures.length;
+      return initialCol;
     }
 
-    if (jalview.util.Comparison.isGap(lastSequence.getCharAt(column)))
+    sfSize = sequenceFeatures.length;
+
+    if (jalview.util.Comparison.isGap(lastSeq.getCharAt(i)))
     {
-      return Color.white.getRGB();
+      return Color.white;
     }
 
     currentColour = null;
 
-    drawSequence(null, lastSequence, lastSequence.findPosition(column), -1, -1);
+    drawSequence(null, lastSeq, lastSeq.findPosition(i), -1, -1);
 
     if (currentColour == null)
     {
       return initialCol;
     }
 
-    return ( (Integer) currentColour).intValue();
+    return new Color( ( (Integer) currentColour).intValue());
   }
 
   /**
+   * This is used by the Molecule Viewer to get the accurate colour
+   * of the rendered sequence
+   */
+  boolean overview = false;
+
+
+  /**
    * DOCUMENT ME!
    *
    * @param g DOCUMENT ME!
@@ -173,12 +452,12 @@ public class FeatureRenderer
    */
   // String type;
   // SequenceFeature sf;
-  int lastSequenceIndex = -1;
-  SequenceI lastSequence;
+
+  SequenceI lastSeq;
   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.getSequenceFeatures() == null
@@ -192,6 +471,13 @@ public class FeatureRenderer
       transparencySetter.setTransparency(g, transparency);
     }
 
+    if (lastSeq == null || seq != lastSeq || sequenceFeatures!=seq.getSequenceFeatures())
+    {
+      lastSeq = seq;
+      sequenceFeatures = seq.getSequenceFeatures();
+      sfSize = sequenceFeatures.length;
+    }
+
     if (av.featuresDisplayed == null || renderOrder == null)
     {
       findAllFeatures();
@@ -203,16 +489,10 @@ public class FeatureRenderer
       sequenceFeatures = seq.getSequenceFeatures();
       sfSize = sequenceFeatures.length;
     }
-    if (lastSequence == null || seq != lastSequence)
-    {
-      lastSequence = seq;
-      sequenceFeatures = seq.getSequenceFeatures();
-      sfSize = sequenceFeatures.length;
-    }
     if (!overview)
     {
-      spos = lastSequence.findPosition(start);
-      epos = lastSequence.findPosition(end);
+      spos = lastSeq.findPosition(start);
+      epos = lastSeq.findPosition(end);
       if (g != null)
       {
         fm = g.getFontMetrics();
@@ -396,21 +676,19 @@ public class FeatureRenderer
 
   public Color getColour(String featureType)
   {
-    return (Color) featureColours.get(featureType);
-  }
-
-  public void addNewFeature(String name, Color col)
-  {
-
-    setColour(name, col);
-    if (av.featuresDisplayed == null)
+    if (!featureColours.containsKey(featureType))
     {
-      av.featuresDisplayed = new Hashtable();
+      jalview.schemes.UserColourScheme ucs = new
+          jalview.schemes.UserColourScheme();
+      Color col = ucs.createColourFromName(featureType);
+      featureColours.put(featureType, col);
+      return col;
     }
-
-    av.featuresDisplayed.put(name, "NOGROUP");
+    else
+      return (Color) featureColours.get(featureType);
   }
 
+
   public void setColour(String featureType, Color col)
   {
     featureColours.put(featureType, col);
@@ -426,6 +704,23 @@ public class FeatureRenderer
       av.featuresDisplayed.clear();
     }
 
+   /* if (visibleNew)
+    {
+      if (av.featuresDisplayed != null)
+      {
+        av.featuresDisplayed.clear();
+      }
+      else
+      {
+        av.featuresDisplayed = new Hashtable();
+      }
+    }
+    if (data == null)
+    {
+      return;
+    }*/
+
+
     renderOrder = new String[data.length];
 
     if (data.length > 0)
@@ -449,9 +744,9 @@ class TransparencySetter
 {
   void setTransparency(Graphics g, float value)
   {
-    /* Graphics2D g2 = (Graphics2D) g;
+     Graphics2D g2 = (Graphics2D) g;
      g2.setComposite(
         AlphaComposite.getInstance(
-             AlphaComposite.SRC_OVER, value));*/
+             AlphaComposite.SRC_OVER, value));
   }
 }