X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=9103c1d3a27d914907cae96557177db5c16f1cfe;hb=37a5dfc3c72a42689e90ad8a0e118e8855d9868b;hp=9dbb05ccb75a749e2211e02bc39b8f848b3067ad;hpb=2df9d1cb0e8975c84486ddc4728062e377adbb1f;p=jalview.git

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 9dbb05c..9103c1d 100755
--- a/src/jalview/appletgui/SequenceRenderer.java
+++ b/src/jalview/appletgui/SequenceRenderer.java
@@ -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,15 @@ 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);
 
     if(av.validCharWidth)
     {
-      fm = g.getFontMetrics();
       drawText(seq, start, end, y1);
     }
   }
@@ -241,13 +246,12 @@ 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 = '~';
@@ -261,10 +265,10 @@ public class SequenceRenderer
           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);
       }
     }
   }