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

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 891dfab..daf971d 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) 2007 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,9 +40,17 @@ 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)
@@ -58,21 +66,21 @@ public class SequenceRenderer
     }
     else if (av.getShowBoxes())
     {
-        getBoxColour(av.globalColourScheme, seq, i);
+      getBoxColour(av.globalColourScheme, seq, i);
     }
 
     return resBoxColour;
-    }
+  }
 
   void getBoxColour(ColourSchemeI cs, SequenceI seq, int i)
   {
     if (cs != null)
     {
-      resBoxColour = cs.findColour(seq.getSequence(i, i + 1), i);
+      resBoxColour = cs.findColour(seq.getCharAt(i), i);
     }
-    else if(forOverview && !jalview.util.Comparison.isGap(seq.getCharAt(i)))
+    else if (forOverview && !jalview.util.Comparison.isGap(seq.getCharAt(i)))
     {
-        resBoxColour = Color.lightGray;
+      resBoxColour = Color.lightGray;
     }
     else
     {
@@ -84,25 +92,29 @@ public class SequenceRenderer
   public Color findSequenceColour(SequenceI seq, int i)
   {
     allGroups = av.alignment.findAllGroups(seq);
-    drawBoxes(seq, i,i, 0);
+    drawBoxes(seq, i, i, 0);
     return resBoxColour;
   }
 
-  public void drawSequence(Graphics g, SequenceI seq, SequenceGroup[] sg,
-                           int start, int end,  int y1)
+  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);
+    drawBoxes(seq, start, end, y1);
 
+    if (av.validCharWidth)
+    {
+      drawText(seq, start, end, y1);
+    }
   }
 
-  public void drawBoxes(SequenceI seq, int start, int end,  int y1)
+  public void drawBoxes(SequenceI seq, int start, int end, int y1)
   {
     int i = start;
     int length = seq.getLength();
@@ -114,7 +126,7 @@ public class SequenceRenderer
     while (i <= end)
     {
       resBoxColour = Color.white;
-      if(i < length)
+      if (i < length)
       {
         if (inCurrentSequenceGroup(i))
         {
@@ -129,7 +141,6 @@ public class SequenceRenderer
         }
       }
 
-
       if (resBoxColour != tempColour)
       {
         if (tempColour != null)
@@ -152,19 +163,30 @@ public class SequenceRenderer
       i++;
     }
 
-    graphics.fillRect(av.charWidth * (curStart - start), y1, curWidth, av.charHeight);
+    graphics.fillRect(av.charWidth * (curStart - start), y1, curWidth,
+                      av.charHeight);
   }
 
   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);
 
-    y1 += av.charHeight - av.charHeight / 5;  // height/5 replaces pady
+      graphics.setFont(av.getFont());
+    }
+
+    y1 += av.charHeight - av.charHeight / 5; // height/5 replaces pady
 
     int charOffset = 0;
 
     // Need to find the sequence position here.
-    if(end+1>=seq.getLength())
-          end = seq.getLength()-1;
+    if (end + 1 >= seq.getLength())
+    {
+      end = seq.getLength() - 1;
+    }
 
     char s = ' ';
 
@@ -212,10 +234,30 @@ 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),
-                        y1 );
+                          charOffset + av.charWidth * (i - start),
+                          y1);
     }
 
   }
@@ -240,27 +282,30 @@ public class SequenceRenderer
   }
 
   public void drawHighlightedText(SequenceI seq, int start, int end, int x1,
-                                  int y1, int width, int height)
+                                  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.getCharAt(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 +320,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);
     }
+  }
 
 }