git://source.jalview.org
/
jalviewjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading
[jalviewjs.git]
/
src
/
jalview
/
appletgui
/
SequenceRenderer.java
diff --git
a/src/jalview/appletgui/SequenceRenderer.java
b/src/jalview/appletgui/SequenceRenderer.java
index
e2e98cb
..
b0733e4
100644
(file)
--- a/
src/jalview/appletgui/SequenceRenderer.java
+++ b/
src/jalview/appletgui/SequenceRenderer.java
@@
-116,7
+116,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
{
if (cs != null)
{
{
if (cs != null)
{
- resBoxColour = cs.findColour(seq.getCharAt(i), i, seq);
+ resBoxColour = cs.findColourSeq(seq.getCharAt(i), i, seq);
}
else if (forOverview && !Comparison.isGap(seq.getCharAt(i)))
{
}
else if (forOverview && !Comparison.isGap(seq.getCharAt(i)))
{
@@
-308,7
+308,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
}
charOffset = (avCharWidth - fm.charWidth(s)) / 2;
}
charOffset = (avCharWidth - fm.charWidth(s)) / 2;
- graphics.drawString(String.valueOf(s), charOffset + avCharWidth
+ awt2swing.Util.drawString(graphics, String.valueOf(s), charOffset + avCharWidth
* (i - start), y1);
}
* (i - start), y1);
}
@@
-370,7
+370,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
}
charOffset = (avCharWidth - fm.charWidth(s)) / 2;
}
charOffset = (avCharWidth - fm.charWidth(s)) / 2;
- graphics.drawString(String.valueOf(s), charOffset + x1
+ awt2swing.Util.drawString(graphics, String.valueOf(s), charOffset + x1
+ avCharWidth * (i - start), y1 + avCharHeight - pady);
}
}
+ avCharWidth * (i - start), y1 + avCharHeight - pady);
}
}
@@
-391,7
+391,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
{
charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
{
charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
- graphics.drawString(String.valueOf(s), charOffset + x1,
+ awt2swing.Util.drawString(graphics, String.valueOf(s), charOffset + x1,
(y1 + av.getCharHeight()) - pady);
}
}
(y1 + av.getCharHeight()) - pady);
}
}