X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=d1046f85927e1bd96d6c495e87d0032740b77f18;hb=c0b77a767e71bffd8f55704f9a64f943f559e4f6;hp=7606ee62889e81dcb9890afe64186900d237c777;hpb=729a8c88cedd23238c8370d12d4adbd8db78cde8;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 7606ee6..d1046f8 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -38,6 +38,7 @@ import java.awt.Color; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.Rectangle; import java.awt.RenderingHints; import java.awt.image.BufferedImage; import java.beans.PropertyChangeEvent; @@ -52,8 +53,14 @@ import javax.swing.JPanel; * Wrapped mode, but not the scale above in Unwrapped mode. * */ +@SuppressWarnings("serial") public class SeqCanvas extends JPanel implements ViewportListenerI { + /* + * pixels gap between sequences and annotations when in wrapped mode + */ + static final int SEQS_ANNOTATION_GAP = 3; + private static final String ZEROS = "0000000000"; final FeatureRenderer fr; @@ -81,9 +88,9 @@ public class SeqCanvas extends JPanel implements ViewportListenerI private int labelWidthWest; // label left width in pixels if shown - private int wrappedSpaceAboveAlignment; // gap between widths + int wrappedSpaceAboveAlignment; // gap between widths - private int wrappedRepeatHeightPx; // height in pixels of wrapped width + int wrappedRepeatHeightPx; // height in pixels of wrapped width private int wrappedVisibleWidths; // number of wrapped widths displayed @@ -109,7 +116,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI public SequenceRenderer getSequenceRenderer() { - return seqRdr; + return seqRdr; } public FeatureRenderer getFeatureRenderer() @@ -270,6 +277,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI *
  • scrolling by trackpad, middle mouse button, or other device
    • *
  • by moving the box in the Overview window
    • *
  • programmatically to make a highlighted position visible
    • + *
  • pasting a block of sequences
    • * * * @param horizontal @@ -279,18 +287,22 @@ public class SeqCanvas extends JPanel implements ViewportListenerI */ public void fastPaint(int horizontal, int vertical) { - if (fastpainting || img == null) + // System.err.println("< 0) // scrollbar pulled right, image to the left { @@ -337,14 +344,27 @@ public class SeqCanvas extends JPanel implements ViewportListenerI } } + + // System.err.println(">>> FastPaint to " + transX + " " + transY + " " + // + horizontal + " " + vertical + " " + startRes + " " + endRes + // + " " + startSeq + " " + endSeq); + + Graphics gg = img.getGraphics(); + gg.copyArea(horizontal * charWidth, vertical * charHeight, + img.getWidth(), img.getHeight(), -horizontal * charWidth, + -vertical * charHeight); + + /** @j2sNative xxi = this.img */ + gg.translate(transX, transY); drawPanel(gg, startRes, endRes, startSeq, endSeq, 0); gg.translate(-transX, -transY); gg.dispose(); - + // Call repaint on alignment panel so that repaints from other alignment // panel components can be aggregated. Otherwise performance of the // overview window and others may be adversely affected. + // System.out.println("SeqCanvas fastPaint() repaint() request..."); av.getAlignPanel().repaint(); } finally { @@ -355,35 +375,52 @@ public class SeqCanvas extends JPanel implements ViewportListenerI @Override public void paintComponent(Graphics g) { - super.paintComponent(g); - int charHeight = av.getCharHeight(); int charWidth = av.getCharWidth(); - ViewportRanges ranges = av.getRanges(); - int width = getWidth(); int height = getHeight(); width -= (width % charWidth); height -= (height % charHeight); - if ((img != null) && (fastPaint - || (getVisibleRect().width != g.getClipBounds().width) - || (getVisibleRect().height != g.getClipBounds().height))) + // BH 2019 can't possibly fastPaint if width and height are 0 + if (width == 0 || height == 0) { - g.drawImage(img, 0, 0, this); - - drawSelectionGroup((Graphics2D) g, ranges.getStartRes(), - ranges.getEndRes(), ranges.getStartSeq(), ranges.getEndSeq()); + return; + } + ViewportRanges ranges = av.getRanges(); + int startRes = ranges.getStartRes(); + int startSeq = ranges.getStartSeq(); + int endRes = ranges.getEndRes(); + int endSeq = ranges.getEndSeq(); + + // System.err.println(">>SeqCanvas paintComponent " + fastPaint + "\n" + // + getVisibleRect() + "\n" + g.getClipBounds()); + // System.err.println(">>>>>>>>>>>>>>>>SeqCanvas paintComponent " + // + startRes + " " + endRes + " " + startSeq + " " + endSeq); + Rectangle vis, clip; + if (img != null + && (fastPaint + || (vis = getVisibleRect()).width != (clip = g + .getClipBounds()).width + || vis.height != clip.height)) + { + g.drawImage(img, 0, 0, this); + // System.err.println(">>>>>>>>>>>>>>>>SeqCanvas paintComponent FAST"); + drawSelectionGroup((Graphics2D) g, startRes, endRes, startSeq, + endSeq); fastPaint = false; + //System.out.println("SeqCanvas fast paint"); } - else if (width > 0 && height > 0) + else { + + System.out.println("SeqCanvas full paint"); /* - * img is a cached version of the last view we drew, if any - * if we have no img or the size has changed, make a new one + * img is a cached version of the last view we drew. + * If we have no img or the size has changed, make a new one */ if (img == null || width != img.getWidth() || height != img.getHeight()) @@ -405,16 +442,14 @@ public class SeqCanvas extends JPanel implements ViewportListenerI if (av.getWrapAlignment()) { - drawWrappedPanel(gg, getWidth(), getHeight(), ranges.getStartRes()); + drawWrappedPanel(gg, width, height, ranges.getStartRes()); } else { - drawPanel(gg, ranges.getStartRes(), ranges.getEndRes(), - ranges.getStartSeq(), ranges.getEndSeq(), 0); + drawPanel(gg, startRes, endRes, startSeq, endSeq, 0); } - drawSelectionGroup(gg, ranges.getStartRes(), - ranges.getEndRes(), ranges.getStartSeq(), ranges.getEndSeq()); + drawSelectionGroup(gg, startRes, endRes, startSeq, endSeq); g.drawImage(img, 0, 0, this); gg.dispose(); @@ -422,8 +457,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI if (av.cursorMode) { - drawCursor(g, ranges.getStartRes(), ranges.getEndRes(), - ranges.getStartSeq(), ranges.getEndSeq()); + drawCursor(g, startRes, endRes, startSeq, endSeq); } } @@ -565,7 +599,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI calculateWrappedGeometry(canvasWidth, canvasHeight); /* - * draw one width at a time (excluding any scales or annotation shown), + * draw one width at a time (excluding any scales shown), * until we have run out of either alignment or vertical space available */ int ypos = wrappedSpaceAboveAlignment; @@ -612,14 +646,22 @@ public class SeqCanvas extends JPanel implements ViewportListenerI * (av.getScaleAboveWrapped() ? 2 : 1); /* - * height in pixels of the wrapped widths + * compute height in pixels of the wrapped widths + * - start with space above plus sequences */ wrappedRepeatHeightPx = wrappedSpaceAboveAlignment; - // add sequences wrappedRepeatHeightPx += av.getAlignment().getHeight() * charHeight; - // add annotations panel height if shown - wrappedRepeatHeightPx += getAnnotationHeight(); + + /* + * add annotations panel height if shown + * also gap between sequences and annotations + */ + if (av.isShowAnnotation()) + { + wrappedRepeatHeightPx += getAnnotationHeight(); + wrappedRepeatHeightPx += SEQS_ANNOTATION_GAP; // 3px + } /* * number of visible widths (the last one may be part height), @@ -663,8 +705,9 @@ public class SeqCanvas extends JPanel implements ViewportListenerI * @param endColumn * @param canvasHeight */ - protected void drawWrappedWidth(Graphics g, int ypos, int startColumn, - int endColumn, int canvasHeight) + protected void drawWrappedWidth(Graphics g, final int ypos, + final int startColumn, final int endColumn, + final int canvasHeight) { ViewportRanges ranges = av.getRanges(); int viewportWidth = ranges.getViewportWidth(); @@ -698,7 +741,8 @@ public class SeqCanvas extends JPanel implements ViewportListenerI if (av.isShowAnnotation()) { - g.translate(0, cHeight + ypos + 3); + final int yShift = cHeight + ypos + SEQS_ANNOTATION_GAP; + g.translate(0, yShift); if (annotations == null) { annotations = new AnnotationPanel(av); @@ -706,7 +750,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI annotations.renderer.drawComponent(annotations, av, g, -1, startColumn, endx + 1); - g.translate(0, -cHeight - ypos - 3); + g.translate(0, -yShift); } g.translate(-xOffset, 0); } @@ -849,13 +893,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI int startx = startRes; int endx; int ypos = hgap; // vertical offset - int maxwidth = av.getAlignment().getWidth(); - - if (av.hasHiddenColumns()) - { - maxwidth = av.getAlignment().getHiddenColumns() - .absoluteToVisibleColumn(maxwidth); - } + int maxwidth = av.getAlignment().getVisibleWidth(); // chop the wrapped alignment extent up into panel-sized blocks and treat // each block as if it were a block from an unwrapped alignment @@ -1627,7 +1665,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI public void propertyChange(PropertyChangeEvent evt) { String eventName = evt.getPropertyName(); - + // System.err.println(">>SeqCanvas propertyChange " + eventName); if (eventName.equals(SequenceGroup.SEQ_GROUP_CHANGED)) { fastPaint = true; @@ -1637,6 +1675,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI else if (eventName.equals(ViewportRanges.MOVE_VIEWPORT)) { fastPaint = false; + // System.err.println("!!!! fastPaint false from MOVE_VIEWPORT"); repaint(); return; } @@ -1658,7 +1697,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI } ViewportRanges vpRanges = av.getRanges(); - int range = vpRanges.getEndRes() - vpRanges.getStartRes(); + int range = vpRanges.getEndRes() - vpRanges.getStartRes() + 1; if (scrollX > range) { scrollX = range; @@ -1668,37 +1707,37 @@ public class SeqCanvas extends JPanel implements ViewportListenerI scrollX = -range; } } - // Both scrolling and resizing change viewport ranges: scrolling changes - // both start and end points, but resize only changes end values. - // Here we only want to fastpaint on a scroll, with resize using a normal - // paint, so scroll events are identified as changes to the horizontal or - // vertical start value. - if (eventName.equals(ViewportRanges.STARTRES)) + // Both scrolling and resizing change viewport ranges: scrolling changes + // both start and end points, but resize only changes end values. + // Here we only want to fastpaint on a scroll, with resize using a normal + // paint, so scroll events are identified as changes to the horizontal or + // vertical start value. + if (eventName.equals(ViewportRanges.STARTRES)) + { + if (av.getWrapAlignment()) { - if (av.getWrapAlignment()) - { - fastPaintWrapped(scrollX); - } - else - { - fastPaint(scrollX, 0); - } + fastPaintWrapped(scrollX); } - else if (eventName.equals(ViewportRanges.STARTSEQ)) + else { - // scroll - fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue()); + fastPaint(scrollX, 0); } - else if (eventName.equals(ViewportRanges.STARTRESANDSEQ)) + } + else if (eventName.equals(ViewportRanges.STARTSEQ)) + { + // scroll + fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue()); + } + else if (eventName.equals(ViewportRanges.STARTRESANDSEQ)) + { + if (av.getWrapAlignment()) { - if (av.getWrapAlignment()) - { - fastPaintWrapped(scrollX); - } - else - { - fastPaint(scrollX, 0); - } + fastPaintWrapped(scrollX); + } + else + { + fastPaint(scrollX, 0); + } } else if (eventName.equals(ViewportRanges.STARTSEQ)) { @@ -1727,10 +1766,10 @@ public class SeqCanvas extends JPanel implements ViewportListenerI { ViewportRanges ranges = av.getRanges(); - if (Math.abs(scrollX) > ranges.getViewportWidth()) + if (Math.abs(scrollX) >= ranges.getViewportWidth()) { /* - * shift of more than one view width is + * shift of one view width or more is * overcomplicated to handle in this method */ fastPaint = false; @@ -1935,10 +1974,17 @@ public class SeqCanvas extends JPanel implements ViewportListenerI while (y >= 0) { + /* + * shift 'widthToCopy' residues by 'positions' places to the right + */ gg.copyArea(copyFromLeftStart, y, widthToCopy, heightToCopy, positions * charWidth, 0); if (y > 0) { + /* + * copy 'positions' residue from the row above (right hand end) + * to this row's left hand end + */ gg.copyArea(copyFromRightStart, y - wrappedRepeatHeightPx, positions * charWidth, heightToCopy, -widthToCopy, wrappedRepeatHeightPx); @@ -2113,4 +2159,19 @@ public class SeqCanvas extends JPanel implements ViewportListenerI { return labelWidthWest; } + + /** + * Ensure that a full paint is done next, for whatever reason. This was + * necessary for JavaScript; apparently in Java the timing is just right on + * multiple threads (EventQueue-0, Consensus, Conservation) that we can get + * away with one fast paint before the others, but this ensures that in the + * end we get a full paint. Problem arose in relation to copy/paste, where the + * paste was not finalized with a full paint. + * + * @author hansonr 2019.04.17 + */ + public void clearFastPaint() + { + fastPaint = false; + } }