updated to jalview 2.1 and begun ArchiveClient/VamsasClient/VamsasStore updates.
[jalview.git] / src / jalview / gui / SeqCanvas.java
index 99447a4..74f59a3 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.gui;\r
-\r
-import jalview.datamodel.*;\r
-\r
-import java.awt.*;\r
-import java.awt.image.*;\r
-\r
-import javax.swing.*;\r
-\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class SeqCanvas extends JComponent\r
-{\r
-    final FeatureRenderer fr;\r
-    final SequenceRenderer sr;\r
-    BufferedImage img;\r
-    Graphics2D gg;\r
-    int imgWidth;\r
-    int imgHeight;\r
-    AlignViewport av;\r
-    SearchResults searchResults = null;\r
-    boolean fastPaint = false;\r
-    int LABEL_WEST;\r
-    int LABEL_EAST;\r
-\r
-\r
-    int cursorX = 0;\r
-    int cursorY = 0;\r
-\r
-\r
-    /**\r
-     * Creates a new SeqCanvas object.\r
-     *\r
-     * @param av DOCUMENT ME!\r
-     */\r
-    public SeqCanvas(AlignViewport av)\r
-    {\r
-        this.av = av;\r
-        fr = new FeatureRenderer(av);\r
-        sr = new SequenceRenderer(av);\r
-        setLayout(new BorderLayout());\r
-        PaintRefresher.Register(this, av.alignment);\r
-        setBackground(Color.white);\r
-    }\r
-\r
-    MCview.PDBCanvas pdbCanvas;\r
-    public SequenceRenderer getSequenceRenderer()\r
-    {\r
-      return sr;\r
-    }\r
-\r
-    public FeatureRenderer getFeatureRenderer()\r
-    {\r
-      return fr;\r
-    }\r
-\r
-    public void setPDBCanvas(MCview.PDBCanvas pc)\r
-    {\r
-      pdbCanvas = pc;\r
-    }\r
-\r
-    public AlignViewport getViewport()\r
-    {\r
-      return av;\r
-    }\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     * @param startx DOCUMENT ME!\r
-     * @param endx DOCUMENT ME!\r
-     * @param ypos DOCUMENT ME!\r
-     */\r
-    void drawNorthScale(Graphics g, int startx, int endx, int ypos)\r
-    {\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
-            int value = i;\r
-            if(av.hasHiddenColumns)\r
-                value = av.getColumnSelection().adjustForHiddenColumns(value);\r
-\r
-            g.drawString( String.valueOf(value), (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 -\r
-                2);\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     * @param startx DOCUMENT ME!\r
-     * @param endx DOCUMENT ME!\r
-     * @param ypos DOCUMENT ME!\r
-     */\r
-    void drawWestScale(Graphics g, int startx, int endx, int ypos)\r
-    {\r
-        FontMetrics fm = getFontMetrics(av.getFont());\r
-        ypos += av.charHeight;\r
-\r
-        if(av.hasHiddenColumns)\r
-                startx = av.getColumnSelection().adjustForHiddenColumns(startx);\r
-\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
-\r
-            while (index < endx)\r
-            {\r
-                if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
-                {\r
-                    index++;\r
-\r
-                    continue;\r
-                }\r
-\r
-                value = av.alignment.getSequenceAt(i).findPosition(index);\r
-\r
-                break;\r
-            }\r
-\r
-            if (value != -1)\r
-            {\r
-                int x = LABEL_WEST - fm.stringWidth(String.valueOf(value))-av.charWidth/2;\r
-                g.drawString(value + "", x,\r
-                    (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     * @param startx DOCUMENT ME!\r
-     * @param endx DOCUMENT ME!\r
-     * @param ypos DOCUMENT ME!\r
-     */\r
-    void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
-    {\r
-        ypos += av.charHeight;\r
-\r
-        if(av.hasHiddenColumns)\r
-                endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
-\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
-\r
-\r
-\r
-            while (index > startx)\r
-            {\r
-                if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
-                {\r
-                    index--;\r
-\r
-                    continue;\r
-                }\r
-\r
-                value = av.alignment.getSequenceAt(i).findPosition(index);\r
-\r
-                break;\r
-            }\r
-\r
-            if (value != -1)\r
-            {\r
-                g.drawString(String.valueOf(value), 0,\r
-                    (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param horizontal DOCUMENT ME!\r
-     * @param vertical DOCUMENT ME!\r
-     */\r
-    public void fastPaint(int horizontal, int vertical)\r
-    {\r
-        if (gg == null)\r
-        {\r
-            return;\r
-        }\r
-\r
-\r
-        fastPaint = true;\r
-\r
-        gg.copyArea(horizontal * av.charWidth,\r
-                    vertical * av.charHeight,\r
-                    imgWidth,\r
-                    imgHeight,\r
-                    -horizontal * av.charWidth,\r
-                    -vertical * av.charHeight);\r
-\r
-        int sr = av.startRes;\r
-        int er = av.endRes;\r
-        int ss = av.startSeq;\r
-        int es = av.endSeq;\r
-        int transX = 0;\r
-        int transY = 0;\r
-\r
-\r
-        if (horizontal > 0) // scrollbar pulled right, image to the left\r
-        {\r
-            er ++;\r
-            transX = (er - sr - horizontal) * av.charWidth;\r
-            sr = er - horizontal;\r
-        }\r
-        else if (horizontal < 0)\r
-        {\r
-            er = sr - horizontal-1;\r
-        }\r
-        else if (vertical > 0) // scroll down\r
-        {\r
-            ss = es - vertical;\r
-\r
-            if (ss < av.startSeq)\r
-            { // ie scrolling too fast, more than a page at a time\r
-                ss = av.startSeq;\r
-            }\r
-            else\r
-            {\r
-                transY = imgHeight - (vertical * av.charHeight);\r
-            }\r
-        }\r
-        else if (vertical < 0)\r
-        {\r
-            es = ss - vertical;\r
-\r
-            if (es > av.endSeq)\r
-            {\r
-                es = av.endSeq;\r
-            }\r
-        }\r
-\r
-        gg.translate(transX, transY);\r
-        drawPanel(gg, sr, er, ss, es, 0);\r
-        gg.translate(-transX, -transY);\r
-\r
-        repaint();\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
-    // Set this to false to force a full panel paint\r
-    public void paintComponent(Graphics g)\r
-    {\r
-        super.paintComponent(g);\r
-\r
-\r
-\r
-        if ( img != null && (fastPaint\r
-             || (getVisibleRect().width != g.getClipBounds().width)\r
-             || (getVisibleRect().height != g.getClipBounds().height)))\r
-        {\r
-            g.drawImage(img, 0, 0, this);\r
-            fastPaint = false;\r
-            return;\r
-        }\r
-\r
-\r
-        // this draws the whole of the alignment\r
-        imgWidth = getWidth();\r
-        imgHeight = getHeight();\r
-\r
-        imgWidth -= (imgWidth % av.charWidth);\r
-        imgHeight -= (imgHeight % av.charHeight);\r
-\r
-        if ((imgWidth < 1) || (imgHeight < 1))\r
-        {\r
-            return;\r
-        }\r
-\r
-        img = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);\r
-        gg = (Graphics2D) img.getGraphics();\r
-        gg.setFont(av.getFont());\r
-\r
-        if (av.antiAlias)\r
-          gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-                              RenderingHints.VALUE_ANTIALIAS_ON);\r
-\r
-        gg.setColor(Color.white);\r
-        gg.fillRect(0, 0, imgWidth, imgHeight);\r
-\r
-\r
-        if (av.getWrapAlignment())\r
-        {\r
-            drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);\r
-        }\r
-        else\r
-        {\r
-            drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, 0);\r
-        }\r
-\r
-        g.drawImage(img, 0, 0, this);\r
-\r
-        if (pdbCanvas != null)\r
-        {\r
-           pdbCanvas.updateSeqColours();\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param cwidth DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     */\r
-    public int getWrappedCanvasWidth(int cwidth)\r
-    {\r
-        FontMetrics fm = getFontMetrics(av.getFont());\r
-\r
-        LABEL_EAST = 0;\r
-        LABEL_WEST = 0;\r
-\r
-        if (av.scaleRightWrapped)\r
-        {\r
-            LABEL_EAST = fm.stringWidth(getMask());\r
-        }\r
-\r
-        if (av.scaleLeftWrapped)\r
-        {\r
-            LABEL_WEST = fm.stringWidth(getMask());\r
-        }\r
-\r
-        return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
-    }\r
-\r
-\r
-    /**\r
-     * Generates a string of zeroes.\r
-     * @return String\r
-     */\r
-    String getMask()\r
-    {\r
-      String mask = "00";\r
-      for (int i = av.alignment.getWidth(); i > 0; i /= 10)\r
-      {\r
-        mask += "0";\r
-      }\r
-      return mask;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     * @param canvasWidth DOCUMENT ME!\r
-     * @param canvasHeight DOCUMENT ME!\r
-     * @param startRes DOCUMENT ME!\r
-     */\r
-    public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight,\r
-        int startRes)\r
-    {\r
-\r
-        AlignmentI al = av.getAlignment();\r
-\r
-        FontMetrics fm = getFontMetrics(av.getFont());\r
-\r
-        int LABEL_EAST = 0;\r
-\r
-        if (av.scaleRightWrapped)\r
-        {\r
-            LABEL_EAST = fm.stringWidth(getMask());\r
-        }\r
-\r
-        int LABEL_WEST = 0;\r
-\r
-        if (av.scaleLeftWrapped)\r
-        {\r
-            LABEL_WEST = fm.stringWidth(getMask());\r
-        }\r
-\r
-        int hgap = av.charHeight;\r
-        if(av.scaleAboveWrapped)\r
-          hgap += av.charHeight;\r
-\r
-        int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
-        int cHeight = av.getAlignment().getHeight() * av.charHeight;\r
-\r
-        av.setWrappedWidth(cWidth);\r
-\r
-        av.endRes = av.startRes + cWidth;\r
-\r
-\r
-        int endx;\r
-        int ypos = hgap;\r
-\r
-        while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
-        {\r
-          endx = startRes + cWidth;\r
-\r
-          if (endx > al.getWidth())\r
-          {\r
-            endx = al.getWidth();\r
-          }\r
-\r
-            g.setFont(av.getFont());\r
-            g.setColor(Color.black);\r
-\r
-            if (av.scaleLeftWrapped)\r
-            {\r
-                drawWestScale(g, startRes, endx, ypos);\r
-            }\r
-\r
-            if (av.scaleRightWrapped)\r
-            {\r
-                g.translate(canvasWidth - LABEL_EAST, 0);\r
-                drawEastScale(g, startRes, endx, ypos);\r
-                g.translate(-(canvasWidth - LABEL_EAST), 0);\r
-            }\r
-\r
-            g.translate(LABEL_WEST, 0);\r
-\r
-            if (av.scaleAboveWrapped)\r
-            {\r
-                drawNorthScale(g, startRes, endx, ypos);\r
-            }\r
-\r
-            // When printing we have an extra clipped region,\r
-            // the Printable page which we need to account for here\r
-            Shape clip = g.getClip();\r
-\r
-            if (clip == null)\r
-            {\r
-                g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
-            }\r
-            else\r
-            {\r
-                g.setClip(0, (int) clip.getBounds().getY(),\r
-                    cWidth * av.charWidth, (int) clip.getBounds().getHeight());\r
-            }\r
-\r
-            drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);\r
-\r
-            if(av.showAnnotation)\r
-            {\r
-              g.translate(0, cHeight + ypos + 3);\r
-              if(annotations==null)\r
-                annotations = new AnnotationPanel(av);\r
-\r
-              annotations.drawComponent( (Graphics2D) g, startRes, endx);\r
-              g.translate(0, -cHeight - ypos);\r
-            }\r
-            g.setClip(clip);\r
-            g.translate(-LABEL_WEST, 0);\r
-\r
-            ypos += cHeight+getAnnotationHeight()+hgap;\r
-            if(av.showAnnotation)\r
-              ypos -= 3;\r
-\r
-            startRes += cWidth;\r
-        }\r
-    }\r
-\r
-    AnnotationPanel annotations;\r
-    int getAnnotationHeight()\r
-    {\r
-      if(!av.showAnnotation)\r
-        return 0;\r
-\r
-      if(annotations==null)\r
-        annotations = new AnnotationPanel(av);\r
-\r
-      return annotations.adjustPanelHeight();\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g1 DOCUMENT ME!\r
-     * @param startRes DOCUMENT ME!\r
-     * @param endRes DOCUMENT ME!\r
-     * @param startSeq DOCUMENT ME!\r
-     * @param endSeq DOCUMENT ME!\r
-     * @param offset DOCUMENT ME!\r
-     */\r
-    void drawPanel(Graphics g1, int startRes, int endRes,\r
-                    int startSeq, int endSeq, int offset)\r
-    {\r
-      if(!av.hasHiddenColumns)\r
-      {\r
-        draw(g1, startRes, endRes, startSeq, endSeq, offset);\r
-      }\r
-      else\r
-      {\r
-        java.util.Vector regions = av.getColumnSelection().getHiddenColumns();\r
-\r
-        int screenY = 0;\r
-        int blockStart = startRes;\r
-        int blockEnd = endRes;\r
-\r
-        for (int i = 0; i < regions.size(); i++)\r
-        {\r
-          int[] region = (int[]) regions.elementAt(i);\r
-          int hideStart = region[0];\r
-          int hideEnd = region[1];\r
-\r
-          if (hideStart <= blockStart)\r
-          {\r
-            blockStart += (hideEnd - hideStart) + 1;\r
-            continue;\r
-          }\r
-\r
-          blockEnd = hideStart - 1;\r
-\r
-          g1.translate(screenY * av.charWidth, 0);\r
-\r
-          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
-\r
-          g1.setColor(Color.blue);\r
-          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                      startSeq + offset,\r
-                      (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                      startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
-          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth,\r
-                      startSeq + offset,\r
-                      (blockEnd - blockStart + 1) * av.charWidth,\r
-                      startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
-\r
-          g1.translate( -screenY * av.charWidth, 0);\r
-          screenY += blockEnd - blockStart + 1;\r
-          blockStart = hideEnd + 1;\r
-        }\r
-\r
-        if (screenY <= (endRes - startRes))\r
-        {\r
-          blockEnd = blockStart + (endRes - startRes) - screenY;\r
-          g1.translate(screenY * av.charWidth, 0);\r
-          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
-          g1.translate( -screenY * av.charWidth, 0);\r
-        }\r
-      }\r
-\r
-    }\r
-\r
-\r
-\r
-\r
-    //int startRes, int endRes, int startSeq, int endSeq, int x, int y,\r
-    // int x1, int x2, int y1, int y2, int startx, int starty,\r
-    void draw(Graphics g1,\r
-                   int startRes, int endRes,\r
-                   int startSeq, int endSeq,\r
-                   int offset)\r
-   {\r
-\r
-\r
-      Graphics2D g = (Graphics2D) g1;\r
-      g.setFont(av.getFont());\r
-      sr.prepare(g, av.renderGaps);\r
-\r
-      SequenceI nextSeq;\r
-\r
-        /// First draw the sequences\r
-        /////////////////////////////\r
-        for (int i = startSeq; i < endSeq; i++)\r
-        {\r
-            nextSeq = av.alignment.getSequenceAt(i);\r
-\r
-            sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),\r
-                            startRes, endRes,\r
-                            offset + ( (i - startSeq) * av.charHeight));\r
-\r
-            if (av.showSequenceFeatures)\r
-            {\r
-                fr.drawSequence(g1, nextSeq, startRes, endRes,\r
-                    offset + ((i - startSeq) * av.charHeight));\r
-            }\r
-\r
-            /// Highlight search Results once all sequences have been drawn\r
-            //////////////////////////////////////////////////////////\r
-            if (searchResults != null)\r
-            {\r
-              int[] visibleResults = searchResults.getResults(nextSeq, startRes, endRes);\r
-              if (visibleResults != null)\r
-                for (int r = 0; r < visibleResults.length; r += 2)\r
-                {\r
-                  sr.drawHighlightedText(nextSeq, visibleResults[r],\r
-                                         visibleResults[r + 1],\r
-                                         (visibleResults[r] - startRes) * av.charWidth,\r
-                                         offset + ( (i - startSeq) * av.charHeight));\r
-                }\r
-            }\r
-\r
-            if(av.cursorMode && cursorY==i\r
-               && cursorX>=startRes && cursorX<=endRes)\r
-            {\r
-              sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth,\r
-                            offset + ( (i - startSeq) * av.charHeight));\r
-            }\r
-          }\r
-\r
-        //\r
-        /////////////////////////////////////\r
-        // Now outline any areas if necessary\r
-        /////////////////////////////////////\r
-        SequenceGroup group = av.getSelectionGroup();\r
-\r
-        int sx = -1;\r
-        int sy = -1;\r
-        int ex = -1;\r
-        int groupIndex = -1;\r
-\r
-        if ((group == null) && (av.alignment.getGroups().size() > 0))\r
-        {\r
-            group = (SequenceGroup) av.alignment.getGroups().elementAt(0);\r
-            groupIndex = 0;\r
-        }\r
-\r
-        if (group != null)\r
-        {\r
-            do\r
-            {\r
-                int oldY = -1;\r
-                int i = 0;\r
-                boolean inGroup = false;\r
-                int top = -1;\r
-                int bottom = -1;\r
-\r
-                for (i = startSeq; i < endSeq; i++)\r
-                {\r
-                    sx = (group.getStartRes() - startRes) * av.charWidth;\r
-                    sy = offset + ((i - startSeq) * av.charHeight);\r
-                    ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -\r
-                        1;\r
-\r
-                    if(sx+ex<0 || sx>imgWidth)\r
-                    {\r
-                      continue;\r
-                    }\r
-\r
-                    if ( (sx <= (endRes-startRes)*av.charWidth) &&\r
-                            group.sequences.contains(av.alignment.getSequenceAt(\r
-                                    i)))\r
-                    {\r
-                        if ((bottom == -1) &&\r
-                                !group.sequences.contains(\r
-                                    av.alignment.getSequenceAt(i + 1)))\r
-                        {\r
-                            bottom = sy + av.charHeight;\r
-                        }\r
-\r
-                        if (!inGroup)\r
-                        {\r
-                            if (((top == -1) && (i == 0)) ||\r
-                                    !group.sequences.contains(\r
-                                        av.alignment.getSequenceAt(i - 1)))\r
-                            {\r
-                                top = sy;\r
-                            }\r
-\r
-                            oldY = sy;\r
-                            inGroup = true;\r
-\r
-                            if (group == av.getSelectionGroup())\r
-                            {\r
-                                g.setStroke(new BasicStroke(1,\r
-                                        BasicStroke.CAP_BUTT,\r
-                                        BasicStroke.JOIN_ROUND, 3f,\r
-                                        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
-                        if (sx >= 0 && sx < imgWidth)\r
-                          g.drawLine(sx, oldY, sx, sy);\r
-\r
-                        if (sx + ex < imgWidth)\r
-                          g.drawLine(sx + ex, oldY, sx + ex, sy);\r
-\r
-                        if (sx < 0)\r
-                        {\r
-                          ex += sx;\r
-                          sx = 0;\r
-                        }\r
-\r
-                        if (sx + ex > imgWidth)\r
-                          ex = imgWidth;\r
-\r
-                        else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
-                          ex = (endRes - startRes + 1) * av.charWidth;\r
-\r
-                        if (top != -1)\r
-                        {\r
-                          g.drawLine(sx, top, sx + ex, top);\r
-                          top = -1;\r
-                        }\r
-\r
-                        if (bottom != -1)\r
-                        {\r
-                          g.drawLine(sx, bottom, sx + ex, bottom);\r
-                          bottom = -1;\r
-                        }\r
-\r
-                        inGroup = false;\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (inGroup)\r
-                {\r
-                  sy = offset + ( (i - startSeq) * av.charHeight);\r
-                  if (sx >= 0 && sx < imgWidth)\r
-                    g.drawLine(sx, oldY, sx, sy);\r
-\r
-                  if (sx + ex < imgWidth)\r
-                    g.drawLine(sx + ex, oldY, sx + ex, sy);\r
-\r
-                  if (sx < 0)\r
-                  {\r
-                    ex += sx;\r
-                    sx = 0;\r
-                  }\r
-\r
-                  if (sx + ex > imgWidth)\r
-                    ex = imgWidth;\r
-                  else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
-                    ex = (endRes - startRes + 1) * av.charWidth;\r
-\r
-                  if (top != -1)\r
-                  {\r
-                    g.drawLine(sx, top, sx + ex, top);\r
-                    top = -1;\r
-                  }\r
-\r
-                  if (bottom != -1)\r
-                  {\r
-                    g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
-                    bottom = -1;\r
-                  }\r
-\r
-                    inGroup = false;\r
-                }\r
-\r
-                groupIndex++;\r
-\r
-                if (groupIndex >= av.alignment.getGroups().size())\r
-                {\r
-                    break;\r
-                }\r
-\r
-                group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);\r
-            }\r
-            while (groupIndex < av.alignment.getGroups().size());\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param results DOCUMENT ME!\r
-     */\r
-    public void highlightSearchResults(SearchResults results)\r
-    {\r
-        img = null;\r
-\r
-        searchResults = results;\r
-\r
-        repaint();\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();
+    }
+}