git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2491 Tidies and more refactoring
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
8619ad0
..
e545b8f
100644
(file)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-156,19
+156,17
@@
public class AlignmentPanel extends GAlignmentPanel implements
{
int widthInRes = getSeqPanel().seqCanvas
.getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
{
int widthInRes = getSeqPanel().seqCanvas
.getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
- vpRanges.setStartEndRes(vpRanges.getStartRes(),
- vpRanges.getStartRes() + widthInRes);
+ vpRanges.setViewportWidth(widthInRes);
}
else
{
}
else
{
- int widthInRes = (getSeqPanel().seqCanvas.getWidth() / av
- .getCharWidth()) - 1;
- int heightInSeq = (getSeqPanel().seqCanvas.getHeight() / av.getCharHeight()) - 1;
+ int widthInRes = getSeqPanel().seqCanvas.getWidth()
+ / av.getCharWidth();
+ int heightInSeq = getSeqPanel().seqCanvas.getHeight()
+ / av.getCharHeight();
- vpRanges.setStartEndRes(vpRanges.getStartRes(),
- vpRanges.getStartRes() + widthInRes);
- vpRanges.setStartEndSeq(vpRanges.getStartSeq(),
- vpRanges.getStartSeq() + heightInSeq);
+ vpRanges.setViewportWidth(widthInRes);
+ vpRanges.setViewportHeight(heightInSeq);
}
}
}
}
@@
-633,8
+631,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
{
int widthInRes = getSeqPanel().seqCanvas
.getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
{
int widthInRes = getSeqPanel().seqCanvas
.getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
- vpRanges.setStartEndRes(vpRanges.getStartRes(),
- vpRanges.getStartRes() + widthInRes - 1);
+ vpRanges.setViewportWidth(widthInRes);
}
else
{
}
else
{
@@
-643,8
+640,8
@@
public class AlignmentPanel extends GAlignmentPanel implements
int heightInSeq = (getSeqPanel().seqCanvas.getHeight() / av
.getCharHeight()) - 1;
int heightInSeq = (getSeqPanel().seqCanvas.getHeight() / av
.getCharHeight()) - 1;
- vpRanges.setStartEndRes(vpRanges.getStartRes(), widthInRes);
- vpRanges.setStartEndSeq(vpRanges.getStartSeq(), heightInSeq);
+ vpRanges.setViewportWidth(widthInRes);
+ vpRanges.setViewportHeight(heightInSeq);
}
idSpaceFillerPanel1.setVisible(!wrap);
}
idSpaceFillerPanel1.setVisible(!wrap);
@@
-759,7
+756,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
}
else if (offy > -1)
{
}
else if (offy > -1)
{
- vpRanges.setStartEndRes(offy * rowSize, (offy + 1) * rowSize - 1);
+ vpRanges.setViewportStartAndWidth(offy * rowSize, rowSize);
}
else
{
}
else
{
@@
-785,7
+782,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (evt.getSource() == hscroll)
{
int x = hscroll.getValue();
if (evt.getSource() == hscroll)
{
int x = hscroll.getValue();
- int width = (getSeqPanel().seqCanvas.getWidth() / av.getCharWidth()) - 1;
+ int width = getSeqPanel().seqCanvas.getWidth() / av.getCharWidth();
// if we're scrolling to the position we're already at, stop
// this prevents infinite recursion of events when the scroll/viewport
// if we're scrolling to the position we're already at, stop
// this prevents infinite recursion of events when the scroll/viewport
@@
-794,13
+791,13
@@
public class AlignmentPanel extends GAlignmentPanel implements
{
return;
}
{
return;
}
- vpRanges.setStartEndRes(x, x + width);
+ vpRanges.setViewportStartAndWidth(x, width);
}
else if (evt.getSource() == vscroll)
{
int y = vscroll.getValue();
}
else if (evt.getSource() == vscroll)
{
int y = vscroll.getValue();
- int height = (getSeqPanel().seqCanvas.getHeight() / av
- .getCharHeight()) - 1;
+ int height = getSeqPanel().seqCanvas.getHeight()
+ / av.getCharHeight();
// if we're scrolling to the position we're already at, stop
// this prevents infinite recursion of events when the scroll/viewport
// if we're scrolling to the position we're already at, stop
// this prevents infinite recursion of events when the scroll/viewport
@@
-809,7
+806,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
{
return;
}
{
return;
}
- vpRanges.setStartEndSeq(y, y + height);
+ vpRanges.setViewportStartAndHeight(y, height);
}
if (!fastPaint)
{
}
if (!fastPaint)
{