/**
* Create an OverviewDimensions object
*
- * @param props
+ * @param ranges
* positional properties of the viewport
* @param showAnnotationPanel
* true if the annotation panel is to be shown, false otherwise
*/
- public OverviewDimensions(ViewportPositionProps props,
+ public OverviewDimensions(ViewportRanges ranges,
boolean showAnnotationPanel)
{
// scale the initial size of overviewpanel to shape of alignment
- float initialScale = (float) props.getAbsoluteAlignmentWidth()
- / (float) props.getAbsoluteAlignmentHeight();
+ float initialScale = (float) ranges.getAbsoluteAlignmentWidth()
+ / (float) ranges.getAbsoluteAlignmentHeight();
if (!showAnnotationPanel)
{
graphHeight = 0;
}
- if (props.getAbsoluteAlignmentWidth() > props
+ if (ranges.getAbsoluteAlignmentWidth() > ranges
.getAbsoluteAlignmentHeight())
{
// wider
width = MAX_WIDTH;
- sequencesHeight = (int) (MAX_WIDTH / initialScale);
+ sequencesHeight = Math.round(MAX_WIDTH / initialScale);
if (sequencesHeight < MIN_SEQ_HEIGHT)
{
sequencesHeight = MIN_SEQ_HEIGHT;
else
{
// taller
- width = (int) (MAX_WIDTH * initialScale);
+ width = Math.round(MAX_WIDTH * initialScale);
sequencesHeight = MAX_SEQ_HEIGHT;
if (width < MIN_WIDTH)
* hidden sequences
* @param hiddenCols
* hidden columns
- * @param props
+ * @param ranges
* viewport position properties
*/
public void updateViewportFromMouse(int mousex, int mousey,
HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
- ViewportPositionProps props)
+ ViewportRanges ranges)
{
int x = mousex;
int y = mousey;
- int alwidth = props.getAbsoluteAlignmentWidth();
- int alheight = props.getAbsoluteAlignmentHeight();
+ int alwidth = ranges.getAbsoluteAlignmentWidth();
+ int alheight = ranges.getAbsoluteAlignmentHeight();
if (x < 0)
{
x = 0;
}
- else if (x >= alwidth)
- {
- x = alwidth - 1;
- }
if (y < 0)
{
y = 0;
}
- else if (y >= alheight)
- {
- y = alheight - 1;
- }
//
// Convert x value to residue position
int xAsRes = Math.round((float) x * alwidth / width);
// get viewport width in residues
- int vpwidth = props.getEndRes() - props.getStartRes() + 1;
+ int vpwidth = ranges.getEndRes() - ranges.getStartRes() + 1;
// get where x should be when accounting for hidden cols
// if x is in a hidden col region, shift to left - but we still need
// absolute position
// so convert back after getting visible region position
- xAsRes = hiddenCols.adjustForHiddenColumns(hiddenCols
- .findColumnPosition(xAsRes));
-
- // get where end res should be by adding the viewport width on
- int endRes = xAsRes + vpwidth;
+ int visXAsRes = hiddenCols.findColumnPosition(xAsRes);
// check in case we went off the edge of the alignment
- if (endRes > alwidth)
+ int visAlignWidth = hiddenCols.findColumnPosition(alwidth - 1);
+ if (visXAsRes + vpwidth - 1 > visAlignWidth)
{
// went past the end of the alignment, adjust backwards
- endRes = alwidth;
- // recalc xAsRes backwards from endRes
- xAsRes = endRes - vpwidth;
+
+ // if last position was before the end of the alignment, need to update
+ if ((scrollCol + vpwidth - 1) < visAlignWidth)
+ {
+ visXAsRes = hiddenCols.findColumnPosition(hiddenCols
+ .subtractVisibleColumns(vpwidth - 1, alwidth - 1));
+ }
+ else
+ {
+ visXAsRes = scrollCol;
+ }
}
//
int yAsSeq = Math.round((float) y * alheight / sequencesHeight);
// get viewport height in sequences
- int vpheight = props.getEndSeq() - props.getStartSeq() + 1;
+ // add 1 because height includes both endSeq and startSeq
+ int vpheight = ranges.getEndSeq() - ranges.getStartSeq() + 1;
// get where y should be when accounting for hidden rows
// if y is in a hidden row region, shift up - but we still need absolute
yAsSeq = hiddenSeqs.adjustForHiddenSeqs(hiddenSeqs
.findIndexWithoutHiddenSeqs(yAsSeq));
- // get where end seq should be by adding the viewport height on
- int endSeq = yAsSeq + vpheight;
-
// check in case we went off the edge of the alignment
- if (endSeq > alheight)
+ int visAlignHeight = hiddenSeqs.findIndexWithoutHiddenSeqs(alheight);
+ int visYAsRes = hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq);
+ if (visYAsRes + vpheight - 1 > visAlignHeight)
{
// went past the end of the alignment, adjust backwards
- endSeq = alheight;
- // recalc yAsSeq backwards from endSeq
- yAsSeq = endSeq - vpheight + 1;
+ if ((scrollRow + vpheight - 1) < visAlignHeight)
+ {
+ visYAsRes = hiddenSeqs.findIndexWithoutHiddenSeqs(hiddenSeqs
+ .subtractVisibleRows(vpheight - 1, alheight - 1));
+ }
+ else
+ {
+ visYAsRes = scrollRow;
+ }
}
- // convert absolute positions back to visible alignment positions for
- // viewport scrolling
- scrollCol = hiddenCols.findColumnPosition(xAsRes);
- scrollRow = hiddenSeqs.findIndexWithoutHiddenSeqs(yAsSeq);
+ // update scroll values
+ scrollCol = visXAsRes;
+ scrollRow = visYAsRes;
+
}
/**
* hidden sequences
* @param hiddenCols
* hidden columns
- * @param props
+ * @param ranges
* viewport position properties
*/
public void setBoxPosition(HiddenSequences hiddenSeqs,
- ColumnSelection hiddenCols, ViewportPositionProps props)
+ ColumnSelection hiddenCols, ViewportRanges ranges)
{
- int alwidth = props.getAbsoluteAlignmentWidth();
- int alheight = props.getAbsoluteAlignmentHeight();
+ int alwidth = ranges.getAbsoluteAlignmentWidth();
+ int alheight = ranges.getAbsoluteAlignmentHeight();
// work with absolute values of startRes and endRes
- int startRes = hiddenCols.adjustForHiddenColumns(props.getStartRes());
- int endRes = hiddenCols.adjustForHiddenColumns(props.getEndRes());
+ int startRes = hiddenCols.adjustForHiddenColumns(ranges.getStartRes());
+ int endRes = hiddenCols.adjustForHiddenColumns(ranges.getEndRes());
// work with absolute values of startSeq and endSeq
- int startSeq = hiddenSeqs.adjustForHiddenSeqs(props.getStartSeq());
- int endSeq = hiddenSeqs.adjustForHiddenSeqs(props.getEndSeq());
+ int startSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getStartSeq());
+ int endSeq = hiddenSeqs.adjustForHiddenSeqs(ranges.getEndSeq());
// boxX, boxY is the x,y location equivalent to startRes, startSeq
boxX = Math.round((float) startRes * width / alwidth);
boxY = Math.round((float) startSeq * sequencesHeight / alheight);
// boxWidth is the width in residues translated to pixels
+ // since the box includes both the start and end residues, add 1 to the
+ // difference
boxWidth = Math
.round((float) (endRes - startRes + 1) * width / alwidth);
// boxHeight is the height in sequences translated to pixels
g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
}
- // don't like this, scroll vals are separate from setting code
public int getScrollCol()
{
return scrollCol;
git://source.jalview.org / jalview.git / blobdiff