git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/JAL-2759
[jalview.git]
/
src
/
jalview
/
viewmodel
/
ViewportRanges.java
diff --git
a/src/jalview/viewmodel/ViewportRanges.java
b/src/jalview/viewmodel/ViewportRanges.java
index
e463cc3
..
691e492
100644
(file)
--- a/
src/jalview/viewmodel/ViewportRanges.java
+++ b/
src/jalview/viewmodel/ViewportRanges.java
@@
-544,7
+544,8
@@
public class ViewportRanges extends ViewportProperties
* the startRes changed, else false.
*
* @param res
* 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)
* @return
*/
public boolean scrollToWrappedVisible(int res)
@@
-563,7
+564,7
@@
public class ViewportRanges extends ViewportProperties
* Calculate wrapped start residue from visible start residue
*
* @param 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)
* @return left column of panel res will be located in
*/
private int calcWrappedStartResidue(int res)
@@
-571,11
+572,6
@@
public class ViewportRanges extends ViewportProperties
int oldStartRes = startRes;
int width = getViewportWidth();
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)
boolean up = res < oldStartRes;
int widthsToScroll = Math.abs((res - oldStartRes) / width);
if (up)
@@
-597,9
+593,9
@@
public class ViewportRanges extends ViewportProperties
* Scroll so that (x,y) is visible. Fires a property change event.
*
* @param x
* 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
* @param y
- * y position in alignment
+ * y position in alignment (absolute position)
*/
public void scrollToVisible(int x, int y)
{
*/
public void scrollToVisible(int x, int y)
{
@@
-613,14
+609,14
@@
public class ViewportRanges extends ViewportProperties
}
HiddenColumns hidden = al.getHiddenColumns();
}
HiddenColumns hidden = al.getHiddenColumns();
- while (x < hidden.adjustForHiddenColumns(startRes))
+ while (x < hidden.visibleToAbsoluteColumn(startRes))
{
if (!scrollRight(false))
{
break;
}
}
{
if (!scrollRight(false))
{
break;
}
}
- while (x > hidden.adjustForHiddenColumns(endRes))
+ while (x > hidden.visibleToAbsoluteColumn(endRes))
{
if (!scrollRight(true))
{
{
if (!scrollRight(true))
{
@@
-633,16
+629,16
@@
public class ViewportRanges extends ViewportProperties
* Set the viewport location so that a position is visible
*
* @param x
* 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
* @param y
- * row to be visible
+ * row to be visible: absolute position in alignment
*/
public boolean setViewportLocation(int x, int y)
{
boolean changedLocation = false;
*/
public boolean setViewportLocation(int x, int y)
{
boolean changedLocation = false;
- // convert the x,y location to absolute values
- int visX = al.getHiddenColumns().findColumnPosition(x);
+ // 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
int visY = al.getHiddenSequences().findIndexWithoutHiddenSeqs(y);
// if (vis_x,vis_y) is already visible don't do anything
@@
-660,18
+656,22
@@
public class ViewportRanges extends ViewportProperties
else
{
// set the viewport x location to contain vis_x
else
{
// set the viewport x location to contain vis_x
+ int newstartres = visX;
int width = getViewportWidth();
int width = getViewportWidth();
- updateStartEndRes(visX, visX + width - 1);
+ if (newstartres + width - 1 > getVisibleAlignmentWidth() - 1)
+ {
+ newstartres = getVisibleAlignmentWidth() - width;
+ }
+ updateStartEndRes(newstartres, newstartres + width - 1);
// set the viewport y location to contain vis_y
// set the viewport y location to contain vis_y
- int startseq = visY;
+ int newstartseq = visY;
int height = getViewportHeight();
int height = getViewportHeight();
- if (startseq + height - 1 > getVisibleAlignmentHeight() - 1)
+ if (newstartseq + height - 1 > getVisibleAlignmentHeight() - 1)
{
{
- startseq = getVisibleAlignmentHeight() - height;
+ newstartseq = getVisibleAlignmentHeight() - height;
}
}
- updateStartEndSeq(startseq,
- startseq + height - 1);
+ updateStartEndSeq(newstartseq, newstartseq + height - 1);
newresseq = new int[] { startRes, startSeq };
}
newresseq = new int[] { startRes, startSeq };
}