*/
public void fastPaint(int vertical)
{
- if (gg == null)
+ /*
+ * for now, not attempting fast paint of wrapped ids...
+ */
+ if (gg == null || av.getWrapAlignment())
{
repaint();
Color currentColor = Color.white;
Color currentTextColor = Color.black;
- final boolean doHiddenCheck = av.isDisplayReferenceSeq()
- || av.hasHiddenRows(), hiddenRows = av.hasHiddenRows();
+ boolean hasHiddenRows = av.hasHiddenRows();
if (av.getWrapAlignment())
{
- int maxwidth = av.getAlignment().getWidth();
- int alheight = av.getAlignment().getHeight();
+ drawIdsWrapped(starty, hasHiddenRows);
+ return;
+ }
- if (av.hasHiddenColumns())
- {
- maxwidth = av.getAlignment().getHiddenColumns()
- .findColumnPosition(maxwidth) - 1;
- }
+ // No need to hang on to labels if we're not wrapped
+ labels = null;
- int annotationHeight = 0;
+ // Now draw the id strings
+ int panelWidth = getWidth();
+ int xPos = 0;
+
+ SequenceI sequence;
+ // Now draw the id strings
+ for (int i = starty; i <= endy; i++)
+ {
+ sequence = av.getAlignment().getSequenceAt(i);
- if (av.isShowAnnotation())
+ if (sequence == null)
{
- if (ap == null)
- {
- ap = new AnnotationPanel(av);
- }
+ continue;
+ }
- annotationHeight = ap.adjustPanelHeight();
- if (labels == null)
- {
- labels = new AnnotationLabels(av);
- }
+ if (hasHiddenRows || av.isDisplayReferenceSeq())
+ {
+ setHiddenFont(sequence);
}
- int hgap = av.getCharHeight();
- if (av.getScaleAboveWrapped())
+ // Selected sequence colours
+ if ((searchResults != null) && searchResults.contains(sequence))
{
- hgap += av.getCharHeight();
+ currentColor = Color.black;
+ currentTextColor = Color.white;
}
+ else if ((av.getSelectionGroup() != null)
+ && av.getSelectionGroup().getSequences(null)
+ .contains(sequence))
+ {
+ currentColor = Color.lightGray;
+ currentTextColor = Color.black;
+ }
+ else
+ {
+ currentColor = av.getSequenceColour(sequence);
+ currentTextColor = Color.black;
+ }
+
+ gg.setColor(currentColor);
+
+ gg.fillRect(0, (i - starty) * av.getCharHeight(), getWidth(),
+ av.getCharHeight());
- int cHeight = alheight * av.getCharHeight() + hgap + annotationHeight;
+ gg.setColor(currentTextColor);
- int rowSize = av.getRanges().getEndRes()
- - av.getRanges().getStartRes();
+ String string = sequence.getDisplayId(av.getShowJVSuffix());
- // Draw the rest of the panels
- for (int ypos = hgap, row = av.getRanges().getStartRes(); (ypos <= getHeight())
- && (row < maxwidth); ypos += cHeight, row += rowSize)
+ if (av.isRightAlignIds())
{
- for (int i = starty; i < alheight; i++)
- {
- SequenceI s = av.getAlignment().getSequenceAt(i);
- if (doHiddenCheck)
- {
- setHiddenFont(s);
- }
- else
- {
- gg.setFont(getIdfont());
- }
-
- drawIdString(gg, hiddenRows, s, i, 0, ypos);
- }
+ xPos = panelWidth - fm.stringWidth(string) - 4;
+ }
- if (labels != null && av.isShowAnnotation())
- {
- gg.translate(0, ypos + (alheight * av.getCharHeight()));
- labels.drawComponent(gg, getWidth());
- gg.translate(0, -ypos - (alheight * av.getCharHeight()));
- }
+ gg.drawString(string, xPos,
+ (((i - starty) * av.getCharHeight()) + av.getCharHeight())
+ - (av.getCharHeight() / 5));
+
+ if (hasHiddenRows)
+ {
+ drawMarker(i, starty, 0);
}
}
- else
- {
- // No need to hang on to labels if we're not wrapped
- labels = null;
+ }
- // Now draw the id strings
- int panelWidth = getWidth();
- int xPos = 0;
+ /**
+ * Draws sequence ids in wrapped mode
+ *
+ * @param starty
+ * @param hasHiddenRows
+ */
+ protected void drawIdsWrapped(int starty, boolean hasHiddenRows)
+ {
+ int maxwidth = av.getAlignment().getWidth();
+ int alheight = av.getAlignment().getHeight();
- SequenceI sequence;
- // Now draw the id strings
- for (int i = starty; i <= endy; i++)
- {
- sequence = av.getAlignment().getSequenceAt(i);
+ if (av.hasHiddenColumns())
+ {
+ maxwidth = av.getAlignment().getHiddenColumns()
+ .findColumnPosition(maxwidth) - 1;
+ }
- if (sequence == null)
- {
- continue;
- }
+ int annotationHeight = 0;
- if (doHiddenCheck)
- {
- setHiddenFont(sequence);
- }
+ if (av.isShowAnnotation())
+ {
+ if (ap == null)
+ {
+ ap = new AnnotationPanel(av);
+ }
- // Selected sequence colours
- if ((searchResults != null) && searchResults.contains(sequence))
- {
- currentColor = Color.black;
- currentTextColor = Color.white;
- }
- else if ((av.getSelectionGroup() != null)
- && av.getSelectionGroup().getSequences(null)
- .contains(sequence))
- {
- currentColor = Color.lightGray;
- currentTextColor = Color.black;
- }
- else
- {
- currentColor = av.getSequenceColour(sequence);
- currentTextColor = Color.black;
- }
+ annotationHeight = ap.adjustPanelHeight();
+ if (labels == null)
+ {
+ labels = new AnnotationLabels(av);
+ }
+ }
- gg.setColor(currentColor);
+ int hgap = av.getCharHeight();
+ if (av.getScaleAboveWrapped())
+ {
+ hgap += av.getCharHeight();
+ }
- gg.fillRect(0, (i - starty) * av.getCharHeight(), getWidth(),
- av.getCharHeight());
+ int cHeight = alheight * av.getCharHeight() + hgap + annotationHeight;
- gg.setColor(currentTextColor);
+ ViewportRanges ranges = av.getRanges();
- String string = sequence.getDisplayId(av.getShowJVSuffix());
+ int rowSize = ranges.getEndRes() - ranges.getStartRes();
- if (av.isRightAlignIds())
+ /*
+ * draw repeating sequence ids until out of sequence data or
+ * out of visible space, whichever comes first
+ */
+ int ypos = hgap;
+ for (int row = ranges.getStartRes(); (ypos <= getHeight())
+ && (row < maxwidth);)
+ {
+ for (int i = starty; i < alheight; i++)
+ {
+ SequenceI s = av.getAlignment().getSequenceAt(i);
+ if (hasHiddenRows || av.isDisplayReferenceSeq())
{
- xPos = panelWidth - fm.stringWidth(string) - 4;
+ setHiddenFont(s);
}
-
- gg.drawString(string, xPos,
- (((i - starty) * av.getCharHeight()) + av.getCharHeight())
- - (av.getCharHeight() / 5));
-
- if (hiddenRows)
+ else
{
- drawMarker(i, starty, 0);
+ gg.setFont(getIdfont());
}
+ drawIdString(gg, hasHiddenRows, s, i, 0, ypos);
+ }
+
+ if (labels != null && av.isShowAnnotation())
+ {
+ gg.translate(0, ypos + (alheight * av.getCharHeight()));
+ labels.drawComponent(gg, getWidth());
+ gg.translate(0, -ypos - (alheight * av.getCharHeight()));
}
+ ypos += cHeight;
+ row += rowSize;
}
}
this.idfont = idfont;
}
+ /**
+ * Respond to viewport range changes (e.g. alignment panel was scrolled). 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.
+ * <p>
+ * In unwrapped mode, only responds to a vertical scroll, as horizontal scroll
+ * leaves sequence ids unchanged. In wrapped mode, only vertical scroll is
+ * provided, but it generates a change of "startres" which does require an
+ * update here.
+ */
@Override
public void propertyChange(PropertyChangeEvent evt)
{
- // Respond to viewport range changes (e.g. alignment panel was scrolled)
- // 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 (evt.getPropertyName().equals(ViewportRanges.STARTSEQ))
+ String propertyName = evt.getPropertyName();
+ if (propertyName.equals(ViewportRanges.STARTSEQ)
+ || (av.getWrapAlignment() && propertyName
+ .equals(ViewportRanges.STARTRES)))
{
fastPaint((int) evt.getNewValue() - (int) evt.getOldValue());
}
git://source.jalview.org / jalview.git / blobdiff