From c55dd45c7f7eeb986ed32189dea45d1caa464b74 Mon Sep 17 00:00:00 2001 From: kiramt Date: Tue, 14 Nov 2017 16:03:47 +0000 Subject: [PATCH] JAL-2831 tidy --- src/jalview/viewmodel/ViewportRanges.java | 36 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/jalview/viewmodel/ViewportRanges.java b/src/jalview/viewmodel/ViewportRanges.java index 973482f..e463cc3 100644 --- a/src/jalview/viewmodel/ViewportRanges.java +++ b/src/jalview/viewmodel/ViewportRanges.java @@ -641,40 +641,42 @@ public class ViewportRanges extends ViewportProperties { boolean changedLocation = false; - int vis_x = al.getHiddenColumns().findColumnPosition(x); - int vis_y = al.getHiddenSequences().findIndexWithoutHiddenSeqs(y); + // convert the x,y location to absolute values + int visX = al.getHiddenColumns().findColumnPosition(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); - - int startseq = vis_y; - int height = getViewportHeight(); - if (startseq + height - 1 > getVisibleAlignmentHeight() - 1) - { - startseq = getVisibleAlignmentHeight() - height; - } + // set the viewport x location to contain vis_x + int width = getViewportWidth(); + updateStartEndRes(visX, visX + width - 1); + + // set the viewport y location to contain vis_y + int startseq = visY; + int height = getViewportHeight(); + if (startseq + height - 1 > getVisibleAlignmentHeight() - 1) + { + startseq = getVisibleAlignmentHeight() - height; + } updateStartEndSeq(startseq, startseq + 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; } -- 1.7.10.2