X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=50849e136bca4ca2671d4b48048d9ed5ed9a70d7;hb=92fbe9788fe62f1e3fcf22e5e64a289d426b1869;hp=7c8850df957c6486d1ce6a965a495e12136dd7f4;hpb=218ff56e061f1329f53b2fa4cb353b0348a87bc0;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 7c8850d..50849e1 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -41,14 +41,17 @@ public class AnnotationLabels extends JPanel implements MouseListener, static String DELETE = "Delete This Row"; static String SHOWALL = "Show All Hidden Rows"; static String OUTPUT_TEXT = "Show Values In Textbox"; - boolean active = false; + 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); + /** * Creates a new AnnotationLabels object. @@ -58,6 +61,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, public AnnotationLabels(AlignmentPanel ap) { this.ap = ap; + av = ap.av; java.net.URL url = getClass().getResource("/images/idwidth.gif"); Image temp = null; @@ -88,6 +92,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, addMouseMotionListener(this); } + public AnnotationLabels(AlignViewport av) + { + this.av = av; + } + /** * DOCUMENT ME! * @@ -99,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! * @@ -119,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,15 +207,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, ap.annotationPanel.adjustPanelHeight(); - - Dimension d = ap.annotationScroller.getPreferredSize(); - 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.addNotify(); + ap.annotationScroller.validate(); + ap.repaint(); } /** @@ -191,6 +218,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mousePressed(MouseEvent evt) { + getSelectedRow(evt.getY() - scrollOffset); oldY = evt.getY(); } @@ -201,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(); } /** @@ -212,8 +257,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseEntered(MouseEvent evt) { - active = true; + if(evt.getY()<10) + { + resizePanel = true; repaint(); + } } /** @@ -222,10 +270,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * @param evt DOCUMENT ME! */ public void mouseExited(MouseEvent evt) - { - active = false; - repaint(); - } + { } /** * DOCUMENT ME! @@ -234,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(); } /** @@ -262,6 +312,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseMoved(MouseEvent evt) { + resizePanel = evt.getY()<10; + + repaint(); } /** @@ -271,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)) @@ -285,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); @@ -346,13 +383,20 @@ public class AnnotationLabels extends JPanel implements MouseListener, * * @param g1 DOCUMENT ME! */ - public void paintComponent(Graphics g1) + public void paintComponent(Graphics g) { - Graphics2D g = (Graphics2D) g1; - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + + 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(g); + drawComponent(g2, width); + } /** @@ -360,8 +404,13 @@ public class AnnotationLabels extends JPanel implements MouseListener, * * @param g DOCUMENT ME! */ - public void drawComponent(Graphics2D g) + 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()); @@ -369,12 +418,13 @@ public class AnnotationLabels extends JPanel implements MouseListener, g.translate(0, scrollOffset); g.setColor(Color.black); - AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); - int y = g.getFont().getSize(); + AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation(); + int fontHeight = g.getFont().getSize(); + int y = fontHeight; int x = 0; - int width = getWidth(); - if(width==0) - width = ap.calculateIdWidth().width + 4; + int graphExtras = 0; + + if (aa != null) { @@ -387,15 +437,73 @@ public class AnnotationLabels extends JPanel implements MouseListener, x = width - fm.stringWidth(aa[i].label) - 3; - if (aa[i].isGraph) + if (aa[i].graph>0) { + graphExtras = y; + y += (aa[i].height / 3); + + if(aa[i].graphGroup<0) + graphExtras = y + fontHeight; } - g.drawString(aa[i].label, x, y); + 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; gg0) { + /* 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 @@ -405,14 +513,17 @@ public class AnnotationLabels extends JPanel implements MouseListener, } } - if (active) + if (resizePanel) { - if (image != null) - { - g.drawImage(image, 2, 0, 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);