av = af.getViewport();
- od = new OverviewDimensions(av, true);
+ od = new OverviewDimensions(av.getPosProps(), true);
while (av.isCalcInProgress())
{
}
// Initial box sizing - default path through code
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
init();
}
viewWidth = av.getEndRes() - av.getStartRes();
// wait for gui to get set up
+ // this does actually appear to be necessary
while (viewHeight != 17 || viewWidth != 62)
{
try
al1.setDataset(null);
AlignViewport av1 = new AlignViewport(al1);
- OverviewDimensions od = new OverviewDimensions(av1, true);
+ OverviewDimensions od = new OverviewDimensions(av1.getPosProps(), true);
int scaledHeight = 266;
assertEquals(od.getGraphHeight(), defaultGraphHeight);
assertEquals(od.getSequencesHeight(), scaledHeight);
al2.setDataset(null);
AlignViewport av2 = new AlignViewport(al2);
- od = new OverviewDimensions(av2, true);
+ od = new OverviewDimensions(av2.getPosProps(), true);
int scaledWidth = 300;
assertEquals(od.getGraphHeight(), defaultGraphHeight);
assertEquals(od.getSequencesHeight(), maxSeqHeight);
al3.setDataset(null);
AlignViewport av3 = new AlignViewport(al3);
- od = new OverviewDimensions(av3, true);
+ od = new OverviewDimensions(av3.getPosProps(), true);
assertEquals(od.getGraphHeight(), defaultGraphHeight);
assertEquals(od.getSequencesHeight(), minSeqHeight);
assertEquals(od.getWidth(), maxWidth);
al4.setDataset(null);
AlignViewport av4 = new AlignViewport(al4);
- od = new OverviewDimensions(av4, true);
+ od = new OverviewDimensions(av4.getPosProps(), true);
assertEquals(od.getGraphHeight(), defaultGraphHeight);
assertEquals(od.getSequencesHeight(), maxSeqHeight);
assertEquals(od.getWidth(), minWidth);
al5.setDataset(null);
AlignViewport av5 = new AlignViewport(al5);
- od = new OverviewDimensions(av5, false);
+ od = new OverviewDimensions(av5.getPosProps(), false);
assertEquals(od.getGraphHeight(), 0);
assertEquals(od.getSequencesHeight(), maxSeqHeight);
assertEquals(od.getWidth(), minWidth);
@Test(groups = { "Functional" })
public void testSetBoxFromMouseClick()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenColsAtStart()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
int lastHiddenCol = 30;
hideColumns(0, lastHiddenCol);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(),
Math.round((float) (lastHiddenCol + 1) * od.getWidth()
/ alwidth));
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenColsInMiddle()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
int lastHidden = 73;
hideColumns(firstHidden, lastHidden);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenColsAtEnd()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
int firstHidden = 140;
int lastHidden = 157;
hideColumns(firstHidden, lastHidden);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenRowsAtStart()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxHeight(), boxHeight);
int lastHiddenRow = 30;
hideSequences(0, lastHiddenRow + 1, lastHiddenRow + 1);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(),
Math.round((float) (lastHiddenRow + 1)
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenRowsInMiddle()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
int lastHiddenRow = 60;
hideSequences(firstHiddenRow, lastHiddenRow + 1, lastHiddenRow + 1);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
@Test(groups = { "Functional" })
public void testFromMouseWithHiddenRowsAtEnd()
{
- od.updateViewportFromMouse(0, 0);
+ od.updateViewportFromMouse(0, 0,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
int lastHidden = 524;
hideSequences(firstHidden - 1, lastHidden, firstHidden - 1);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
assertEquals(od.getBoxX(), 0);
assertEquals(od.getBoxY(), 0);
assertEquals(od.getBoxWidth(), boxWidth);
{
av.setStartRes(startRes);
av.setEndRes(startRes + viewWidth);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
}
/*
{
av.setStartSeq(startSeq);
av.setEndSeq(startSeq + viewHeight);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
}
/*
av.setEndRes(startRes + viewWidth);
av.setStartSeq(startSeq);
av.setEndSeq(startSeq + viewHeight);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
}
/*
*/
private void mouseClick(OverviewDimensions od, int x, int y)
{
- od.updateViewportFromMouse(x, y);
+ od.updateViewportFromMouse(x, y,
+ av.getAlignment().getHiddenSequences(),
+ av.getColumnSelection(), av.getPosProps());
// updates require an OverviewPanel to exist which it doesn't here
// so call setBoxPosition() as it would be called by the AlignmentPanel
// normally
av.setEndRes(od.getScrollCol() + viewWidth);
av.setStartSeq(od.getScrollRow());
av.setEndSeq(od.getScrollRow() + viewHeight);
- od.setBoxPosition();
+ od.setBoxPosition(av.getAlignment()
+ .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
}
private void testBoxIsAtClickPoint(int xpos, int ypos)