X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FViewportRanges.java;h=b6bfcd6658c1cf6859d76af6d5d5ee7d86befb84;hb=801c367379086cc38bf4d3059a8e30ca9f4e78c0;hp=0cc8d7c00a32c2582cffd84ec7fc9bd8f5f1d6fc;hpb=8e820dadfebf0ced59476338df0fa391590f5401;p=jalview.git diff --git a/src/jalview/viewmodel/ViewportRanges.java b/src/jalview/viewmodel/ViewportRanges.java index 0cc8d7c..b6bfcd6 100644 --- a/src/jalview/viewmodel/ViewportRanges.java +++ b/src/jalview/viewmodel/ViewportRanges.java @@ -23,6 +23,8 @@ package jalview.viewmodel; import jalview.datamodel.AlignmentI; import jalview.datamodel.HiddenColumns; +import java.util.Arrays; + /** * Supplies and updates viewport properties relating to position such as: start * and end residues and sequences; ideally will serve hidden columns/rows too. @@ -72,10 +74,25 @@ public class ViewportRanges extends ViewportProperties this.startRes = 0; this.endRes = alignment.getWidth() - 1; this.startSeq = 0; - this.endSeq = alignment.getHeight() - 1; + this.setEndSeqTest(alignment.getHeight() - 1); this.al = alignment; } + public static String sTest = ""; + + private void setEndSeqTest(int val) + { + String st = Thread.currentThread().toString(); + sTest += "ViewPortRanges.setEndseqTest " + val + " " + + st + "\n"; + if (val == 13) + { + sTest += Arrays.toString(new NullPointerException().getStackTrace()) + .replace(',', '\n') + + "\n"; + } + endSeq = val; + } /** * Get alignment width in cols, including hidden cols */ @@ -97,7 +114,7 @@ public class ViewportRanges extends ViewportProperties */ public int getVisibleAlignmentWidth() { - return al.getWidth() - al.getHiddenColumns().getSize(); + return al.getVisibleWidth(); } /** @@ -137,11 +154,20 @@ public class ViewportRanges extends ViewportProperties int oldstartres = oldvalues[0]; int oldendres = oldvalues[1]; + if (oldstartres == startRes && oldendres == endRes) + { + return; // BH 2019.07.27 standard check for no changes + } + + // "STARTRES" is a misnomer here -- really "STARTORENDRES" + // note that this could be "no change" if the range is just being expanded changeSupport.firePropertyChange(STARTRES, oldstartres, startRes); if (oldstartres == startRes) { - // event won't be fired if start positions are same - // fire an event for the end positions in case they changed + // No listener cares about this + // "ENDRES" is a misnomer here -- really "ENDONLYRES" + // BH 2019.07.27 adds end change check + // fire only if only the end is changed changeSupport.firePropertyChange(ENDRES, oldendres, endRes); } } @@ -203,12 +229,13 @@ public class ViewportRanges extends ViewportProperties */ public void setStartSeq(int seq) { - int startseq = seq; int height = getViewportHeight(); - if (startseq + height - 1 > getVisibleAlignmentHeight() - 1) - { - startseq = getVisibleAlignmentHeight() - height; - } + int startseq = Math.min(seq, getVisibleAlignmentHeight() - height); + // BH 2019.07.27 cosmetic only -- was: + // if (startseq + height - 1 > getVisibleAlignmentHeight() - 1) + // { + // startseq = getVisibleAlignmentHeight() - height; + // } setStartEndSeq(startseq, startseq + height - 1); } @@ -224,15 +251,24 @@ public class ViewportRanges extends ViewportProperties */ public void setStartEndSeq(int start, int end) { + // System.out.println("ViewportRange setStartEndSeq " + start + " " + end); int[] oldvalues = updateStartEndSeq(start, end); int oldstartseq = oldvalues[0]; int oldendseq = oldvalues[1]; + if (oldstartseq == startSeq && oldendseq == endSeq) + { + return; // BH 2019.07.27 standard check for no changes + } + + // "STARTSEQ" is a misnomer here -- really "STARTORENDSEQ" changeSupport.firePropertyChange(STARTSEQ, oldstartseq, startSeq); if (oldstartseq == startSeq) { - // event won't be fired if start positions are the same - // fire in case the end positions changed + // Note that all listeners ignore this - could be removed, or there is a + // bug. + // "ENDSEQ" is a misnomer here -- really "ENDONLYSEQ" + // additional fire, only if only the end is changed changeSupport.firePropertyChange(ENDSEQ, oldendseq, endSeq); } } @@ -267,15 +303,15 @@ public class ViewportRanges extends ViewportProperties int oldendseq = this.endSeq; if (end >= visibleHeight) { - endSeq = Math.max(visibleHeight - 1, 0); + setEndSeqTest(Math.max(visibleHeight - 1, 0)); } else if (end < 0) { - endSeq = 0; + setEndSeqTest(0); } else { - endSeq = end; + setEndSeqTest(end); } return new int[] { oldstartseq, oldendseq }; } @@ -285,12 +321,12 @@ public class ViewportRanges extends ViewportProperties * event. * * @param seq - * sequence position + * sequence position in the range [0, height) */ public void setEndSeq(int seq) { - int height = getViewportHeight(); - setStartEndSeq(seq - height + 1, seq); + // BH 2018.04.18 added safety for seq < 0; comment about not being >= height + setStartEndSeq(Math.max(0, seq + 1 - getViewportHeight()), seq); } /** @@ -316,9 +352,9 @@ public class ViewportRanges extends ViewportProperties } int[] oldseqvalues = updateStartEndSeq(startseq, startseq + height - 1); - int[] old = new int[] { oldresvalues[0], oldseqvalues[0] }; - int[] newresseq = new int[] { startRes, startSeq }; - changeSupport.firePropertyChange(STARTRESANDSEQ, old, newresseq); + int[] oldvalues = new int[] { oldresvalues[0], oldseqvalues[0] }; + int[] newvalues = new int[] { startRes, startSeq }; + changeSupport.firePropertyChange(STARTRESANDSEQ, oldvalues, newvalues); } /** @@ -425,17 +461,19 @@ public class ViewportRanges extends ViewportProperties public void setViewportStartAndHeight(int start, int h) { int vpstart = start; + + int visHeight = getVisibleAlignmentHeight(); if (vpstart < 0) { vpstart = 0; } - else if ((h <= getVisibleAlignmentHeight()) - && (vpstart + h - 1 > getVisibleAlignmentHeight() - 1)) + else if (h <= visHeight && vpstart + h > visHeight) // viewport height is less than the full alignment and we are running off // the bottom { - vpstart = getVisibleAlignmentHeight() - h; + vpstart = visHeight - h; } + setStartEndSeq(vpstart, vpstart + h - 1); } @@ -544,7 +582,8 @@ public class ViewportRanges extends ViewportProperties * 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) @@ -592,9 +631,9 @@ public class ViewportRanges extends ViewportProperties * 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) { @@ -608,14 +647,14 @@ public class ViewportRanges extends ViewportProperties } 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)) { @@ -637,7 +676,7 @@ public class ViewportRanges extends ViewportProperties boolean changedLocation = false; // convert the x,y location to visible coordinates - int visX = al.getHiddenColumns().findColumnPosition(x); + int visX = al.getHiddenColumns().absoluteToVisibleColumn(x); int visY = al.getHiddenSequences().findIndexWithoutHiddenSeqs(y); // if (vis_x,vis_y) is already visible don't do anything @@ -791,4 +830,11 @@ public class ViewportRanges extends ViewportProperties return maxScroll; } + + @Override + public String toString() + { + return "[ViewportRange startRes=" + startRes + " endRes=" + endRes + + " startSeq=" + startSeq + " endSeq=" + endSeq + "]"; + } }