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
parseFeaturesFile
[jalview.git]
/
src
/
jalview
/
appletgui
/
SequenceRenderer.java
diff --git
a/src/jalview/appletgui/SequenceRenderer.java
b/src/jalview/appletgui/SequenceRenderer.java
index
891dfab
..
9dbb05c
100755
(executable)
--- a/
src/jalview/appletgui/SequenceRenderer.java
+++ b/
src/jalview/appletgui/SequenceRenderer.java
@@
-97,9
+97,11
@@
public class SequenceRenderer
\r
drawBoxes(seq, start, end, y1);
\r
\r
\r
drawBoxes(seq, start, end, y1);
\r
\r
- fm = g.getFontMetrics();
\r
- drawText(seq, start, end, y1);
\r
-
\r
+ if(av.validCharWidth)
\r
+ {
\r
+ fm = g.getFontMetrics();
\r
+ drawText(seq, start, end, y1);
\r
+ }
\r
}
\r
\r
public void drawBoxes(SequenceI seq, int start, int end, int y1)
\r
}
\r
\r
public void drawBoxes(SequenceI seq, int start, int end, int y1)
\r
@@
-250,17
+252,20
@@
public class SequenceRenderer
\r
char s = '~';
\r
// Need to find the sequence position here.
\r
\r
char s = '~';
\r
// Need to find the sequence position here.
\r
- for (int i = start; i <= end; i++)
\r
+ if(av.validCharWidth)
\r
{
\r
{
\r
- if (i < seq.getLength())
\r
+ for (int i = start; i <= end; i++)
\r
{
\r
{
\r
- s = seq.getSequence().charAt(i);
\r
- }
\r
+ if (i < seq.getLength())
\r
+ {
\r
+ s = seq.getSequence().charAt(i);
\r
+ }
\r
\r
\r
- charOffset = (width - fm.charWidth(s)) / 2;
\r
- graphics.drawString(String.valueOf(s),
\r
- charOffset + x1 + width * (i - start),
\r
- y1 + height - pady);
\r
+ charOffset = (width - fm.charWidth(s)) / 2;
\r
+ graphics.drawString(String.valueOf(s),
\r
+ charOffset + x1 + width * (i - start),
\r
+ y1 + height - pady);
\r
+ }
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-275,11
+280,14
@@
public class SequenceRenderer
graphics.setColor(Color.white);
\r
\r
char s = seq.getCharAt(res);
\r
graphics.setColor(Color.white);
\r
\r
char s = seq.getCharAt(res);
\r
+ if (av.validCharWidth)
\r
+ {
\r
\r
\r
- charOffset = (av.charWidth - fm.charWidth(s)) / 2;
\r
- graphics.drawString(String.valueOf(s),
\r
- charOffset + x1,
\r
- (y1 + av.charHeight) - pady);
\r
+ charOffset = (av.charWidth - fm.charWidth(s)) / 2;
\r
+ graphics.drawString(String.valueOf(s),
\r
+ charOffset + x1,
\r
+ (y1 + av.charHeight) - pady);
\r
+ }
\r
}
\r
\r
}
\r
}
\r
\r
}
\r