}
/**
- * DOCUMENT ME!
+ * Draws the scale above a region of a wrapped alignment, consisting of a
+ * column number every major interval (10 columns).
*
* @param g
- * DOCUMENT ME!
+ * the graphics context to draw on, positioned at the start (bottom
+ * left) of the line on which to draw any scale marks
* @param startx
- * DOCUMENT ME!
+ * start alignment column (0..)
* @param endx
- * DOCUMENT ME!
+ * end alignment column (0..)
* @param ypos
- * DOCUMENT ME!
+ * y offset to draw at
*/
private void drawNorthScale(Graphics g, int startx, int endx, int ypos)
{
updateViewport();
- for (ScaleMark mark : new ScaleRenderer().calculateMarks(av, startx,
- endx))
+ List<ScaleMark> marks = new ScaleRenderer().calculateMarks(av, startx,
+ endx);
+ for (ScaleMark mark : marks)
{
int mpos = mark.column; // (i - startx - 1)
if (mpos < 0)
{
g.drawString(mstring, mpos * charWidth, ypos - (charHeight / 2));
}
- g.drawLine((mpos * charWidth) + (charWidth / 2), (ypos + 2)
- - (charHeight / 2), (mpos * charWidth) + (charWidth / 2),
- ypos - 2);
+
+ /*
+ * draw a tick mark below the column number, centred on the column;
+ * height of tick mark is 4 pixels less than half a character
+ */
+ int xpos = (mpos * charWidth) + (charWidth / 2);
+ g.drawLine(xpos, (ypos + 2) - (charHeight / 2), xpos, ypos - 2);
}
}
}
if (value != -1)
{
/*
- * draw scale value, justified, with half a character width
+ * white fill the space for the scale
+ */
+ g.setColor(Color.white);
+ int y = (ypos + (i * charHeight)) - (charHeight / 5);
+ y -= charHeight; // fillRect: origin is top left of rectangle
+ int xpos = left ? 0 : getWidth() - labelWidthEast;
+ g.fillRect(xpos, y, left ? labelWidthWest : labelWidthEast,
+ charHeight + 1);
+ y += charHeight; // drawString: origin is bottom left of text
+
+ /*
+ * draw scale value, right justified, with half a character width
* separation from the sequence data
*/
String valueAsString = String.valueOf(value);
int justify = fm.stringWidth(valueAsString) + charWidth;
- int xpos = left ? labelWidthWest - justify + charWidth / 2
+ xpos = left ? labelWidthWest - justify + charWidth / 2
: getWidth() - justify - charWidth / 2;
- g.setColor(Color.white);
- int y = (ypos + (i * charHeight)) - (charHeight / 5);
- g.fillRect(xpos, y, justify, charHeight);
g.setColor(Color.black);
g.drawString(valueAsString, xpos, y);
}
}
/**
- * need to make this thread safe move alignment rendering in response to
- * slider adjustment
+ * Does a fast paint of an alignment in response to a scroll. Most of the
+ * visible region is simply copied and shifted, and then any newly visible
+ * columns or rows are drawn. The scroll may be horizontal or vertical, but
+ * not both at once. Scrolling may be the result of
+ * <ul>
+ * <li>dragging a scroll bar</li>
+ * <li>clicking in the scroll bar</li>
+ * <li>scrolling by trackpad, middle mouse button, or other device</li>
+ * <li>by moving the box in the Overview window</li>
+ * <li>programmatically to make a highlighted position visible</li>
+ * </ul>
*
* @param horizontal
- * shift along
+ * columns to shift right (positive) or left (negative)
* @param vertical
- * shift up or down in repaint
+ * rows to shift down (positive) or up (negative)
*/
public void fastPaint(int horizontal, int vertical)
{
}
fastpainting = true;
fastPaint = true;
- updateViewport();
- ViewportRanges ranges = av.getRanges();
- int startRes = ranges.getStartRes();
- int endRes = ranges.getEndRes();
- int startSeq = ranges.getStartSeq();
- int endSeq = ranges.getEndSeq();
- int transX = 0;
- int transY = 0;
+ try
+ {
+ updateViewport();
- gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
- imgHeight, -horizontal * charWidth, -vertical * charHeight);
+ ViewportRanges ranges = av.getRanges();
+ int startRes = ranges.getStartRes();
+ int endRes = ranges.getEndRes();
+ int startSeq = ranges.getStartSeq();
+ int endSeq = ranges.getEndSeq();
+ int transX = 0;
+ int transY = 0;
- if (horizontal > 0) // scrollbar pulled right, image to the left
- {
- transX = (endRes - startRes - horizontal) * charWidth;
- startRes = endRes - horizontal;
- }
- else if (horizontal < 0)
- {
- endRes = startRes - horizontal;
- }
- else if (vertical > 0) // scroll down
- {
- startSeq = endSeq - vertical;
+ gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
+ imgHeight, -horizontal * charWidth, -vertical * charHeight);
- if (startSeq < ranges.getStartSeq())
- { // ie scrolling too fast, more than a page at a time
- startSeq = ranges.getStartSeq();
+ if (horizontal > 0) // scrollbar pulled right, image to the left
+ {
+ transX = (endRes - startRes - horizontal) * charWidth;
+ startRes = endRes - horizontal;
}
- else
+ else if (horizontal < 0)
{
- transY = imgHeight - ((vertical + 1) * charHeight);
+ endRes = startRes - horizontal;
}
- }
- else if (vertical < 0)
- {
- endSeq = startSeq - vertical;
+ else if (vertical > 0) // scroll down
+ {
+ startSeq = endSeq - vertical;
- if (endSeq > ranges.getEndSeq())
+ if (startSeq < ranges.getStartSeq())
+ { // ie scrolling too fast, more than a page at a time
+ startSeq = ranges.getStartSeq();
+ }
+ else
+ {
+ transY = imgHeight - ((vertical + 1) * charHeight);
+ }
+ }
+ else if (vertical < 0)
{
- endSeq = ranges.getEndSeq();
+ endSeq = startSeq - vertical;
+
+ if (endSeq > ranges.getEndSeq())
+ {
+ endSeq = ranges.getEndSeq();
+ }
}
- }
- gg.translate(transX, transY);
- drawPanel(gg, startRes, endRes, startSeq, endSeq, 0);
- gg.translate(-transX, -transY);
+ gg.translate(transX, transY);
+ drawPanel(gg, startRes, endRes, startSeq, endSeq, 0);
+ gg.translate(-transX, -transY);
- repaint();
- fastpainting = false;
+ repaint();
+ } finally
+ {
+ fastpainting = false;
+ }
}
@Override
}
/**
- * DOCUMENT ME!
+ * Draws as many widths of a wrapped alignment as can fit in the visible
+ * window
*
* @param g
- * DOCUMENT ME!
* @param canvasWidth
- * DOCUMENT ME!
+ * available width in pixels
* @param canvasHeight
- * DOCUMENT ME!
+ * available height in pixels
* @param startRes
- * DOCUMENT ME!
+ * the first visible column (0...) of the alignment to draw
*/
public void drawWrappedPanel(Graphics g, int canvasWidth,
int canvasHeight, int startRes)
int annotationHeight = getAnnotationHeight();
int sequencesHeight = av.getAlignment().getHeight() * charHeight;
- while ((ypos <= canvasHeight) && (startRes < maxwidth))
+ /*
+ * draw one width at a time (including any scales or annotation shown),
+ * until we have run out of alignment or vertical space available
+ * (stop if not enough room left for at least one sequence)
+ */
+ int yposMax = canvasHeight;// - hgap - charHeight + 1;
+ while ((ypos <= yposMax) && (startRes < maxwidth))
{
drawWrappedWidth(g, startRes, canvasHeight, cWidth, maxwidth, ypos);
}
/**
+ * Draws one width of a wrapped alignment, including scales left, right or
+ * above, and annnotations, if shown
+ *
* @param g
* @param startRes
* @param canvasHeight
drawVerticalScale(g, startRes, endx, ypos, false);
}
+ drawWrappedRegion(g, startRes, endx, canvasHeight, canvasWidth, ypos);
+ }
+
+ /**
+ * Draws columns of a wrapped alignment from startRes to endRes, including
+ * scale above and annotations if shown, but not scale left or right.
+ *
+ * @param g
+ * @param startRes
+ * @param endRes
+ * @param canvasHeight
+ * @param canvasWidth
+ * @param ypos
+ */
+ protected void drawWrappedRegion(Graphics g, int startRes, int endRes,
+ int canvasHeight, int canvasWidth, int ypos)
+ {
g.translate(labelWidthWest, 0);
if (av.getScaleAboveWrapped())
{
- drawNorthScale(g, startRes, endx, ypos);
+ drawNorthScale(g, startRes, endRes, ypos);
}
+ // todo can we let drawPanel() handle this?
if (av.hasHiddenColumns() && av.getShowHiddenMarkers())
{
g.setColor(Color.blue);
{
int res = pos - startRes;
- if (res < 0 || res > endx - startRes)
+ if (res < 0 || res > endRes - startRes)
{
continue;
}
res * charWidth + charHeight / 4, res * charWidth }, new int[] {
ypos - (charHeight / 2), ypos - (charHeight / 2),
ypos - (charHeight / 2) + 8 }, 3);
-
}
}
(int) clip.getBounds().getHeight());
}
- drawPanel(g, startRes, endx, 0, av.getAlignment().getHeight() - 1, ypos);
+ drawPanel(g, startRes, endRes, 0, av.getAlignment().getHeight() - 1, ypos);
int cHeight = av.getAlignment().getHeight() * charHeight;
}
annotations.renderer.drawComponent(annotations, av, g, -1, startRes,
- endx + 1);
+ endRes + 1);
g.translate(0, -cHeight - ypos - 3);
}
g.setClip(clip);
* marker.
*
* @param g1
+ * the graphics context, positioned at the first residue to be drawn
* @param startRes
- * offset of the first column in the visible region (0..)
+ * offset of the first column to draw (0..)
* @param endRes
- * offset of the last column in the visible region (0..)
+ * offset of the last column to draw (0..)
* @param startSeq
- * offset of the first sequence in the visible region (0..)
+ * offset of the first sequence to draw (0..)
* @param endSeq
- * offset of the last sequence in the visible region (0..)
+ * offset of the last sequence to draw (0..)
* @param yOffset
* vertical offset at which to draw (for wrapped alignments)
*/
{
String eventName = evt.getPropertyName();
- if (true/*!av.getWrapAlignment()*/)
+ int scrollX = 0;
+ if (eventName.equals(ViewportRanges.STARTRES))
{
- int scrollX = 0;
- if (eventName.equals(ViewportRanges.STARTRES))
+ // Make sure we're not trying to draw a panel
+ // larger than the visible window
+ ViewportRanges vpRanges = av.getRanges();
+ scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+ int range = vpRanges.getEndRes() - vpRanges.getStartRes();
+ if (scrollX > range)
{
- // Make sure we're not trying to draw a panel
- // larger than the visible window
- ViewportRanges vpRanges = av.getRanges();
- scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
- int range = vpRanges.getEndRes() - vpRanges.getStartRes();
- if (scrollX > range)
- {
- scrollX = range;
- }
- else if (scrollX < -range)
- {
- scrollX = -range;
- }
+ scrollX = range;
}
+ else if (scrollX < -range)
+ {
+ 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))
+ {
+ // scroll - startres and endres both change
+ if (av.getWrapAlignment())
{
- // scroll - startres and endres both change
- 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.STARTSEQ))
+ {
+ fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue());
+ }
}
/**
if (Math.abs(scrollX) > av.getRanges().getViewportWidth())
{
/*
- * shift of more than one view width is too much
- * to handle in this method
+ * shift of more than one view width is
+ * overcomplicated to handle in this method
*/
fastPaint = false;
repaint();
return;
}
+ if (fastpainting || gg == null)
+ {
+ return;
+ }
+
fastPaint = true;
- shiftWrappedAlignment(-scrollX);
+ fastpainting = true;
+
+ try
+ {
+ /*
+ * relocate the regions of the alignment that are still visible
+ */
+ shiftWrappedAlignment(-scrollX);
+
+ /*
+ * add new columns (scale above, sequence, annotation)
+ * - at top left if scrollX < 0
+ * - at right of last two widths if scrollX > 0
+ * also West scale top left or East scale bottom right if shown
+ */
+ if (scrollX < 0)
+ {
+ fastPaintWrappedAddLeft(-scrollX);
+ }
+ else
+ {
+ fastPaintWrappedAddRight(scrollX);
+ }
+
+ repaint();
+ } finally
+ {
+ fastpainting = false;
+ }
+ }
+
+ /**
+ * Draws the specified number of columns at the 'end' (bottom right) of a
+ * wrapped alignment view, including scale above and right and annotations if
+ * shown. Also draws the same number of columns at the right hand end of the
+ * second last width shown, if the last width is not full height (so cannot
+ * simply be copied from the graphics image).
+ *
+ * @param columns
+ */
+ protected void fastPaintWrappedAddRight(int columns)
+ {
+ if (columns == 0)
+ {
+ return;
+ }
+
+ /*
+ * how many widths are visible? we will be adding
+ * columns to the last visible width, right hand end
+ */
+ int repeatHeight = getRepeatHeightWrapped();
+ int canvasHeight = getHeight();
+ int visibleWidths = canvasHeight / repeatHeight;
+ int remainder = canvasHeight % repeatHeight;
+ int hgap = charHeight * (av.getScaleAboveWrapped() ? 2 : 1);
+ boolean lastWidthPartHeight = false;
+ if (remainder >= (hgap + charHeight))
+ {
+ visibleWidths++;
+ lastWidthPartHeight = true;
+ }
- // add new columns (scale above, sequence, annotation)
- // at top left if scrollX < 0 or bottom right if scrollX > 0
+ /*
+ * limit visible widths to max widths of alignment, from the
+ * current start residue (we may be scrolled down)
+ */
+ ViewportRanges ranges = av.getRanges();
+ int availableAlignmentWidth = ranges.getVisibleAlignmentWidth()
+ - ranges.getStartRes();
+ int viewportWidth = ranges.getViewportWidth();
+ int maxWidths = availableAlignmentWidth / viewportWidth;
+ if (availableAlignmentWidth % viewportWidth > 0)
+ {
+ maxWidths++;
+ }
+ visibleWidths = Math.min(visibleWidths, maxWidths);
+ int canvasWidth = getWidth();
+ int widthInColumns = (canvasWidth - labelWidthEast - labelWidthWest)
+ / charWidth;
+
+ /**
+ * draw full height alignment in the second last row, last columns, if the
+ * last row was not full height
+ */
+ if (lastWidthPartHeight)
+ {
+ int widthsAbove = visibleWidths - 2;
+ int ypos = repeatHeight * widthsAbove + hgap;
+ int endRes = ranges.getEndRes();
+ endRes += widthsAbove * viewportWidth;
+ int startRes = endRes - columns;
+ int xOffset = ((startRes - ranges.getStartRes()) % viewportWidth)
+ * charWidth;
+ gg.translate(xOffset, 0);
- repaint();
+ /*
+ * white fill first to erase annotations
+ */
+ gg.setColor(Color.white);
+ gg.fillRect(labelWidthWest, ypos,
+ (endRes - startRes + 1) * charWidth, repeatHeight);
+
+ drawWrappedRegion(gg, startRes, endRes, canvasHeight, widthInColumns,
+ ypos);
+ gg.translate(-xOffset, 0);
+ }
+
+ /*
+ * y-offset for drawing is height of widths above,
+ * plus one gap row
+ */
+ int widthsAbove = visibleWidths - 1;
+ int ypos = repeatHeight * widthsAbove + hgap;
+ int endRes = ranges.getEndRes();
+ endRes += widthsAbove * viewportWidth;
+ endRes = Math.min(endRes, ranges.getVisibleAlignmentWidth());
+
+ /*
+ * draw one extra column than strictly needed - this is a (harmless)
+ * fudge to ensure scale marks get drawn (JAL-2636)
+ */
+ int startRes = endRes - columns;
+
+ /*
+ * x-offset is x-start modulo viewport start residue;
+ * doesn't include label West (offset is applied in drawWrappedRegion)
+ */
+
+ int leftEndColumn = ranges.getStartRes() + widthsAbove
+ * ranges.getViewportWidth();
+ // startRes = Math.max(startRes - 0, leftEndColumn);
+ int xOffset = ((startRes - ranges.getStartRes()) % viewportWidth)
+ * charWidth;
+ gg.translate(xOffset, 0);
+
+ /*
+ * white fill the region to be drawn including scale left or above;
+ * extend to right hand margin so as to erase scale above when
+ * scrolling right beyond end of alignment
+ */
+ gg.setColor(Color.white);
+ int width = canvasWidth - labelWidthWest - xOffset;
+ gg.fillRect(labelWidthWest, ypos - hgap, width, repeatHeight);
+
+ gg.setFont(av.getFont());
+ gg.setColor(Color.black);
+
+ drawWrappedRegion(gg, startRes, endRes, canvasHeight, widthInColumns,
+ ypos);
+ gg.translate(-xOffset, 0);
+
+ /*
+ * draw scale right if shown, passing in the start/end columns
+ * for the whole line, not just the last few columns
+ */
+ if (av.getScaleRightWrapped())
+ {
+ drawVerticalScale(gg, leftEndColumn, endRes, ypos, false);
+ }
+
+ /*
+ * and finally, white fill any space below the visible alignment
+ * (in case it has wrapped to just the top part of the panel)
+ */
+ int heightBelow = canvasHeight - visibleWidths * repeatHeight;
+ if (heightBelow > 0)
+ {
+ gg.setColor(Color.white);
+ gg.fillRect(0, canvasHeight - heightBelow, canvasWidth, heightBelow);
+ }
+ }
+
+ /**
+ * Draws the specified number of columns at the 'start' (top left) of a
+ * wrapped alignment view, including scale above and left and annotations if
+ * shown
+ *
+ * @param columns
+ */
+ protected void fastPaintWrappedAddLeft(int columns)
+ {
+ int startRes = av.getRanges().getStartRes();
+
+ /*
+ * draw one extra column than strictly needed - this is a (harmless)
+ * fudge to ensure scale marks get drawn (JAL-2636)
+ */
+ int endx = startRes + columns;
+ int ypos = 0;
+
+ /*
+ * white fill the region to be drawn including scale left or above
+ */
+ gg.setColor(Color.white);
+ int height = getRepeatHeightWrapped();
+ gg.fillRect(0, ypos, labelWidthWest + columns * charWidth, height);
+ ypos += charHeight * (av.getScaleAboveWrapped() ? 2 : 1);
+
+ gg.setFont(av.getFont());
+ gg.setColor(Color.black);
+
+ if (av.getScaleLeftWrapped())
+ {
+ drawVerticalScale(gg, startRes, endx, ypos, true);
+ }
+
+ int cWidth = (getWidth() - labelWidthEast - labelWidthWest) / charWidth;
+
+ drawWrappedRegion(gg, startRes, endx, getHeight(), cWidth, ypos);
}
/**
int repeatHeight = getRepeatHeightWrapped();
ViewportRanges ranges = av.getRanges();
+ int xMax = ranges.getVisibleAlignmentWidth();
int widthToCopy = (ranges.getViewportWidth() - Math.abs(positions))
* charWidth;
- int visibleWidths = getHeight() / repeatHeight;
- if (getHeight() % repeatHeight > 0)
+ int canvasHeight = getHeight();
+ int visibleWidths = canvasHeight / repeatHeight;
+ if (canvasHeight % repeatHeight > 0)
{
visibleWidths++;
}
int viewportWidth = ranges.getViewportWidth();
+ int hgap = charHeight * (av.getScaleAboveWrapped() ? 2 : 1);
+
+ int remainder = canvasHeight % repeatHeight;
+ if (remainder >= (hgap + charHeight))
+ {
+ visibleWidths++;
+ }
+ /*
+ * limit visibleWidths to not exceed width of alignment
+ */
+ int maxWidths = (xMax - ranges.getStartRes()) / viewportWidth;
+ if (xMax % viewportWidth > 0)
+ {
+ maxWidths++;
+ }
+ visibleWidths = Math.min(visibleWidths, maxWidths);
if (positions > 0)
{
/*
* get y-offset of last wrapped width
*/
- int y = getHeight() / repeatHeight * repeatHeight;
+ int y = canvasHeight / repeatHeight * repeatHeight;
int copyFromLeftStart = labelWidthWest;
int copyFromRightStart = copyFromLeftStart + widthToCopy;
while (y >= 0)
{
- // todo limit repeatHeight for a last part height width
gg.copyArea(copyFromLeftStart, y, widthToCopy, repeatHeight,
positions * charWidth, 0);
if (y > 0)
if (av.getScaleLeftWrapped())
{
- // drawVerticalScale(gg, xpos, xpos + viewportWidth, y, true);
+ drawVerticalScale(gg, xpos, xpos + viewportWidth - 1, y + hgap,
+ true);
}
if (av.getScaleRightWrapped())
{
- // drawVerticalScale(gg, xpos, xpos + viewportWidth, y, false);
+ drawVerticalScale(gg, xpos, xpos + viewportWidth - 1, y + hgap,
+ false);
}
y -= repeatHeight;
int y = 0;
int copyFromRightStart = labelWidthWest - positions * charWidth;
- while (y < getHeight())
+ while (y < canvasHeight)
{
- // todo limit repeatHeight for a last part height width
gg.copyArea(copyFromRightStart, y, widthToCopy, repeatHeight,
positions * charWidth, 0);
- if (y + repeatHeight < getHeight())
+ if (y + repeatHeight < canvasHeight - repeatHeight
+ && (xpos + viewportWidth <= xMax))
{
gg.copyArea(labelWidthWest, y + repeatHeight, -positions
* charWidth, repeatHeight, widthToCopy, -repeatHeight);
if (av.getScaleLeftWrapped())
{
- drawVerticalScale(gg, xpos, xpos + viewportWidth, y, true);
+ drawVerticalScale(gg, xpos, xpos + viewportWidth, y + hgap, true);
}
if (av.getScaleRightWrapped())
{
- drawVerticalScale(gg, xpos, xpos + viewportWidth, y, false);
+ drawVerticalScale(gg, xpos, xpos + viewportWidth, y + hgap, false);
}
y += repeatHeight;
- xpos += ranges.getViewportWidth();
+ xpos += viewportWidth;
}
}
}
git://source.jalview.org / jalview.git / blobdiff