X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=d0af0a549fc101d7b048addd9e50e9893f495dd2;hb=59d682209891099d46b960509907c79e3fb276fe;hp=e77fbed98c4853d257bfbe7d59b3be09c829f5df;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index e77fbed..d0af0a5 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/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 @@ -20,25 +20,22 @@ package jalview.gui; import java.awt.*; import java.awt.event.*; import java.awt.image.*; -import java.util.Hashtable; - import javax.swing.*; -import jalview.analysis.AAFrequency; -import jalview.analysis.StructureFrequency; import jalview.datamodel.*; import jalview.renderer.AnnotationRenderer; import jalview.renderer.AwtRenderPanelI; /** - * DOCUMENT ME! + * AnnotationPanel displays visible portion of annotation rows below unwrapped + * alignment * * @author $author$ * @version $Revision$ */ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, - MouseListener, MouseMotionListener, ActionListener, - AdjustmentListener + MouseListener, MouseWheelListener, MouseMotionListener, + ActionListener, AdjustmentListener, Scrollable { final String HELIX = "Helix"; @@ -70,7 +67,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, public BufferedImage image; - public BufferedImage fadedImage; + public volatile BufferedImage fadedImage; Graphics2D gg; @@ -100,6 +97,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, public final AnnotationRenderer renderer; + private MouseWheelListener[] _mwl; + /** * Creates a new AnnotationPanel object. * @@ -121,6 +120,11 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, addMouseMotionListener(this); ap.annotationScroller.getVerticalScrollBar() .addAdjustmentListener(this); + // save any wheel listeners on the scroller, so we can propagate scroll + // events to them. + _mwl = ap.annotationScroller.getMouseWheelListeners(); + // and then set our own listener to consume all mousewheel events + ap.annotationScroller.addMouseWheelListener(this); renderer = new AnnotationRenderer(); } @@ -130,14 +134,82 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, renderer = new AnnotationRenderer(); } - /** - * DOCUMENT ME! + @Override + public void mouseWheelMoved(MouseWheelEvent e) + { + if (e.isShiftDown()) + { + e.consume(); + if (e.getWheelRotation() > 0) + { + ap.scrollRight(true); + } + else + { + ap.scrollRight(false); + } + } + else + { + // TODO: find the correct way to let the event bubble up to + // ap.annotationScroller + for (MouseWheelListener mwl : _mwl) + { + if (mwl != null) + { + mwl.mouseWheelMoved(e); + } + if (e.isConsumed()) + { + break; + } + } + } + } + + @Override + public Dimension getPreferredScrollableViewportSize() + { + return getPreferredSize(); + } + + @Override + public int getScrollableBlockIncrement(Rectangle visibleRect, + int orientation, int direction) + { + return 30; + } + + @Override + public boolean getScrollableTracksViewportHeight() + { + return false; + } + + @Override + public boolean getScrollableTracksViewportWidth() + { + return true; + } + + @Override + public int getScrollableUnitIncrement(Rectangle visibleRect, + int orientation, int direction) + { + return 30; + } + + /* + * (non-Javadoc) * - * @param evt - * DOCUMENT ME! + * @see + * java.awt.event.AdjustmentListener#adjustmentValueChanged(java.awt.event + * .AdjustmentEvent) */ + @Override public void adjustmentValueChanged(AdjustmentEvent evt) { + // update annotation label display ap.alabels.setScrollOffset(-evt.getValue()); } @@ -149,7 +221,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, */ public int adjustPanelHeight() { - int height = calcPanelHeight(); + int height = av.calcPanelHeight(); this.setPreferredSize(new Dimension(1, height)); if (ap != null) { @@ -161,70 +233,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, } /** - * 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] == null) - { - System.err.println("Null annotation row: ignoring."); - continue; - } - 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) - { - // set minimum - height = 20; - } - return height; - } - - /** * DOCUMENT ME! * * @param evt * DOCUMENT ME! */ + @Override public void actionPerformed(ActionEvent evt) { AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); @@ -362,8 +376,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, anot[index].displayCharacter = label; } } + aa[activeRow].validateRangeAndDisplay(); adjustPanelHeight(); + ap.alignmentChanged(); repaint(); return; @@ -374,12 +390,13 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, { String collatedInput = ""; String last = ""; + ColumnSelection viscols = av.getColumnSelection(); // TODO: refactor and save av.getColumnSelection for efficiency for (int i = 0; i < columnSelection.size(); i++) { int index = columnSelection.columnAt(i); // always check for current display state - just in case - if (!av.getColumnSelection().isVisible(index)) + if (!viscols.isVisible(index)) continue; String tlabel = null; if (anot[index] != null) @@ -420,6 +437,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mousePressed(MouseEvent evt) { @@ -512,6 +530,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseReleased(MouseEvent evt) { graphStretch = -1; @@ -526,6 +545,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseEntered(MouseEvent evt) { ap.scalePanel.mouseEntered(evt); @@ -537,6 +557,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseExited(MouseEvent evt) { ap.scalePanel.mouseExited(evt); @@ -548,6 +569,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseDragged(MouseEvent evt) { if (graphStretch > -1) @@ -574,6 +596,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseMoved(MouseEvent evt) { AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); @@ -616,7 +639,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, } if (row > -1 && aa[row].annotations != null - && res < (int) aa[row].annotations.length) + && res < aa[row].annotations.length) { if (aa[row].graphGroup > -1) { @@ -673,6 +696,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, * @param evt * DOCUMENT ME! */ + @Override public void mouseClicked(MouseEvent evt) { if (activeRow != -1) @@ -709,12 +733,15 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, } + private volatile boolean imageFresh = false; + /** * DOCUMENT ME! * * @param g * DOCUMENT ME! */ + @Override public void paintComponent(Graphics g) { g.setColor(Color.white); @@ -736,8 +763,24 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, if (image == null || imgWidth != image.getWidth() || image.getHeight(this) != getHeight()) { - image = new BufferedImage(imgWidth, ap.annotationPanel.getHeight(), - BufferedImage.TYPE_INT_RGB); + try + { + image = new BufferedImage(imgWidth, ap.annotationPanel.getHeight(), + BufferedImage.TYPE_INT_RGB); + } catch (OutOfMemoryError oom) + { + try + { + System.gc(); + } catch (Exception x) + { + } + ; + new OOMWarning( + "Couldn't allocate memory to redraw screen. Please restart Jalview", + oom); + return; + } gg = (Graphics2D) image.getGraphics(); if (av.antiAlias) @@ -750,9 +793,11 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, fm = gg.getFontMetrics(); gg.setColor(Color.white); gg.fillRect(0, 0, imgWidth, image.getHeight()); + imageFresh = true; } drawComponent(gg, av.startRes, av.endRes + 1); + imageFresh = false; g.drawImage(image, 0, 0, this); } @@ -800,6 +845,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, } + private volatile boolean lastImageGood = false; + /** * DOCUMENT ME! * @@ -812,18 +859,23 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, */ public void drawComponent(Graphics g, int startRes, int endRes) { + BufferedImage oldFaded = fadedImage; if (av.isCalcInProgress()) { if (image == null) { + lastImageGood = false; return; } // We'll keep a record of the old image, // and draw a faded image until the calculation // has completed - if (fadedImage == null || fadedImage.getWidth() != imgWidth - || fadedImage.getHeight() != image.getHeight()) + if (lastImageGood + && (fadedImage == null || fadedImage.getWidth() != imgWidth || fadedImage + .getHeight() != image.getHeight())) { + // System.err.println("redraw faded image ("+(fadedImage==null ? + // "null image" : "") + " lastGood="+lastImageGood+")"); fadedImage = new BufferedImage(imgWidth, image.getHeight(), BufferedImage.TYPE_INT_RGB); @@ -837,10 +889,17 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, fadedG.drawImage(image, 0, 0, this); } + // make sure we don't overwrite the last good faded image until all + // calculations have finished + lastImageGood = false; } else { + if (fadedImage != null) + { + oldFaded = fadedImage; + } fadedImage = null; } @@ -866,7 +925,12 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, return; } - renderer.drawComponent(this, av, g, activeRow, startRes, endRes); + lastImageGood = renderer.drawComponent(this, av, g, activeRow, + startRes, endRes); + if (!lastImageGood && fadedImage == null) + { + fadedImage = oldFaded; + } } @Override