package jalview.viewmodel;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
import jalview.analysis.AlignmentGenerator;
import jalview.datamodel.Alignment;
public class OverviewDimensionsShowHiddenTest
{
AlignmentI al;
+
OverviewDimensionsShowHidden od;
// cached widths and heights
int boxWidth;
+
int boxHeight;
+
int viewHeight;
+
int viewWidth;
+
int alheight;
+
int alwidth;
ViewportRanges vpranges;
}
ColumnSelection colsel = new ColumnSelection();
hiddenCols.revealAllHiddenColumns(colsel);
-
+
vpranges = new ViewportRanges(al);
vpranges.setViewportStartAndHeight(0, 18);
vpranges.setViewportStartAndWidth(0, 63);
alheight = vpranges.getAbsoluteAlignmentHeight();
alwidth = vpranges.getAbsoluteAlignmentWidth();
- boxWidth = Math.round((float) (vpranges.getEndRes()
- - vpranges.getStartRes() + 1)
- * od.getWidth() / alwidth);
- boxHeight = Math.round((float) (vpranges.getEndSeq()
- - vpranges.getStartSeq() + 1)
- * od.getSequencesHeight() / alheight);
+ boxWidth = Math.round(
+ (float) (vpranges.getEndRes() - vpranges.getStartRes() + 1)
+ * od.getWidth() / alwidth);
+ boxHeight = Math.round(
+ (float) (vpranges.getEndSeq() - vpranges.getStartSeq() + 1)
+ * od.getSequencesHeight() / alheight);
}
@AfterClass(alwaysRun = true)
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(vpranges.getStartRes(),
Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()));
// overly large boxY value reset to sequenceHeight - boxHeight
mouseClick(od, 10, 520);
// here (float) od.getBoxY() * alheight / od.getSequencesHeight() = 507.5
// and round rounds to 508; however we get 507 working with row values
// hence the subtraction of 1
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()) - 1);
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()) - 1);
// click past end of alignment, as above
mouseClick(od, 3000, 5);
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(vpranges.getStartRes(),
Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()));
// move viewport so startRes non-zero and then mouseclick
moveViewportH(20);
assertEquals(vpranges.getStartRes(),
Math.round((float) od.getBoxX() * alwidth / od.getWidth()));
assertEquals(od.getBoxY(), oldboxy + 3);
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()));
// click at top corner
mouseClick(od, 0, 0);
hiddenCols.hideColumns(0, lastHiddenCol);
od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
- assertEquals(od.getBoxX(),
- Math.round((float) (lastHiddenCol + 1) * od.getWidth()
- / alwidth));
+ assertEquals(od.getBoxX(), Math
+ .round((float) (lastHiddenCol + 1) * od.getWidth() / alwidth));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
// try to click in hidden cols, check box does not move
int xpos = 10;
mouseClick(od, xpos, 0);
- assertEquals(
- od.getBoxX(),
- Math.round((float) (lastHiddenCol + 1) * od.getWidth()
- / alwidth));
+ assertEquals(od.getBoxX(), Math
+ .round((float) (lastHiddenCol + 1) * od.getWidth() / alwidth));
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(vpranges.getStartSeq(), 0);
assertEquals(vpranges.getStartRes(),
- Math.round(
- (float) 60 * alwidth / od.getWidth())
+ Math.round((float) 60 * alwidth / od.getWidth())
- (lastHiddenCol + 1));
// click to right of hidden columns such that box runs over right hand side
assertEquals(vpranges.getStartRes(),
Math.round((float) od.getBoxX() * alwidth / od.getWidth())
- (lastHiddenCol + 1));
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()));
}
/**
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(vpranges.getStartRes(), 0);
assertEquals(vpranges.getStartSeq(), 0);
-
+
// hide columns 63-73, no change to box position or dimensions
int firstHidden = 63;
int lastHidden = 73;
// move box so that it overlaps with hidden cols on one side
// box width changes, boxX and scrollCol as for unhidden case
int xpos = 54 - boxWidth / 2; // 54 is position in overview approx halfway
- // between cols 60 and 70
+ // between cols 60 and 70
mouseClick(od, xpos, boxHeight / 2);
assertEquals(od.getBoxX(), xpos - boxWidth / 2);
assertEquals(od.getBoxY(), 0);
- assertEquals(
- od.getBoxWidth(),
+ assertEquals(od.getBoxWidth(),
Math.round(boxWidth + (float) (lastHidden - firstHidden + 1)
* od.getWidth() / alwidth));
assertEquals(od.getBoxHeight(), boxHeight);
mouseClick(od, xpos, 0);
assertEquals(od.getBoxX(), 24);
assertEquals(od.getBoxY(), 0);
- assertEquals(
- od.getBoxWidth(),
+ assertEquals(od.getBoxWidth(),
Math.round(boxWidth + (float) (lastHidden - firstHidden + 1)
* od.getWidth() / alwidth));
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(vpranges.getStartSeq(), 0);
assertEquals(vpranges.getStartRes(),
75 - (lastHidden - firstHidden + 1));
-
+
// move box so it goes beyond full width of alignment
// boxX, scrollCol adjusted back, box width normal
xpos = 3000;
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
- assertEquals(
- vpranges.getStartRes(),
+ assertEquals(vpranges.getStartRes(),
Math.round(((float) od.getBoxX() * alwidth / od.getWidth())
- (lastHidden - firstHidden + 1)));
- assertEquals(
- vpranges.getStartSeq(),
- Math.round((float) od.getBoxY() * alheight
- / od.getSequencesHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) od.getBoxY() * alheight / od.getSequencesHeight()));
}
int xpos = 30;
int ypos = 6;
testBoxIsAtClickPoint(xpos, ypos);
- assertEquals(vpranges.getStartSeq(), Math
- .round((float) (ypos - boxHeight / 2) * alheight
- / od.getHeight()));
+ assertEquals(vpranges.getStartSeq(), Math.round(
+ (float) (ypos - boxHeight / 2) * alheight / od.getHeight()));
assertEquals(vpranges.getStartRes(), Math.round(
(float) (xpos - boxWidth / 2) * alwidth / od.getWidth()));
xpos = Math.round((float) 145 * od.getWidth() / alwidth) - boxWidth;
mouseClick(od, xpos + boxWidth / 2, boxHeight / 2);
assertEquals(od.getBoxX(),
- Math.round((float) (firstHidden - 1)
- * od.getWidth() / alwidth)
+ Math.round((float) (firstHidden - 1) * od.getWidth() / alwidth)
- boxWidth + 1);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
assertEquals(vpranges.getStartRes(),
- Math.round((float) (od.getBoxX()) * alwidth
- / od.getWidth()));
+ Math.round((float) (od.getBoxX()) * alwidth / od.getWidth()));
assertEquals(vpranges.getStartSeq(), 0);
// click in hidden cols
assertEquals(od.getBoxX(),
Math.round((float) 10 * od.getWidth() / alwidth));
assertEquals(od.getBoxY(), 0);
- assertEquals(
- od.getBoxWidth(),
- boxWidth
- + Math.round((float) (lastHidden - firstHidden + 1)
- * od.getWidth() / alwidth));
+ assertEquals(od.getBoxWidth(),
+ boxWidth + Math.round((float) (lastHidden - firstHidden + 1)
+ * od.getWidth() / alwidth));
assertEquals(od.getBoxHeight(), boxHeight);
// move viewport to straddle hidden columns
assertEquals(od.getBoxX(),
Math.round((float) 63 * od.getWidth() / alwidth));
assertEquals(od.getBoxY(), 0);
- assertEquals(
- od.getBoxWidth(),
- boxWidth
- + Math.round((lastHidden - firstHidden + 1)
- * od.getWidth() / alwidth));
+ assertEquals(od.getBoxWidth(), boxWidth + Math.round(
+ (lastHidden - firstHidden + 1) * od.getWidth() / alwidth));
assertEquals(od.getBoxHeight(), boxHeight);
// move viewport to right of hidden columns, no overlap
// viewport can't actually extend into hidden cols,
// so move to the far right edge of the viewport
moveViewport(firstHidden - viewWidth, 0);
- assertEquals(od.getBoxX(),
- Math.round((float) (firstHidden - viewWidth)
- * od.getWidth() / alwidth));
+ assertEquals(od.getBoxX(), Math.round(
+ (float) (firstHidden - viewWidth) * od.getWidth() / alwidth));
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
// box moves to below hidden rows, height remains same
moveViewport(0, 0);
assertEquals(od.getBoxX(), 0);
- assertEquals(od.getBoxY(),
- Math.round((float) (lastHidden + 1) * od.getSequencesHeight()
- / alheight));
+ assertEquals(od.getBoxY(), Math.round(
+ (float) (lastHidden + 1) * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
// move viewport to end of alignment
moveViewport(0, 525 - viewHeight - lastHidden - 1);
assertEquals(od.getBoxX(), 0);
- assertEquals(
- od.getBoxY(),
- Math.round((float) (525 - viewHeight) * od.getSequencesHeight()
- / alheight));
+ assertEquals(od.getBoxY(), Math.round((float) (525 - viewHeight)
+ * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
}
// move viewport to straddle hidden rows
moveViewport(0, 198);
assertEquals(od.getBoxX(), 0);
- assertEquals(od.getBoxY(), Math.round ((float)198 * od.getSequencesHeight()
- / alheight));
+ assertEquals(od.getBoxY(),
+ Math.round((float) 198 * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
- assertEquals(
- od.getBoxHeight(),
+ assertEquals(od.getBoxHeight(),
Math.round((float) (viewHeight + lastHidden - firstHidden + 1)
* od.getSequencesHeight() / alheight));
}
// viewport sits above hidden rows and does not include them
moveViewport(0, firstHidden - viewHeight - 1);
assertEquals(od.getBoxX(), 0);
- assertEquals(
- od.getBoxY(),
+ assertEquals(od.getBoxY(),
Math.round((float) (firstHidden - viewHeight - 1)
* od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
assertEquals(od.getBoxX(), 0);
- assertEquals(od.getBoxY(),
- Math.round((float) (lastHiddenRow + 1)
- * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+ * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
// click in hidden rows - same result
mouseClick(od, 0, 0);
assertEquals(od.getBoxX(), 0);
- assertEquals(
- od.getBoxY(),
- Math.round((float) (lastHiddenRow + 1)
- * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+ * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
// click below hidden rows
- mouseClick(od, 0, 150 + boxHeight/2);
+ mouseClick(od, 0, 150 + boxHeight / 2);
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 150);
assertEquals(od.getBoxWidth(), boxWidth);
// click above hidden rows, so that box overlaps
int rowpos = 35; // row value in residues
int centrepos = 43; // centre row
- mouseClick(od, 0,
- Math.round((float) centrepos * od.getSequencesHeight()
- / alheight));
+ mouseClick(od, 0, Math
+ .round((float) centrepos * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxX(), 0);
- assertEquals(od.getBoxY(),
- Math.round(
- (float) rowpos * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxY(), Math
+ .round((float) rowpos * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
- assertEquals(
- od.getBoxHeight(),
- boxHeight
- + Math.round((float) (lastHiddenRow - firstHiddenRow + 1)
+ assertEquals(od.getBoxHeight(),
+ boxHeight + Math
+ .round((float) (lastHiddenRow - firstHiddenRow + 1)
* od.getSequencesHeight() / alheight));
}
mouseClick(od, 0,
Math.round((float) ypos * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxX(), 0);
- assertEquals(
- od.getBoxY(),
- Math.round((float) (firstHidden - viewHeight)
- * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxY(), Math.round((float) (firstHidden - viewHeight)
+ * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
mouseClick(od, 0,
Math.round((float) ypos * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxX(), 0);
- assertEquals(
- od.getBoxY(),
- Math.round((firstHidden - viewHeight) * od.getSequencesHeight()
- / alheight));
+ assertEquals(od.getBoxY(), Math.round((firstHidden - viewHeight)
+ * od.getSequencesHeight() / alheight));
assertEquals(od.getBoxWidth(), boxWidth);
assertEquals(od.getBoxHeight(), boxHeight);
}
+ /**
+ * Test the function to determine if a point is in the overview's box or not
+ */
+ @Test(groups = { "Functional" })
+ public void testPositionInBox()
+ {
+ od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols);
+
+ assertFalse(od.isPositionInBox(0, 0));
+ assertTrue(od.isPositionInBox(10, 9));
+ assertFalse(od.isPositionInBox(0, 9));
+ assertFalse(od.isPositionInBox(9, 0));
+ assertFalse(od.isPositionInBox(75, 20));
+
+ assertTrue(od.isPositionInBox(47, 6));
+ assertFalse(od.isPositionInBox(48, 6));
+ assertTrue(od.isPositionInBox(47, 9));
+ assertFalse(od.isPositionInBox(47, 10));
+
+ // hide columns in the box area
+ // extends area where a point is considered to be in the box
+ hiddenCols.hideColumns(1, 4);
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+ assertFalse(od.isPositionInBox(0, 0));
+ assertTrue(od.isPositionInBox(10, 9));
+ assertFalse(od.isPositionInBox(0, 9));
+ assertFalse(od.isPositionInBox(9, 0));
+ assertFalse(od.isPositionInBox(75, 20));
+
+ assertTrue(od.isPositionInBox(47, 6));
+ assertTrue(od.isPositionInBox(48, 6));
+ assertTrue(od.isPositionInBox(47, 9));
+ assertFalse(od.isPositionInBox(47, 10));
+
+ // hide sequences in box area
+ // extends area where a point is considered to be in the box
+ hideSequences(1, 3);
+ ColumnSelection cs = new ColumnSelection();
+ hiddenCols.revealAllHiddenColumns(cs);
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+ assertFalse(od.isPositionInBox(0, 0));
+ assertTrue(od.isPositionInBox(10, 9));
+ assertFalse(od.isPositionInBox(0, 9));
+ assertFalse(od.isPositionInBox(9, 0));
+ assertFalse(od.isPositionInBox(75, 20));
+
+ assertTrue(od.isPositionInBox(47, 6));
+ assertFalse(od.isPositionInBox(48, 6));
+ assertTrue(od.isPositionInBox(47, 9));
+ assertTrue(od.isPositionInBox(47, 10));
+ }
+
+ /**
+ * Test the dragging functionality
+ */
+ @Test(groups = { "Functional" })
+ public void testDragging()
+ {
+ od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols);
+ od.setDragPoint(4, 16, al.getHiddenSequences(), hiddenCols);
+ od.adjustViewportFromMouse(20, 22, al.getHiddenSequences(), hiddenCols);
+
+ // updates require an OverviewPanel to exist which it doesn't here
+ // so call setBoxPosition() as it would be called by the AlignmentPanel
+ // normally
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+
+ // corner moves 16 (20-4) right and 6 (22-16) up
+ assertEquals(od.getBoxX(), 16);
+ assertEquals(od.getBoxY(), 6);
+
+ // hide columns - box moves drag distance + hidden cols, vertically makes no
+ // difference
+ hiddenCols.hideColumns(1, 4);
+ od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols);
+ od.setDragPoint(4, 16, al.getHiddenSequences(), hiddenCols);
+ od.adjustViewportFromMouse(20, 22, al.getHiddenSequences(), hiddenCols);
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+
+ // corner moves 16 (20-4) + hiddenCols right and 6 (22-16) down
+ assertEquals(od.getBoxX(),
+ 16 + Math.round((float) 4 * od.getWidth() / alwidth));
+ assertEquals(od.getBoxY(), 6);
+
+ // hide sequences in box area
+ // makes absolutely no difference
+ hideSequences(1, 3);
+ od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols);
+ od.setDragPoint(4, 16, al.getHiddenSequences(), hiddenCols);
+ od.adjustViewportFromMouse(20, 22, al.getHiddenSequences(), hiddenCols);
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+
+ // corner moves 16 (20-4) + hiddenCols right and 6 (22-16) + hiddenRows down
+ assertEquals(od.getBoxX(),
+ 16 + Math.round((float) 4 * od.getWidth() / alwidth));
+ assertEquals(od.getBoxY(),
+ 6 + Math.round((float) 3 * od.getHeight() / alheight));
+ }
+
/*
* Move viewport horizontally: startRes + previous width gives new horizontal extent. Vertical extent stays the same.
*/
// normally
od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
}
-
+
/*
* Test that the box is positioned with the centre at xpos, ypos
* and with the original width and height
{
SequenceI[] allseqs = al.getSequencesArray();
SequenceGroup theseSeqs = new SequenceGroup();
-
+
for (int i = start; i <= end; i++)
{
theseSeqs.addSequence(allseqs[i], false);
hiddenRepSequences.put(allseqs[start], theseSeqs);
}
+
+ /**
+ * Test setting of the box position, when there are hidden rows at the start
+ * of the alignment
+ */
+ @Test(groups = { "Functional" })
+ public void testFromMouseWithHiddenRowsAtStartWrapped()
+ {
+ vpranges.setWrappedMode(true);
+ od.updateViewportFromMouse(0, 0, al.getHiddenSequences(), hiddenCols);
+ assertEquals(od.getBoxX(), 0);
+ assertEquals(od.getBoxY(), 0);
+ assertEquals(od.getBoxHeight(), boxHeight);
+ assertEquals(od.getBoxWidth(), boxWidth);
+ assertEquals(vpranges.getStartRes(), 0);
+ assertEquals(vpranges.getStartSeq(), 0);
+
+ // hide rows at start and check updated box position is correct
+ // changes boxY but not boxheight
+ int lastHiddenRow = 30;
+ hideSequences(0, lastHiddenRow);
+
+ od.setBoxPosition(al.getHiddenSequences(), hiddenCols);
+ assertEquals(od.getBoxX(), 0);
+ assertEquals(od.getBoxY(), Math.round((float) (lastHiddenRow + 1)
+ * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxWidth(), boxWidth);
+ assertEquals(od.getBoxHeight(), boxHeight);
+
+ // click in hidden rows - same result
+ mouseClick(od, 0, 0);
+ assertEquals(od.getBoxX(), 0);
+ int boxY = od.getBoxY();
+ assertEquals(boxY, Math.round((float) (lastHiddenRow + 1)
+ * od.getSequencesHeight() / alheight));
+ assertEquals(od.getBoxWidth(), boxWidth);
+ assertEquals(od.getBoxHeight(), boxHeight);
+
+ // click below hidden rows
+ // vertical move of overview box is suppressed in wrapped mode
+ mouseClick(od, 0, 150);
+ assertEquals(od.getBoxX(), 0);
+ assertEquals(od.getBoxY(), boxY); // unchanged
+ assertEquals(od.getBoxWidth(), boxWidth);
+ assertEquals(od.getBoxHeight(), boxHeight);
+ }
}
git://source.jalview.org / jalview.git / blobdiff