X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=9103c1d3a27d914907cae96557177db5c16f1cfe;hb=559b96a91b710f3f2e116790c9cf7e3aa6c76766;hp=321edef3b1bec6cfc21f9fa0bcdb277f0e757d85;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index 321edef..9103c1d 100755
--- a/src/jalview/appletgui/SequenceRenderer.java
+++ b/src/jalview/appletgui/SequenceRenderer.java
@@ -1,27 +1,28 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 
 package jalview.appletgui;
 
+import java.awt.*;
+
 import jalview.datamodel.*;
 import jalview.schemes.*;
-import java.awt.*;
 
 public class SequenceRenderer
 {
@@ -29,181 +30,268 @@ public class SequenceRenderer
   FontMetrics fm;
   boolean renderGaps = true;
   SequenceGroup currentSequenceGroup = null;
-  SequenceGroup [] allGroups = null;
+  SequenceGroup[] allGroups = null;
   Color resBoxColour;
   Graphics graphics;
+  boolean forOverview = false;
 
   public SequenceRenderer(AlignViewport av)
   {
     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();
 
-  public Color getResidueBoxColour(ColourSchemeI cs, SequenceI seq, int i)
+      this.renderGaps = renderGaps;
+    }
+
+  public Color getResidueBoxColour(SequenceI seq, int i)
   {
-    getBoxColour(cs, seq, i);
+    allGroups = av.alignment.findAllGroups(seq);
+
+    if (inCurrentSequenceGroup(i))
+    {
+      if (currentSequenceGroup.getDisplayBoxes())
+      {
+        getBoxColour(currentSequenceGroup.cs, seq, i);
+      }
+    }
+    else if (av.getShowBoxes())
+    {
+        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);
-   else
-       resBoxColour = Color.white;
+    if (cs != null)
+    {
+      resBoxColour = cs.findColour(seq.getSequence(i, i + 1), i);
+    }
+    else if(forOverview && !jalview.util.Comparison.isGap(seq.getCharAt(i)))
+    {
+        resBoxColour = Color.lightGray;
+    }
+    else
+    {
+      resBoxColour = Color.white;
+    }
+
   }
 
-  public void drawSequence(Graphics g,SequenceI seq,SequenceGroup [] sg, int start, int end, int x1, int y1, int width, int height)
+  public Color findSequenceColour(SequenceI seq, int i)
   {
-    allGroups = sg;
-
-    graphics = g;
+    allGroups = av.alignment.findAllGroups(seq);
+    drawBoxes(seq, i,i, 0);
+    return resBoxColour;
+  }
 
-    drawBoxes(seq, start, end, x1, y1, (int) width, height);
+  public void drawSequence(SequenceI seq, SequenceGroup[] sg,
+                           int start, int end,  int y1)
+  {
+    allGroups = sg;
 
-    fm = g.getFontMetrics();
-    drawText(seq,start,end,x1,y1,(int)width,height);
+    drawBoxes(seq, start, end,  y1);
 
+    if(av.validCharWidth)
+    {
+      drawText(seq, start, end, y1);
+    }
   }
 
-  public void drawBoxes(SequenceI seq,int start, int end, int x1, int y1, int width, int height) {
-    int i      = start;
+  public void drawBoxes(SequenceI seq, int start, int end,  int y1)
+  {
+    int i = start;
     int length = seq.getLength();
 
     int curStart = -1;
-    int curWidth = width;
+    int curWidth = av.charWidth;
 
     Color tempColour = null;
-    while (i <= end && i < length)
+    while (i <= end)
     {
-      if(inCurrentSequenceGroup(i))
+      resBoxColour = Color.white;
+      if(i < length)
       {
-        if( currentSequenceGroup.getDisplayBoxes())
-             getBoxColour(currentSequenceGroup.cs, seq, i);
-        else
-             resBoxColour = Color.white;
+        if (inCurrentSequenceGroup(i))
+        {
+          if (currentSequenceGroup.getDisplayBoxes())
+          {
+            getBoxColour(currentSequenceGroup.cs, seq, i);
+          }
+        }
+        else if (av.getShowBoxes())
+        {
+          getBoxColour(av.getGlobalColourScheme(), seq, i);
+        }
       }
-      else if(av.getShowBoxes())
-            getBoxColour(av.getGlobalColourScheme(), seq, i);
-      else
-        resBoxColour = Color.white;
 
 
       if (resBoxColour != tempColour)
       {
-        if(tempColour!=null)
-          graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height);
+        if (tempColour != null)
+        {
+          graphics.fillRect(av.charWidth * (curStart - start), y1, curWidth,
+                            av.charHeight);
+        }
         graphics.setColor(resBoxColour);
 
         curStart = i;
-        curWidth = width;
+        curWidth = av.charWidth;
         tempColour = resBoxColour;
 
       }
       else
-        curWidth += width;
+      {
+        curWidth += av.charWidth;
+      }
 
       i++;
     }
 
-
-     graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height);
+    graphics.fillRect(av.charWidth * (curStart - start), y1, curWidth, av.charHeight);
   }
 
-  public void drawText(SequenceI seq,int start, int end, int x1, int y1, int width, int height)
+  public void drawText(SequenceI seq, int start, int end, int y1)
   {
-    int pady = height/5;
-    int charOffset=0;
-    char s;
+
+    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;
+
+    char s = ' ';
 
-    String sequence  = seq.getSequence();
     for (int i = start; i <= end; i++)
     {
-        graphics.setColor(Color.black);
-        if(i<sequence.length())
-          s = sequence.charAt(i);
-        else
-          s = ' ';
+      graphics.setColor(Color.black);
 
-        if(!renderGaps && jalview.util.Comparison.isGap(s))
-          continue;
+      s = seq.getCharAt(i);
+      if (!renderGaps && jalview.util.Comparison.isGap(s))
+      {
+        continue;
+      }
 
+      if (inCurrentSequenceGroup(i))
+      {
+        if (!currentSequenceGroup.getDisplayText())
+        {
+          continue;
+        }
 
-        if (inCurrentSequenceGroup(i))
+        if (currentSequenceGroup.getColourText())
         {
-          if(!currentSequenceGroup.getDisplayText())
-            continue;
-
-            if (currentSequenceGroup.getColourText())
-            {
-              getBoxColour(currentSequenceGroup.cs, seq, i);
-              graphics.setColor(resBoxColour.darker());
-            }
+          getBoxColour(currentSequenceGroup.cs, seq, i);
+          graphics.setColor(resBoxColour.darker());
         }
-        else
+      }
+      else
+      {
+        if (!av.getShowText())
         {
-          if(!av.getShowText())
-            continue;
-
-          if(av.getColourText())
-           {
-             getBoxColour(av.getGlobalColourScheme(), seq, i);
-             if(av.getShowBoxes())
-              graphics.setColor(resBoxColour.darker());
-            else
-              graphics.setColor(resBoxColour);
-           }
+          continue;
         }
 
-          charOffset =  (width - fm.charWidth(s))/2;
-          graphics.drawString(String.valueOf(s),
-                              charOffset + x1 + width * (i - start),
-                              y1 + height - pady);
+        if (av.getColourText())
+        {
+          getBoxColour(av.getGlobalColourScheme(), seq, i);
+          if (av.getShowBoxes())
+          {
+            graphics.setColor(resBoxColour.darker());
+          }
+          else
+          {
+            graphics.setColor(resBoxColour);
+          }
         }
+      }
 
+      charOffset = (av.charWidth - fm.charWidth(s)) / 2;
+      graphics.drawString(String.valueOf(s),
+                         charOffset + av.charWidth * (i - start),
+                        y1 );
+    }
 
   }
 
   boolean inCurrentSequenceGroup(int res)
   {
-    if(allGroups ==null)
+    if (allGroups == null)
+    {
       return false;
+    }
 
-    for(int i=0; i<allGroups.length; i++)
-      if(allGroups[i].getStartRes()<=res && allGroups[i].getEndRes()>=res)
+    for (int i = 0; i < allGroups.length; i++)
+    {
+      if (allGroups[i].getStartRes() <= res && allGroups[i].getEndRes() >= res)
       {
-         currentSequenceGroup = allGroups[i];
-         return true;
+        currentSequenceGroup = allGroups[i];
+        return true;
       }
+    }
 
     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 charOffset=0;
+    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='~';
+    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++)
+      {
+        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);
+      }
     }
   }
 
+  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,
+                          (y1 + av.charHeight) - pady);
+    }
+    }
 
 }