X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqPanelTest.java;fp=test%2Fjalview%2Fgui%2FSeqPanelTest.java;h=c148039e5bad5a78d126e3a9332c1b9c55527d9c;hb=1bbf9cd2904a084b5f4df2db064a477480e5c688;hp=53b4259b781916d583cbe223cb1e9caf7275cab4;hpb=257a5c22aad2205509236e7a1f4a2739db656460;p=jalview.git diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index 53b4259..c148039 100644 --- a/test/jalview/gui/SeqPanelTest.java +++ b/test/jalview/gui/SeqPanelTest.java @@ -725,6 +725,8 @@ public class SeqPanelTest assertTrue(charWidth > 0); // sanity check assertEquals(alignFrame.getViewport().getRanges().getStartRes(), 0); + System.out.println("SPT endres " + + alignFrame.getViewport().getRanges().getEndRes()); /* * mouse at top left of unwrapped panel */ @@ -765,7 +767,21 @@ public class SeqPanelTest SeqCanvas seqCanvas = alignFrame.alignPanel.getSeqPanel().seqCanvas; int w = seqCanvas.getWidth(); // limited to number of whole columns, base 0 - int expected = w / charWidth - 1; + // BH there are only 61 residues, but this calculation gives 65 + // from SeqPanel return for findColumn: + + // /* + // * make sure we calculate relative to visible alignment, + // * rather than right-hand gutter + // */ + // x = Math.min(x, seqCanvas.getX() + seqCanvas.getWidth()); + // res = (x / charWidth) + startRes; + // res = Math.min(res, av.getRanges().getEndRes()); + + int expected = w / charWidth; + expected = Math.min( + alignFrame.getViewport().getRanges().getEndRes(), + expected); int col = testee.findColumn(evt); assertEquals(col, expected);