X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceRenderer.java;h=a8a9a470f593acb6736b282ed4052cfec33a141d;hb=6bfaf3d3a82e4eece77dc1c2d83aede7c4dbb690;hp=ec93abf246f244f59897e1ba794ce5c91b17450e;hpb=27b78e7d308dd52df87135dd815740ad1a64b1ab;p=jalview.git

diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java
index ec93abf..a8a9a47 100755
--- a/src/jalview/gui/SequenceRenderer.java
+++ b/src/jalview/gui/SequenceRenderer.java
@@ -61,7 +61,14 @@ public class SequenceRenderer
     {
         graphics = g;
         fm = g.getFontMetrics();
-        monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();
+
+        // If EPS graphics, stringWidth will be a double, not an int
+        double dwidth = fm.getStringBounds("M", g).getWidth();
+
+        monospacedFont =
+               dwidth == fm.getStringBounds("|",g).getWidth()
+               && av.charWidth == (int)dwidth;
+
         this.renderGaps = renderGaps;
     }
 
@@ -129,7 +136,8 @@ public class SequenceRenderer
 
         drawBoxes(seq, start, end, y1);
 
-        drawText(seq, start, end, y1);
+        if (av.validCharWidth)
+          drawText(seq, start, end, y1);
     }
 
     /**
@@ -340,17 +348,20 @@ public class SequenceRenderer
         char s = '~';
 
         // Need to find the sequence position here.
-        for (int i = start; i <= end; i++)
+        if(av.validCharWidth)
         {
+          for (int i = start; i <= end; i++)
+          {
             if (i < seq.getLength())
             {
-                s = seq.getSequence().charAt(i);
+              s = seq.getSequence().charAt(i);
             }
 
             charOffset = (av.charWidth - fm.charWidth(s)) / 2;
             graphics.drawString(String.valueOf(s),
-                charOffset + x1 + (av.charWidth * (i - start)),
-                (y1 + av.charHeight) - pady);
+                                charOffset + x1 + (av.charWidth * (i - start)),
+                                (y1 + av.charHeight) - pady);
+          }
         }
     }
 
@@ -360,17 +371,18 @@ public class SequenceRenderer
       int charOffset = 0;
       graphics.setColor(Color.black);
       graphics.fillRect(x1, y1, av.charWidth, av.charHeight);
-      graphics.setColor(Color.white);
-
-      graphics.setColor(Color.white);
 
-      char s = seq.getCharAt(res);
+      if(av.validCharWidth)
+      {
+        graphics.setColor(Color.white);
 
-      charOffset = (av.charWidth - fm.charWidth(s)) / 2;
-      graphics.drawString(String.valueOf(s),
-                charOffset + x1,
-                (y1 + av.charHeight) - pady);
+        char s = seq.getCharAt(res);
 
+        charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+        graphics.drawString(String.valueOf(s),
+                            charOffset + x1,
+                            (y1 + av.charHeight) - pady);
+      }
 
     }
 }