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
Fire alignment changed if seqs hidden / revealed
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceRenderer.java
diff --git
a/src/jalview/gui/SequenceRenderer.java
b/src/jalview/gui/SequenceRenderer.java
index
ec93abf
..
a8a9a47
100755
(executable)
--- a/
src/jalview/gui/SequenceRenderer.java
+++ b/
src/jalview/gui/SequenceRenderer.java
@@
-61,7
+61,14
@@
public class SequenceRenderer
{
\r
graphics = g;
\r
fm = g.getFontMetrics();
\r
{
\r
graphics = g;
\r
fm = g.getFontMetrics();
\r
- monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();
\r
+
\r
+ // If EPS graphics, stringWidth will be a double, not an int
\r
+ double dwidth = fm.getStringBounds("M", g).getWidth();
\r
+
\r
+ monospacedFont =
\r
+ dwidth == fm.getStringBounds("|",g).getWidth()
\r
+ && av.charWidth == (int)dwidth;
\r
+
\r
this.renderGaps = renderGaps;
\r
}
\r
\r
this.renderGaps = renderGaps;
\r
}
\r
\r
@@
-129,7
+136,8
@@
public class SequenceRenderer
\r
drawBoxes(seq, start, end, y1);
\r
\r
\r
drawBoxes(seq, start, end, y1);
\r
\r
- drawText(seq, start, end, y1);
\r
+ if (av.validCharWidth)
\r
+ drawText(seq, start, end, y1);
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-340,17
+348,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
@@
-360,17
+371,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
- graphics.setColor(Color.white);
\r
\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