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
Formatting changes
[jalview.git]
/
src
/
jalview
/
appletgui
/
SeqCanvas.java
diff --git
a/src/jalview/appletgui/SeqCanvas.java
b/src/jalview/appletgui/SeqCanvas.java
index
5aa5d66
..
29616ef
100755
(executable)
--- a/
src/jalview/appletgui/SeqCanvas.java
+++ b/
src/jalview/appletgui/SeqCanvas.java
@@
-374,7
+374,7
@@
public class SeqCanvas
sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
\r
(x1 - startx) * av.charWidth,
\r
offset +
\r
sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
\r
(x1 - startx) * av.charWidth,
\r
offset +
\r
- AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
\r
+ (i-starty)*av.charHeight,
\r
av.charWidth, av.charHeight);
\r
\r
if (av.showSequenceFeatures)
\r
av.charWidth, av.charHeight);
\r
\r
if (av.showSequenceFeatures)
\r
@@
-382,7
+382,7
@@
public class SeqCanvas
fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
\r
(x1 - startx) * av.charWidth,
\r
offset +
\r
fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
\r
(x1 - startx) * av.charWidth,
\r
offset +
\r
- AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
\r
+ (i-starty)*av.charHeight,
\r
av.charWidth, av.charHeight);
\r
}
\r
}
\r
av.charWidth, av.charHeight);
\r
}
\r
}
\r
@@
-413,7
+413,7
@@
public class SeqCanvas
for (i = y1; i < y2; i++)
\r
{
\r
sx = (group.getStartRes() - startx) * av.charWidth;
\r
for (i = y1; i < y2; i++)
\r
{
\r
sx = (group.getStartRes() - startx) * av.charWidth;
\r
- sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);
\r
+ sy = offset + (i-starty)*av.charHeight;
\r
ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth - 1;
\r
\r
if (sx < getSize().width
\r
ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth - 1;
\r
\r
if (sx < getSize().width
\r
@@
-484,7
+484,7
@@
public class SeqCanvas
bottom = -1;
\r
\r
}
\r
bottom = -1;
\r
\r
}
\r
- sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);
\r
+ sy = offset + (i-starty)*av.charHeight;
\r
g.drawLine(sx, oldY, sx, sy);
\r
g.drawLine(sx + ex, oldY, sx + ex, sy);
\r
inGroup = false;
\r
g.drawLine(sx, oldY, sx, sy);
\r
g.drawLine(sx + ex, oldY, sx + ex, sy);
\r
inGroup = false;
\r
@@
-531,9
+531,7
@@
public class SeqCanvas
searchEnd,
\r
(searchStart - startx) * av.charWidth,
\r
offset +
\r
searchEnd,
\r
(searchStart - startx) * av.charWidth,
\r
offset +
\r
- AlignmentUtil.getPixelHeight(starty,
\r
- searchSeq,
\r
- av.charHeight),
\r
+ (searchSeq-starty)*av.charHeight,
\r
av.charWidth,
\r
av.charHeight);
\r
}
\r
av.charWidth,
\r
av.charHeight);
\r
}
\r