package jalview.gui;
import jalview.datamodel.AlignmentI;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.renderer.ScaleRenderer;
import jalview.renderer.ScaleRenderer.ScaleMark;
+import jalview.viewmodel.ViewportListenerI;
import jalview.viewmodel.ViewportRanges;
import java.awt.BasicStroke;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
import java.util.List;
import javax.swing.JComponent;
* @author $author$
* @version $Revision$
*/
-public class SeqCanvas extends JComponent
+public class SeqCanvas extends JComponent implements ViewportListenerI
{
final FeatureRenderer fr;
setLayout(new BorderLayout());
PaintRefresher.Register(this, av.getSequenceSetId());
setBackground(Color.white);
+
+ av.getRanges().addPropertyChangeListener(this);
}
public SequenceRenderer getSequenceRenderer()
if (av.hasHiddenColumns())
{
- startx = av.getColumnSelection().adjustForHiddenColumns(startx);
- endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+ startx = av.getAlignment().getHiddenColumns()
+ .adjustForHiddenColumns(startx);
+ endx = av.getAlignment().getHiddenColumns()
+ .adjustForHiddenColumns(endx);
}
int maxwidth = av.getAlignment().getWidth();
if (av.hasHiddenColumns())
{
- maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+ maxwidth = av.getAlignment().getHiddenColumns()
+ .findColumnPosition(maxwidth) - 1;
}
// WEST SCALE
if (av.hasHiddenColumns())
{
- endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+ endx = av.getAlignment().getHiddenColumns()
+ .adjustForHiddenColumns(endx);
}
SequenceI seq;
* @param vertical
* shift up or down in repaint
*/
- public void fastPaint(int horizontal, int vertical)
+ public void fastPaint(int horizontal, int vertical, boolean isresize)
{
if (fastpainting || gg == null)
{
fastpainting = true;
fastPaint = true;
updateViewport();
- gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
- imgHeight, -horizontal * charWidth, -vertical * charHeight);
ViewportRanges ranges = av.getRanges();
int sr = ranges.getStartRes();
int transX = 0;
int transY = 0;
- if (horizontal > 0) // scrollbar pulled right, image to the left
- {
- er++;
- transX = (er - sr - horizontal) * charWidth;
- sr = er - horizontal;
- }
- else if (horizontal < 0)
+ if (isresize)
{
- er = sr - horizontal - 1;
+ imgWidth = getWidth();
+ imgHeight = getHeight();
+
+ imgWidth -= (imgWidth % charWidth);
+ imgHeight -= (imgHeight % charHeight);
+
+ BufferedImage newimg = new BufferedImage(imgWidth, imgHeight,
+ BufferedImage.TYPE_INT_ARGB);
+
+ gg = (Graphics2D) newimg.getGraphics();
+ gg.setFont(av.getFont());
+ gg.drawImage(img, null, 0, 0);
+ img = newimg;
+
+ transX = (er - horizontal - sr) * charWidth;
+ sr = er - horizontal - sr;
}
- else if (vertical > 0) // scroll down
+ else
{
- ss = es - vertical;
+ gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
+ imgHeight, -horizontal * charWidth, -vertical * charHeight);
- if (ss < ranges.getStartSeq())
- { // ie scrolling too fast, more than a page at a time
- ss = ranges.getStartSeq();
+ if (horizontal > 0) // scrollbar pulled right, image to the left
+ {
+ transX = (er - sr - horizontal) * charWidth;
+ sr = er - horizontal;
}
- else
+ else if (horizontal < 0)
{
- transY = imgHeight - ((vertical + 1) * charHeight);
+ er = sr - horizontal;
}
- }
- else if (vertical < 0)
- {
- es = ss - vertical;
+ else if (vertical > 0) // scroll down
+ {
+ ss = es - vertical;
- if (es > ranges.getEndSeq())
+ if (ss < ranges.getStartSeq())
+ { // ie scrolling too fast, more than a page at a time
+ ss = ranges.getStartSeq();
+ }
+ else
+ {
+ transY = imgHeight - ((vertical + 1) * charHeight);
+ }
+ }
+ else if (vertical < 0)
{
- es = ranges.getEndSeq();
+ es = ss - vertical;
+
+ if (es > ranges.getEndSeq())
+ {
+ es = ranges.getEndSeq();
+ }
}
}
av.setWrappedWidth(cWidth);
- av.getRanges().setEndRes(av.getRanges().getStartRes() + cWidth);
+ av.getRanges().setEndRes(av.getRanges().getStartRes() + cWidth - 1);
int endx;
int ypos = hgap;
if (av.hasHiddenColumns())
{
- maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+ maxwidth = av.getAlignment().getHiddenColumns()
+ .findColumnPosition(maxwidth) - 1;
}
while ((ypos <= canvasHeight) && (startRes < maxwidth))
{
g.setColor(Color.blue);
int res;
- for (int i = 0; i < av.getColumnSelection().getHiddenColumns()
- .size(); i++)
+ HiddenColumns hidden = av.getAlignment().getHiddenColumns();
+ List<Integer> positions = hidden.findHiddenRegionPositions();
+ for (int pos : positions)
{
- res = av.getColumnSelection().findHiddenRegionPosition(i)
- - startRes;
+ res = pos - startRes;
if (res < 0 || res > endx - startRes)
{
(int) clip.getBounds().getHeight());
}
- drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);
+ drawPanel(g, startRes, endx, 0, al.getHeight() - 1, ypos);
if (av.isShowAnnotation())
{
}
else
{
- List<int[]> regions = av.getColumnSelection().getHiddenColumns();
-
int screenY = 0;
int blockStart = startRes;
int blockEnd = endRes;
- for (int[] region : regions)
+ for (int[] region : av.getAlignment().getHiddenColumns()
+ .getHiddenColumnsCopy())
{
int hideStart = region[0];
int hideEnd = region[1];
g1.drawLine((blockEnd - blockStart + 1) * charWidth - 1,
0 + offset, (blockEnd - blockStart + 1) * charWidth - 1,
- (endSeq - startSeq) * charHeight + offset);
+ (endSeq - startSeq + 1) * charHeight + offset);
}
g1.translate(-screenY * charWidth, 0);
if (av.isShowSequenceFeatures())
{
fr.drawSequence(g, nextSeq, startRes, endRes, offset
- + ((i - startSeq) * charHeight));
+ + ((i - startSeq) * charHeight), false);
}
// / Highlight search Results once all sequences have been drawn
repaint();
}
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ if (!av.getWrapAlignment())
+ {
+ if (evt.getPropertyName().equals("startres"))
+ {
+ // scroll - startres and endres both change
+
+ // Make sure we're not trying to draw a panel
+ // larger than the visible window
+ ViewportRanges vpRanges = av.getRanges();
+ int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+ if (scrollX > vpRanges.getEndRes() - vpRanges.getStartRes())
+ {
+ scrollX = vpRanges.getEndRes() - vpRanges.getStartRes();
+ }
+ else if (scrollX < vpRanges.getStartRes() - vpRanges.getEndRes())
+ {
+ scrollX = vpRanges.getStartRes() - vpRanges.getEndRes();
+ }
+ fastPaint(scrollX, 0, false);
+ }
+ else if (evt.getPropertyName().equals("endres"))
+ {
+ // resize - only endres changes
+ int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+ fastPaint(scrollX, 0, true);
+ }
+ else if (evt.getPropertyName().equals("startseq"))
+ {
+ // scroll
+ fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(), false);
+ }
+ else if (evt.getPropertyName().equals("endseq"))
+ {
+ // resize
+ }
+ }
+ }
}
git://source.jalview.org / jalview.git / blobdiff