updated to jalview 2.1 and begun ArchiveClient/VamsasClient/VamsasStore updates.
[jalview.git] / src / jalview / gui / SeqCanvas.java
index 6dc2acd..74f59a3 100755 (executable)
-package jalview.gui;\r
-\r
-import java.awt.*;\r
-import javax.swing.*;\r
-import jalview.datamodel.*;\r
-import jalview.analysis.*;\r
-\r
-\r
-public class SeqCanvas extends JPanel\r
-{\r
-     FeatureRenderer fr;\r
-    Image             img;\r
-    Graphics2D          gg;\r
-    int               imgWidth;\r
-    int               imgHeight;\r
-\r
-    AlignViewport     av;\r
-\r
-    boolean showScores = false;\r
-    boolean displaySearch = false;\r
-    int [] searchResults = null;\r
-\r
-    int chunkHeight;\r
-    int chunkWidth;\r
-\r
-    boolean fastPaint = false;\r
-\r
-\r
-    public SeqCanvas(AlignViewport av)\r
-    {\r
-       this.av         = av;\r
-       fr = new FeatureRenderer(av);\r
-       setLayout(new BorderLayout());\r
-       PaintRefresher.Register(this);\r
-\r
-    }\r
-\r
-  void drawNorthScale(Graphics g, int startx, int endx,int ypos) {\r
-    int scalestartx = startx - startx % 10 + 10;\r
-\r
-    g.setColor(Color.black);\r
-\r
-    // NORTH SCALE\r
-    for (int i = scalestartx; i < endx; i += 10)\r
-    {\r
-      String string = String.valueOf(i);\r
-      g.drawString(string, (i - startx - 1) * av.charWidth,\r
-                   ypos - av.charHeight / 2);\r
-\r
-      g.drawLine( (i - startx - 1) * av.charWidth + av.charWidth / 2,\r
-                 ypos + 2 - av.charHeight / 2,\r
-                 (i - startx - 1) * av.charWidth + av.charWidth / 2, ypos - 2);\r
-\r
-    }\r
-  }\r
-\r
-  void drawWestScale(Graphics g, int startx, int endx, int ypos)\r
-  {\r
-    FontMetrics fm = getFontMetrics(av.getFont());\r
-    ypos+= av.charHeight;\r
-      // EAST SCALE\r
-    for (int i = 0; i < av.alignment.getHeight(); i++)\r
-    {\r
-      SequenceI seq = av.alignment.getSequenceAt(i);\r
-      int index = startx;\r
-      int value = -1;\r
-      while (index < endx)\r
-      {\r
-        if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
-        {\r
-          index++;\r
-          continue;\r
-        }\r
-\r
-        value = av.alignment.getSequenceAt(i).findPosition(index);\r
-        break;\r
-      }\r
-      if(value!=-1)\r
-      {\r
-        int x = fm.stringWidth("000") - fm.stringWidth(value+"");\r
-        g.drawString(value + "", x,  ypos +  i*av.charHeight - av.charHeight/5);\r
-      }\r
-    }\r
-  }\r
-\r
-  void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
-{\r
-    ypos+= av.charHeight;\r
-    // EAST SCALE\r
-  for (int i = 0; i < av.alignment.getHeight(); i++)\r
-  {\r
-    SequenceI seq = av.alignment.getSequenceAt(i);\r
-    int index = endx;\r
-    int value = -1;\r
-    while (index > startx)\r
-    {\r
-      if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
-      {\r
-        index--;\r
-        continue;\r
-      }\r
-\r
-      value = av.alignment.getSequenceAt(i).findPosition(index);\r
-      break;\r
-    }\r
-    if(value!=-1)\r
-       g.drawString(value + "", 0,  ypos +  i*av.charHeight - av.charHeight/5);\r
-  }\r
-\r
-}\r
-\r
-\r
-\r
-\r
-\r
-public void fastPaint(int horizontal, int vertical)\r
-{\r
-    if (horizontal == 0 && vertical == 0 || gg==null)\r
-      return;\r
-\r
-    gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,\r
-                -vertical * av.charHeight);\r
-\r
-    int sr = av.startRes, er = av.endRes + 1, ss = av.startSeq, es = av.endSeq,\r
-        transX = 0, transY = 0;\r
-    if (horizontal > 0) // scrollbar pulled right, image to the left\r
-    {\r
-      transX = (er - sr - horizontal) * av.charWidth;\r
-      sr = er - horizontal;\r
-    }\r
-    else if (horizontal < 0)\r
-      er = sr - horizontal;\r
-\r
-    else if (vertical > 0) // scroll down\r
-    {\r
-      transY = imgHeight - vertical * av.charHeight;\r
-      ss = es - vertical;\r
-    }\r
-    else if (vertical < 0)\r
-      es = ss - vertical;\r
-\r
-    gg.translate(transX, transY);\r
-\r
-    gg.setColor(Color.white);\r
-    gg.fillRect(0,0, (er-sr)*av.charWidth, (es-ss)*av.charHeight);\r
-    drawPanel(gg, sr, er, ss, es, sr, ss, 0);\r
-    gg.translate( -transX, -transY);\r
-\r
-    fastPaint = true;\r
-    repaint();\r
-\r
-}\r
-\r
-/**\r
- * Definitions of startx and endx (hopefully):\r
- * SMJS This is what I'm working towards!\r
- *   startx is the first residue (starting at 0) to display.\r
- *   endx   is the last residue to display (starting at 0).\r
- *   starty is the first sequence to display (starting at 0).\r
- *   endy   is the last sequence to display (starting at 0).\r
- * NOTE 1: The av limits are set in setFont in this class and\r
- * in the adjustment listener in SeqPanel when the scrollbars move.\r
- */\r
-\r
-  public void paintComponent(Graphics g)\r
-  {\r
-    g.setColor(Color.white);\r
-    g.fillRect(0, 0, getWidth(), getHeight());\r
-\r
-    if (fastPaint)\r
-    {\r
-      g.drawImage(img, 0, 0, this);\r
-      fastPaint = false;\r
-      return;\r
-    }\r
-\r
-    // this draws the whole of the alignment\r
-      imgWidth  = getWidth();\r
-      imgHeight = getHeight();\r
-      if(imgWidth==0 || imgHeight==0)\r
-        return;\r
-\r
-      imgWidth -= imgWidth%av.charWidth;\r
-      imgHeight-= imgHeight%av.charHeight;\r
-\r
-      img = createImage(imgWidth,imgHeight);\r
-      gg  = (Graphics2D)img.getGraphics();\r
-      gg.setFont(av.getFont());\r
-      gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);\r
-\r
-      gg.setColor(Color.white);\r
-      gg.fillRect(0,0,imgWidth,imgHeight);\r
-\r
-    chunkWidth  =   getWrappedCanvasWidth( getWidth() );\r
-    chunkHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;\r
-\r
-    av.setChunkHeight(chunkHeight);\r
-    av.setChunkWidth(chunkWidth);\r
-\r
-\r
-    if (av.getWrapAlignment())\r
-      drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);\r
-    else\r
-      drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0);\r
-\r
-    g.drawImage(img, 0, 0, this);\r
-\r
-  }\r
-\r
-  public int getWrappedCanvasWidth(int cwidth)\r
-  {\r
-    FontMetrics fm = getFontMetrics(av.getFont());\r
-\r
-    int LABEL_EAST = 0;\r
-    if(av.scaleRightWrapped)\r
-      LABEL_EAST = fm.stringWidth( av.alignment.getWidth()+"000" );\r
-    int LABEL_WEST = 0;\r
-    if(av.scaleLeftWrapped)\r
-      LABEL_WEST = fm.stringWidth( av.alignment.getWidth()+"0" );\r
-\r
-    return  (cwidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
-  }\r
-\r
-  public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)\r
-  {\r
-      AlignmentI al = av.getAlignment();\r
-\r
-      FontMetrics fm = getFontMetrics(av.getFont());\r
-\r
-      int LABEL_EAST = 0;\r
-      if(av.scaleRightWrapped)\r
-        LABEL_EAST = fm.stringWidth( al.getWidth()+"000" );\r
-      int LABEL_WEST = 0;\r
-      if(av.scaleLeftWrapped)\r
-        LABEL_WEST = fm.stringWidth( al.getWidth()+"0" );\r
-\r
-      int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
-      int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;\r
-\r
-      int  endx   = startRes+cWidth-1;\r
-      int  ypos  = 2*av.charHeight;\r
-\r
-\r
-      while (ypos <= canvasHeight && endx <al.getWidth())\r
-      {\r
-        g.setColor(Color.black);\r
-\r
-        if(av.scaleLeftWrapped)\r
-          drawWestScale(g, startRes, endx, ypos);\r
-\r
-        if(av.scaleRightWrapped)\r
-        {\r
-          g.translate(canvasWidth - LABEL_EAST +av.charWidth, 0);\r
-          drawEastScale(g, startRes, endx, ypos);\r
-          g.translate( - (canvasWidth - LABEL_EAST+av.charWidth), 0);\r
-        }\r
-\r
-\r
-        g.translate(LABEL_WEST,0);\r
-        if(av.scaleAboveWrapped)\r
-          drawNorthScale(g, startRes, endx, ypos);\r
-\r
-        drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
-        g.translate(-LABEL_WEST,0);\r
-\r
-        ypos += cHeight;\r
-        startRes += cWidth;\r
-        endx = startRes + cWidth - 1;\r
-\r
-        if (endx > al.getWidth())\r
-          endx = al.getWidth();\r
-      }\r
-\r
-  }\r
-\r
-\r
-  public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {\r
-\r
-    Graphics2D g = (Graphics2D)g1;\r
-    g.setFont(av.getFont());\r
-    RendererI sr = av.getRenderer();\r
-\r
-    /*Vector    pid    = av.getConsensus(false);\r
-    Vector tmpseq = new Vector();\r
-    for (int i = 0; i < av.getAlignment().getHeight(); i++)\r
-       if (!av.getSelection().contains(av.getAlignment().getSequenceAt(i)))\r
-           tmpseq.addElement(av.getAlignment().getSequenceAt(i));\r
-\r
-    if (sr instanceof SequenceRenderer)\r
-       pid    = AAFrequency.calculate(tmpseq,x1,x2);\r
-\r
-    else if (sr instanceof GraphRenderer)\r
-       pid = AAFrequency.calculatePID(av.getAlignment().getSequenceAt(0),\r
-                                      av.getAlignment().getSequences(),\r
-                                      av.getPIDWindow(),x1,x2);\r
-\r
-*/\r
-\r
-   /* if (y2 > starty && y1 < av.getEndSeq())\r
-    {\r
-       fillBackground(g,\r
-                   Color.red,\r
-                   (x1-startx)*charWidth,\r
-                   offset + AlignmentUtil.getPixelHeight(starty,y1,av.getCharHeight()),\r
-                   (x2-x1+1)*charWidth,\r
-                   offset + AlignmentUtil.getPixelHeight(y1,y2,av.getCharHeight()));\r
-    }*/\r
-\r
-    SequenceI nextSeq;\r
-\r
-    /// First draw the sequences\r
-    /////////////////////////////\r
-    for (int i = y1 ; i < y2 ;i++)\r
-    {\r
-     nextSeq = av.alignment.getSequenceAt(i);\r
-\r
-     sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2,\r
-                 (x1 - startx) * av.charWidth,\r
-                 offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
-                 av.charWidth,av.charHeight,null, i);\r
-\r
-     if(av.showSequenceFeatures)\r
-     {\r
-       fr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ), x1, x2,\r
-                       (x1 - startx) * av.charWidth,\r
-                       offset +\r
-                       AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
-                       av.charWidth, av.charHeight, null, i);\r
-     }\r
-    }\r
-    //\r
-    /////////////////////////////////////\r
-\r
-    // Now outline any areas if necessary\r
-    /////////////////////////////////////\r
-    SequenceGroup group = av.getSelectionGroup();\r
-    java.util.Vector groups = av.alignment.getGroups();\r
-\r
-    int sx = -1, sy = -1, ex = -1;\r
-    int groupIndex = -1;\r
-    if (group == null && groups.size() > 0)\r
-    {\r
-      group = (SequenceGroup) groups.elementAt(0);\r
-      groupIndex = 0;\r
-    }\r
-\r
-    if (group != null)\r
-      do\r
-      {\r
-        int oldY = -1;\r
-        int i = 0;\r
-        boolean inGroup = false;\r
-        int top=-1, bottom =-1;\r
-        for (i = y1; i < y2; i++)\r
-        {\r
-          sx = (group.getStartRes() - startx) * av.charWidth;\r
-          sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
-          ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth;\r
-\r
-          if (av.getWrapAlignment())\r
-          {\r
-            if (sx < 0)\r
-              sx = 0;\r
-\r
-            if (ex > getWidth())\r
-            {\r
-              if (av.getWrapAlignment())\r
-                ex = getWrappedCanvasWidth(getWidth()) * av.charWidth;\r
-\r
-            }\r
-          }\r
-          else if(ex>getWidth())\r
-            ex -= av.charWidth;\r
-\r
-\r
-          if (sx < getWidth()\r
-              && ex > 0\r
-              && group.sequences.contains(av.alignment.getSequenceAt(i)))\r
-          {\r
-            if (bottom == -1 &&\r
-                !group.sequences.contains(av.alignment.getSequenceAt(i + 1)))\r
-              bottom = sy + av.charHeight ;\r
-\r
-            if (!inGroup)\r
-            {\r
-              if (top == -1 && i==0 ||\r
-                  !group.sequences.contains(av.alignment.getSequenceAt(i - 1)))\r
-                top = sy;\r
-\r
-\r
-              oldY = sy;\r
-              inGroup = true;\r
-              if (group == av.getSelectionGroup())\r
-              {\r
-                g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,3f}, 0f ));\r
-                g.setColor(Color.RED);\r
-              }\r
-              else\r
-              {\r
-                g.setStroke(new BasicStroke());\r
-                g.setColor(group.getOutlineColour());\r
-              }\r
-            }\r
-          }\r
-          else\r
-          {\r
-            if (inGroup)\r
-            {\r
-              g.drawLine(sx, oldY, sx, sy );\r
-              g.drawLine(sx+ex, oldY, sx+ex, sy );\r
-\r
-              if (top != -1)\r
-              {\r
-                g.drawLine(sx, top, sx + ex, top);\r
-                top =-1;\r
-              }\r
-              if (bottom != -1)\r
-              {\r
-                g.drawLine(sx, bottom, sx + ex, bottom);\r
-                bottom = -1;\r
-              }\r
-\r
-\r
-              inGroup = false;\r
-            }\r
-          }\r
-        }\r
-\r
-        if (inGroup)\r
-        {\r
-\r
-          if(top!=-1)\r
-          {\r
-            g.drawLine(sx, top, sx + ex, top);\r
-            top =-1;\r
-          }\r
-          if(bottom!=-1)\r
-           {\r
-             g.drawLine(sx, bottom-1, sx + ex, bottom-1);\r
-             bottom = -1;\r
-\r
-           }\r
-          sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
-          g.drawLine(sx, oldY, sx, sy );\r
-          g.drawLine(sx+ex, oldY, sx+ex, sy );\r
-          inGroup = false;\r
-        }\r
-        groupIndex++;\r
-        if (groupIndex >= groups.size())\r
-          break;\r
-\r
-        group = (SequenceGroup) groups.elementAt(groupIndex);\r
-\r
-      }\r
-      while (groupIndex < groups.size());\r
-\r
-\r
-    /// Highlight search Results once all sequences have been drawn\r
-    //////////////////////////////////////////////////////////\r
-    if(displaySearch)\r
-    {\r
-      for(int r=0; r<searchResults.length; r+=3)\r
-      {\r
-        int searchSeq = searchResults[r];\r
-        int searchStart = searchResults[r+1];\r
-        int searchEnd = searchResults[r+2];\r
-\r
-        if (searchSeq >= y1 && searchSeq < y2)\r
-        {\r
-          SequenceRenderer ssr = (SequenceRenderer) sr;\r
-          if(searchStart<x1)\r
-            searchStart = x1;\r
-          if(searchEnd > x2)\r
-            searchEnd = x2;\r
-          ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),\r
-                                  searchStart,\r
-                                  searchEnd,\r
-                                  (searchStart - startx) * av.charWidth,\r
-                                  offset +\r
-                                  AlignmentUtil.getPixelHeight(starty, searchSeq,\r
-              av.charHeight),\r
-                                  av.charWidth,\r
-                                  av.charHeight);\r
-        }\r
-      }\r
-    }\r
-\r
-  }\r
-\r
-\r
-\r
-  public void highlightSearchResults(int [] results)\r
-  {\r
-    // results are in the order sequence, startRes, endRes\r
-    if(results==null)\r
-      displaySearch = false;\r
-    else\r
-      displaySearch = true;\r
-\r
-    searchResults = results;\r
-\r
-    repaint();\r
-  }\r
-\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * 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
+ * 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.gui;
+
+import jalview.datamodel.*;
+
+import java.awt.*;
+import java.awt.image.*;
+
+import javax.swing.*;
+
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class SeqCanvas extends JComponent
+{
+    final FeatureRenderer fr;
+    final SequenceRenderer sr;
+    BufferedImage img;
+    Graphics2D gg;
+    int imgWidth;
+    int imgHeight;
+    AlignViewport av;
+    SearchResults searchResults = null;
+    boolean fastPaint = false;
+    int LABEL_WEST;
+    int LABEL_EAST;
+
+
+    int cursorX = 0;
+    int cursorY = 0;
+
+
+    /**
+     * Creates a new SeqCanvas object.
+     *
+     * @param av DOCUMENT ME!
+     */
+    public SeqCanvas(AlignViewport av)
+    {
+        this.av = av;
+        fr = new FeatureRenderer(av);
+        sr = new SequenceRenderer(av);
+        setLayout(new BorderLayout());
+        PaintRefresher.Register(this, av.alignment);
+        setBackground(Color.white);
+    }
+
+    MCview.PDBCanvas pdbCanvas;
+    public SequenceRenderer getSequenceRenderer()
+    {
+      return sr;
+    }
+
+    public FeatureRenderer getFeatureRenderer()
+    {
+      return fr;
+    }
+
+    public void setPDBCanvas(MCview.PDBCanvas pc)
+    {
+      pdbCanvas = pc;
+    }
+
+    public AlignViewport getViewport()
+    {
+      return av;
+    }
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     * @param startx DOCUMENT ME!
+     * @param endx DOCUMENT ME!
+     * @param ypos DOCUMENT ME!
+     */
+    void drawNorthScale(Graphics g, int startx, int endx, int ypos)
+    {
+        int scalestartx = startx - (startx % 10) + 10;
+
+        g.setColor(Color.black);
+
+        // NORTH SCALE
+        for (int i = scalestartx; i < endx; i += 10)
+        {
+            int value = i;
+            if(av.hasHiddenColumns)
+                value = av.getColumnSelection().adjustForHiddenColumns(value);
+
+            g.drawString( String.valueOf(value), (i - startx - 1) * av.charWidth,
+                ypos - (av.charHeight / 2));
+
+            g.drawLine(((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+                (ypos + 2) - (av.charHeight / 2),
+                ((i - startx - 1) * av.charWidth) + (av.charWidth / 2), ypos -
+                2);
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     * @param startx DOCUMENT ME!
+     * @param endx DOCUMENT ME!
+     * @param ypos DOCUMENT ME!
+     */
+    void drawWestScale(Graphics g, int startx, int endx, int ypos)
+    {
+        FontMetrics fm = getFontMetrics(av.getFont());
+        ypos += av.charHeight;
+
+        if(av.hasHiddenColumns)
+        {
+          startx = av.getColumnSelection().adjustForHiddenColumns(startx);
+          endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+        }
+
+        int maxwidth = av.alignment.getWidth();
+        if (av.hasHiddenColumns)
+            maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+        // WEST SCALE
+        for (int i = 0; i < av.alignment.getHeight(); i++)
+        {
+            SequenceI seq = av.alignment.getSequenceAt(i);
+            int index = startx;
+            int value = -1;
+
+            while (index < endx)
+            {
+                if (jalview.util.Comparison.isGap(seq.getCharAt(index)))
+                {
+                    index++;
+
+                    continue;
+                }
+
+                value = av.alignment.getSequenceAt(i).findPosition(index);
+
+                break;
+            }
+
+            if (value != -1)
+            {
+                int x = LABEL_WEST - fm.stringWidth(String.valueOf(value))-av.charWidth/2;
+                g.drawString(value + "", x,
+                    (ypos + (i * av.charHeight)) - (av.charHeight / 5));
+            }
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     * @param startx DOCUMENT ME!
+     * @param endx DOCUMENT ME!
+     * @param ypos DOCUMENT ME!
+     */
+    void drawEastScale(Graphics g, int startx, int endx, int ypos)
+    {
+        ypos += av.charHeight;
+
+        if(av.hasHiddenColumns)
+                endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+
+        SequenceI seq;
+        // EAST SCALE
+        for (int i = 0; i < av.alignment.getHeight(); i++)
+        {
+            seq = av.alignment.getSequenceAt(i);
+            int index = endx;
+            int value = -1;
+
+            while (index > startx)
+            {
+                if (jalview.util.Comparison.isGap(seq.getCharAt(index)))
+                {
+                    index--;
+
+                    continue;
+                }
+
+                value = seq.findPosition(index);
+
+                break;
+            }
+
+            if (value != -1)
+            {
+                g.drawString(String.valueOf(value), 0,
+                    (ypos + (i * av.charHeight)) - (av.charHeight / 5));
+            }
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param horizontal DOCUMENT ME!
+     * @param vertical DOCUMENT ME!
+     */
+    public void fastPaint(int horizontal, int vertical)
+    {
+        if (gg == null)
+        {
+            return;
+        }
+
+
+        fastPaint = true;
+
+        gg.copyArea(horizontal * av.charWidth,
+                    vertical * av.charHeight,
+                    imgWidth,
+                    imgHeight,
+                    -horizontal * av.charWidth,
+                    -vertical * av.charHeight);
+
+        int sr = av.startRes;
+        int er = av.endRes;
+        int ss = av.startSeq;
+        int es = av.endSeq;
+        int transX = 0;
+        int transY = 0;
+
+
+        if (horizontal > 0) // scrollbar pulled right, image to the left
+        {
+            er ++;
+            transX = (er - sr - horizontal) * av.charWidth;
+            sr = er - horizontal;
+        }
+        else if (horizontal < 0)
+        {
+            er = sr - horizontal-1;
+        }
+        else if (vertical > 0) // scroll down
+        {
+            ss = es - vertical;
+
+            if (ss < av.startSeq)
+            { // ie scrolling too fast, more than a page at a time
+                ss = av.startSeq;
+            }
+            else
+            {
+                transY = imgHeight - (vertical * av.charHeight);
+            }
+        }
+        else if (vertical < 0)
+        {
+            es = ss - vertical;
+
+            if (es > av.endSeq)
+            {
+                es = av.endSeq;
+            }
+        }
+
+        gg.translate(transX, transY);
+        drawPanel(gg, sr, er, ss, es, 0);
+        gg.translate(-transX, -transY);
+
+        repaint();
+    }
+
+    /**
+     * Definitions of startx and endx (hopefully):
+     * SMJS This is what I'm working towards!
+     *   startx is the first residue (starting at 0) to display.
+     *   endx   is the last residue to display (starting at 0).
+     *   starty is the first sequence to display (starting at 0).
+     *   endy   is the last sequence to display (starting at 0).
+     * NOTE 1: The av limits are set in setFont in this class and
+     * in the adjustment listener in SeqPanel when the scrollbars move.
+     */
+
+    // Set this to false to force a full panel paint
+    public void paintComponent(Graphics g)
+    {
+        super.paintComponent(g);
+
+
+
+        if ( img != null && (fastPaint
+             || (getVisibleRect().width != g.getClipBounds().width)
+             || (getVisibleRect().height != g.getClipBounds().height)))
+        {
+            g.drawImage(img, 0, 0, this);
+            fastPaint = false;
+            return;
+        }
+
+
+        // this draws the whole of the alignment
+        imgWidth = getWidth();
+        imgHeight = getHeight();
+
+        imgWidth -= (imgWidth % av.charWidth);
+        imgHeight -= (imgHeight % av.charHeight);
+
+        if ((imgWidth < 1) || (imgHeight < 1))
+        {
+            return;
+        }
+
+        img = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);
+        gg = (Graphics2D) img.getGraphics();
+        gg.setFont(av.getFont());
+
+        if (av.antiAlias)
+          gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                              RenderingHints.VALUE_ANTIALIAS_ON);
+
+        gg.setColor(Color.white);
+        gg.fillRect(0, 0, imgWidth, imgHeight);
+
+
+        if (av.getWrapAlignment())
+        {
+            drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);
+        }
+        else
+        {
+            drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, 0);
+        }
+
+        g.drawImage(img, 0, 0, this);
+
+        if (pdbCanvas != null)
+        {
+           pdbCanvas.updateSeqColours();
+        }
+
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param cwidth DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public int getWrappedCanvasWidth(int cwidth)
+    {
+        FontMetrics fm = getFontMetrics(av.getFont());
+
+        LABEL_EAST = 0;
+        LABEL_WEST = 0;
+
+        if (av.scaleRightWrapped)
+        {
+            LABEL_EAST = fm.stringWidth(getMask());
+        }
+
+        if (av.scaleLeftWrapped)
+        {
+            LABEL_WEST = fm.stringWidth(getMask());
+        }
+
+        return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;
+    }
+
+
+    /**
+     * Generates a string of zeroes.
+     * @return String
+     */
+    String getMask()
+    {
+      String mask = "00";
+      for (int i = av.alignment.getWidth(); i > 0; i /= 10)
+      {
+        mask += "0";
+      }
+      return mask;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     * @param canvasWidth DOCUMENT ME!
+     * @param canvasHeight DOCUMENT ME!
+     * @param startRes DOCUMENT ME!
+     */
+    public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight,
+        int startRes)
+    {
+        AlignmentI al = av.getAlignment();
+
+        FontMetrics fm = getFontMetrics(av.getFont());
+
+
+        if (av.scaleRightWrapped)
+        {
+            LABEL_EAST = fm.stringWidth(getMask());
+        }
+
+
+        if (av.scaleLeftWrapped)
+        {
+            LABEL_WEST = fm.stringWidth(getMask());
+        }
+
+        int hgap = av.charHeight;
+        if(av.scaleAboveWrapped)
+          hgap += av.charHeight;
+
+        int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;
+        int cHeight = av.getAlignment().getHeight() * av.charHeight;
+
+        av.setWrappedWidth(cWidth);
+
+        av.endRes = av.startRes + cWidth;
+
+
+        int endx;
+        int ypos = hgap;
+        int maxwidth = av.alignment.getWidth();
+
+        if(av.hasHiddenColumns)
+          maxwidth = av.getColumnSelection().findColumnPosition(maxwidth)-1;
+
+        while ((ypos <= canvasHeight) && (startRes < maxwidth))
+        {
+          endx = startRes + cWidth -1;
+
+          if (endx > maxwidth)
+          {
+            endx = maxwidth;
+          }
+
+            g.setFont(av.getFont());
+            g.setColor(Color.black);
+
+            if (av.scaleLeftWrapped)
+            {
+                drawWestScale(g, startRes, endx, ypos);
+            }
+
+            if (av.scaleRightWrapped)
+            {
+                g.translate(canvasWidth - LABEL_EAST, 0);
+                drawEastScale(g, startRes, endx, ypos);
+                g.translate(-(canvasWidth - LABEL_EAST), 0);
+            }
+
+            g.translate(LABEL_WEST, 0);
+
+            if (av.scaleAboveWrapped)
+            {
+                drawNorthScale(g, startRes, endx, ypos);
+            }
+
+            if (av.hasHiddenColumns && av.showHiddenMarkers)
+            {
+              g.setColor(Color.blue);
+              int res;
+              for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();
+                   i++)
+              {
+                res = av.getColumnSelection().findHiddenRegionPosition(i) -
+                    startRes;
+
+                if (res < 0 || res > endx - startRes)
+                  continue;
+
+                gg.fillPolygon(new int[]
+                               {res * av.charWidth - av.charHeight / 4,
+                               res * av.charWidth + av.charHeight / 4,
+                               res * av.charWidth},
+                               new int[]
+                               {
+                               ypos - (av.charHeight / 2),
+                               ypos - (av.charHeight / 2),
+                               ypos - (av.charHeight / 2) + 8
+                }, 3);
+
+              }
+            }
+
+
+
+            // When printing we have an extra clipped region,
+            // the Printable page which we need to account for here
+            Shape clip = g.getClip();
+
+            if (clip == null)
+            {
+                g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);
+            }
+            else
+            {
+                g.setClip(0, (int) clip.getBounds().getY(),
+                    cWidth * av.charWidth, (int) clip.getBounds().getHeight());
+            }
+
+            drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);
+
+            if(av.showAnnotation)
+            {
+              g.translate(0, cHeight + ypos + 3);
+              if(annotations==null)
+                annotations = new AnnotationPanel(av);
+
+              annotations.drawComponent( (Graphics2D) g, startRes, endx+1);
+              g.translate(0, -cHeight - ypos);
+            }
+            g.setClip(clip);
+            g.translate(-LABEL_WEST, 0);
+
+            ypos += cHeight+getAnnotationHeight()+hgap;
+            if(av.showAnnotation)
+              ypos -= 3;
+
+            startRes += cWidth;
+        }
+    }
+
+    AnnotationPanel annotations;
+    int getAnnotationHeight()
+    {
+      if(!av.showAnnotation)
+        return 0;
+
+      if(annotations==null)
+        annotations = new AnnotationPanel(av);
+
+      return annotations.adjustPanelHeight();
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g1 DOCUMENT ME!
+     * @param startRes DOCUMENT ME!
+     * @param endRes DOCUMENT ME!
+     * @param startSeq DOCUMENT ME!
+     * @param endSeq DOCUMENT ME!
+     * @param offset DOCUMENT ME!
+     */
+    void drawPanel(Graphics g1, int startRes, int endRes,
+                    int startSeq, int endSeq, int offset)
+    {
+      if(!av.hasHiddenColumns)
+      {
+        draw(g1, startRes, endRes, startSeq, endSeq, offset);
+      }
+      else
+      {
+        java.util.Vector regions = av.getColumnSelection().getHiddenColumns();
+
+        int screenY = 0;
+        int blockStart = startRes;
+        int blockEnd = endRes;
+
+        for (int i = 0; i < regions.size(); i++)
+        {
+          int[] region = (int[]) regions.elementAt(i);
+          int hideStart = region[0];
+          int hideEnd = region[1];
+
+          if (hideStart <= blockStart)
+          {
+            blockStart += (hideEnd - hideStart) + 1;
+            continue;
+          }
+
+          blockEnd = hideStart - 1;
+
+          g1.translate(screenY * av.charWidth, 0);
+
+          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);
+
+          if(av.getShowHiddenMarkers())
+          {
+            g1.setColor(Color.blue);
+            g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,
+                        startSeq + offset,
+                        (blockEnd - blockStart + 1) * av.charWidth - 1,
+                        startSeq + (endSeq - startSeq) * av.charHeight + offset);
+          }
+
+          g1.translate( -screenY * av.charWidth, 0);
+          screenY += blockEnd - blockStart + 1;
+          blockStart = hideEnd + 1;
+        }
+
+        if (screenY <= (endRes - startRes))
+        {
+          blockEnd = blockStart + (endRes - startRes) - screenY;
+          g1.translate(screenY * av.charWidth, 0);
+          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);
+
+          g1.translate( -screenY * av.charWidth, 0);
+        }
+      }
+
+    }
+
+
+
+
+    //int startRes, int endRes, int startSeq, int endSeq, int x, int y,
+    // int x1, int x2, int y1, int y2, int startx, int starty,
+    void draw(Graphics g,
+                   int startRes, int endRes,
+                   int startSeq, int endSeq,
+                   int offset)
+   {
+      g.setFont(av.getFont());
+      sr.prepare(g, av.renderGaps);
+
+      SequenceI nextSeq;
+
+        /// First draw the sequences
+        /////////////////////////////
+        for (int i = startSeq; i < endSeq; i++)
+        {
+            nextSeq = av.alignment.getSequenceAt(i);
+
+            sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),
+                            startRes, endRes,
+                            offset + ( (i - startSeq) * av.charHeight));
+
+            if (av.showSequenceFeatures)
+            {
+                fr.drawSequence(g, nextSeq, startRes, endRes,
+                    offset + ((i - startSeq) * av.charHeight));
+            }
+
+            /// Highlight search Results once all sequences have been drawn
+            //////////////////////////////////////////////////////////
+            if (searchResults != null)
+            {
+              int[] visibleResults = searchResults.getResults(nextSeq, startRes, endRes);
+              if (visibleResults != null)
+                for (int r = 0; r < visibleResults.length; r += 2)
+                {
+                  sr.drawHighlightedText(nextSeq, visibleResults[r],
+                                         visibleResults[r + 1],
+                                         (visibleResults[r] - startRes) * av.charWidth,
+                                         offset + ( (i - startSeq) * av.charHeight));
+                }
+            }
+
+            if(av.cursorMode && cursorY==i
+               && cursorX>=startRes && cursorX<=endRes)
+            {
+              sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth,
+                            offset + ( (i - startSeq) * av.charHeight));
+            }
+          }
+
+          if(av.getSelectionGroup()!=null || av.alignment.getGroups().size()>0)
+            drawGroupsBoundaries(g, startRes, endRes, startSeq, endSeq, offset);
+
+   }
+
+   void drawGroupsBoundaries(Graphics g1,
+                   int startRes, int endRes,
+                   int startSeq, int endSeq,
+                   int offset)
+   {
+       Graphics2D g = (Graphics2D)g1;
+        //
+        /////////////////////////////////////
+        // Now outline any areas if necessary
+        /////////////////////////////////////
+        SequenceGroup group = av.getSelectionGroup();
+
+        int sx = -1;
+        int sy = -1;
+        int ex = -1;
+        int groupIndex = -1;
+
+        if ((group == null) && (av.alignment.getGroups().size() > 0))
+        {
+            group = (SequenceGroup) av.alignment.getGroups().elementAt(0);
+            groupIndex = 0;
+        }
+
+        if (group != null)
+        {
+            do
+            {
+                int oldY = -1;
+                int i = 0;
+                boolean inGroup = false;
+                int top = -1;
+                int bottom = -1;
+
+                for (i = startSeq; i < endSeq; i++)
+                {
+                    sx = (group.getStartRes() - startRes) * av.charWidth;
+                    sy = offset + ((i - startSeq) * av.charHeight);
+                    ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -
+                        1;
+
+                    if(sx+ex<0 || sx>imgWidth)
+                    {
+                      continue;
+                    }
+
+                    if ( (sx <= (endRes-startRes)*av.charWidth) &&
+                            group.getSequences(false).
+                            contains(av.alignment.getSequenceAt(i)))
+                    {
+                        if ((bottom == -1) &&
+                                !group.getSequences(false).contains(
+                                    av.alignment.getSequenceAt(i + 1)))
+                        {
+                            bottom = sy + av.charHeight;
+                        }
+
+                        if (!inGroup)
+                        {
+                            if (((top == -1) && (i == 0)) ||
+                                    !group.getSequences(false).contains(
+                                        av.alignment.getSequenceAt(i - 1)))
+                            {
+                                top = sy;
+                            }
+
+                            oldY = sy;
+                            inGroup = true;
+
+                            if (group == av.getSelectionGroup())
+                            {
+                                g.setStroke(new BasicStroke(1,
+                                        BasicStroke.CAP_BUTT,
+                                        BasicStroke.JOIN_ROUND, 3f,
+                                        new float[] { 5f, 3f }, 0f));
+                                g.setColor(Color.RED);
+                            }
+                            else
+                            {
+                                g.setStroke(new BasicStroke());
+                                g.setColor(group.getOutlineColour());
+                            }
+                        }
+                    }
+                    else
+                    {
+                      if (inGroup)
+                      {
+                        if (sx >= 0 && sx < imgWidth)
+                          g.drawLine(sx, oldY, sx, sy);
+
+                        if (sx + ex < imgWidth)
+                          g.drawLine(sx + ex, oldY, sx + ex, sy);
+
+                        if (sx < 0)
+                        {
+                          ex += sx;
+                          sx = 0;
+                        }
+
+                        if (sx + ex > imgWidth)
+                          ex = imgWidth;
+
+                        else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)
+                          ex = (endRes - startRes + 1) * av.charWidth;
+
+                        if (top != -1)
+                        {
+                          g.drawLine(sx, top, sx + ex, top);
+                          top = -1;
+                        }
+
+                        if (bottom != -1)
+                        {
+                          g.drawLine(sx, bottom, sx + ex, bottom);
+                          bottom = -1;
+                        }
+
+                        inGroup = false;
+                        }
+                    }
+                }
+
+                if (inGroup)
+                {
+                  sy = offset + ( (i - startSeq) * av.charHeight);
+                  if (sx >= 0 && sx < imgWidth)
+                    g.drawLine(sx, oldY, sx, sy);
+
+                  if (sx + ex < imgWidth)
+                    g.drawLine(sx + ex, oldY, sx + ex, sy);
+
+                  if (sx < 0)
+                  {
+                    ex += sx;
+                    sx = 0;
+                  }
+
+                  if (sx + ex > imgWidth)
+                    ex = imgWidth;
+                  else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)
+                    ex = (endRes - startRes + 1) * av.charWidth;
+
+                  if (top != -1)
+                  {
+                    g.drawLine(sx, top, sx + ex, top);
+                    top = -1;
+                  }
+
+                  if (bottom != -1)
+                  {
+                    g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);
+                    bottom = -1;
+                  }
+
+                    inGroup = false;
+                }
+
+                groupIndex++;
+
+                if (groupIndex >= av.alignment.getGroups().size())
+                {
+                    break;
+                }
+
+                group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);
+
+                g.setStroke(new BasicStroke());
+            }
+            while (groupIndex < av.alignment.getGroups().size());
+
+        }
+
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param results DOCUMENT ME!
+     */
+    public void highlightSearchResults(SearchResults results)
+    {
+        img = null;
+
+        searchResults = results;
+
+        repaint();
+    }
+}