X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=a7dff864402eac9ffcdd72ff7245f2e46a135ea8;hb=062ebc02980364930ceb26dd6c06448af971fe20;hp=aad07764d1ee3dc246e2ed8c56c62878bf6a666f;hpb=97b26ba418dec7a6e926378205d25470bf098633;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index aad0776..a7dff86 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -21,6 +21,7 @@ package jalview.gui; import jalview.datamodel.SequenceI; +import jalview.viewmodel.ViewportListenerI; import jalview.viewmodel.ViewportRanges; import java.awt.BorderLayout; @@ -31,6 +32,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; +import java.beans.PropertyChangeEvent; import java.util.List; import javax.swing.JPanel; @@ -41,7 +43,7 @@ import javax.swing.JPanel; * @author $author$ * @version $Revision$ */ -public class IdCanvas extends JPanel +public class IdCanvas extends JPanel implements ViewportListenerI { protected AlignViewport av; @@ -80,6 +82,7 @@ public class IdCanvas extends JPanel setLayout(new BorderLayout()); this.av = av; PaintRefresher.Register(this, av.getSequenceSetId()); + av.getRanges().addPropertyChangeListener(this); } /** @@ -152,7 +155,10 @@ public class IdCanvas extends JPanel */ public void fastPaint(int vertical) { - if (gg == null) + /* + * for now, not attempting fast paint of wrapped ids... + */ + if (gg == null || av.getWrapAlignment()) { repaint(); @@ -260,8 +266,8 @@ public class IdCanvas extends JPanel { if (av.isSeqNameItalics()) { - setIdfont(new Font(av.getFont().getName(), Font.ITALIC, av.getFont() - .getSize())); + setIdfont(new Font(av.getFont().getName(), Font.ITALIC, + av.getFont().getSize())); } else { @@ -280,149 +286,165 @@ public class IdCanvas extends JPanel 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.getColumnSelection().findColumnPosition(maxwidth) - 1; - } + // 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; - int annotationHeight = 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)) + { + currentColor = Color.black; + currentTextColor = Color.white; + } + else if ((av.getSelectionGroup() != null) && av.getSelectionGroup() + .getSequences(null).contains(sequence)) + { + currentColor = Color.lightGray; + currentTextColor = Color.black; + } + else { - hgap += av.getCharHeight(); + currentColor = av.getSequenceColour(sequence); + currentTextColor = Color.black; } - int cHeight = alheight * av.getCharHeight() + hgap + annotationHeight; + gg.setColor(currentColor); - int rowSize = av.getRanges().getEndRes() - - av.getRanges().getStartRes(); + gg.fillRect(0, (i - starty) * av.getCharHeight(), getWidth(), + av.getCharHeight()); - // Draw the rest of the panels - for (int ypos = hgap, row = av.getRanges().getStartRes(); (ypos <= getHeight()) - && (row < maxwidth); ypos += cHeight, row += rowSize) + gg.setColor(currentTextColor); + + String string = sequence.getDisplayId(av.getShowJVSuffix()); + + 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.getViewportWidth(); - if (av.isRightAlignIds()) + /* + * draw repeating sequence ids until out of sequence data or + * out of visible space, whichever comes first + */ + int ypos = hgap; + int row = ranges.getStartRes(); + while ((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; } } void drawMarker(int i, int starty, int yoffset) { - SequenceI[] hseqs = av.getAlignment().getHiddenSequences().hiddenSequences; + SequenceI[] hseqs = av.getAlignment() + .getHiddenSequences().hiddenSequences; // Use this method here instead of calling hiddenSeq adjust // 3 times. int hSize = hseqs.length; @@ -457,32 +479,36 @@ public class IdCanvas extends JPanel if (below) { gg.fillPolygon( - new int[] { getWidth() - av.getCharHeight(), + new int[] + { getWidth() - av.getCharHeight(), getWidth() - av.getCharHeight(), getWidth() }, - new int[] { - (i - starty) * av.getCharHeight() + yoffset, + new int[] + { (i - starty) * av.getCharHeight() + yoffset, (i - starty) * av.getCharHeight() + yoffset + av.getCharHeight() / 4, - (i - starty) * av.getCharHeight() + yoffset }, 3); + (i - starty) * av.getCharHeight() + yoffset }, + 3); } if (above) { gg.fillPolygon( - new int[] { getWidth() - av.getCharHeight(), + new int[] + { getWidth() - av.getCharHeight(), getWidth() - av.getCharHeight(), getWidth() }, - new int[] { - (i - starty + 1) * av.getCharHeight() + yoffset, + new int[] + { (i - starty + 1) * av.getCharHeight() + yoffset, (i - starty + 1) * av.getCharHeight() + yoffset - av.getCharHeight() / 4, - (i - starty + 1) * av.getCharHeight() + yoffset }, 3); + (i - starty + 1) * av.getCharHeight() + yoffset }, + 3); } } void setHiddenFont(SequenceI seq) { - Font bold = new Font(av.getFont().getName(), Font.BOLD, av.getFont() - .getSize()); + Font bold = new Font(av.getFont().getName(), Font.BOLD, + av.getFont().getSize()); if (av.isReferenceSeq(seq) || av.isHiddenRepSequence(seq)) { @@ -515,4 +541,28 @@ public class IdCanvas extends JPanel { 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. + *
+ * 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) + { + String propertyName = evt.getPropertyName(); + if (propertyName.equals(ViewportRanges.STARTSEQ) + || (av.getWrapAlignment() + && propertyName.equals(ViewportRanges.STARTRES))) + { + fastPaint((int) evt.getNewValue() - (int) evt.getOldValue()); + } + } }