X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationPanel.java;h=4a5fc8b081dbc03d00e6cfe6970cf7f3be61c2d4;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=7e6e3a153c89569cb34ed5690c3cdecafb5346ef;hpb=f52f7b378972cc884b5d3e5cc250f89667f558f7;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java index 7e6e3a1..4a5fc8b 100755 --- a/src/jalview/appletgui/AnnotationPanel.java +++ b/src/jalview/appletgui/AnnotationPanel.java @@ -1,19 +1,20 @@ /* - * 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.2) + * Copyright (C) 2014 The Jalview Authors + * * 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 + * 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 + * + * 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 * PURPOSE. See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.appletgui; @@ -21,14 +22,15 @@ import java.util.*; import java.awt.*; import java.awt.event.*; -import java.awt.image.BufferedImage; import jalview.datamodel.*; import jalview.renderer.AnnotationRenderer; import jalview.renderer.AwtRenderPanelI; +import jalview.util.MessageManager; -public class AnnotationPanel extends Panel implements AwtRenderPanelI, AdjustmentListener, - ActionListener, MouseListener, MouseMotionListener +public class AnnotationPanel extends Panel implements AwtRenderPanelI, + AdjustmentListener, ActionListener, MouseListener, + MouseMotionListener { AlignViewport av; @@ -110,7 +112,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen /** * DOCUMENT ME! - * + * * @param evt * DOCUMENT ME! */ @@ -133,7 +135,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; @@ -233,6 +236,10 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen if ((label.length() > 0) && !aa[activeRow].hasText) { aa[activeRow].hasText = true; + if (evt.getActionCommand().equals(STEM)) + { + aa[activeRow].showAllColLabels=true; + } } for (int i = 0; i < av.getColumnSelection().size(); i++) @@ -252,8 +259,9 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen } } - aa[activeRow].validateRangeAndDisplay(); + av.getAlignment().validateAnnotation(aa[activeRow]); + ap.alignmentChanged(); adjustPanelHeight(); repaint(); @@ -315,7 +323,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen return; } - PopupMenu pop = new PopupMenu("Structure type"); + PopupMenu pop = new PopupMenu(MessageManager.getString("label.structure_type")); MenuItem item; /* * Just display the needed structure options @@ -325,7 +333,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); @@ -389,7 +399,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); } @@ -463,7 +473,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) { @@ -471,59 +481,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) { @@ -567,11 +531,12 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen 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(); @@ -596,7 +561,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(); @@ -629,7 +595,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen /** * DOCUMENT ME! - * + * * @param g * DOCUMENT ME! * @param startRes @@ -658,7 +624,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen g.setColor(Color.black); if (av.validCharWidth) { - g.drawString("Alignment has no annotations", 20, 15); + g.drawString(MessageManager.getString("label.alignment_has_no_annotations"), 20, 15); } return; @@ -670,10 +636,13 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen int scrollOffset = 0; - public void setScrollOffset(int value) + public void setScrollOffset(int value, boolean repaint) { scrollOffset = value; - repaint(); + if (repaint) + { + repaint(); + } } @Override @@ -693,4 +662,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; + } }