JAL-4024 only render partially when new view overlaps with last rendered annotation...
[jalview.git] / src / jalview / gui / AnnotationPanel.java
index 0f025b5..e9ef19c 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.event.*;\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 AnnotationPanel extends JPanel implements MouseListener,\r
-    MouseMotionListener, ActionListener, AdjustmentListener\r
-{\r
-    final String HELIX = "Helix";\r
-    final String SHEET = "Sheet";\r
-    final String LABEL = "Label";\r
-    final String REMOVE = "Remove Annotation";\r
-    final String COLOUR = "Colour";\r
-    final Color HELIX_COLOUR = Color.red.darker();\r
-    final Color SHEET_COLOUR = Color.green.darker().darker();\r
-\r
-    /** DOCUMENT ME!! */\r
-    AlignViewport av;\r
-    AlignmentPanel ap;\r
-    int activeRow = -1;\r
-    BufferedImage image;\r
-    Graphics2D gg;\r
-    FontMetrics fm;\r
-    int imgWidth = 0;\r
-    boolean fastPaint = false;\r
-\r
-    //Used For mouse Dragging and resizing graphs\r
-    int graphStretch = -1;\r
-    int graphStretchY = -1;\r
-    int min; //used by mouseDragged to see if user\r
-    int max; //used by mouseDragged to see if user\r
-    boolean mouseDragging = false;\r
-\r
-    boolean MAC = false;\r
-\r
-    /**\r
-     * Creates a new AnnotationPanel object.\r
-     *\r
-     * @param ap DOCUMENT ME!\r
-     */\r
-    public AnnotationPanel(AlignmentPanel ap)\r
-    {\r
-\r
-    if(System.getProperty("os.name").startsWith("Mac"))\r
-      MAC = true;\r
-\r
-        ToolTipManager.sharedInstance().registerComponent(this);\r
-        ToolTipManager.sharedInstance().setInitialDelay(0);\r
-        ToolTipManager.sharedInstance().setDismissDelay(10000);\r
-        this.ap = ap;\r
-        av = ap.av;\r
-        this.setLayout(null);\r
-        addMouseListener(this);\r
-        addMouseMotionListener(this);\r
-        ap.annotationScroller.getVerticalScrollBar().addAdjustmentListener(this);\r
-    }\r
-\r
-    public AnnotationPanel(AlignViewport av)\r
-    {\r
-      this.av = av;\r
-    }\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void adjustmentValueChanged(AdjustmentEvent evt)\r
-    {\r
-        ap.alabels.setScrollOffset(-evt.getValue());\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public int adjustPanelHeight()\r
-    {\r
-        // setHeight of panels\r
-        image = null;\r
-        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-        int height = 0;\r
-\r
-        if (aa != null)\r
-        {\r
-            for (int i = 0; i < aa.length; i++)\r
-            {\r
-                if (!aa[i].visible)\r
-                {\r
-                    continue;\r
-                }\r
-\r
-                aa[i].height = 0;\r
-\r
-                if (aa[i].hasText)\r
-                {\r
-                    aa[i].height += av.charHeight;\r
-                }\r
-\r
-                if (aa[i].hasIcons)\r
-                {\r
-                    aa[i].height += 16;\r
-                }\r
-\r
-                if (aa[i].graph>0)\r
-                {\r
-                    aa[i].height += aa[i].graphHeight;\r
-                }\r
-\r
-                if (aa[i].height == 0)\r
-                {\r
-                    aa[i].height = 20;\r
-                }\r
-\r
-                height += aa[i].height;\r
-            }\r
-        }\r
-        else\r
-        {\r
-            height = 20;\r
-        }\r
-\r
-        this.setPreferredSize(new Dimension(1, height));\r
-\r
-        return height;\r
-    }\r
-\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void actionPerformed(ActionEvent evt)\r
-    {\r
-        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-        Annotation[] anot = aa[activeRow].annotations;\r
-\r
-        if (evt.getActionCommand().equals(REMOVE))\r
-        {\r
-            for (int i = 0; i < av.getColumnSelection().size(); i++)\r
-            {\r
-                anot[av.getColumnSelection().columnAt(i)] = null;\r
-            }\r
-        }\r
-        else if (evt.getActionCommand().equals(LABEL))\r
-        {\r
-            String label = JOptionPane.showInputDialog(this, "Enter Label ",\r
-                    "Enter label", JOptionPane.QUESTION_MESSAGE);\r
-\r
-            if (label == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            if ((label.length() > 0) && !aa[activeRow].hasText)\r
-            {\r
-                aa[activeRow].hasText = true;\r
-            }\r
-\r
-            for (int i = 0; i < av.getColumnSelection().size(); i++)\r
-            {\r
-                int index = av.getColumnSelection().columnAt(i);\r
-\r
-                if (anot[index] == null)\r
-                {\r
-                    anot[index] = new Annotation(label, "", ' ', 0);\r
-                }\r
-\r
-                anot[index].displayCharacter = label;\r
-            }\r
-        }\r
-        else if (evt.getActionCommand().equals(COLOUR))\r
-        {\r
-            Color col = JColorChooser.showDialog(this,\r
-                    "Choose foreground colour", Color.black);\r
-\r
-            for (int i = 0; i < av.getColumnSelection().size(); i++)\r
-            {\r
-                int index = av.getColumnSelection().columnAt(i);\r
-\r
-                if (anot[index] == null)\r
-                {\r
-                    anot[index] = new Annotation("", "", ' ', 0);\r
-                }\r
-\r
-                anot[index].colour = col;\r
-            }\r
-        }\r
-        else // HELIX OR SHEET\r
-        {\r
-            char type = 0;\r
-            String symbol = "\u03B1";\r
-\r
-            if (evt.getActionCommand().equals(HELIX))\r
-            {\r
-                type = 'H';\r
-            }\r
-            else if (evt.getActionCommand().equals(SHEET))\r
-            {\r
-                type = 'E';\r
-                symbol = "\u03B2";\r
-            }\r
-\r
-            if (!aa[activeRow].hasIcons)\r
-            {\r
-                aa[activeRow].hasIcons = true;\r
-            }\r
-\r
-            String label = JOptionPane.showInputDialog("Enter a label for the structure?",\r
-                    symbol);\r
-\r
-            if (label == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            if ((label.length() > 0) && !aa[activeRow].hasText)\r
-            {\r
-                aa[activeRow].hasText = true;\r
-            }\r
-\r
-            for (int i = 0; i < av.getColumnSelection().size(); i++)\r
-            {\r
-                int index = av.getColumnSelection().columnAt(i);\r
-\r
-                if (anot[index] == null)\r
-                {\r
-                    anot[index] = new Annotation(label, "", type, 0);\r
-                }\r
-\r
-                anot[index].secondaryStructure = type;\r
-                anot[index].displayCharacter = label;\r
-            }\r
-        }\r
-\r
-        adjustPanelHeight();\r
-        repaint();\r
-\r
-        return;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mousePressed(MouseEvent evt)\r
-    {\r
-\r
-\r
-        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-        if(aa==null)\r
-          return;\r
-\r
-\r
-        int height = 0;\r
-        activeRow = -1;\r
-\r
-\r
-        for (int i = 0; i < aa.length; i++)\r
-        {\r
-            if (aa[i].visible)\r
-            {\r
-              height += aa[i].height;\r
-            }\r
-\r
-            if (evt.getY() < height)\r
-            {\r
-                if (aa[i].editable)\r
-                {\r
-                    activeRow = i;\r
-                }\r
-                else if(aa[i].graph>0)\r
-                {\r
-                    //Stretch Graph\r
-                    graphStretch = i;\r
-                    graphStretchY = evt.getY();\r
-                }\r
-\r
-                break;\r
-            }\r
-        }\r
-\r
-\r
-        if (SwingUtilities.isRightMouseButton(evt))\r
-        {\r
-            if (av.getColumnSelection() == null)\r
-            {\r
-                return;\r
-            }\r
-\r
-            JPopupMenu pop = new JPopupMenu("Structure type");\r
-            JMenuItem item = new JMenuItem(HELIX);\r
-            item.addActionListener(this);\r
-            pop.add(item);\r
-            item = new JMenuItem(SHEET);\r
-            item.addActionListener(this);\r
-            pop.add(item);\r
-            item = new JMenuItem(LABEL);\r
-            item.addActionListener(this);\r
-            pop.add(item);\r
-            item = new JMenuItem(COLOUR);\r
-            item.addActionListener(this);\r
-            pop.add(item);\r
-            item = new JMenuItem(REMOVE);\r
-            item.addActionListener(this);\r
-            pop.add(item);\r
-            pop.show(this, evt.getX(), evt.getY());\r
-\r
-            return;\r
-        }\r
-\r
-        if (aa == null)\r
-        {\r
-            return;\r
-        }\r
-\r
-        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-\r
-        min = res;\r
-        max = res;\r
-\r
-        if (av.getColumnSelection().contains(res))\r
-          av.getColumnSelection().removeElement(res);\r
-        else\r
-        {\r
-            av.getColumnSelection().addElement(res);\r
-            SequenceGroup sg = new SequenceGroup();\r
-\r
-            for (int i = 0; i < av.alignment.getSequences().size(); i++)\r
-            {\r
-                sg.addSequence(av.alignment.getSequenceAt(i), false);\r
-            }\r
-\r
-            sg.setStartRes(res);\r
-            sg.setEndRes(res);\r
-            av.setSelectionGroup(sg);\r
-        }\r
-\r
-        ap.repaint();\r
-\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseReleased(MouseEvent evt)\r
-    {\r
-      graphStretch = -1;\r
-      graphStretchY = -1;\r
-      mouseDragging = false;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseEntered(MouseEvent evt)\r
-    {\r
-      if(mouseDragging)\r
-        ap.seqPanel.scrollCanvas(null);\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseExited(MouseEvent evt)\r
-    {\r
-      if(mouseDragging)\r
-        ap.seqPanel.scrollCanvas(evt);\r
-    }\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseDragged(MouseEvent evt)\r
-    {\r
-      if(graphStretch>-1)\r
-      {\r
-        av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight += graphStretchY - evt.getY();\r
-        if(av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight <10)\r
-          av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight = 10;\r
-        graphStretchY = evt.getY();\r
-        adjustPanelHeight();\r
-        ap.repaint();\r
-      }\r
-      else\r
-      {\r
-        mouseDragging = true;\r
-\r
-        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-\r
-        SequenceGroup sg = av.getSelectionGroup();\r
-\r
-        if (res < min)\r
-        {\r
-            min = res;\r
-        }\r
-\r
-        if (res > max)\r
-        {\r
-            max = res;\r
-        }\r
-\r
-        if (sg != null)\r
-        {\r
-            if (!av.getColumnSelection().contains(res))\r
-            {\r
-                av.getColumnSelection().addElement(res);\r
-            }\r
-\r
-            if (res > sg.getStartRes())\r
-            {\r
-                sg.setEndRes(res);\r
-            }\r
-            else if (res < sg.getStartRes())\r
-            {\r
-                sg.setStartRes(res);\r
-            }\r
-\r
-            for (int i = min; i <= max; i++)\r
-            {\r
-                if ((i < sg.getStartRes()) || (i > sg.getEndRes()))\r
-                {\r
-                    av.getColumnSelection().removeElement(i);\r
-                }\r
-                else\r
-                {\r
-                    av.getColumnSelection().addElement(i);\r
-                }\r
-            }\r
-\r
-            ap.repaint();\r
-        }\r
-\r
-      }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseMoved(MouseEvent evt)\r
-    {\r
-        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-\r
-        if (aa == null)\r
-        {\r
-            return;\r
-        }\r
-\r
-        int row = -1;\r
-        int height = 0;\r
-\r
-        for (int i = 0; i < aa.length; i++)\r
-        {\r
-            if (aa[i].visible)\r
-            {\r
-                height += aa[i].height;\r
-            }\r
-\r
-            if (evt.getY() < height)\r
-            {\r
-                row = i;\r
-\r
-                break;\r
-            }\r
-        }\r
-\r
-        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-\r
-        if(av.hasHiddenColumns)\r
-          res = av.getColumnSelection().adjustForHiddenColumns(res);\r
-\r
-        if (row > -1 && res<aa[row].annotations.length)\r
-        {\r
-            if(aa[row].graphGroup>-1)\r
-            {\r
-              StringBuffer tip = new StringBuffer("<html>");\r
-              for (int gg = 0; gg < aa.length; gg++)\r
-              {\r
-                if (aa[gg].graphGroup == aa[row].graphGroup && aa[gg].annotations[res]!=null)\r
-                  tip.append(aa[gg].label+" "+aa[gg].annotations[res].description+"<br>" );\r
-              }\r
-              if(tip.length()!=6)\r
-              {\r
-                tip.setLength(tip.length() - 4);\r
-                this.setToolTipText(tip.toString() + "</html>");\r
-              }\r
-            }\r
-            else if(aa[row].annotations[res] != null)\r
-              this.setToolTipText(aa[row].annotations[res].description);\r
-\r
-            if(aa[row].annotations[res]!=null)\r
-            {\r
-              StringBuffer text = new StringBuffer("Sequence position " +\r
-                                                   (res + 1) + "  " +\r
-                                                   aa[row].annotations[res].description);\r
-\r
-              ap.alignFrame.statusBar.setText(text.toString());\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void mouseClicked(MouseEvent evt)\r
-    {\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     */\r
-    public void paintComponent(Graphics g)\r
-    {\r
-      g.setColor(Color.white);\r
-      g.fillRect(0, 0, getWidth(), getHeight());\r
-\r
-      if(image!=null)\r
-      {if (fastPaint\r
-            || (getVisibleRect().width != g.getClipBounds().width)\r
-            || (getVisibleRect().height != g.getClipBounds().height))\r
-        {\r
-          g.drawImage(image, 0, 0, this);\r
-          fastPaint = false;\r
-          return;\r
-        }\r
-      }\r
-      imgWidth = (av.endRes - av.startRes + 1) * av.charWidth;\r
-\r
-      if (image == null || imgWidth != image.getWidth()\r
-          || image.getHeight(this) != getHeight())\r
-      {\r
-        image = new BufferedImage(imgWidth, ap.annotationPanel.getHeight(),\r
-                                  BufferedImage.TYPE_INT_RGB);\r
-        gg = (Graphics2D) image.getGraphics();\r
-\r
-        if(av.antiAlias)\r
-        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-                            RenderingHints.VALUE_ANTIALIAS_ON);\r
-\r
-        gg.setFont(av.getFont());\r
-        fm = gg.getFontMetrics();\r
-      }\r
-\r
-\r
-      drawComponent(gg, av.startRes, av.endRes + 1);\r
-      g.drawImage(image, 0, 0, this);\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param horizontal DOCUMENT ME!\r
-     */\r
-    public void fastPaint(int horizontal)\r
-    {\r
-        if ((horizontal == 0) || gg==null ||\r
-                (av.alignment.getAlignmentAnnotation() == null) ||\r
-                (av.alignment.getAlignmentAnnotation().length < 1))\r
-        {\r
-            repaint();\r
-            return;\r
-        }\r
-\r
-        gg.copyArea(0, 0, imgWidth, getHeight(), -horizontal * av.charWidth, 0);\r
-\r
-        int sr = av.startRes;\r
-        int er = av.endRes + 1;\r
-        int transX = 0;\r
-\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
-        {\r
-            er = sr - horizontal;\r
-        }\r
-\r
-        gg.translate(transX, 0);\r
-\r
-        drawComponent(gg, sr, er);\r
-\r
-        gg.translate(-transX, 0);\r
-\r
-        fastPaint = true;\r
-\r
-        repaint();\r
-\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     * @param startRes DOCUMENT ME!\r
-     * @param endRes DOCUMENT ME!\r
-     */\r
-    public void drawComponent(Graphics g, int startRes, int endRes)\r
-    {\r
-      g.setFont(av.getFont());\r
-\r
-      if (fm == null)\r
-        fm = g.getFontMetrics();\r
-\r
-\r
-        g.setColor(Color.white);\r
-        g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());\r
-\r
-        if ( (av.alignment.getAlignmentAnnotation() == null) ||\r
-                (av.alignment.getAlignmentAnnotation().length < 1))\r
-        {\r
-            g.setColor(Color.white);\r
-            g.fillRect(0, 0, getWidth(), getHeight());\r
-            g.setColor(Color.black);\r
-            if(av.validCharWidth)\r
-              g.drawString("Alignment has no annotations", 20, 15);\r
-\r
-            return;\r
-        }\r
-\r
-        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
-\r
-        int x = 0, y = 0;\r
-        int column=0;\r
-        char lastSS;\r
-        int lastSSX;\r
-        int iconOffset = av.charHeight / 2;\r
-        boolean validRes = false;\r
-\r
-        boolean [] graphGroupDrawn = new boolean[aa.length];\r
-\r
-\r
-        //\u03B2 \u03B1\r
-        for (int i = 0; i < aa.length; i++)\r
-        {\r
-            AlignmentAnnotation row = aa[i];\r
-\r
-            if (!row.visible)\r
-            {\r
-                continue;\r
-            }\r
-\r
-            lastSS = ' ';\r
-            lastSSX = 0;\r
-\r
-            if (row.graph>0)\r
-            {\r
-                if(row.graphGroup>-1 && graphGroupDrawn[ row.graphGroup ] )\r
-                  continue;\r
-\r
-                // this is so that we draw the characters below the graph\r
-                y += row.height;\r
-\r
-                if (row.hasText)\r
-                {\r
-                    y -= av.charHeight;\r
-                }\r
-            }\r
-\r
-            if (row.hasText)\r
-            {\r
-                iconOffset = av.charHeight / 2;\r
-            }\r
-            else\r
-            {\r
-                iconOffset = 0;\r
-            }\r
-\r
-            x = 0;\r
-            while (x < endRes-startRes)\r
-            {\r
-              if (av.hasHiddenColumns)\r
-              {\r
-                column = av.getColumnSelection().adjustForHiddenColumns(startRes+x);\r
-                if (column > row.annotations.length-1)\r
-                {\r
-                  break;\r
-                }\r
-              }\r
-              else\r
-                column = startRes+x;\r
-\r
-\r
-                if ((row.annotations.length <= column) ||\r
-                        (row.annotations[column] == null))\r
-                {\r
-                    validRes = false;\r
-                }\r
-                else\r
-                {\r
-                    validRes = true;\r
-                }\r
-\r
-\r
-                if (activeRow == i)\r
-                {\r
-                    g.setColor(Color.red);\r
-\r
-                    if (av.getColumnSelection() != null)\r
-                    {\r
-                        for (int n = 0; n < av.getColumnSelection().size(); n++)\r
-                        {\r
-                            int v = av.getColumnSelection().columnAt(n);\r
-\r
-                            if (v == column)\r
-                            {\r
-                                g.fillRect(x * av.charWidth, y,\r
-                                    av.charWidth, av.charHeight);\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (av.validCharWidth && validRes &&\r
-                        (row.annotations[column].displayCharacter.length() > 0))\r
-                {\r
-\r
-                    int charOffset = (av.charWidth -\r
-                        fm.charWidth(row.annotations[column].displayCharacter.charAt(\r
-                                0))) / 2;\r
-                    g.setColor(row.annotations[column].colour);\r
-\r
-                    if (column == 0 || row.graph>0)\r
-                    {\r
-                        g.drawString(row.annotations[column].displayCharacter,\r
-                                     (x*av.charWidth)+charOffset,\r
-                            y + iconOffset + 3);\r
-                    }\r
-                    else if (\r
-                        row.annotations[column - 1] == null\r
-                        ||(!row.annotations[column].displayCharacter.equals(\r
-                            row.annotations[column - 1].displayCharacter)\r
-                        ||\r
-                  (row.annotations[column].displayCharacter.length() <2 &&\r
-                   row.annotations[column].secondaryStructure==' ')))\r
-                    {\r
-                        g.drawString(row.annotations[column].displayCharacter,\r
-                                     x*av.charWidth+charOffset,\r
-                                     y + iconOffset + 3);\r
-                    }\r
-                }\r
-\r
-                if (row.hasIcons)\r
-                {\r
-                    if (!validRes ||\r
-                            (row.annotations[column].secondaryStructure != lastSS))\r
-                    {\r
-                        switch (lastSS)\r
-                        {\r
-                        case 'H':\r
-                            g.setColor(HELIX_COLOUR);\r
-                            if(MAC)\r
-                            {\r
-                              //Off by 1 offset when drawing rects and ovals\r
-                              //to offscreen image on the MAC\r
-                              g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
-                                              x*av.charWidth - lastSSX, 7, 8, 8);\r
-                              break;\r
-                            }\r
-\r
-                            int sCol = (lastSSX / av.charWidth) + startRes;\r
-                            int x1 = lastSSX;\r
-                            int x2 = x*av.charWidth;\r
-\r
-                           if(sCol==0 ||\r
-                              row.annotations[sCol-1]==null ||\r
-                              row.annotations[sCol-1].secondaryStructure!='H')\r
-                           {\r
-                             g.fillArc(lastSSX, y+4+iconOffset, av.charWidth+1, 7, 90,180) ;\r
-                             x1 += av.charWidth/2;\r
-                           }\r
-\r
-                            if(row.annotations[column]==null ||\r
-                               row.annotations[column].secondaryStructure!='H')\r
-                            {\r
-                              g.fillArc(x*av.charWidth-av.charWidth,\r
-                                        y+4+iconOffset,\r
-                                        av.charWidth,\r
-                                        7, 270,180);\r
-                              x2 -= av.charWidth/2;\r
-                            }\r
-\r
-                            g.fillRect(x1, y+4+iconOffset, x2-x1+1, 7);\r
-                            break;\r
-\r
-                        case 'E':\r
-                            g.setColor(SHEET_COLOUR);\r
-                            g.fillRect(lastSSX, y + 4 + iconOffset,\r
-                                x*av.charWidth - lastSSX - 4, 7);\r
-                            g.fillPolygon(new int[] { x*av.charWidth - 5,\r
-                                          x*av.charWidth - 5,\r
-                                          x*av.charWidth },\r
-                                new int[]\r
-                                {\r
-                                    y + iconOffset, y + 14 + iconOffset,\r
-                                    y + 7 + iconOffset\r
-                                }, 3);\r
-\r
-                            break;\r
-\r
-\r
-                        default:\r
-                            g.setColor(Color.gray);\r
-                            g.fillRect(lastSSX, y + 6 + iconOffset,\r
-                                x*av.charWidth - lastSSX, 2);\r
-\r
-                            break;\r
-                        }\r
-\r
-                        if (validRes)\r
-                        {\r
-                            lastSS = row.annotations[column].secondaryStructure;\r
-                        }\r
-                        else\r
-                        {\r
-                            lastSS = ' ';\r
-                        }\r
-\r
-                        lastSSX = x*av.charWidth;\r
-                    }\r
-                }\r
-                column++;\r
-                x++;\r
-            }\r
-\r
-            if(column>=row.annotations.length)\r
-              column = row.annotations.length-1;\r
-\r
-            x ++;\r
-\r
-            if (row.hasIcons)\r
-            {\r
-                switch (lastSS)\r
-                {\r
-                case 'H':\r
-                  g.setColor(HELIX_COLOUR);\r
-                  if (MAC)\r
-                  {\r
-                    //Off by 1 offset when drawing rects and ovals\r
-                    //to offscreen image on the MAC\r
-                    g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
-                                    x*av.charWidth - lastSSX, 7, 8, 8);\r
-                    break;\r
-                  }\r
-\r
-\r
-                  int sCol = (lastSSX / av.charWidth) + startRes;\r
-                  int x1 = lastSSX;\r
-                  int x2 = x;\r
-\r
-                 if(sCol==0 ||\r
-                    row.annotations[sCol-1]==null ||\r
-                    row.annotations[sCol-1].secondaryStructure!='H')\r
-                 {\r
-                   g.fillArc(lastSSX, y+4+iconOffset, av.charWidth+1, 7, 90,180) ;\r
-                   x1 += av.charWidth/2;\r
-                 }\r
-\r
-                  if(row.annotations[column]==null ||\r
-                     row.annotations[column].secondaryStructure!='H')\r
-                  {\r
-                    g.fillArc(x-av.charWidth, y+4+iconOffset, av.charWidth, 7, 270,180);\r
-                    x2 -= av.charWidth/2;\r
-                  }\r
-\r
-                  g.fillRect(x1, y+4+iconOffset, x2-x1+1, 7);\r
-\r
-                    break;\r
-\r
-                case 'E':\r
-                    g.setColor(SHEET_COLOUR);\r
-\r
-                    if (row.annotations[endRes] ==null\r
-                        || row.annotations[endRes].secondaryStructure != 'E')\r
-                    {\r
-                      g.fillRect(lastSSX, y + 4 + iconOffset,\r
-                                 x*av.charWidth - lastSSX - 4, 7);\r
-                      g.fillPolygon(new int[]\r
-                                    {x*av.charWidth - 5,\r
-                                    x*av.charWidth - 5,\r
-                                    x*av.charWidth},\r
-                                    new int[]\r
-                                    {\r
-                                    y + iconOffset, y + 14 + iconOffset,\r
-                                    y + 7 + iconOffset\r
-                      }, 3);\r
-                    }\r
-                    else\r
-                      g.fillRect(lastSSX, y + 4 + iconOffset,\r
-                                 x*av.charWidth - lastSSX, 7);\r
-\r
-                    break;\r
-\r
-\r
-                default:\r
-                    g.setColor(Color.gray);\r
-                    if(!av.wrapAlignment || endRes==av.endRes)\r
-                      g.fillRect(lastSSX, y + 6 + iconOffset,\r
-                                 x*av.charWidth - lastSSX, 2);\r
-\r
-                    break;\r
-                }\r
-            }\r
-\r
-            if (row.graph>0)\r
-            {\r
-                if(row.graph == AlignmentAnnotation.LINE_GRAPH )\r
-                {\r
-                  if(row.graphGroup>-1 && !graphGroupDrawn[row.graphGroup])\r
-                   {\r
-                     float groupmax=-999999, groupmin=9999999;\r
-                     for(int gg=0; gg<aa.length; gg++)\r
-                     {\r
-                       if(aa[gg].graphGroup!=row.graphGroup)\r
-                         continue;\r
-\r
-                       if(aa[gg]!=row)\r
-                         aa[gg].visible = false;\r
-\r
-                       if(aa[gg].graphMax>groupmax)\r
-                         groupmax = aa[gg].graphMax;\r
-                       if(aa[gg].graphMin<groupmin)\r
-                         groupmin = aa[gg].graphMin;\r
-                     }\r
-\r
-                     for (int gg = 0; gg < aa.length; gg++)\r
-                     {\r
-                       if (aa[gg].graphGroup == row.graphGroup)\r
-                       {\r
-                         drawLineGraph(g, aa[gg], startRes, endRes, y,\r
-                                       groupmin, groupmax,\r
-                                       row.graphHeight);\r
-                       }\r
-                     }\r
-\r
-                     graphGroupDrawn[ row.graphGroup ] = true;\r
-                   }\r
-                   else\r
-                     drawLineGraph(g, row, startRes, endRes,\r
-                                   y, row.graphMin, row.graphMax, row.graphHeight  );\r
-                }\r
-                else if(row.graph == AlignmentAnnotation.BAR_GRAPH )\r
-                   drawBarGraph(g, row, startRes, endRes,\r
-                                row.graphMin, row.graphMax, y);\r
-            }\r
-\r
-            if (row.graph>0 && row.hasText)\r
-            {\r
-                y += av.charHeight;\r
-            }\r
-\r
-            if (row.graph==0)\r
-            {\r
-                y += aa[i].height;\r
-            }\r
-        }\r
-    }\r
-\r
-    public void drawLineGraph(Graphics g, AlignmentAnnotation aa,\r
-                              int sRes, int eRes,\r
-                              int y,\r
-                              float min, float max,\r
-                              int graphHeight)\r
-    {\r
-      if(sRes>aa.annotations.length)\r
-        return;\r
-\r
-\r
-      int x = 0;\r
-\r
-      //Adjustment for fastpaint to left\r
-      if(eRes<av.endRes)\r
-        eRes++;\r
-\r
-      eRes = Math.min(eRes, aa.annotations.length);\r
-\r
-      if(sRes==0)\r
-      {\r
-        x++;\r
-      }\r
-\r
-      int y1=y, y2=y;\r
-      float range = max - min;\r
-\r
-      ////Draw origin\r
-      if(min<0)\r
-        y2 = y - (int)((0-min / range)*graphHeight);\r
-\r
-      g.setColor(Color.gray);\r
-      g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);\r
-\r
-      eRes = Math.min(eRes, aa.annotations.length);\r
-\r
-      int column;\r
-      int aaMax = aa.annotations.length-1;\r
-\r
-      while( x < eRes - sRes )\r
-      {\r
-        column = sRes + x;\r
-        if(av.hasHiddenColumns)\r
-        {\r
-          column = av.getColumnSelection().adjustForHiddenColumns(column);\r
-        }\r
-\r
-        if (column > aaMax)\r
-        {\r
-          break;\r
-        }\r
-\r
-        if(aa.annotations[column]==null || aa.annotations[column-1]==null)\r
-        {\r
-          x++;\r
-          continue;\r
-        }\r
-\r
-\r
-          g.setColor(aa.annotations[column].colour);\r
-          y1 = y - (int) (((aa.annotations[column-1].value-min) / range) * graphHeight);\r
-          y2 = y - (int) (((aa.annotations[column].value-min) / range) * graphHeight);\r
-\r
-          g.drawLine(x*av.charWidth-av.charWidth/2, y1, x*av.charWidth+av.charWidth/2, y2);\r
-          x ++;\r
-       }\r
-\r
-       if(aa.threshold!=null)\r
-       {\r
-           g.setColor(aa.threshold.colour);\r
-           Graphics2D g2 = (Graphics2D)g;\r
-           g2.setStroke(new BasicStroke(1,\r
-                                         BasicStroke.CAP_SQUARE,\r
-                                         BasicStroke.JOIN_ROUND, 3f,\r
-                                         new float[] { 5f, 3f }, 0f));\r
-\r
-           y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);\r
-           g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2);\r
-           g2.setStroke(new BasicStroke());\r
-      }\r
-    }\r
-\r
-    public void drawBarGraph(Graphics g, AlignmentAnnotation aa,\r
-                             int sRes, int eRes,\r
-                             float min, float max,\r
-                             int y)\r
-    {\r
-      if(sRes>aa.annotations.length)\r
-        return;\r
-\r
-      eRes = Math.min(eRes, aa.annotations.length);\r
-\r
-      int x=0, y1=y, y2=y;\r
-\r
-      float range = max - min;\r
-\r
-      if(min<0)\r
-        y2 = y - (int)((0-min / (range))*aa.graphHeight);\r
-\r
-      g.setColor(Color.gray);\r
-\r
-      g.drawLine(x,y2,(eRes-sRes)*av.charWidth,y2);\r
-\r
-      int column;\r
-      int aaMax = aa.annotations.length-1;\r
-\r
-      while( x < eRes-sRes )\r
-      {\r
-        column = sRes + x;\r
-        if(av.hasHiddenColumns)\r
-        {\r
-          column = av.getColumnSelection().adjustForHiddenColumns(column);\r
-        }\r
-\r
-        if(column > aaMax)\r
-        {\r
-            break;\r
-        }\r
-\r
-        if (aa.annotations[column] == null)\r
-        {\r
-          x ++;\r
-          continue;\r
-        }\r
-\r
-          g.setColor(aa.annotations[column].colour);\r
-          y1 = y - (int) (((aa.annotations[column].value-min) / (range)) * aa.graphHeight);\r
-\r
-          if(y1-y2>0)\r
-            g.fillRect(x*av.charWidth, y2, av.charWidth, y1-y2 );\r
-          else\r
-            g.fillRect(x*av.charWidth, y1, av.charWidth, y2-y1 );\r
-\r
-          x ++ ;\r
-\r
-      }\r
-      if(aa.threshold!=null)\r
-      {\r
-          g.setColor(aa.threshold.colour);\r
-          Graphics2D g2 = (Graphics2D)g;\r
-          g2.setStroke(new BasicStroke(1,\r
-                                        BasicStroke.CAP_SQUARE,\r
-                                        BasicStroke.JOIN_ROUND, 3f,\r
-                                        new float[] { 5f, 3f }, 0f));\r
-\r
-          y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);\r
-          g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2);\r
-          g2.setStroke(new BasicStroke());\r
-      }\r
-    }\r
-\r
-    // used by overview window\r
-    public void drawGraph(Graphics g, AlignmentAnnotation aa, int width, int y, int sRes, int eRes)\r
-    {\r
-      eRes = Math.min(eRes, aa.annotations.length);\r
-      g.setColor(Color.white);\r
-      g.fillRect(0, 0, width, y);\r
-      g.setColor(new Color(0, 0, 180));\r
-\r
-      int x = 0, height;\r
-\r
-      for (int j = sRes; j < eRes; j++)\r
-      {\r
-          g.setColor(aa.annotations[j].colour);\r
-\r
-          height = (int) ((aa.annotations[j].value / aa.graphMax) * y);\r
-          if(height>y)\r
-            height = y;\r
-\r
-          g.fillRect(x, y - height, av.charWidth, height);\r
-          x += av.charWidth;\r
-      }\r
-    }\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.gui;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.Scrollable;
+import javax.swing.ToolTipManager;
+
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
+import jalview.renderer.AnnotationRenderer;
+import jalview.renderer.AwtRenderPanelI;
+import jalview.schemes.ResidueProperties;
+import jalview.util.Comparison;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.viewmodel.ViewportListenerI;
+import jalview.viewmodel.ViewportRanges;
+
+/**
+ * AnnotationPanel displays visible portion of annotation rows below unwrapped
+ * alignment
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
+public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
+        MouseListener, MouseWheelListener, MouseMotionListener,
+        ActionListener, AdjustmentListener, Scrollable, ViewportListenerI
+{
+  enum DragMode
+  {
+    Select, Resize, Undefined
+  };
+
+  String HELIX = MessageManager.getString("label.helix");
+
+  String SHEET = MessageManager.getString("label.sheet");
+
+  /**
+   * For RNA secondary structure "stems" aka helices
+   */
+  String STEM = MessageManager.getString("label.rna_helix");
+
+  String LABEL = MessageManager.getString("label.label");
+
+  String REMOVE = MessageManager.getString("label.remove_annotation");
+
+  String COLOUR = MessageManager.getString("action.colour");
+
+  public final Color HELIX_COLOUR = Color.red.darker();
+
+  public final Color SHEET_COLOUR = Color.green.darker().darker();
+
+  public final Color STEM_COLOUR = Color.blue.darker();
+
+  /** DOCUMENT ME!! */
+  public AlignViewport av;
+
+  AlignmentPanel ap;
+
+  public int activeRow = -1;
+
+  public BufferedImage image;
+
+  public volatile BufferedImage fadedImage;
+
+  // private Graphics2D gg;
+
+  public FontMetrics fm;
+
+  public int imgWidth = 0;
+
+  boolean fastPaint = false;
+
+  // Used For mouse Dragging and resizing graphs
+  int graphStretch = -1;
+
+  int mouseDragLastX = -1;
+
+  int mouseDragLastY = -1;
+
+  DragMode dragMode = DragMode.Undefined;
+
+  boolean mouseDragging = false;
+
+  // for editing cursor
+  int cursorX = 0;
+
+  int cursorY = 0;
+
+  public final AnnotationRenderer renderer;
+
+  private MouseWheelListener[] _mwl;
+
+  /**
+   * Creates a new AnnotationPanel object.
+   * 
+   * @param ap
+   *          DOCUMENT ME!
+   */
+  public AnnotationPanel(AlignmentPanel ap)
+  {
+    ToolTipManager.sharedInstance().registerComponent(this);
+    ToolTipManager.sharedInstance().setInitialDelay(0);
+    ToolTipManager.sharedInstance().setDismissDelay(10000);
+    this.ap = ap;
+    av = ap.av;
+    this.setLayout(null);
+    addMouseListener(this);
+    addMouseMotionListener(this);
+    ap.annotationScroller.getVerticalScrollBar()
+            .addAdjustmentListener(this);
+    // save any wheel listeners on the scroller, so we can propagate scroll
+    // events to them.
+    _mwl = ap.annotationScroller.getMouseWheelListeners();
+    // and then set our own listener to consume all mousewheel events
+    ap.annotationScroller.addMouseWheelListener(this);
+    renderer = new AnnotationRenderer();
+
+    av.getRanges().addPropertyChangeListener(this);
+  }
+
+  public AnnotationPanel(AlignViewport av)
+  {
+    this.av = av;
+    renderer = new AnnotationRenderer();
+  }
+
+  @Override
+  public void mouseWheelMoved(MouseWheelEvent e)
+  {
+    if (e.isShiftDown())
+    {
+      e.consume();
+      double wheelRotation = e.getPreciseWheelRotation();
+      if (wheelRotation > 0)
+      {
+        av.getRanges().scrollRight(true);
+      }
+      else if (wheelRotation < 0)
+      {
+        av.getRanges().scrollRight(false);
+      }
+    }
+    else
+    {
+      // TODO: find the correct way to let the event bubble up to
+      // ap.annotationScroller
+      for (MouseWheelListener mwl : _mwl)
+      {
+        if (mwl != null)
+        {
+          mwl.mouseWheelMoved(e);
+        }
+        if (e.isConsumed())
+        {
+          break;
+        }
+      }
+    }
+  }
+
+  @Override
+  public Dimension getPreferredScrollableViewportSize()
+  {
+    Dimension ps = getPreferredSize();
+    return new Dimension(ps.width, adjustForAlignFrame(false, ps.height));
+  }
+
+  @Override
+  public int getScrollableBlockIncrement(Rectangle visibleRect,
+          int orientation, int direction)
+  {
+    return 30;
+  }
+
+  @Override
+  public boolean getScrollableTracksViewportHeight()
+  {
+    return false;
+  }
+
+  @Override
+  public boolean getScrollableTracksViewportWidth()
+  {
+    return true;
+  }
+
+  @Override
+  public int getScrollableUnitIncrement(Rectangle visibleRect,
+          int orientation, int direction)
+  {
+    return 30;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * java.awt.event.AdjustmentListener#adjustmentValueChanged(java.awt.event
+   * .AdjustmentEvent)
+   */
+  @Override
+  public void adjustmentValueChanged(AdjustmentEvent evt)
+  {
+    // update annotation label display
+    ap.getAlabels().setScrollOffset(-evt.getValue());
+  }
+
+  /**
+   * Calculates the height of the annotation displayed in the annotation panel.
+   * Callers should normally call the ap.adjustAnnotationHeight method to ensure
+   * all annotation associated components are updated correctly.
+   * 
+   */
+  public int adjustPanelHeight()
+  {
+    int height = av.calcPanelHeight();
+    this.setPreferredSize(new Dimension(1, height));
+    if (ap != null)
+    {
+      // revalidate only when the alignment panel is fully constructed
+      ap.validate();
+    }
+
+    return height;
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void actionPerformed(ActionEvent evt)
+  {
+    AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+    if (aa == null)
+    {
+      return;
+    }
+    Annotation[] anot = aa[activeRow].annotations;
+
+    if (anot.length < av.getColumnSelection().getMax())
+    {
+      Annotation[] temp = new Annotation[av.getColumnSelection().getMax()
+              + 2];
+      System.arraycopy(anot, 0, temp, 0, anot.length);
+      anot = temp;
+      aa[activeRow].annotations = anot;
+    }
+
+    String action = evt.getActionCommand();
+    if (action.equals(REMOVE))
+    {
+      for (int index : av.getColumnSelection().getSelected())
+      {
+        if (av.getAlignment().getHiddenColumns().isVisible(index))
+        {
+          anot[index] = null;
+        }
+      }
+    }
+    else if (action.equals(LABEL))
+    {
+      String exMesg = collectAnnotVals(anot, LABEL);
+      String label = JvOptionPane.showInputDialog(
+              MessageManager.getString("label.enter_label"), exMesg);
+
+      if (label == null)
+      {
+        return;
+      }
+
+      if ((label.length() > 0) && !aa[activeRow].hasText)
+      {
+        aa[activeRow].hasText = true;
+      }
+
+      for (int index : av.getColumnSelection().getSelected())
+      {
+        if (!av.getAlignment().getHiddenColumns().isVisible(index))
+        {
+          continue;
+        }
+
+        if (anot[index] == null)
+        {
+          anot[index] = new Annotation(label, "", ' ', 0);
+        }
+        else
+        {
+          anot[index].displayCharacter = label;
+        }
+      }
+    }
+    else if (action.equals(COLOUR))
+    {
+      final Annotation[] fAnot = anot;
+      String title = MessageManager
+              .getString("label.select_foreground_colour");
+      ColourChooserListener listener = new ColourChooserListener()
+      {
+        @Override
+        public void colourSelected(Color c)
+        {
+          HiddenColumns hiddenColumns = av.getAlignment()
+                  .getHiddenColumns();
+          for (int index : av.getColumnSelection().getSelected())
+          {
+            if (hiddenColumns.isVisible(index))
+            {
+              if (fAnot[index] == null)
+              {
+                fAnot[index] = new Annotation("", "", ' ', 0);
+              }
+              fAnot[index].colour = c;
+            }
+          }
+        };
+      };
+      JalviewColourChooser.showColourChooser(this, title, Color.black,
+              listener);
+    }
+    else
+    // HELIX, SHEET or STEM
+    {
+      char type = 0;
+      String symbol = "\u03B1"; // alpha
+
+      if (action.equals(HELIX))
+      {
+        type = 'H';
+      }
+      else if (action.equals(SHEET))
+      {
+        type = 'E';
+        symbol = "\u03B2"; // beta
+      }
+
+      // Added by LML to color stems
+      else if (action.equals(STEM))
+      {
+        type = 'S';
+        int column = av.getColumnSelection().getSelectedRanges().get(0)[0];
+        symbol = aa[activeRow].getDefaultRnaHelixSymbol(column);
+      }
+
+      if (!aa[activeRow].hasIcons)
+      {
+        aa[activeRow].hasIcons = true;
+      }
+
+      String label = JvOptionPane.showInputDialog(MessageManager
+              .getString("label.enter_label_for_the_structure"), symbol);
+
+      if (label == null)
+      {
+        return;
+      }
+
+      if ((label.length() > 0) && !aa[activeRow].hasText)
+      {
+        aa[activeRow].hasText = true;
+        if (action.equals(STEM))
+        {
+          aa[activeRow].showAllColLabels = true;
+        }
+      }
+      for (int index : av.getColumnSelection().getSelected())
+      {
+        if (!av.getAlignment().getHiddenColumns().isVisible(index))
+        {
+          continue;
+        }
+
+        if (anot[index] == null)
+        {
+          anot[index] = new Annotation(label, "", type, 0);
+        }
+
+        anot[index].secondaryStructure = type != 'S' ? type
+                : label.length() == 0 ? ' ' : label.charAt(0);
+        anot[index].displayCharacter = label;
+
+      }
+    }
+
+    av.getAlignment().validateAnnotation(aa[activeRow]);
+    ap.alignmentChanged();
+    ap.alignFrame.setMenusForViewport();
+    adjustPanelHeight();
+    repaint();
+
+    return;
+  }
+
+  /**
+   * Returns any existing annotation concatenated as a string. For each
+   * annotation, takes the description, if any, else the secondary structure
+   * character (if type is HELIX, SHEET or STEM), else the display character (if
+   * type is LABEL).
+   * 
+   * @param anots
+   * @param type
+   * @return
+   */
+  private String collectAnnotVals(Annotation[] anots, String type)
+  {
+    // TODO is this method wanted? why? 'last' is not used
+
+    StringBuilder collatedInput = new StringBuilder(64);
+    String last = "";
+    ColumnSelection viscols = av.getColumnSelection();
+    HiddenColumns hidden = av.getAlignment().getHiddenColumns();
+
+    /*
+     * the selection list (read-only view) is in selection order, not
+     * column order; make a copy so we can sort it
+     */
+    List<Integer> selected = new ArrayList<>(viscols.getSelected());
+    Collections.sort(selected);
+    for (int index : selected)
+    {
+      // always check for current display state - just in case
+      if (!hidden.isVisible(index))
+      {
+        continue;
+      }
+      String tlabel = null;
+      if (anots[index] != null)
+      { // LML added stem code
+        if (type.equals(HELIX) || type.equals(SHEET) || type.equals(STEM)
+                || type.equals(LABEL))
+        {
+          tlabel = anots[index].description;
+          if (tlabel == null || tlabel.length() < 1)
+          {
+            if (type.equals(HELIX) || type.equals(SHEET)
+                    || type.equals(STEM))
+            {
+              tlabel = "" + anots[index].secondaryStructure;
+            }
+            else
+            {
+              tlabel = "" + anots[index].displayCharacter;
+            }
+          }
+        }
+        if (tlabel != null && !tlabel.equals(last))
+        {
+          if (last.length() > 0)
+          {
+            collatedInput.append(" ");
+          }
+          collatedInput.append(tlabel);
+        }
+      }
+    }
+    return collatedInput.toString();
+  }
+
+  /**
+   * Action on right mouse pressed on Mac is to show a pop-up menu for the
+   * annotation. Action on left mouse pressed is to find which annotation is
+   * pressed and mark the start of a column selection or graph resize operation.
+   * 
+   * @param evt
+   */
+  @Override
+  public void mousePressed(MouseEvent evt)
+  {
+
+    AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+    if (aa == null)
+    {
+      return;
+    }
+    mouseDragLastX = evt.getX();
+    mouseDragLastY = evt.getY();
+
+    /*
+     * add visible annotation heights until we reach the y
+     * position, to find which annotation it is in
+     */
+    int height = 0;
+    activeRow = -1;
+
+    final int y = evt.getY();
+    for (int i = 0; i < aa.length; i++)
+    {
+      if (aa[i].visible)
+      {
+        height += aa[i].height;
+      }
+
+      if (y < height)
+      {
+        if (aa[i].editable)
+        {
+          activeRow = i;
+        }
+        else if (aa[i].graph > 0)
+        {
+          /*
+           * we have clicked on a resizable graph annotation
+           */
+          graphStretch = i;
+        }
+        break;
+      }
+    }
+
+    /*
+     * isPopupTrigger fires in mousePressed on Mac,
+     * not until mouseRelease on Windows
+     */
+    if (evt.isPopupTrigger() && activeRow != -1)
+    {
+      showPopupMenu(y, evt.getX());
+      return;
+    }
+
+    ap.getScalePanel().mousePressed(evt);
+  }
+
+  /**
+   * Construct and display a context menu at the right-click position
+   * 
+   * @param y
+   * @param x
+   */
+  void showPopupMenu(final int y, int x)
+  {
+    if (av.getColumnSelection() == null
+            || av.getColumnSelection().isEmpty())
+    {
+      return;
+    }
+
+    JPopupMenu pop = new JPopupMenu(
+            MessageManager.getString("label.structure_type"));
+    JMenuItem item;
+    /*
+     * Just display the needed structure options
+     */
+    if (av.getAlignment().isNucleotide())
+    {
+      item = new JMenuItem(STEM);
+      item.addActionListener(this);
+      pop.add(item);
+    }
+    else
+    {
+      item = new JMenuItem(HELIX);
+      item.addActionListener(this);
+      pop.add(item);
+      item = new JMenuItem(SHEET);
+      item.addActionListener(this);
+      pop.add(item);
+    }
+    item = new JMenuItem(LABEL);
+    item.addActionListener(this);
+    pop.add(item);
+    item = new JMenuItem(COLOUR);
+    item.addActionListener(this);
+    pop.add(item);
+    item = new JMenuItem(REMOVE);
+    item.addActionListener(this);
+    pop.add(item);
+    pop.show(this, x, y);
+  }
+
+  /**
+   * Action on mouse up is to clear mouse drag data and call mouseReleased on
+   * ScalePanel, to deal with defining the selection group (if any) defined by
+   * the mouse drag
+   * 
+   * @param evt
+   */
+  @Override
+  public void mouseReleased(MouseEvent evt)
+  {
+    graphStretch = -1;
+    mouseDragLastX = -1;
+    mouseDragLastY = -1;
+    mouseDragging = false;
+    if (dragMode == DragMode.Resize)
+    {
+      ap.adjustAnnotationHeight();
+    }
+    dragMode = DragMode.Undefined;
+    ap.getScalePanel().mouseReleased(evt);
+
+    /*
+     * isPopupTrigger is set in mouseReleased on Windows
+     * (in mousePressed on Mac)
+     */
+    if (evt.isPopupTrigger() && activeRow != -1)
+    {
+      showPopupMenu(evt.getY(), evt.getX());
+    }
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mouseEntered(MouseEvent evt)
+  {
+    this.mouseDragging = false;
+    ap.getScalePanel().mouseEntered(evt);
+  }
+
+  /**
+   * On leaving the panel, calls ScalePanel.mouseExited to deal with scrolling
+   * with column selection on a mouse drag
+   * 
+   * @param evt
+   */
+  @Override
+  public void mouseExited(MouseEvent evt)
+  {
+    ap.getScalePanel().mouseExited(evt);
+  }
+
+  /**
+   * Action on starting or continuing a mouse drag. There are two possible
+   * actions:
+   * <ul>
+   * <li>drag up or down on a graphed annotation increases or decreases the
+   * height of the graph</li>
+   * <li>dragging left or right selects the columns dragged across</li>
+   * </ul>
+   * A drag on a graph annotation is treated as column selection if it starts
+   * with more horizontal than vertical movement, and as resize if it starts
+   * with more vertical than horizontal movement. Once started, the drag does
+   * not change mode.
+   * 
+   * @param evt
+   */
+  @Override
+  public void mouseDragged(MouseEvent evt)
+  {
+    /*
+     * if dragMode is Undefined:
+     * - set to Select if dx > dy
+     * - set to Resize if dy > dx
+     * - do nothing if dx == dy
+     */
+    final int x = evt.getX();
+    final int y = evt.getY();
+    if (dragMode == DragMode.Undefined)
+    {
+      int dx = Math.abs(x - mouseDragLastX);
+      int dy = Math.abs(y - mouseDragLastY);
+      if (graphStretch == -1 || dx > dy)
+      {
+        /*
+         * mostly horizontal drag, or not a graph annotation
+         */
+        dragMode = DragMode.Select;
+      }
+      else if (dy > dx)
+      {
+        /*
+         * mostly vertical drag
+         */
+        dragMode = DragMode.Resize;
+      }
+    }
+
+    if (dragMode == DragMode.Undefined)
+    {
+      /*
+       * drag is diagonal - defer deciding whether to
+       * treat as up/down or left/right
+       */
+      return;
+    }
+
+    try
+    {
+      if (dragMode == DragMode.Resize)
+      {
+        /*
+         * resize graph annotation if mouse was dragged up or down
+         */
+        int deltaY = mouseDragLastY - evt.getY();
+        if (deltaY != 0)
+        {
+          AlignmentAnnotation graphAnnotation = av.getAlignment()
+                  .getAlignmentAnnotation()[graphStretch];
+          int newHeight = Math.max(0, graphAnnotation.graphHeight + deltaY);
+          graphAnnotation.graphHeight = newHeight;
+          adjustPanelHeight();
+          ap.paintAlignment(false, false);
+        }
+      }
+      else
+      {
+        /*
+         * for mouse drag left or right, delegate to 
+         * ScalePanel to adjust the column selection
+         */
+        ap.getScalePanel().mouseDragged(evt);
+      }
+    } finally
+    {
+      mouseDragLastX = x;
+      mouseDragLastY = y;
+    }
+  }
+
+  /**
+   * Constructs the tooltip, and constructs and displays a status message, for
+   * the current mouse position
+   * 
+   * @param evt
+   */
+  @Override
+  public void mouseMoved(MouseEvent evt)
+  {
+    int yPos = evt.getY();
+    AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+
+    int row = getRowIndex(yPos, aa);
+
+    if (row == -1)
+    {
+      this.setToolTipText(null);
+      return;
+    }
+
+    int column = (evt.getX() / av.getCharWidth())
+            + av.getRanges().getStartRes();
+    column = Math.min(column, av.getRanges().getEndRes());
+
+    if (av.hasHiddenColumns())
+    {
+      column = av.getAlignment().getHiddenColumns()
+              .visibleToAbsoluteColumn(column);
+    }
+
+    AlignmentAnnotation ann = aa[row];
+    if (row > -1 && ann.annotations != null
+            && column < ann.annotations.length)
+    {
+      String toolTip = buildToolTip(ann, column, aa);
+      setToolTipText(toolTip == null ? null
+              : JvSwingUtils.wrapTooltip(true, toolTip));
+      String msg = getStatusMessage(av.getAlignment(), column, ann);
+      ap.alignFrame.setStatus(msg);
+    }
+    else
+    {
+      this.setToolTipText(null);
+      ap.alignFrame.setStatus(" ");
+    }
+  }
+
+  /**
+   * Answers the index in the annotations array of the visible annotation at the
+   * given y position. This is done by adding the heights of visible annotations
+   * until the y position has been exceeded. Answers -1 if no annotations are
+   * visible, or the y position is below all annotations.
+   * 
+   * @param yPos
+   * @param aa
+   * @return
+   */
+  static int getRowIndex(int yPos, AlignmentAnnotation[] aa)
+  {
+    if (aa == null)
+    {
+      return -1;
+    }
+    int row = -1;
+    int height = 0;
+
+    for (int i = 0; i < aa.length; i++)
+    {
+      if (aa[i].visible)
+      {
+        height += aa[i].height;
+      }
+
+      if (height > yPos)
+      {
+        row = i;
+        break;
+      }
+    }
+    return row;
+  }
+
+  /**
+   * Answers a tooltip for the annotation at the current mouse position, not
+   * wrapped in &lt;html&gt; tags (apply if wanted). Answers null if there is no
+   * tooltip to show.
+   * 
+   * @param ann
+   * @param column
+   * @param anns
+   */
+  static String buildToolTip(AlignmentAnnotation ann, int column,
+          AlignmentAnnotation[] anns)
+  {
+    String tooltip = null;
+    if (ann.graphGroup > -1)
+    {
+      StringBuilder tip = new StringBuilder(32);
+      boolean first = true;
+      for (int i = 0; i < anns.length; i++)
+      {
+        if (anns[i].graphGroup == ann.graphGroup
+                && anns[i].annotations[column] != null)
+        {
+          if (!first)
+          {
+            tip.append("<br>");
+          }
+          first = false;
+          tip.append(anns[i].label);
+          String description = anns[i].annotations[column].description;
+          if (description != null && description.length() > 0)
+          {
+            tip.append(" ").append(description);
+          }
+        }
+      }
+      tooltip = first ? null : tip.toString();
+    }
+    else if (column < ann.annotations.length
+            && ann.annotations[column] != null)
+    {
+      tooltip = ann.annotations[column].description;
+    }
+
+    return tooltip;
+  }
+
+  /**
+   * Constructs and returns the status bar message
+   * 
+   * @param al
+   * @param column
+   * @param ann
+   */
+  static String getStatusMessage(AlignmentI al, int column,
+          AlignmentAnnotation ann)
+  {
+    /*
+     * show alignment column and annotation description if any
+     */
+    StringBuilder text = new StringBuilder(32);
+    text.append(MessageManager.getString("label.column")).append(" ")
+            .append(column + 1);
+
+    if (column < ann.annotations.length && ann.annotations[column] != null)
+    {
+      String description = ann.annotations[column].description;
+      if (description != null && description.trim().length() > 0)
+      {
+        text.append("  ").append(description);
+      }
+    }
+
+    /*
+     * if the annotation is sequence-specific, show the sequence number
+     * in the alignment, and (if not a gap) the residue and position
+     */
+    SequenceI seqref = ann.sequenceRef;
+    if (seqref != null)
+    {
+      int seqIndex = al.findIndex(seqref);
+      if (seqIndex != -1)
+      {
+        text.append(", ").append(MessageManager.getString("label.sequence"))
+                .append(" ").append(seqIndex + 1);
+        char residue = seqref.getCharAt(column);
+        if (!Comparison.isGap(residue))
+        {
+          text.append(" ");
+          String name;
+          if (al.isNucleotide())
+          {
+            name = ResidueProperties.nucleotideName
+                    .get(String.valueOf(residue));
+            text.append(" Nucleotide: ")
+                    .append(name != null ? name : residue);
+          }
+          else
+          {
+            name = 'X' == residue ? "X"
+                    : ('*' == residue ? "STOP"
+                            : ResidueProperties.aa2Triplet
+                                    .get(String.valueOf(residue)));
+            text.append(" Residue: ").append(name != null ? name : residue);
+          }
+          int residuePos = seqref.findPosition(column);
+          text.append(" (").append(residuePos).append(")");
+        }
+      }
+    }
+
+    return text.toString();
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mouseClicked(MouseEvent evt)
+  {
+    // if (activeRow != -1)
+    // {
+    // AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
+    // AlignmentAnnotation anot = aa[activeRow];
+    // }
+  }
+
+  // TODO mouseClicked-content and drawCursor are quite experimental!
+  public void drawCursor(Graphics graphics, SequenceI seq, int res, int x1,
+          int y1)
+  {
+    int pady = av.getCharHeight() / 5;
+    int charOffset = 0;
+    graphics.setColor(Color.black);
+    graphics.fillRect(x1, y1, av.getCharWidth(), av.getCharHeight());
+
+    if (av.validCharWidth)
+    {
+      graphics.setColor(Color.white);
+
+      char s = seq.getCharAt(res);
+
+      charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
+      graphics.drawString(String.valueOf(s), charOffset + x1,
+              (y1 + av.getCharHeight()) - pady);
+    }
+
+  }
+
+  private volatile boolean imageFresh = false;
+
+  private Rectangle visibleRect = new Rectangle(),
+          clipBounds = new Rectangle();
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param g
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void paintComponent(Graphics g)
+  {
+
+    // BH: note that this method is generally recommended to
+    // call super.paintComponent(g). Otherwise, the children of this
+    // component will not be rendered. That is not needed here
+    // because AnnotationPanel does not have any children. It is
+    // just a JPanel contained in a JViewPort.
+
+    computeVisibleRect(visibleRect);
+
+    g.setColor(Color.white);
+    g.fillRect(0, 0, visibleRect.width, visibleRect.height);
+
+    if (image != null)
+    {
+      // BH 2018 optimizing generation of new Rectangle().
+      if (fastPaint
+              || (visibleRect.width != (clipBounds = g
+                      .getClipBounds(clipBounds)).width)
+              || (visibleRect.height != clipBounds.height))
+      {
+
+        g.drawImage(image, 0, 0, this);
+        fastPaint = false;
+        return;
+      }
+    }
+    imgWidth = (av.getRanges().getEndRes() - av.getRanges().getStartRes()
+            + 1) * av.getCharWidth();
+    if (imgWidth < 1)
+    {
+      return;
+    }
+    Graphics2D gg;
+    if (image == null || imgWidth != image.getWidth(this)
+            || image.getHeight(this) != getHeight())
+    {
+      try
+      {
+        image = new BufferedImage(imgWidth,
+                ap.getAnnotationPanel().getHeight(),
+                BufferedImage.TYPE_INT_RGB);
+      } catch (OutOfMemoryError oom)
+      {
+        try
+        {
+          System.gc();
+        } catch (Exception x)
+        {
+        }
+        ;
+        new OOMWarning(
+                "Couldn't allocate memory to redraw screen. Please restart Jalview",
+                oom);
+        return;
+      }
+      gg = (Graphics2D) image.getGraphics();
+
+      if (av.antiAlias)
+      {
+        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+      }
+
+      gg.setFont(av.getFont());
+      fm = gg.getFontMetrics();
+      gg.setColor(Color.white);
+      gg.fillRect(0, 0, imgWidth, image.getHeight());
+      imageFresh = true;
+    }
+    else
+    {
+      gg = (Graphics2D) image.getGraphics();
+
+    }
+
+    drawComponent(gg, av.getRanges().getStartRes(),
+            av.getRanges().getEndRes() + 1);
+    gg.dispose();
+    imageFresh = false;
+    g.drawImage(image, 0, 0, this);
+  }
+
+  /**
+   * set true to enable redraw timing debug output on stderr
+   */
+  private final boolean debugRedraw = false;
+
+  /**
+   * non-Thread safe repaint
+   * 
+   * @param horizontal
+   *          repaint with horizontal shift in alignment
+   */
+  public void fastPaint(int horizontal)
+  {
+    if ((horizontal == 0) || image == null
+            || av.getAlignment().getAlignmentAnnotation() == null
+            || av.getAlignment().getAlignmentAnnotation().length < 1
+            || av.isCalcInProgress())
+    {
+      repaint();
+      return;
+    }
+
+    int sr = av.getRanges().getStartRes();
+    int er = av.getRanges().getEndRes() + 1;
+    int transX = 0;
+
+    Graphics2D gg = (Graphics2D) image.getGraphics();
+
+    if (imgWidth>Math.abs(horizontal*av.getCharWidth())) {
+      //scroll is less than imgWidth away so can re-use buffered graphics
+      gg.copyArea(0, 0, imgWidth, getHeight(),
+              -horizontal * av.getCharWidth(), 0);
+      
+      if (horizontal > 0) // scrollbar pulled right, image to the left
+      {
+        transX = (er - sr - horizontal) * av.getCharWidth();
+        sr = er - horizontal;
+      }
+      else if (horizontal < 0)
+      {
+        er = sr - horizontal;
+      }
+    }
+    gg.translate(transX, 0);
+
+    drawComponent(gg, sr, er);
+
+    gg.translate(-transX, 0);
+
+    gg.dispose();
+
+    fastPaint = true;
+
+    // Call repaint on alignment panel so that repaints from other alignment
+    // panel components can be aggregated. Otherwise performance of the overview
+    // window and others may be adversely affected.
+    av.getAlignPanel().repaint();
+  }
+
+  private volatile boolean lastImageGood = false;
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param g
+   *          DOCUMENT ME!
+   * @param startRes
+   *          DOCUMENT ME!
+   * @param endRes
+   *          DOCUMENT ME!
+   */
+  public void drawComponent(Graphics g, int startRes, int endRes)
+  {
+    BufferedImage oldFaded = fadedImage;
+    if (av.isCalcInProgress())
+    {
+      if (image == null)
+      {
+        lastImageGood = false;
+        return;
+      }
+      // We'll keep a record of the old image,
+      // and draw a faded image until the calculation
+      // has completed
+      if (lastImageGood
+              && (fadedImage == null || fadedImage.getWidth() != imgWidth
+                      || fadedImage.getHeight() != image.getHeight()))
+      {
+        // System.err.println("redraw faded image ("+(fadedImage==null ?
+        // "null image" : "") + " lastGood="+lastImageGood+")");
+        fadedImage = new BufferedImage(imgWidth, image.getHeight(),
+                BufferedImage.TYPE_INT_RGB);
+
+        Graphics2D fadedG = (Graphics2D) fadedImage.getGraphics();
+
+        fadedG.setColor(Color.white);
+        fadedG.fillRect(0, 0, imgWidth, image.getHeight());
+
+        fadedG.setComposite(
+                AlphaComposite.getInstance(AlphaComposite.SRC_OVER, .3f));
+        fadedG.drawImage(image, 0, 0, this);
+
+      }
+      // make sure we don't overwrite the last good faded image until all
+      // calculations have finished
+      lastImageGood = false;
+
+    }
+    else
+    {
+      if (fadedImage != null)
+      {
+        oldFaded = fadedImage;
+      }
+      fadedImage = null;
+    }
+
+    g.setColor(Color.white);
+    g.fillRect(0, 0, (endRes - startRes) * av.getCharWidth(), getHeight());
+
+    g.setFont(av.getFont());
+    if (fm == null)
+    {
+      fm = g.getFontMetrics();
+    }
+
+    if ((av.getAlignment().getAlignmentAnnotation() == null)
+            || (av.getAlignment().getAlignmentAnnotation().length < 1))
+    {
+      g.setColor(Color.white);
+      g.fillRect(0, 0, getWidth(), getHeight());
+      g.setColor(Color.black);
+      if (av.validCharWidth)
+      {
+        g.drawString(MessageManager
+                .getString("label.alignment_has_no_annotations"), 20, 15);
+      }
+
+      return;
+    }
+    lastImageGood = renderer.drawComponent(this, av, g, activeRow, startRes,
+            endRes);
+    if (!lastImageGood && fadedImage == null)
+    {
+      fadedImage = oldFaded;
+    }
+  }
+
+  @Override
+  public FontMetrics getFontMetrics()
+  {
+    return fm;
+  }
+
+  @Override
+  public Image getFadedImage()
+  {
+    return fadedImage;
+  }
+
+  @Override
+  public int getFadedImageWidth()
+  {
+    return imgWidth;
+  }
+
+  private int[] bounds = new int[2];
+
+  @Override
+  public int[] getVisibleVRange()
+  {
+    if (ap != null && ap.getAlabels() != null)
+    {
+      int sOffset = -ap.getAlabels().getScrollOffset();
+      int visHeight = sOffset + ap.annotationSpaceFillerHolder.getHeight();
+      bounds[0] = sOffset;
+      bounds[1] = visHeight;
+      return bounds;
+    }
+    else
+    {
+      return null;
+    }
+  }
+
+  /**
+   * Try to ensure any references held are nulled
+   */
+  public void dispose()
+  {
+    av = null;
+    ap = null;
+    image = null;
+    fadedImage = null;
+    // gg = null;
+    _mwl = null;
+
+    /*
+     * I created the renderer so I will dispose of it
+     */
+    if (renderer != null)
+    {
+      renderer.dispose();
+    }
+  }
+
+  @Override
+  public void propertyChange(PropertyChangeEvent evt)
+  {
+    // Respond to viewport range changes (e.g. alignment panel was scrolled)
+    // Both scrolling and resizing change viewport ranges: scrolling changes
+    // both start and end points, but resize only changes end values.
+    // Here we only want to fastpaint on a scroll, with resize using a normal
+    // paint, so scroll events are identified as changes to the horizontal or
+    // vertical start value.
+    if (evt.getPropertyName().equals(ViewportRanges.STARTRES))
+    {
+      fastPaint((int) evt.getNewValue() - (int) evt.getOldValue());
+    }
+    else if (evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ))
+    {
+      fastPaint(((int[]) evt.getNewValue())[0]
+              - ((int[]) evt.getOldValue())[0]);
+    }
+    else if (evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
+    {
+      repaint();
+    }
+  }
+
+  /**
+   * computes the visible height of the annotation panel
+   * 
+   * @param adjustPanelHeight
+   *          - when false, just adjust existing height according to other
+   *          windows
+   * @param annotationHeight
+   * @return height to use for the ScrollerPreferredVisibleSize
+   */
+  public int adjustForAlignFrame(boolean adjustPanelHeight,
+          int annotationHeight)
+  {
+    /*
+     * Estimate available height in the AlignFrame for alignment +
+     * annotations. Deduct an estimate for title bar, menu bar, scale panel,
+     * hscroll, status bar, insets. 
+     */
+    int stuff = (ap.getViewName() != null ? 30 : 0)
+            + (Platform.isAMacAndNotJS() ? 120 : 140);
+    int availableHeight = ap.alignFrame.getHeight() - stuff;
+    int rowHeight = av.getCharHeight();
+
+    if (adjustPanelHeight)
+    {
+      int alignmentHeight = rowHeight * av.getAlignment().getHeight();
+
+      /*
+       * If not enough vertical space, maximize annotation height while keeping
+       * at least two rows of alignment visible
+       */
+      if (annotationHeight + alignmentHeight > availableHeight)
+      {
+        annotationHeight = Math.min(annotationHeight,
+                availableHeight - 2 * rowHeight);
+      }
+    }
+    else
+    {
+      // maintain same window layout whilst updating sliders
+      annotationHeight = Math.min(ap.annotationScroller.getSize().height,
+              availableHeight - 2 * rowHeight);
+    }
+    return annotationHeight;
+  }
+}