X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=e786b114c389cbface8fb50d94108fe81535f551;hb=c20e9d4ae9c98b093e74a10bf965e6d20d80fadf;hp=891dfabd775c1253f44e904c6b4b0349613992d8;hpb=f7d45a21db810c5f8f7ca668d1a28f1403defe32;p=jalview.git

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 891dfab..e786b11 100755
--- a/src/jalview/appletgui/SequenceRenderer.java
+++ b/src/jalview/appletgui/SequenceRenderer.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -40,10 +40,18 @@ public class SequenceRenderer
     this.av = av;
   }
 
-  public void renderGaps(boolean b)
+  /**
+   * DOCUMENT ME!
+   *
+   * @param b DOCUMENT ME!
+   */
+  public void prepare(Graphics g, boolean renderGaps)
   {
-    renderGaps = b;
-  }
+      graphics = g;
+      fm = g.getFontMetrics();
+
+      this.renderGaps = renderGaps;
+    }
 
   public Color getResidueBoxColour(SequenceI seq, int i)
   {
@@ -88,18 +96,17 @@ public class SequenceRenderer
     return resBoxColour;
   }
 
-  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();
-    drawText(seq, start, end, y1);
-
+    if(av.validCharWidth)
+    {
+      drawText(seq, start, end, y1);
+    }
   }
 
   public void drawBoxes(SequenceI seq, int start, int end,  int y1)
@@ -239,28 +246,30 @@ public class SequenceRenderer
     return false;
   }
 
-  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)
     {
-      if (i < seq.getLength())
+      for (int i = start; i <= end; i++)
       {
-        s = seq.getSequence().charAt(i);
-      }
+        if (i < seq.getLength())
+        {
+          s = seq.getSequence().charAt(i);
+        }
 
-      charOffset = (width - fm.charWidth(s)) / 2;
-      graphics.drawString(String.valueOf(s),
-                          charOffset + x1 + width * (i - start),
-                          y1 + height - pady);
+        charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+        graphics.drawString(String.valueOf(s),
+                            charOffset + x1 + av.charWidth * (i - start),
+                            y1 + av.charHeight - pady);
+      }
     }
   }
 
@@ -275,11 +284,14 @@ public class SequenceRenderer
     graphics.setColor(Color.white);
 
     char s = seq.getCharAt(res);
+    if (av.validCharWidth)
+    {
 
-    charOffset = (av.charWidth - fm.charWidth(s)) / 2;
-    graphics.drawString(String.valueOf(s),
-              charOffset + x1,
-              (y1 + av.charHeight) - pady);
+      charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+      graphics.drawString(String.valueOf(s),
+                          charOffset + x1,
+                          (y1 + av.charHeight) - pady);
+    }
     }
 
 }