X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceRenderer.java;h=a8a9a470f593acb6736b282ed4052cfec33a141d;hb=c42fcf7bf5cfcf51e67dd0f683edb9ab6683d157;hp=0e4312a65654d8b3da25235002743ee329c0ae1b;hpb=3d1120fca6dd9dc2865ee6cde98760f65c2701da;p=jalview.git

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