X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=bf6d38d47515a95717218c58ea184fd8fb6aa190;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=d0cad36e574aad08d92a2a4e2194cd6e02782389;hpb=cb93b1c06ba1c28eee9e10588a44794edf61c3ff;p=jalview.git

diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index d0cad36..bf6d38d 100755
--- a/src/jalview/appletgui/AnnotationLabels.java
+++ b/src/jalview/appletgui/AnnotationLabels.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 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
@@ -19,21 +19,23 @@
 
 package jalview.appletgui;
 
+import java.util.*;
+
 import java.awt.*;
 import java.awt.event.*;
-import java.util.Vector;
 
 import jalview.datamodel.*;
 
 public class AnnotationLabels
     extends Panel implements ActionListener, MouseListener, MouseMotionListener
 {
+  Image image;
   boolean active = false;
   AlignmentPanel ap;
   AlignViewport av;
   boolean resizing = false;
   int oldY, mouseX;
-  static String ADDNEW = "Add new row";
+  static String EDITNAME = "Edit label/description";
   static String HIDE = "Hide this row";
   static String DELETE = "Delete this row";
   static String SHOWALL = "Show all hidden rows";
@@ -55,10 +57,9 @@ public class AnnotationLabels
   }
 
   public AnnotationLabels(AlignViewport av)
-{
-  this.av = av;
-}
-
+  {
+    this.av = av;
+  }
 
   public void setScrollOffset(int y)
   {
@@ -71,8 +72,10 @@ public class AnnotationLabels
     selectedRow = -1;
     AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-    if(aa==null)
+    if (aa == null)
+    {
       return;
+    }
 
     int height = 0;
     for (int i = 0; i < aa.length; i++)
@@ -95,6 +98,23 @@ public class AnnotationLabels
   {
     AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
 
+    if (evt.getActionCommand().equals(EDITNAME))
+    {
+      EditNameDialog dialog = new EditNameDialog(
+          aa[selectedRow].label,
+          aa[selectedRow].description,
+          "       Annotation Label",
+          "Annotation Description",
+          ap,
+          "Edit Annotation Name / Description");
+
+      if (dialog.accept)
+      {
+        aa[selectedRow].label = dialog.getName();
+        aa[selectedRow].description = dialog.getDescription();
+        repaint();
+      }
+    }
     if (evt.getActionCommand().equals(HIDE))
     {
       aa[selectedRow].visible = false;
@@ -118,9 +138,11 @@ public class AnnotationLabels
     }
     else if (evt.getActionCommand().equals(COPYCONS_SEQ))
     {
-      SequenceI cons=av.getConsensusSeq();
-      if (cons!=null)
+      SequenceI cons = av.getConsensusSeq();
+      if (cons != null)
+      {
         copy_annotseqtoclipboard(cons);
+      }
 
     }
     ap.annotationPanel.adjustPanelHeight();
@@ -136,16 +158,17 @@ public class AnnotationLabels
     if (selectedRow > -1)
     {
       if (tooltip == null)
+      {
         tooltip = new Tooltip(ap.av.alignment.
-                                          getAlignmentAnnotation()[selectedRow].
-                                          description,
-                                          this);
+                              getAlignmentAnnotation()[selectedRow].
+                              description,
+                              this);
+      }
       else
+      {
         tooltip.setTip(ap.av.alignment.
-                     getAlignmentAnnotation()[selectedRow].description);
-
-      tooltip.repaint();
-
+                       getAlignmentAnnotation()[selectedRow].description);
+      }
     }
     else if (tooltip != null)
     {
@@ -156,21 +179,29 @@ public class AnnotationLabels
 
   public void mouseDragged(MouseEvent evt)
   {}
+
   public void mouseClicked(MouseEvent evt)
   {}
+
   public void mouseReleased(MouseEvent evt)
   {}
+
   public void mouseEntered(MouseEvent evt)
   {}
+
   public void mouseExited(MouseEvent evt)
   {}
+
   public void mousePressed(MouseEvent evt)
   {
-    int y = evt.getY() - scrollOffset;
     AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
     PopupMenu pop = new PopupMenu("Annotations");
-    MenuItem item = new MenuItem(HIDE);
+
+    MenuItem item = new MenuItem(EDITNAME);
+    item.addActionListener(this);
+    pop.add(item);
+    item = new MenuItem(HIDE);
     item.addActionListener(this);
     pop.add(item);
     item = new MenuItem(SHOWALL);
@@ -181,7 +212,7 @@ public class AnnotationLabels
     item.addActionListener(this);
     pop.add(item);
 
-    if (aa[selectedRow].label.equals("Consensus"))
+    if (aa[selectedRow] == ap.av.consensus)
     {
       pop.addSeparator();
       final CheckboxMenuItem cbmi = new CheckboxMenuItem(
@@ -197,45 +228,61 @@ public class AnnotationLabels
         }
       });
       pop.add(cbmi);
-      final MenuItem cpcons=new MenuItem(COPYCONS_SEQ);
+      final MenuItem cpcons = new MenuItem(COPYCONS_SEQ);
       cpcons.addActionListener(this);
       pop.add(cpcons);
     }
 
-     pop.show(this, evt.getX(), evt.getY());
+    pop.show(this, evt.getX(), evt.getY());
 
   }
-/**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    protected void copy_annotseqtoclipboard(SequenceI sq)
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  protected void copy_annotseqtoclipboard(SequenceI sq)
+  {
+    if (sq == null || sq.getLength() < 1)
     {
-      if (sq==null || sq.getLength()<1)
-        return;
-      jalview.appletgui.AlignFrame.copiedSequences = new StringBuffer();
-      jalview.appletgui.AlignFrame.copiedSequences.append(sq.getName() + "\t" +
-          sq.getStart() + "\t" +
-          sq.getEnd() + "\t" +
-          sq.getSequenceAsString() + "\n");
-      if (av.hasHiddenColumns)
+      return;
+    }
+    jalview.appletgui.AlignFrame.copiedSequences = new StringBuffer();
+    jalview.appletgui.AlignFrame.copiedSequences.append(sq.getName() + "\t" +
+        sq.getStart() + "\t" +
+        sq.getEnd() + "\t" +
+        sq.getSequenceAsString() + "\n");
+    if (av.hasHiddenColumns)
+    {
+      jalview.appletgui.AlignFrame.copiedHiddenColumns = new Vector();
+      for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
       {
-        jalview.appletgui.AlignFrame.copiedHiddenColumns=new Vector();
-        for(int i=0; i<av.getColumnSelection().getHiddenColumns().size(); i++)
-        {
-          int[] region = (int[])
-              av.getColumnSelection().getHiddenColumns().elementAt(i);
+        int[] region = (int[])
+            av.getColumnSelection().getHiddenColumns().elementAt(i);
 
-          jalview.appletgui.AlignFrame.copiedHiddenColumns.addElement(new int[]{region[0],
-                            region[1]});
-        }
+        jalview.appletgui.AlignFrame.copiedHiddenColumns.addElement(new int[]
+            {region[0],
+            region[1]});
       }
     }
+  }
+
+  public void update(Graphics g)
+  {
+    paint(g);
+  }
 
   public void paint(Graphics g)
   {
-    drawComponent(g, getSize().width);
+    int w = getSize().width;
+    if (image == null || w != image.getWidth(this))
+    {
+      image = createImage(w, ap.annotationPanel.getSize().height);
+    }
+
+    drawComponent(image.getGraphics(), w);
+    g.drawImage(image, 0, 0, this);
   }
 
   public void drawComponent(Graphics g, int width)
@@ -263,14 +310,14 @@ public class AnnotationLabels
 
         x = width - fm.stringWidth(aa[i].label) - 3;
 
-        if (aa[i].graph>0)
+        if (aa[i].graph > 0)
         {
           y += (aa[i].height / 3);
         }
 
         g.drawString(aa[i].label, x, y);
 
-        if (aa[i].graph>0)
+        if (aa[i].graph > 0)
         {
           y += (2 * aa[i].height / 3);
         }