Use AAFrequency final keys

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

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 9dbb05c..510b32f 100755 (executable)
--- a/src/jalview/appletgui/SequenceRenderer.java
+++ b/src/jalview/appletgui/SequenceRenderer.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -40,10 +40,18 @@ public class SequenceRenderer
     this.av = av;\r
   }\r
 \r
-  public void renderGaps(boolean b)\r
+  /**\r
+   * DOCUMENT ME!\r
+   *\r
+   * @param b DOCUMENT ME!\r
+   */\r
+  public void prepare(Graphics g, boolean renderGaps)\r
   {\r
-    renderGaps = b;\r
-  }\r
+      graphics = g;\r
+      fm = g.getFontMetrics();\r
+\r
+      this.renderGaps = renderGaps;\r
+    }\r
 \r
   public Color getResidueBoxColour(SequenceI seq, int i)\r
   {\r
@@ -88,18 +96,15 @@ public class SequenceRenderer
     return resBoxColour;\r
   }\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
     if(av.validCharWidth)\r
     {\r
-      fm = g.getFontMetrics();\r
       drawText(seq, start, end, y1);\r
     }\r
   }\r
@@ -159,6 +164,14 @@ public class SequenceRenderer
 \r
   public void drawText(SequenceI seq, int start, int end, int y1)\r
   {\r
+   Font boldFont = null;\r
+   boolean bold = false;\r
+   if(av.upperCasebold)\r
+   {\r
+     boldFont = new Font(av.getFont().getName(), Font.BOLD, av.charHeight);\r
+\r
+     graphics.setFont(av.getFont());\r
+   }\r
 \r
     y1 += av.charHeight - av.charHeight / 5;  // height/5 replaces pady\r
 \r
@@ -214,6 +227,26 @@ public class SequenceRenderer
         }\r
       }\r
 \r
+      if (av.upperCasebold)\r
+      {\r
+        fm = graphics.getFontMetrics();\r
+        if ('A' <= s && s <= 'Z')\r
+        {\r
+          if(!bold)\r
+          {\r
+\r
+            graphics.setFont(boldFont);\r
+          }\r
+          bold = true;\r
+        }\r
+        else if(bold)\r
+        {\r
+          graphics.setFont(av.font);\r
+          bold = false;\r
+        }\r
+\r
+      }\r
+\r
       charOffset = (av.charWidth - fm.charWidth(s)) / 2;\r
       graphics.drawString(String.valueOf(s),\r
                          charOffset + av.charWidth * (i - start),\r
@@ -241,13 +274,12 @@ public class SequenceRenderer
     return false;\r
   }\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
@@ -261,10 +293,10 @@ public class SequenceRenderer
           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),\r
-                            y1 + height - pady);\r
+                            charOffset + x1 + av.charWidth * (i - start),\r
+                            y1 + av.charHeight - pady);\r
       }\r
     }\r
   }\r