X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=5667f84826c238243a9aaa2a427948922e7007b2;hb=69e9cd54dcfd25dd3067f353bc53eb6b4d7e27af;hp=7418e48f0de2a0204a002a2f864d212b1d5d3f76;hpb=3a45e0d68dde73c005832b7b3924194b214e00ff;p=jalview.git

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 7418e48..5667f84 100755
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -40,15 +40,15 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     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;
+    static String OUTPUT_TEXT = "Export Annotation";
+    boolean resizePanel = false;
     Image image;
     AlignmentPanel ap;
     AlignViewport av;
     boolean resizing = false;
+    MouseEvent dragEvent;
     int oldY;
-    int mouseX;
-    int selectedRow = 0;
+    int selectedRow;
     int scrollOffset = 0;
     Font font = new Font("Arial", Font.PLAIN, 11);
 
@@ -108,6 +108,29 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         repaint();
     }
 
+    void getSelectedRow(int y)
+    {
+      int height = 0;
+      AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
+
+      for (int i = 0; i < aa.length; i++)
+      {
+        if (!aa[i].visible)
+        {
+          continue;
+        }
+
+        height += aa[i].height;
+
+        if (y < height)
+        {
+          selectedRow = i;
+
+          break;
+        }
+      }
+    }
+
     /**
      * DOCUMENT ME!
      *
@@ -128,10 +151,12 @@ public class AnnotationLabels extends JPanel implements MouseListener,
                 label = "";
             }
 
-            ap.av.alignment.addAnnotation(new AlignmentAnnotation(label,
+            AlignmentAnnotation newAnnotation = new AlignmentAnnotation(label,
                     "New description",
-                    new Annotation[ap.av.alignment.getWidth()]));
+                    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))
@@ -173,11 +198,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         }
         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());
+          new AnnotationExporter().exportAnnotations(
+              ap,
+              new AlignmentAnnotation[]
+              {aa[selectedRow]}
+              );
         }
 
 
@@ -193,6 +218,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mousePressed(MouseEvent evt)
     {
+        getSelectedRow(evt.getY() - scrollOffset);
         oldY = evt.getY();
     }
 
@@ -203,8 +229,25 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mouseReleased(MouseEvent evt)
     {
-        active = false;
+        int start = selectedRow;
+        getSelectedRow(evt.getY() - scrollOffset);
+        int end = selectedRow;
+
+        if(start!=end)
+        {
+          //Swap these annotations
+          AlignmentAnnotation startAA = ap.av.alignment.getAlignmentAnnotation()[start];
+          AlignmentAnnotation endAA = ap.av.alignment.getAlignmentAnnotation()[end];
+
+
+          ap.av.alignment.getAlignmentAnnotation()[end] = startAA;
+          ap.av.alignment.getAlignmentAnnotation()[start] = endAA;
+        }
+
+        resizePanel = false;
+        dragEvent = null;
         repaint();
+        ap.annotationPanel.repaint();
     }
 
     /**
@@ -214,8 +257,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mouseEntered(MouseEvent evt)
     {
-        active = true;
+      if(evt.getY()<10)
+      {
+        resizePanel = true;
         repaint();
+      }
     }
 
     /**
@@ -224,10 +270,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      * @param evt DOCUMENT ME!
      */
     public void mouseExited(MouseEvent evt)
-    {
-        active = false;
-        repaint();
-    }
+    {       }
 
     /**
      * DOCUMENT ME!
@@ -236,25 +279,30 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mouseDragged(MouseEvent evt)
     {
-        active = true;
+      dragEvent = evt;
 
+      if (resizePanel)
+      {
         Dimension d = ap.annotationScroller.getPreferredSize();
         int dif = evt.getY() - oldY;
 
         dif /= ap.av.charHeight;
         dif *= ap.av.charHeight;
 
-        if ((d.height - dif) > 20)
+        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.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();
     }
 
     /**
@@ -264,6 +312,9 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mouseMoved(MouseEvent evt)
     {
+      resizePanel = evt.getY()<10;
+
+      repaint();
     }
 
     /**
@@ -273,7 +324,9 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      */
     public void mouseClicked(MouseEvent evt)
     {
-        int y = evt.getY() - scrollOffset;
+       if(!SwingUtilities.isRightMouseButton(evt))
+         return;
+
         AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
 
         if ((aa == null) || (aa.length == 0))
@@ -287,24 +340,6 @@ public class AnnotationLabels extends JPanel implements MouseListener,
             return;
         }
 
-        int height = 0;
-
-        for (int i = 0; i < aa.length; i++)
-        {
-            if (!aa[i].visible)
-            {
-                continue;
-            }
-
-            height += aa[i].height;
-
-            if (y < height)
-            {
-                selectedRow = i;
-
-                break;
-            }
-        }
 
         JPopupMenu pop = new JPopupMenu("Annotations");
         JMenuItem item = new JMenuItem(ADDNEW);
@@ -447,7 +482,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
 
                 if (aa[i].graph>0)
                 {
-                  if (aa[i].graphLines != null)
+                /*  if (aa[i].graphLines != null)
                   {
                     for (int gl = 0; gl < aa[i].graphLines.size(); gl++)
                     {
@@ -468,7 +503,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
                                  graphExtras);
                       g2.setStroke(new BasicStroke());
                     }
-                  }
+                  }*/
                     y += ((2 * aa[i].height) / 3);
                 }
                 else
@@ -478,14 +513,17 @@ public class AnnotationLabels extends JPanel implements MouseListener,
             }
         }
 
-        if (active)
+        if (resizePanel)
         {
-            if (image != null)
-            {
-                g.drawImage(image, 2, 0 - scrollOffset, this);
-            }
+          g.drawImage(image, 2, 0 - scrollOffset, this);
+        }
+        else if (dragEvent != null)
+        {
+          g.setColor(Color.lightGray);
+          g.drawString(aa[selectedRow].label, dragEvent.getX(), dragEvent.getY() - scrollOffset);
         }
 
+
         if ((aa == null) || (aa.length < 1))
         {
             g.drawString("Right click", 2, 8);