X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=480a50600f573a5e338c1a34a734e11ba5bc50a2;hb=6d50f49d0e32b01c57733c4b6e5ece33aa9664af;hp=3f87b02aded9ca039dd04a2ec37f46ad4adfe2dc;hpb=ce78438036915fc817cc6f4dd4294b3bc4a3c270;p=jalview.git

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 3f87b02..480a506 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,20 @@ 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;
+    if(seq==null)
+      return;
 
-    graphics = g;
+    allGroups = sg;
 
     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)
@@ -157,6 +167,14 @@ public class SequenceRenderer
 
   public void drawText(SequenceI seq, int start, int end, int y1)
   {
+   Font boldFont = null;
+   boolean bold = false;
+   if(av.upperCasebold)
+   {
+     boldFont = new Font(av.getFont().getName(), Font.BOLD, av.charHeight);
+
+     graphics.setFont(av.getFont());
+   }
 
     y1 += av.charHeight - av.charHeight / 5;  // height/5 replaces pady
 
@@ -212,6 +230,26 @@ public class SequenceRenderer
         }
       }
 
+      if (av.upperCasebold)
+      {
+        fm = graphics.getFontMetrics();
+        if ('A' <= s && s <= 'Z')
+        {
+          if(!bold)
+          {
+
+            graphics.setFont(boldFont);
+          }
+          bold = true;
+        }
+        else if(bold)
+        {
+          graphics.setFont(av.font);
+          bold = false;
+        }
+
+      }
+
       charOffset = (av.charWidth - fm.charWidth(s)) / 2;
       graphics.drawString(String.valueOf(s),
                          charOffset + av.charWidth * (i - start),
@@ -239,29 +277,52 @@ 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 = (av.charWidth - fm.charWidth(s)) / 2;
+        graphics.drawString(String.valueOf(s),
+                            charOffset + x1 + av.charWidth * (i - start),
+                            y1 + av.charHeight - pady);
       }
+    }
+  }
 
-      charOffset = (width - fm.charWidth(s)) / 2;
+  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);
+    graphics.setColor(Color.white);
+
+    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 + width * (i - start),
-                          y1 + height - pady);
+                          charOffset + x1,
+                          (y1 + av.charHeight) - pady);
+    }
     }
-  }
 
 }