package jalview.gui;
import jalview.datamodel.AlignmentI;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
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
+ if (isresize)
{
- er++;
- transX = (er - sr - horizontal) * charWidth;
- sr = er - horizontal;
- }
- else if (horizontal < 0)
- {
- 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)
{
}
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];
@Override
public void propertyChange(PropertyChangeEvent evt)
{
-
- if (evt.getPropertyName().equals("startres")
- || evt.getPropertyName().equals("endres"))
+ if (!av.getWrapAlignment())
{
- // 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())
+ 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"))
{
- scrollX = vpRanges.getEndRes() - vpRanges.getStartRes();
+ // resize - only endres changes
+ int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+ fastPaint(scrollX, 0, true);
}
- else if (scrollX < vpRanges.getStartRes() - vpRanges.getEndRes())
+ else if (evt.getPropertyName().equals("startseq"))
{
- scrollX = vpRanges.getStartRes() - vpRanges.getEndRes();
+ // scroll
+ fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(), false);
+ }
+ else if (evt.getPropertyName().equals("endseq"))
+ {
+ // resize
}
- fastPaint(scrollX, 0);
- }
- else if (evt.getPropertyName() == "startseq"
- || evt.getPropertyName() == "endseq")
- {
- fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue());
}
-
}
}
git://source.jalview.org / jalview.git / blobdiff