EPS font width is a double, check this for monospacedFont

[jalview.git] / src / jalview / gui / SequenceRenderer.java

diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java
index 0e4312a..f41a0b9 100755 (executable)
--- a/src/jalview/gui/SequenceRenderer.java
+++ b/src/jalview/gui/SequenceRenderer.java
@@ -57,9 +57,19 @@ public class SequenceRenderer
      *\r
      * @param b DOCUMENT ME!\r
      */\r
-    public void renderGaps(boolean b)\r
+    public void prepare(Graphics g, boolean renderGaps)\r
     {\r
-        renderGaps = b;\r
+        graphics = g;\r
+        fm = g.getFontMetrics();\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
+               && dwidth == (int)dwidth;\r
+\r
+        this.renderGaps = renderGaps;\r
     }\r
 \r
 \r
@@ -119,20 +129,15 @@ public class SequenceRenderer
      * @param width DOCUMENT ME!\r
      * @param height DOCUMENT ME!\r
      */\r
-    public void drawSequence(Graphics g, SequenceI seq, SequenceGroup[] sg,\r
+    public void drawSequence(SequenceI seq, SequenceGroup[] sg,\r
         int start, int end, int y1)\r
     {\r
         allGroups = sg;\r
 \r
-        graphics = g;\r
-\r
         drawBoxes(seq, start, end, y1);\r
 \r
-        fm = g.getFontMetrics();\r
-\r
-        monospacedFont = fm.getStringBounds("M",g).getWidth()==fm.getStringBounds("|",g).getWidth();\r
-\r
-        drawText(seq, start, end, y1);\r
+        if (av.validCharWidth)\r
+          drawText(seq, start, end, y1);\r
     }\r
 \r
     /**\r
@@ -227,7 +232,13 @@ public class SequenceRenderer
 \r
         if(monospacedFont && av.showText && allGroups.length==0 && !av.getColourText())\r
         {\r
+          if(av.renderGaps)\r
           graphics.drawString(seq.getSequence(start, end + 1), 0, y1);\r
+         else\r
+         {\r
+           char gap = av.getGapCharacter();\r
+           graphics.drawString( seq.getSequence(start, end+1).replace(gap, ' '), 0, y1);\r
+         }\r
         }\r
         else\r
         {\r
@@ -326,28 +337,52 @@ public class SequenceRenderer
      * @param width DOCUMENT ME!\r
      * @param height DOCUMENT ME!\r
      */\r
-    public void drawHighlightedText(SequenceI seq, int start, int end, int x1,\r
-        int y1, int width, int height)\r
+    public void drawHighlightedText(SequenceI seq, int start, int end, int x1, int y1)\r
     {\r
-        int pady = height / 5;\r
+        int pady = av.charHeight / 5;\r
         int charOffset = 0;\r
         graphics.setColor(Color.BLACK);\r
-        graphics.fillRect(x1, y1, width * (end - start + 1), height);\r
+        graphics.fillRect(x1, y1, av.charWidth * (end - start + 1), av.charHeight);\r
         graphics.setColor(Color.white);\r
 \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
+          for (int i = start; i <= end; i++)\r
+          {\r
             if (i < seq.getLength())\r
             {\r
-                s = seq.getSequence().charAt(i);\r
+              s = seq.getSequence().charAt(i);\r
             }\r
 \r
-            charOffset = (width - fm.charWidth(s)) / 2;\r
+            charOffset = (av.charWidth - fm.charWidth(s)) / 2;\r
             graphics.drawString(String.valueOf(s),\r
-                charOffset + x1 + (width * (i - start)), (y1 + height) - pady);\r
+                                charOffset + x1 + (av.charWidth * (i - start)),\r
+                                (y1 + av.charHeight) - pady);\r
+          }\r
         }\r
     }\r
+\r
+    public void drawCursor(SequenceI seq, int res, int x1, int y1)\r
+    {\r
+      int pady = av.charHeight / 5;\r
+      int charOffset = 0;\r
+      graphics.setColor(Color.black);\r
+      graphics.fillRect(x1, y1, av.charWidth, av.charHeight);\r
+\r
+      if(av.validCharWidth)\r
+      {\r
+        graphics.setColor(Color.white);\r
+\r
+        char s = seq.getCharAt(res);\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