*/
public int getVisibleAlignmentWidth()
{
- return al.getWidth() - al.getHiddenColumns().getSize();
+ return al.getVisibleWidth();
}
/**
* the startRes changed, else false.
*
* @param res
- * residue position to scroll to
+ * residue position to scroll to NB visible position not absolute
+ * alignment position
* @return
*/
public boolean scrollToWrappedVisible(int res)
* Calculate wrapped start residue from visible start residue
*
* @param res
- * absolute start residue
+ * visible start residue
* @return left column of panel res will be located in
*/
private int calcWrappedStartResidue(int res)
int oldStartRes = startRes;
int width = getViewportWidth();
- /*if (res >= oldStartRes && res < oldStartRes + width)
- {
- return false;
- }*/
-
boolean up = res < oldStartRes;
int widthsToScroll = Math.abs((res - oldStartRes) / width);
if (up)
* Scroll so that (x,y) is visible. Fires a property change event.
*
* @param x
- * x position in alignment
+ * x position in alignment (absolute position)
* @param y
- * y position in alignment
+ * y position in alignment (absolute position)
*/
public void scrollToVisible(int x, int y)
{
}
HiddenColumns hidden = al.getHiddenColumns();
- while (x < hidden.adjustForHiddenColumns(startRes))
+ while (x < hidden.visibleToAbsoluteColumn(startRes))
{
if (!scrollRight(false))
{
break;
}
}
- while (x > hidden.adjustForHiddenColumns(endRes))
+ while (x > hidden.visibleToAbsoluteColumn(endRes))
{
if (!scrollRight(true))
{
* Set the viewport location so that a position is visible
*
* @param x
- * column to be visible
+ * column to be visible: absolute position in alignment
* @param y
- * row to be visible
+ * row to be visible: absolute position in alignment
*/
public boolean setViewportLocation(int x, int y)
{
boolean changedLocation = false;
- int vis_x = al.getHiddenColumns().findColumnPosition(x);
- int vis_y = al.getHiddenSequences().findIndexWithoutHiddenSeqs(y);
+ // convert the x,y location to visible coordinates
+ int visX = al.getHiddenColumns().absoluteToVisibleColumn(x);
+ int visY = al.getHiddenSequences().findIndexWithoutHiddenSeqs(y);
// if (vis_x,vis_y) is already visible don't do anything
- if (startRes > vis_x || vis_x > endRes
- || startSeq > vis_y && vis_y > endSeq)
+ if (startRes > visX || visX > endRes
+ || startSeq > visY && visY > endSeq)
{
int[] old = new int[] { startRes, startSeq };
int[] newresseq;
if (wrappedMode)
{
- int newstartres = calcWrappedStartResidue(vis_x);
+ int newstartres = calcWrappedStartResidue(visX);
setStartRes(newstartres);
newresseq = new int[] { startRes, startSeq };
}
else
{
- int width = getViewportWidth();
- updateStartEndRes(vis_x, vis_x + width - 1);
+ // set the viewport x location to contain vis_x
+ int newstartres = visX;
+ int width = getViewportWidth();
+ if (newstartres + width - 1 > getVisibleAlignmentWidth() - 1)
+ {
+ newstartres = getVisibleAlignmentWidth() - width;
+ }
+ updateStartEndRes(newstartres, newstartres + width - 1);
- int startseq = vis_y;
- int height = getViewportHeight();
- if (startseq + height - 1 > getVisibleAlignmentHeight() - 1)
- {
- startseq = getVisibleAlignmentHeight() - height;
- }
- updateStartEndSeq(startseq,
- startseq + height - 1);
+ // set the viewport y location to contain vis_y
+ int newstartseq = visY;
+ int height = getViewportHeight();
+ if (newstartseq + height - 1 > getVisibleAlignmentHeight() - 1)
+ {
+ newstartseq = getVisibleAlignmentHeight() - height;
+ }
+ updateStartEndSeq(newstartseq, newstartseq + height - 1);
- // int[] old = new int[] { oldresvalues[0], oldseqvalues[0] };
newresseq = new int[] { startRes, startSeq };
}
- changedLocation = true;
- changeSupport.firePropertyChange(MOVE_VIEWPORT, old, newresseq);
+ changedLocation = true;
+ changeSupport.firePropertyChange(MOVE_VIEWPORT, old, newresseq);
}
return changedLocation;
}