X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationPanel.java;h=f63cb76d9dc0addb9ccb714dbae85b17daddc5cd;hb=296d1d4fdf60f651889d03a475e54aee135890d4;hp=a941ef27109d3c77e1af8452db97ef967e6b9ab9;hpb=209d11e9f68d26ae195e48627a9364aca9e0ee27;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java index a941ef2..f63cb76 100755 --- a/src/jalview/appletgui/AnnotationPanel.java +++ b/src/jalview/appletgui/AnnotationPanel.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -21,17 +21,14 @@ import java.util.*; import java.awt.*; import java.awt.event.*; -import java.awt.font.LineMetrics; -import java.awt.geom.AffineTransform; -import jalview.analysis.AAFrequency; import jalview.datamodel.*; import jalview.renderer.AnnotationRenderer; import jalview.renderer.AwtRenderPanelI; -import jalview.schemes.ColourSchemeI; -public class AnnotationPanel extends Panel implements AwtRenderPanelI, AdjustmentListener, - ActionListener, MouseListener, MouseMotionListener +public class AnnotationPanel extends Panel implements AwtRenderPanelI, + AdjustmentListener, ActionListener, MouseListener, + MouseMotionListener { AlignViewport av; @@ -44,7 +41,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen final String HELIX = "Helix"; final String SHEET = "Sheet"; - + /** * For RNA secondary structure "stems" aka helices */ @@ -106,6 +103,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen renderer = new AnnotationRenderer(); } + @Override public void adjustmentValueChanged(AdjustmentEvent evt) { } @@ -116,6 +114,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen * @param evt * DOCUMENT ME! */ + @Override public void actionPerformed(ActionEvent evt) { AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); @@ -134,7 +133,8 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen } String label = ""; - if (av.getColumnSelection() != null && av.getColumnSelection().size() > 0 + if (av.getColumnSelection() != null + && av.getColumnSelection().size() > 0 && anot[av.getColumnSelection().getMin()] != null) label = anot[av.getColumnSelection().getMin()].displayCharacter; @@ -256,6 +256,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen aa[activeRow].validateRangeAndDisplay(); adjustPanelHeight(); + ap.alignmentChanged(); repaint(); return; @@ -272,6 +273,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen return null; } + @Override public void mousePressed(MouseEvent evt) { AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); @@ -325,7 +327,9 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen item = new MenuItem(STEM); item.addActionListener(this); pop.add(item); - } else { + } + else + { item = new MenuItem(HELIX); item.addActionListener(this); pop.add(item); @@ -356,6 +360,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen ap.scalePanel.mousePressed(evt); } + @Override public void mouseReleased(MouseEvent evt) { graphStretch = -1; @@ -369,12 +374,14 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen ap.scalePanel.mouseReleased(evt); } + @Override public void mouseClicked(MouseEvent evt) { } boolean needValidating = false; + @Override public void mouseDragged(MouseEvent evt) { if (graphStretch > -1) @@ -386,7 +393,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen av.getAlignment().getAlignmentAnnotation()[graphStretch].graphHeight = 0; } graphStretchY = evt.getY(); - calcPanelHeight(); + av.calcPanelHeight(); needValidating = true; ap.paintAlignment(true); } @@ -396,6 +403,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen } } + @Override public void mouseMoved(MouseEvent evt) { AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); @@ -440,11 +448,13 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen } } + @Override public void mouseEntered(MouseEvent evt) { ap.scalePanel.mouseEntered(evt); } + @Override public void mouseExited(MouseEvent evt) { ap.scalePanel.mouseExited(evt); @@ -457,7 +467,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen public int adjustPanelHeight(boolean repaint) { - int height = calcPanelHeight(); + int height = av.calcPanelHeight(); this.setSize(new Dimension(getSize().width, height)); if (repaint) { @@ -465,59 +475,13 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen } return height; } + /** - * calculate the height for visible annotation, revalidating bounds where necessary - * ABSTRACT GUI METHOD + * calculate the height for visible annotation, revalidating bounds where + * necessary ABSTRACT GUI METHOD + * * @return total height of annotation */ - public int calcPanelHeight() - { - // setHeight of panels - AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); - int height = 0; - - if (aa != null) - { - for (int i = 0; i < aa.length; i++) - { - if (!aa[i].visible) - { - continue; - } - - aa[i].height = 0; - - if (aa[i].hasText) - { - aa[i].height += av.charHeight; - } - - if (aa[i].hasIcons) - { - aa[i].height += 16; - } - - if (aa[i].graph > 0) - { - aa[i].height += aa[i].graphHeight; - } - - if (aa[i].height == 0) - { - aa[i].height = 20; - } - - height += aa[i].height; - } - } - if (height == 0) - { - height = 20; - } - - return height; - - } public void addEditableColumn(int i) { @@ -549,21 +513,24 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen activeRes.addElement(String.valueOf(i)); } + @Override public void update(Graphics g) { paint(g); } + @Override public void paint(Graphics g) { Dimension d = getSize(); imgWidth = d.width; // (av.endRes - av.startRes + 1) * av.charWidth; - if (imgWidth<1 || d.height<1) + if (imgWidth < 1 || d.height < 1) { return; } - if (image == null || imgWidth != image.getWidth(this) || d.height != image.getHeight(this)) + if (image == null || imgWidth != image.getWidth(this) + || d.height != image.getHeight(this)) { image = createImage(imgWidth, d.height); gg = image.getGraphics(); @@ -588,7 +555,8 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen public void fastPaint(int horizontal) { - if (horizontal == 0 || av.getAlignment().getAlignmentAnnotation() == null + if (horizontal == 0 + || av.getAlignment().getAlignmentAnnotation() == null || av.getAlignment().getAlignmentAnnotation().length < 1) { repaint(); @@ -659,7 +627,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen renderer.drawComponent(this, av, g, activeRow, startRes, endRes); g.translate(0, +scrollOffset); } - + int scrollOffset = 0; public void setScrollOffset(int value) @@ -685,4 +653,16 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen { return imgWidth; } + private int[] bounds = new int[2]; + @Override + public int[] getVisibleVRange() + { + if (ap!=null && ap.alabels!=null) + { + int sOffset=-ap.alabels.scrollOffset; + int visHeight = sOffset+ap.annotationPanelHolder.getHeight(); + bounds[0] = sOffset; bounds[1]=visHeight; + return bounds; + } else return null; + } }