X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=ceb736dd2d13335bcb436e3ae1e08fcf9e50411f;hb=5ae7fc3b4050c0ed10c9e6ad96f4b5360bce5f84;hp=10689809707174975adbdca8da7defa39146734c;hpb=05c597c23a32c17b91f893139ee2707232df0fc5;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 1068980..ceb736d 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,32 @@ public class AnnotationLabels extends JPanel implements MouseListener, repaint(); } + void getSelectedRow(int y) + { + int height = 0; + AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); + + if(aa!=null) + { + 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! * @@ -134,7 +160,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, ap.av.alignment.addAnnotation(newAnnotation); ap.av.alignment.setAnnotationIndex(newAnnotation, 0); - dif = aa[aa.length - 1].height; + if (aa != null) + dif = aa[aa.length - 1].height; } else if (evt.getActionCommand().equals(HIDE)) { @@ -175,11 +202,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]} + ); } @@ -195,6 +222,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mousePressed(MouseEvent evt) { + getSelectedRow(evt.getY() - scrollOffset); oldY = evt.getY(); } @@ -205,8 +233,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(); } /** @@ -216,8 +261,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseEntered(MouseEvent evt) { - active = true; + if(evt.getY()<10) + { + resizePanel = true; repaint(); + } } /** @@ -227,8 +275,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseExited(MouseEvent evt) { - active = false; + if(dragEvent == null) + { + resizePanel = false; repaint(); + } } /** @@ -238,25 +289,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(); } /** @@ -266,6 +322,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseMoved(MouseEvent evt) { + resizePanel = evt.getY()<10; + + repaint(); } /** @@ -275,7 +334,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)) @@ -289,24 +350,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); @@ -374,9 +417,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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); + else + g.setFont(av.getFont()); FontMetrics fm = g.getFontMetrics(g.getFont()); g.setColor(Color.white); @@ -449,7 +492,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++) { @@ -470,7 +513,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, graphExtras); g2.setStroke(new BasicStroke()); } - } + }*/ y += ((2 * aa[i].height) / 3); } else @@ -480,14 +523,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 && aa!=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);