X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=50849e136bca4ca2671d4b48048d9ed5ed9a70d7;hb=92fbe9788fe62f1e3fcf22e5e64a289d426b1869;hp=1b9fd8fb46eef8a1ab3aad9ae72d698647582cde;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 1b9fd8f..50849e1 100755
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -18,302 +18,516 @@
  */
 package jalview.gui;
 
+import jalview.datamodel.*;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
-import jalview.datamodel.*;
 
-public class AnnotationLabels
-    extends JPanel implements MouseListener,
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class AnnotationLabels extends JPanel implements MouseListener,
     MouseMotionListener, ActionListener
 {
-  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 OUTPUT_TEXT = "Show Values In Textbox";
-  boolean active = false;
-  Image image;
-  AlignmentPanel ap;
-  boolean resizing = false;
-  int oldY;
-  int mouseX;
-  int selectedRow = 0;
-  int scrollOffset = 0;
-
-  public AnnotationLabels(AlignmentPanel ap)
-  {
-    this.ap = ap;
-
-    java.net.URL url = getClass().getResource("/images/idwidth.gif");
-    Image temp = null;
-
-    if (url != null)
+    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 OUTPUT_TEXT = "Show Values In Textbox";
+    boolean resizePanel = false;
+    Image image;
+    AlignmentPanel ap;
+    AlignViewport av;
+    boolean resizing = false;
+    MouseEvent dragEvent;
+    int oldY;
+    int selectedRow;
+    int scrollOffset = 0;
+    Font font = new Font("Arial", Font.PLAIN, 11);
+
+
+    /**
+     * Creates a new AnnotationLabels object.
+     *
+     * @param ap DOCUMENT ME!
+     */
+    public AnnotationLabels(AlignmentPanel ap)
     {
-      temp = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+        this.ap = ap;
+        av = ap.av;
+
+        java.net.URL url = getClass().getResource("/images/idwidth.gif");
+        Image temp = null;
+
+        if (url != null)
+        {
+            temp = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+        }
+
+        try
+        {
+            MediaTracker mt = new MediaTracker(this);
+            mt.addImage(temp, 0);
+            mt.waitForID(0);
+        }
+        catch (Exception ex)
+        {
+        }
+
+        BufferedImage bi = new BufferedImage(temp.getHeight(this),
+                temp.getWidth(this), BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = (Graphics2D) bi.getGraphics();
+        g.rotate(Math.toRadians(90));
+        g.drawImage(temp, 0, -bi.getWidth(this), this);
+        image = (Image) bi;
+
+        addMouseListener(this);
+        addMouseMotionListener(this);
     }
 
-    try
+    public AnnotationLabels(AlignViewport av)
     {
-      MediaTracker mt = new MediaTracker(this);
-      mt.addImage(temp, 0);
-      mt.waitForID(0);
+      this.av = av;
     }
-    catch (Exception ex)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param y DOCUMENT ME!
+     */
+    public void setScrollOffset(int y)
     {
+        scrollOffset = y;
+        repaint();
     }
 
-    BufferedImage bi = new BufferedImage(temp.getHeight(this),
-                                         temp.getWidth(this),
-                                         BufferedImage.TYPE_INT_RGB);
-    Graphics2D g = (Graphics2D) bi.getGraphics();
-    g.rotate(Math.toRadians(90));
-    g.drawImage(temp, 0, -bi.getWidth(this), this);
-    image = (Image) bi;
-
-    addMouseListener(this);
-    addMouseMotionListener(this);
-  }
-
-  public void setScrollOffset(int y)
-  {
-    scrollOffset = y;
-    repaint();
-  }
-
-  public void actionPerformed(ActionEvent evt)
-  {
-    AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
-
-    if (evt.getActionCommand().equals(ADDNEW))
+    void getSelectedRow(int y)
     {
-      String label = JOptionPane.showInputDialog(this,
-                                                 "Label for annotation");
+      int height = 0;
+      AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-      if (label == null)
+      for (int i = 0; i < aa.length; i++)
       {
-        label = "";
-      }
-
-      ap.av.alignment.addAnnotation(new AlignmentAnnotation(label,
-          "New description",
-          new Annotation[ap.av.alignment.getWidth()]));
-    }
-    else if (evt.getActionCommand().equals(HIDE))
-    {
-      aa[selectedRow].visible = false;
+        if (!aa[i].visible)
+        {
+          continue;
+        }
 
-      if (aa[selectedRow].label.equals("Conservation"))
-      {
-        ap.av.showConservation = false;
-      }
+        height += aa[i].height;
 
-      if (aa[selectedRow].label.equals("Quality"))
-      {
-        ap.av.showQuality = false;
-      }
+        if (y < height)
+        {
+          selectedRow = i;
 
-      if (aa[selectedRow].label.equals("Consensus"))
-      {
-        ap.av.showIdentity = false;
+          break;
+        }
       }
     }
-    else if (evt.getActionCommand().equals(DELETE))
-    {
-      ap.av.alignment.deleteAnnotation(aa[selectedRow]);
-    }
-    else if (evt.getActionCommand().equals(SHOWALL))
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void actionPerformed(ActionEvent evt)
     {
-      for (int i = 0; i < aa.length; i++)
-      {
-        aa[i].visible = true;
-      }
+        int dif = 0;
+        AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
+
+        if (evt.getActionCommand().equals(ADDNEW))
+        {
+            String label = JOptionPane.showInputDialog(this,
+                    "Label for annotation");
+
+            if (label == null)
+            {
+                label = "";
+            }
+
+            AlignmentAnnotation newAnnotation = new AlignmentAnnotation(label,
+                    "New description",
+                    new Annotation[ap.av.alignment.getWidth()]);
+
+            ap.av.alignment.addAnnotation(newAnnotation);
+            ap.av.alignment.setAnnotationIndex(newAnnotation, 0);
+            dif = aa[aa.length - 1].height;
+        }
+        else if (evt.getActionCommand().equals(HIDE))
+        {
+            aa[selectedRow].visible = false;
+
+            if (aa[selectedRow].label.equals("Conservation"))
+            {
+                ap.av.showConservation = false;
+            }
+
+            if (aa[selectedRow].label.equals("Quality"))
+            {
+                ap.av.showQuality = false;
+            }
+
+            if (aa[selectedRow].label.equals("Consensus"))
+            {
+                ap.av.showIdentity = false;
+            }
+
+            dif = aa[selectedRow].height * -1;
+        }
+        else if (evt.getActionCommand().equals(DELETE))
+        {
+            ap.av.alignment.deleteAnnotation(aa[selectedRow]);
+            dif = aa[selectedRow].height * -1;
+        }
+        else if (evt.getActionCommand().equals(SHOWALL))
+        {
+            for (int i = 0; i < aa.length; i++)
+            {
+                if (!aa[i].visible)
+                {
+                    dif += aa[i].height;
+                    aa[i].visible = true;
+                }
+            }
+        }
+        else if (evt.getActionCommand().equals(OUTPUT_TEXT))
+        {
+            CutAndPasteTransfer cap = new CutAndPasteTransfer();
+            Desktop.addInternalFrame(cap,
+                ap.alignFrame.getTitle() + " - " + aa[selectedRow].label, 500,
+                100);
+            cap.setText(aa[selectedRow].toString());
+        }
+
+
+        ap.annotationPanel.adjustPanelHeight();
+        ap.annotationScroller.validate();
+        ap.repaint();
     }
-    else if (evt.getActionCommand().equals(OUTPUT_TEXT))
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent evt)
     {
-      CutAndPasteTransfer cap = new CutAndPasteTransfer();
-      Desktop.addInternalFrame(cap,
-                               ap.alignFrame.getTitle() + " - " +
-                               aa[selectedRow].label, 500,
-                               100);
-      cap.setText(aa[selectedRow].toString());
+        getSelectedRow(evt.getY() - scrollOffset);
+        oldY = evt.getY();
     }
 
-    ap.annotationPanel.adjustPanelHeight();
-    ap.repaint();
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent evt)
+    {
+        int start = selectedRow;
+        getSelectedRow(evt.getY() - scrollOffset);
+        int end = selectedRow;
 
-  public void mousePressed(MouseEvent evt)
-  {
-    int y = evt.getY() - scrollOffset;
+        if(start!=end)
+        {
+          //Swap these annotations
+          AlignmentAnnotation startAA = ap.av.alignment.getAlignmentAnnotation()[start];
+          AlignmentAnnotation endAA = ap.av.alignment.getAlignmentAnnotation()[end];
 
-    AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-    if ( (aa == null) || (aa.length == 0))
-    {
-      JPopupMenu pop = new JPopupMenu("Annotations");
-      JMenuItem item = new JMenuItem(ADDNEW);
-      item.addActionListener(this);
-      pop.add(item);
-      pop.show(this, evt.getX(), evt.getY());
+          ap.av.alignment.getAlignmentAnnotation()[end] = startAA;
+          ap.av.alignment.getAlignmentAnnotation()[start] = endAA;
+        }
 
-      return;
+        resizePanel = false;
+        dragEvent = null;
+        repaint();
+        ap.annotationPanel.repaint();
     }
 
-    int height = 0;
-
-    for (int i = 0; i < aa.length; i++)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseEntered(MouseEvent evt)
     {
-      if (!aa[i].visible)
+      if(evt.getY()<10)
       {
-        continue;
+        resizePanel = true;
+        repaint();
       }
+    }
 
-      height += aa[i].height;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseExited(MouseEvent evt)
+    {       }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseDragged(MouseEvent evt)
+    {
+      dragEvent = evt;
 
-      if (y < height)
+      if (resizePanel)
       {
-        selectedRow = i;
+        Dimension d = ap.annotationScroller.getPreferredSize();
+        int dif = evt.getY() - oldY;
 
-        break;
+        dif /= ap.av.charHeight;
+        dif *= ap.av.charHeight;
+
+        if ( (d.height - dif) > 20)
+        {
+          ap.annotationScroller.setPreferredSize(new Dimension(d.width,
+              d.height - dif));
+          d = ap.annotationSpaceFillerHolder.getPreferredSize();
+          ap.annotationSpaceFillerHolder.setPreferredSize(new Dimension(
+              d.width, d.height - dif));
+          ap.repaint();
+        }
+
+        ap.addNotify();
       }
+      else
+        repaint();
     }
 
-    JPopupMenu pop = new JPopupMenu("Annotations");
-    JMenuItem item = new JMenuItem(ADDNEW);
-    item.addActionListener(this);
-    pop.add(item);
-    item = new JMenuItem(HIDE);
-    item.addActionListener(this);
-    pop.add(item);
-    item = new JMenuItem(DELETE);
-    item.addActionListener(this);
-    pop.add(item);
-    item = new JMenuItem(SHOWALL);
-    item.addActionListener(this);
-    pop.add(item);
-    item = new JMenuItem(OUTPUT_TEXT);
-    item.addActionListener(this);
-    pop.add(item);
-    pop.show(this, evt.getX(), evt.getY());
-
-    oldY = evt.getY();
-  }
-
-  public void mouseReleased(MouseEvent evt)
-  {
-    active = false;
-    repaint();
-  }
-
-  public void mouseEntered(MouseEvent evt)
-  {
-    active = true;
-    repaint();
-  }
-
-  public void mouseExited(MouseEvent evt)
-  {
-    active = false;
-    repaint();
-  }
-
-  public void mouseDragged(MouseEvent evt)
-  {
-    active = true;
-
-    Dimension d = ap.annotationScroller.getPreferredSize();
-    int dif = evt.getY() - oldY;
-
-    dif /= ap.av.charHeight;
-    dif *= ap.av.charHeight;
-
-    if ( (d.height - dif) > 20)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseMoved(MouseEvent evt)
     {
-      ap.annotationScroller.setPreferredSize(new Dimension(d.width,
-          d.height - dif));
-      d = ap.annotationSpaceFillerHolder.getPreferredSize();
-      ap.annotationSpaceFillerHolder.setPreferredSize(new Dimension(
-          d.width, d.height - dif));
-      ap.repaint();
+      resizePanel = evt.getY()<10;
+
+      repaint();
     }
 
-    ap.addNotify();
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseClicked(MouseEvent evt)
+    {
+       if(!SwingUtilities.isRightMouseButton(evt))
+         return;
 
-  public void mouseMoved(MouseEvent evt)
-  {
-  }
+        AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
-  public void mouseClicked(MouseEvent evt)
-  {
-  }
+        if ((aa == null) || (aa.length == 0))
+        {
+            JPopupMenu pop = new JPopupMenu("Annotations");
+            JMenuItem item = new JMenuItem(ADDNEW);
+            item.addActionListener(this);
+            pop.add(item);
+            pop.show(this, evt.getX(), evt.getY());
 
-  public void paintComponent(Graphics g1)
-  {
-    Graphics2D g = (Graphics2D) g1;
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                       RenderingHints.VALUE_ANTIALIAS_ON);
+            return;
+        }
 
-    drawComponent(g);
-  }
 
-  public void drawComponent(Graphics2D g)
-  {
-    FontMetrics fm = g.getFontMetrics(g.getFont());
-    g.setColor(Color.white);
-    g.fillRect(0, 0, getWidth(), getHeight());
+        JPopupMenu pop = new JPopupMenu("Annotations");
+        JMenuItem item = new JMenuItem(ADDNEW);
+        item.addActionListener(this);
+        pop.add(item);
+        item = new JMenuItem(HIDE);
+        item.addActionListener(this);
+        pop.add(item);
+        item = new JMenuItem(DELETE);
+        item.addActionListener(this);
+        pop.add(item);
+        item = new JMenuItem(SHOWALL);
+        item.addActionListener(this);
+        pop.add(item);
+        item = new JMenuItem(OUTPUT_TEXT);
+        item.addActionListener(this);
+        pop.add(item);
+
+        if (aa[selectedRow].label.equals("Consensus"))
+        {
+          pop.addSeparator();
+          final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem(
+              "Ignore Gaps In Consensus",
+              ap.av.getIgnoreGapsConsensus());
+          cbmi.addActionListener(new ActionListener()
+              {public void actionPerformed(ActionEvent e)
+               {
+                 ap.av.setIgnoreGapsConsensus(cbmi.getState());
+                 ap.repaint();
+               }
+              });
+          pop.add(cbmi);
 
-    g.translate(0, scrollOffset);
-    g.setColor(Color.black);
+        }
 
-    AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
-    int y = g.getFont().getSize();
-    int x = 0;
+        pop.show(this, evt.getX(), evt.getY());
+    }
 
-    if (aa != null)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g1 DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
     {
-      for (int i = 0; i < aa.length; i++)
-      {
-        if (!aa[i].visible)
-        {
-          continue;
-        }
 
-        x = getWidth() - fm.stringWidth(aa[i].label) - 3;
+        int width = getWidth();
+        if(width==0)
+         width = ap.calculateIdWidth().width + 4;
+
+       Graphics2D g2 = (Graphics2D) g;
+       if(av.antiAlias)
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+            RenderingHints.VALUE_ANTIALIAS_ON);
+
+       drawComponent(g2, width);
+
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void drawComponent(Graphics g, int width)
+    {
+        if(av.getFont().getSize()<10)
+          g.setFont(new Font("Arial", Font.PLAIN, av.getFont().getSize()-1));
+        else
+          g.setFont(font);
+
+        FontMetrics fm = g.getFontMetrics(g.getFont());
+        g.setColor(Color.white);
+        g.fillRect(0, 0, getWidth(), getHeight());
+
+        g.translate(0, scrollOffset);
+        g.setColor(Color.black);
+
+        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
+        int fontHeight = g.getFont().getSize();
+        int y = fontHeight;
+        int x = 0;
+        int graphExtras = 0;
 
-        if (aa[i].isGraph)
+
+
+        if (aa != null)
         {
-          y += (aa[i].height / 3);
+            for (int i = 0; i < aa.length; i++)
+            {
+                if (!aa[i].visible)
+                {
+                    continue;
+                }
+
+                x = width - fm.stringWidth(aa[i].label) - 3;
+
+                if (aa[i].graph>0)
+                {
+                    graphExtras = y;
+
+                    y += (aa[i].height / 3);
+
+                    if(aa[i].graphGroup<0)
+                        graphExtras = y + fontHeight;
+                }
+
+                if(aa[i].graphGroup>-1)
+                {
+                  int groupSize = 0;
+                  for (int gg = 0; gg < aa.length; gg++)
+                  {
+                    if (aa[gg].graphGroup == aa[i].graphGroup)
+                      groupSize++;
+                  }
+
+                  if(groupSize * (fontHeight+8) < aa[i].height)
+                    graphExtras += (aa[i].height -( groupSize * (fontHeight+8)) )/2;
+
+                 for(int gg=0; gg<aa.length; gg++)
+                 {
+                   if(aa[gg].graphGroup==aa[i].graphGroup)
+                   {
+                     x = width - fm.stringWidth(aa[gg].label) - 3;
+                     g.drawString(aa[gg].label, x, graphExtras );
+                     if(aa[gg].annotations[0]!=null)
+                       g.setColor(aa[gg].annotations[0].colour);
+
+                     g.drawLine( x, graphExtras+3,
+                                 x+fm.stringWidth(aa[gg].label),
+                                 graphExtras+3);
+
+                     g.setColor(Color.black);
+                     graphExtras += fontHeight+8;
+                   }
+                 }
+                }
+                else
+                  g.drawString(aa[i].label, x, y);
+
+                if (aa[i].graph>0)
+                {
+                /*  if (aa[i].graphLines != null)
+                  {
+                    for (int gl = 0; gl < aa[i].graphLines.size(); gl++)
+                    {
+                       x = width - fm.stringWidth(aa[i].getGraphLine(gl).label) - 3;
+                      g.drawString(aa[i].getGraphLine(gl).label, x, graphExtras);
+                      g.setColor(aa[i].getGraphLine(gl).colour);
+                      Graphics2D g2 = (Graphics2D) g;
+                      g2.setStroke(new BasicStroke(1,
+                          BasicStroke.CAP_SQUARE,
+                          BasicStroke.JOIN_ROUND, 3f,
+                          new float[]
+                          {5f, 3f}, 0f));
+
+                      graphExtras += 3;
+
+                      g.drawLine(x, graphExtras,
+                                 x+fm.stringWidth(aa[i].label),
+                                 graphExtras);
+                      g2.setStroke(new BasicStroke());
+                    }
+                  }*/
+                    y += ((2 * aa[i].height) / 3);
+                }
+                else
+                {
+                    y += aa[i].height;
+                }
+            }
         }
 
-        g.drawString(aa[i].label, x, y);
-
-        if (aa[i].isGraph)
+        if (resizePanel)
         {
-          y += ( (2 * aa[i].height) / 3);
+          g.drawImage(image, 2, 0 - scrollOffset, this);
         }
-        else
+        else if (dragEvent != null)
         {
-          y += aa[i].height;
+          g.setColor(Color.lightGray);
+          g.drawString(aa[selectedRow].label, dragEvent.getX(), dragEvent.getY() - scrollOffset);
         }
-      }
-    }
 
-    if (active)
-    {
-      if (image != null)
-      {
-        g.drawImage(image, 2, 0, this);
-      }
-    }
 
-    if ( (aa == null) || (aa.length < 1))
-    {
-      g.drawString("Right click", 2, 8);
-      g.drawString("to add annotation", 2, 18);
+        if ((aa == null) || (aa.length < 1))
+        {
+            g.drawString("Right click", 2, 8);
+            g.drawString("to add annotation", 2, 18);
+        }
     }
-  }
 }