X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=a952f9d870ce5bd06ee6b3f5698ef9179689e8a9;hb=ad52f1ddcaefa09c6a3e85329b28dad155613f49;hp=5150867e93be6dc4f41090c8dda726f58d15fed3;hpb=7cf10829103036f92f8db096e2f5451c570b0269;p=jalview.git

diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index 5150867..a952f9d 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,29 +19,32 @@
 
 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 HIDE = "Hide this row";
-  static String DELETE = "Delete this row";
-  static String SHOWALL = "Show all hidden rows";
+
+  static String ADDNEW = "Add New Row";
+  static String EDITNAME = "Edit Label/Description";
+  static String HIDE = "Hide This Row";
+  static String SHOWALL = "Show All Hidden Rows";
   static String OUTPUT_TEXT = "Show Values In Textbox";
   static String COPYCONS_SEQ = "Copy Consensus Sequence";
 
-  int selectedRow = 0;
   int scrollOffset = 0;
+  int selectedRow = -1;
 
   Tooltip tooltip;
 
@@ -55,10 +58,9 @@ public class AnnotationLabels
   }
 
   public AnnotationLabels(AlignViewport av)
-{
-  this.av = av;
-}
-
+  {
+    this.av = av;
+  }
 
   public void setScrollOffset(int y)
   {
@@ -66,13 +68,15 @@ public class AnnotationLabels
     repaint();
   }
 
-  void getSelectedRow(int y)
+  int getSelectedRow(int y)
   {
-    selectedRow = -1;
+    int row = -1;
     AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-    if(aa==null)
-      return;
+    if (aa == null)
+    {
+      return row;
+    }
 
     int height = 0;
     for (int i = 0; i < aa.length; i++)
@@ -85,17 +89,37 @@ public class AnnotationLabels
       height += aa[i].height;
       if (y < height)
       {
-        selectedRow = i;
+        row = i;
         break;
       }
     }
+
+    return row;
   }
 
   public void actionPerformed(ActionEvent evt)
   {
     AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
 
-    if (evt.getActionCommand().equals(HIDE))
+    if (evt.getActionCommand().equals(ADDNEW))
+    {
+      AlignmentAnnotation newAnnotation = new AlignmentAnnotation("",
+          null,
+          new Annotation[ap.av.alignment.getWidth()]);
+
+      if (!editLabelDescription(newAnnotation))
+      {
+        return;
+      }
+
+      ap.av.alignment.addAnnotation(newAnnotation);
+      ap.av.alignment.setAnnotationIndex(newAnnotation, 0);
+    }
+    else if (evt.getActionCommand().equals(EDITNAME))
+    {
+      editLabelDescription(aa[selectedRow]);
+    }
+    else if (evt.getActionCommand().equals(HIDE))
     {
       aa[selectedRow].visible = false;
     }
@@ -118,34 +142,60 @@ 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();
     setSize(getSize().width, ap.annotationPanel.getSize().height);
     ap.validate();
-    ap.repaint();
+    ap.paintAlignment(true);
+  }
+
+  boolean editLabelDescription(AlignmentAnnotation annotation)
+  {
+    EditNameDialog dialog = new EditNameDialog(
+        annotation.label,
+        annotation.description,
+        "       Annotation Label",
+        "Annotation Description",
+        ap.alignFrame,
+        "Edit Annotation Name / Description",
+        500, 100);
+
+    if (dialog.accept)
+    {
+      annotation.label = dialog.getName();
+      annotation.description = dialog.getDescription();
+      repaint();
+      return true;
+    }
+    else
+      return false;
+
   }
 
   public void mouseMoved(MouseEvent evt)
   {
-    getSelectedRow(evt.getY() - scrollOffset);
+    int row = getSelectedRow(evt.getY() - scrollOffset);
 
-    if (selectedRow > -1)
+    if (row > -1)
     {
       if (tooltip == null)
+      {
         tooltip = new Tooltip(ap.av.alignment.
-                                          getAlignmentAnnotation()[selectedRow].
-                                          description,
-                                          this);
+                              getAlignmentAnnotation()[row].
+                              description,
+                              this);
+      }
       else
+      {
         tooltip.setTip(ap.av.alignment.
-                     getAlignmentAnnotation()[selectedRow].description);
-
-      tooltip.repaint();
-
+                       getAlignmentAnnotation()[row].description);
+      }
     }
     else if (tooltip != null)
     {
@@ -156,33 +206,47 @@ 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)
   {
+    selectedRow = getSelectedRow(evt.getY() - scrollOffset);
+
     AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-    PopupMenu pop = new PopupMenu("Annotations");
-    MenuItem item = new MenuItem(HIDE);
+    PopupMenu popup = new PopupMenu("Annotations");
+
+    MenuItem item = new MenuItem(ADDNEW);
     item.addActionListener(this);
-    pop.add(item);
+    popup.add(item);
+    item = new MenuItem(EDITNAME);
+    item.addActionListener(this);
+    popup.add(item);
+    item = new MenuItem(HIDE);
+    item.addActionListener(this);
+    popup.add(item);
     item = new MenuItem(SHOWALL);
     item.addActionListener(this);
-    pop.add(item);
-    this.add(pop);
+    popup.add(item);
+    this.add(popup);
     item = new MenuItem(OUTPUT_TEXT);
     item.addActionListener(this);
-    pop.add(item);
+    popup.add(item);
 
-    if (aa[selectedRow].label.equals("Consensus"))
+    if (aa[selectedRow] == ap.av.consensus)
     {
-      pop.addSeparator();
+      popup.addSeparator();
       final CheckboxMenuItem cbmi = new CheckboxMenuItem(
           "Ignore Gaps In Consensus",
           ap.av.getIgnoreGapsConsensus());
@@ -192,49 +256,65 @@ public class AnnotationLabels
         public void itemStateChanged(ItemEvent e)
         {
           ap.av.setIgnoreGapsConsensus(cbmi.getState());
-          ap.repaint();
+          ap.paintAlignment(true);
         }
       });
-      pop.add(cbmi);
-      final MenuItem cpcons=new MenuItem(COPYCONS_SEQ);
-      cpcons.addActionListener(this);
-      pop.add(cpcons);
+      popup.add(cbmi);
+      item = new MenuItem(COPYCONS_SEQ);
+      item.addActionListener(this);
+      popup.add(item);
     }
 
-     pop.show(this, evt.getX(), evt.getY());
+    popup.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)
@@ -262,14 +342,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);
         }