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
validCharWidth moved to viewport
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceRenderer.java
diff --git
a/src/jalview/gui/SequenceRenderer.java
b/src/jalview/gui/SequenceRenderer.java
index
6350fba
..
02ea4b5
100755
(executable)
--- a/
src/jalview/gui/SequenceRenderer.java
+++ b/
src/jalview/gui/SequenceRenderer.java
@@
-41,7
+41,6
@@
public class SequenceRenderer
Graphics graphics;
\r
boolean monospacedFont;
\r
boolean forOverview = false;
\r
Graphics graphics;
\r
boolean monospacedFont;
\r
boolean forOverview = false;
\r
- boolean validCharWidth = true;
\r
\r
/**
\r
* Creates a new SequenceRenderer object.
\r
\r
/**
\r
* Creates a new SequenceRenderer object.
\r
@@
-63,8
+62,6
@@
public class SequenceRenderer
graphics = g;
\r
fm = g.getFontMetrics();
\r
monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();
\r
graphics = g;
\r
fm = g.getFontMetrics();
\r
monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();
\r
- validCharWidth = fm.charWidth('M') <= av.charWidth;
\r
-
\r
this.renderGaps = renderGaps;
\r
}
\r
\r
this.renderGaps = renderGaps;
\r
}
\r
\r
@@
-132,7
+129,7
@@
public class SequenceRenderer
\r
drawBoxes(seq, start, end, y1);
\r
\r
\r
drawBoxes(seq, start, end, y1);
\r
\r
- if (validCharWidth)
\r
+ if (av.validCharWidth)
\r
drawText(seq, start, end, y1);
\r
}
\r
\r
drawText(seq, start, end, y1);
\r
}
\r
\r
@@
-344,17
+341,20
@@
public class SequenceRenderer
char s = '~';
\r
\r
// Need to find the sequence position here.
\r
char s = '~';
\r
\r
// Need to find the sequence position here.
\r
- for (int i = start; i <= end; i++)
\r
+ if(av.validCharWidth)
\r
{
\r
{
\r
+ for (int i = start; i <= end; i++)
\r
+ {
\r
if (i < seq.getLength())
\r
{
\r
if (i < seq.getLength())
\r
{
\r
- s = seq.getSequence().charAt(i);
\r
+ s = seq.getSequence().charAt(i);
\r
}
\r
\r
charOffset = (av.charWidth - fm.charWidth(s)) / 2;
\r
graphics.drawString(String.valueOf(s),
\r
}
\r
\r
charOffset = (av.charWidth - fm.charWidth(s)) / 2;
\r
graphics.drawString(String.valueOf(s),
\r
- charOffset + x1 + (av.charWidth * (i - start)),
\r
- (y1 + av.charHeight) - pady);
\r
+ charOffset + x1 + (av.charWidth * (i - start)),
\r
+ (y1 + av.charHeight) - pady);
\r
+ }
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-364,17
+364,18
@@
public class SequenceRenderer
int charOffset = 0;
\r
graphics.setColor(Color.black);
\r
graphics.fillRect(x1, y1, av.charWidth, av.charHeight);
\r
int charOffset = 0;
\r
graphics.setColor(Color.black);
\r
graphics.fillRect(x1, y1, av.charWidth, av.charHeight);
\r
- graphics.setColor(Color.white);
\r
\r
\r
- graphics.setColor(Color.white);
\r
-
\r
- char s = seq.getCharAt(res);
\r
+ if(av.validCharWidth)
\r
+ {
\r
+ graphics.setColor(Color.white);
\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
+ char s = seq.getCharAt(res);
\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
+ }
\r
\r
}
\r
}
\r
\r
}
\r
}
\r