Multiple Views
[jalview.git] / src / jalview / gui / SeqPanel.java
index 27cb962..4b7a388 100755 (executable)
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 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
  */\r
 package jalview.gui;\r
 \r
-import java.util.*;\r
+import jalview.datamodel.*;\r
+\r
+import jalview.schemes.*;\r
 \r
 import java.awt.*;\r
 import java.awt.event.*;\r
-import javax.swing.*;\r
 \r
-import jalview.analysis.*;\r
-import jalview.datamodel.*;\r
-import jalview.schemes.*;\r
-\r
-public class SeqPanel\r
-    extends JPanel\r
-{\r
-  public SeqCanvas seqCanvas;\r
-  public AlignmentPanel ap;\r
-  protected int lastres;\r
-  protected int startseq;\r
-  int startEdit = -1;\r
-  int endEdit = -1;\r
-  protected AlignViewport av;\r
-\r
-  // if character is inserted or deleted, we will need to recalculate the conservation\r
-  int seqEditOccurred = -1;\r
-  ScrollThread scrollThread = null;\r
-  boolean mouseDragging = false;\r
-  boolean editingSeqs = false;\r
-  boolean groupEditing = false;\r
-\r
-  //////////////////////////////////////////\r
-  /////Everything below this is for defining the boundary of the rubberband\r
-  //////////////////////////////////////////\r
-  int oldSeq = -1;\r
-  boolean changeEndSeq = false;\r
-  boolean changeStartSeq = false;\r
-  boolean changeEndRes = false;\r
-  boolean changeStartRes = false;\r
-  SequenceGroup stretchGroup = null;\r
-  boolean remove = false;\r
-\r
-  public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
-  {\r
-    ToolTipManager.sharedInstance().registerComponent(this);\r
-    ToolTipManager.sharedInstance().setInitialDelay(0);\r
-    ToolTipManager.sharedInstance().setDismissDelay(10000);\r
-    this.av = avp;\r
-    setBackground(Color.white);\r
-\r
-    seqCanvas = new SeqCanvas(avp);\r
-    setLayout(new BorderLayout());\r
-    add(seqCanvas, BorderLayout.CENTER);\r
-\r
-    ap = p;\r
-\r
-    addMouseMotionListener(new MouseMotionAdapter()\r
-    {\r
-      public void mouseMoved(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
+import javax.swing.*;\r
 \r
-        doMouseMoved(evt);\r
-      }\r
+import java.util.Vector;\r
 \r
-      public void mouseDragged(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
 \r
-        if (editingSeqs)\r
-        {\r
-          doMouseDragged(evt);\r
-        }\r
-        else\r
-        {\r
-          doMouseDraggedDefineMode(evt);\r
-        }\r
-      }\r
-    });\r
+/**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @author $author$\r
+ * @version $Revision$\r
+ */\r
+public class SeqPanel extends JPanel implements MouseListener,\r
+    MouseMotionListener, MouseWheelListener\r
 \r
-    addMouseListener(new MouseAdapter()\r
+{\r
+    /** DOCUMENT ME!! */\r
+    public SeqCanvas seqCanvas;\r
+\r
+    /** DOCUMENT ME!! */\r
+    public AlignmentPanel ap;\r
+    protected int lastres;\r
+    protected int startseq;\r
+    protected AlignViewport av;\r
+\r
+    // if character is inserted or deleted, we will need to recalculate the conservation\r
+    boolean seqEditOccurred = false;\r
+    ScrollThread scrollThread = null;\r
+    boolean mouseDragging = false;\r
+    boolean editingSeqs = false;\r
+    boolean groupEditing = false;\r
+\r
+    //////////////////////////////////////////\r
+    /////Everything below this is for defining the boundary of the rubberband\r
+    //////////////////////////////////////////\r
+    int oldSeq = -1;\r
+    boolean changeEndSeq = false;\r
+    boolean changeStartSeq = false;\r
+    boolean changeEndRes = false;\r
+    boolean changeStartRes = false;\r
+    SequenceGroup stretchGroup = null;\r
+    boolean remove = false;\r
+\r
+    Point lastMousePress;\r
+    boolean mouseWheelPressed = false;\r
+    StringBuffer keyboardNo1;\r
+    StringBuffer keyboardNo2;\r
+\r
+    java.net.URL linkImageURL;\r
+\r
+    /**\r
+     * Creates a new SeqPanel object.\r
+     *\r
+     * @param avp DOCUMENT ME!\r
+     * @param p DOCUMENT ME!\r
+     */\r
+    public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
     {\r
-      public void mouseReleased(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
-\r
-        if (editingSeqs)\r
-        {\r
-          doMouseReleased(evt);\r
-        }\r
-        else\r
-        {\r
-          doMouseReleasedDefineMode(evt);\r
-        }\r
-      }\r
-\r
-      public void mousePressed(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
-\r
-        if (evt.isShiftDown() || evt.isAltDown() ||\r
-            evt.isControlDown())\r
-        {\r
-          if (evt.isAltDown() || evt.isControlDown())\r
-          {\r
-            groupEditing = true;\r
-          }\r
-\r
-          editingSeqs = true;\r
-          doMousePressed(evt);\r
-        }\r
-        else\r
-        {\r
-          doMousePressedDefineMode(evt);\r
-        }\r
-      }\r
+        linkImageURL = getClass().getResource("/images/link.gif");\r
+        ToolTipManager.sharedInstance().registerComponent(this);\r
+        ToolTipManager.sharedInstance().setInitialDelay(0);\r
+        ToolTipManager.sharedInstance().setDismissDelay(10000);\r
+        this.av = avp;\r
+        setBackground(Color.white);\r
 \r
-      public void mouseExited(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment() || editingSeqs)\r
-        {\r
-          return;\r
-        }\r
+        seqCanvas = new SeqCanvas(avp);\r
+        setLayout(new BorderLayout());\r
+        add(seqCanvas, BorderLayout.CENTER);\r
 \r
-        doMouseExitedDefineMode(evt);\r
-      }\r
+        ap = p;\r
 \r
-      public void mouseEntered(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment() || editingSeqs)\r
+        if(!av.isDataset())\r
         {\r
-          return;\r
+          addMouseMotionListener(this);\r
+          addMouseListener(this);\r
+          addMouseWheelListener(this);\r
         }\r
+    }\r
 \r
-        doMouseEnteredDefineMode(evt);\r
-      }\r
-    });\r
-  }\r
-\r
+    int startWrapBlock=-1;\r
+    int wrappedBlock=-1;\r
+    int findRes(MouseEvent evt)\r
+   {\r
+     int res = 0;\r
+     int x = evt.getX();\r
 \r
-  public void doMouseReleased(MouseEvent evt)\r
-  {\r
-    if (seqEditOccurred > -1)\r
+    if (av.wrapAlignment)\r
     {\r
-      editOccurred(seqEditOccurred);\r
-    }\r
 \r
-    startseq = -1;\r
-    lastres = -1;\r
-    seqEditOccurred = -1;\r
-    editingSeqs = false;\r
-    groupEditing = false;\r
+      int hgap = av.charHeight;\r
+      if (av.scaleAboveWrapped)\r
+        hgap += av.charHeight;\r
 \r
-    seqCanvas.repaint();\r
-  }\r
+      int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+          + hgap + seqCanvas.getAnnotationHeight();\r
 \r
-  public void doMousePressed(MouseEvent evt)\r
-  {\r
-    ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
-                                                 av.alignment, HistoryItem.EDIT));\r
+        int y = evt.getY();\r
+        y -= hgap;\r
+        x -= seqCanvas.LABEL_WEST;\r
 \r
-    int seq;\r
-    int res;\r
 \r
-    int x = evt.getX();\r
-    int y = evt.getY();\r
+        int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());\r
+        if(cwidth<1)\r
+          return 0;\r
 \r
-    res = (x / av.getCharWidth()) + av.getStartRes();\r
-    seq = (y / av.getCharHeight()) + av.getStartSeq();\r
+        wrappedBlock = y / cHeight;\r
+        wrappedBlock += av.getStartRes() / cwidth;\r
+\r
+        res = wrappedBlock * cwidth + x / av.getCharWidth();\r
 \r
-    if ( (seq < av.getAlignment().getHeight()) &&\r
-        (res < av.getAlignment().getSequenceAt(seq).getLength()))\r
-    {\r
-      startseq = seq;\r
-      lastres = res;\r
     }\r
     else\r
     {\r
-      startseq = -1;\r
-      lastres = -1;\r
+        res = (x / av.getCharWidth()) + av.getStartRes();\r
     }\r
 \r
-    startEdit = lastres;\r
-    endEdit = lastres;\r
-\r
-    return;\r
+    if(av.hasHiddenColumns)\r
+          res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
+    return res;\r
+\r
+   }\r
+\r
+   int findSeq(MouseEvent evt)\r
+   {\r
+     int seq = 0;\r
+     int y = evt.getY();\r
+\r
+     if (av.wrapAlignment)\r
+     {\r
+       int hgap = av.charHeight;\r
+       if (av.scaleAboveWrapped)\r
+         hgap += av.charHeight;\r
+\r
+       int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+           + hgap + seqCanvas.getAnnotationHeight();\r
+\r
+         y -= hgap;\r
+\r
+       seq = Math.min( (y % cHeight) / av.getCharHeight(),\r
+                       av.alignment.getHeight() -1);\r
+     }\r
+     else\r
+     {\r
+       seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),\r
+                       av.alignment.getHeight() -1);\r
+     }\r
+\r
+     return seq;\r
+   }\r
+\r
+   Vector getAllFeaturesAtRes(SequenceI seq, int res)\r
+   {\r
+     Vector allFeatures = new Vector();\r
+     int index = 0;\r
+     if(seq.getSequenceFeatures()!=null && av.featuresDisplayed!=null)\r
+     {\r
+       while (index < seq.getSequenceFeatures().length)\r
+       {\r
+         SequenceFeature sf = seq.getSequenceFeatures()[index];\r
+         if (sf.getBegin() <= res &&\r
+             sf.getEnd() >= res)\r
+         {\r
+           if (av.featuresDisplayed.containsKey(sf.getType()))\r
+           {\r
+             allFeatures.addElement(sf);\r
+           }\r
+         }\r
+         index++;\r
+       }\r
+     }\r
+     return allFeatures;\r
   }\r
 \r
-  public void doMouseMoved(MouseEvent evt)\r
-  {\r
-    int res = 0;\r
-    int seq = 0;\r
-    int x = evt.getX();\r
-    int y = evt.getY();\r
+   void endEditing()\r
+   {\r
+     startseq = -1;\r
+     lastres = -1;\r
+     seqEditOccurred = false;\r
+     editingSeqs = false;\r
+     groupEditing = false;\r
+     keyboardNo1 = null;\r
+     keyboardNo2 = null;\r
+    }\r
 \r
-    if (av.wrapAlignment)\r
+    void setCursorRow()\r
     {\r
-      y -= (2 * av.charHeight);\r
-\r
-      int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
-\r
-      res = (int) ( (y / chunkHeight) * (getWidth() / av.charWidth)) +\r
-          (x / av.getCharWidth()) + av.getStartRes();\r
-\r
-      y %= chunkHeight;\r
-      seq = (y / av.getCharHeight()) + av.getStartSeq();\r
+      seqCanvas.cursorY = getKeyboardNo(keyboardNo1)-1;\r
+      scrollToVisible();\r
     }\r
-    else\r
+\r
+    void setCursorColumn()\r
     {\r
-      res = (x / av.getCharWidth()) + av.getStartRes();\r
-      seq = (y / av.getCharHeight()) + av.getStartSeq();\r
+      seqCanvas.cursorX = getKeyboardNo(keyboardNo1)-1;\r
+      scrollToVisible();\r
     }\r
 \r
-    if (seq >= av.getAlignment().getHeight())\r
+    void setCursorRowAndColumn()\r
     {\r
-      return;\r
+      if(keyboardNo2==null)\r
+      {\r
+        keyboardNo2 = new StringBuffer();\r
+      }\r
+      else\r
+      {\r
+        seqCanvas.cursorX = getKeyboardNo(keyboardNo1) - 1;\r
+        seqCanvas.cursorY = getKeyboardNo(keyboardNo2) - 1;\r
+        scrollToVisible();\r
+      }\r
     }\r
 \r
-    SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
-\r
-    if (res > sequence.getLength())\r
+    void setCursorPosition()\r
     {\r
-      return;\r
-    }\r
+      SequenceI sequence =\r
+          (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);\r
 \r
-    Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) +\r
-                                                  "");\r
-    String aa = "";\r
+      seqCanvas.cursorX = sequence.findIndex(\r
+          getKeyboardNo(keyboardNo1)-1\r
+          );\r
+      scrollToVisible();\r
+    }\r
 \r
-    if (obj != null)\r
+    void moveCursor(int dx, int dy)\r
     {\r
-      aa = obj.toString();\r
+      seqCanvas.cursorX += dx;\r
+      seqCanvas.cursorY += dy;\r
+      scrollToVisible();\r
     }\r
 \r
-    StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
-                                         sequence.getName());\r
-\r
-    if (aa != "")\r
+    void scrollToVisible()\r
     {\r
-      text.append("  Residue: " + aa + " (" +\r
-                  av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
-    }\r
+      if (seqCanvas.cursorX < 0)\r
+        seqCanvas.cursorX = 0;\r
+      else if (seqCanvas.cursorX > av.alignment.getWidth() - 1)\r
+        seqCanvas.cursorX = av.alignment.getWidth() - 1;\r
 \r
-    ap.alignFrame.statusBar.setText(text.toString());\r
+      if (seqCanvas.cursorY < 0)\r
+        seqCanvas.cursorY = 0;\r
+      else if (seqCanvas.cursorY > av.alignment.getHeight() - 1)\r
+        seqCanvas.cursorY = av.alignment.getHeight() - 1;\r
 \r
-    // use aa to see if the mouse pointer is on a\r
-    if (av.showSequenceFeatures)\r
-    {\r
-      Vector features = sequence.getSequenceFeatures();\r
-      Enumeration e = features.elements();\r
-      StringBuffer sbuffer = new StringBuffer();\r
 \r
-      while (e.hasMoreElements())\r
+      endEditing();\r
+      if(av.wrapAlignment)\r
       {\r
-        SequenceFeature sf = (SequenceFeature) e.nextElement();\r
-\r
-        if ( (sf.getStart() <= sequence.findPosition(res)) &&\r
-            (sf.getEnd() >= sequence.findPosition(res)))\r
+        ap.scrollToWrappedVisible(seqCanvas.cursorX);\r
+      }\r
+      else\r
+      {\r
+        while (seqCanvas.cursorY < av.startSeq)\r
+        {\r
+          ap.scrollUp(true);\r
+        }\r
+        while (seqCanvas.cursorY + 1 > av.endSeq)\r
+        {\r
+          ap.scrollUp(false);\r
+        }\r
+        if (!av.wrapAlignment)\r
         {\r
-          if (sbuffer.length() > 0)\r
+          while (seqCanvas.cursorX < av.startRes)\r
           {\r
-            sbuffer.append("; ");\r
+            if (!ap.scrollRight(false))\r
+              break;\r
           }\r
-\r
-          sbuffer.append(sf.getType() + " " + sf.getDescription());\r
-\r
-          if (sf.getStatus().length() > 0)\r
+          while (seqCanvas.cursorX > av.endRes)\r
           {\r
-            sbuffer.append(" (" + sf.getStatus() + ")");\r
+            if (!ap.scrollRight(true))\r
+              break;\r
           }\r
         }\r
       }\r
+      setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),\r
+                       seqCanvas.cursorX, seqCanvas.cursorY);\r
 \r
-      this.setToolTipText(sbuffer.toString());\r
-    }\r
-  }\r
-\r
-  public void doMouseDragged(MouseEvent evt)\r
-  {\r
-    // If we're dragging we're editing\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-\r
-    if (res < 0)\r
-    {\r
-      res = 0;\r
-    }\r
-\r
-    if ( (lastres == -1) || (lastres == res))\r
-    {\r
-      return;\r
+      seqCanvas.repaint();\r
     }\r
 \r
-    boolean dragRight = true;\r
-\r
-    if ( (res < av.getAlignment().getWidth()) && (res < lastres))\r
+    void setSelectionAreaAtCursor(boolean topLeft)\r
     {\r
-      dragRight = false;\r
-    }\r
+      SequenceI sequence =\r
+          (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);\r
 \r
-    if (res != lastres)\r
-    {\r
-      // Group editing\r
-      if (groupEditing)\r
+      if(av.getSelectionGroup()!=null)\r
       {\r
-        SequenceGroup sg = av.getSelectionGroup();\r
-\r
-        if (sg == null)\r
+        SequenceGroup sg = av.selectionGroup;\r
+        //Find the top and bottom of this group\r
+        int min = av.alignment.getHeight(), max = 0;\r
+        for(int i=0; i<sg.getSize(false); i++)\r
         {\r
-          lastres = -1;\r
-\r
-          return;\r
+          int index = av.alignment.findIndex( sg.getSequenceAt(i) );\r
+          if(index > max)\r
+            max = index;\r
+          if(index < min)\r
+            min = index;\r
         }\r
 \r
-        // drag to right\r
-        if (dragRight)\r
+        max ++;\r
+\r
+        if(topLeft)\r
         {\r
-          sg.setEndRes(sg.getEndRes() + (res - lastres));\r
+          sg.setStartRes(seqCanvas.cursorX);\r
+          if(sg.getEndRes()<seqCanvas.cursorX)\r
+            sg.setEndRes(seqCanvas.cursorX);\r
+\r
+          min = seqCanvas.cursorY;\r
         }\r
-        // drag to left\r
         else\r
         {\r
-          /// Are we able to delete?\r
-          // ie are all columns blank?\r
-          boolean deleteAllowed = false;\r
-\r
-          for (int s = 0; s < sg.getSize(); s++)\r
-          {\r
-            SequenceI seq = sg.getSequenceAt(s);\r
-\r
-            for (int j = res; j < lastres; j++)\r
-            {\r
-              if (seq.getSequence().length() <= j)\r
-              {\r
-                continue;\r
-              }\r
-\r
-              if (!jalview.util.Comparison.isGap(\r
-                  seq.getSequence().charAt(j)))\r
-              {\r
-                // Not a gap, block edit not valid\r
-                res = j + 1;\r
-                deleteAllowed = false;\r
-\r
-                continue;\r
-              }\r
-\r
-              deleteAllowed = true;\r
-            }\r
-          }\r
-\r
-          if (!deleteAllowed)\r
-          {\r
-            lastres = -1;\r
-\r
-            return;\r
-          }\r
+          sg.setEndRes(seqCanvas.cursorX);\r
+          if(sg.getStartRes()>seqCanvas.cursorX)\r
+            sg.setStartRes(seqCanvas.cursorX);\r
 \r
-          sg.setEndRes(sg.getEndRes() - (lastres - res));\r
+          max = seqCanvas.cursorY+1;\r
         }\r
 \r
-        for (int i = 0; i < sg.getSize(); i++)\r
-        {\r
-          SequenceI s = sg.getSequenceAt(i);\r
-          int k = av.alignment.findIndex(s);\r
-\r
-          // drag to right\r
-          if (dragRight)\r
-          {\r
-            for (int j = lastres; j < res; j++)\r
-            {\r
-              insertChar(j, k);\r
-            }\r
-          }\r
-          // drag to left\r
-          else\r
-          {\r
-            for (int j = res; j < lastres; j++)\r
-            {\r
-              if (s.getLength() > j)\r
-              {\r
-                deleteChar(res, k);\r
-              }\r
-            }\r
-          }\r
-        }\r
-      }\r
-      else /////Editing a single sequence///////////\r
-      {\r
-        if ( (res < av.getAlignment().getWidth()) && (res > lastres))\r
+        if(min>max)\r
         {\r
-          // dragging to the right\r
-          for (int j = lastres; j < res; j++)\r
-          {\r
-            insertChar(j, startseq);\r
-          }\r
+          // Only the user can do this\r
+          av.setSelectionGroup(null);\r
         }\r
-        else if ( (res < av.getAlignment().getWidth()) &&\r
-                 (res < lastres))\r
+        else\r
         {\r
-          // dragging to the left\r
-          for (int j = lastres; j > res; j--)\r
+          // Now add any sequences between min and max\r
+          sg.getSequences(false).clear();\r
+          for (int i = min; i < max; i++)\r
           {\r
-            if (jalview.util.Comparison.isGap(\r
-                av.alignment.getSequenceAt(startseq)\r
-                .getSequence().charAt(res)))\r
-            {\r
-              deleteChar(res, startseq);\r
-            }\r
-            else\r
-            {\r
-              break;\r
-            }\r
+            sg.addSequence(av.alignment.getSequenceAt(i), false);\r
           }\r
         }\r
       }\r
-    }\r
 \r
-    endEdit = res;\r
-    lastres = res;\r
-    seqCanvas.repaint();\r
-  }\r
+      if (av.getSelectionGroup() == null)\r
+      {\r
+        SequenceGroup sg = new SequenceGroup();\r
+        sg.setStartRes(seqCanvas.cursorX);\r
+        sg.setEndRes(seqCanvas.cursorX);\r
+        sg.addSequence(sequence, false);\r
+        av.setSelectionGroup(sg);\r
+      }\r
 \r
-  public void drawChars(int seqstart, int seqend, int start)\r
-  {\r
-    seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,\r
-                        seqend, av.getStartRes(), av.getStartSeq(), 0);\r
-    seqCanvas.repaint();\r
-  }\r
 \r
-  public void insertChar(int j, int seq)\r
-  {\r
-    av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());\r
-    seqEditOccurred = seq;\r
-  }\r
+      ap.repaint();\r
+    }\r
 \r
-  public void deleteChar(int j, int seq)\r
-  {\r
-    av.alignment.getSequenceAt(seq).deleteCharAt(j);\r
-    seqEditOccurred = seq;\r
+    void insertGapAtCursor(boolean group)\r
+    {\r
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
+                                                   av.alignment, HistoryItem.EDIT));\r
+      groupEditing = group;\r
+      startseq = seqCanvas.cursorY;\r
+      lastres = seqCanvas.cursorX;\r
+      editSequence(true, seqCanvas.cursorX+getKeyboardNo(keyboardNo1));\r
+      editOccurred();\r
+    }\r
 \r
-    av.alignment.getWidth();\r
-    seqCanvas.repaint();\r
-  }\r
+    void deleteGapAtCursor(boolean group)\r
+    {\r
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
+                                                   av.alignment, HistoryItem.EDIT));\r
+      groupEditing = group;\r
+      startseq = seqCanvas.cursorY;\r
+      lastres = seqCanvas.cursorX+getKeyboardNo(keyboardNo1);\r
+      editSequence(false, seqCanvas.cursorX);\r
+      editOccurred();\r
+    }\r
 \r
-  void editOccurred(int i)\r
-  {\r
-    if (endEdit == startEdit)\r
+    void numberPressed(char value)\r
     {\r
-      ap.alignFrame.historyList.pop();\r
-      ap.alignFrame.updateEditMenuBar();\r
+      if(keyboardNo1==null)\r
+        keyboardNo1 = new StringBuffer();\r
+\r
+      if(keyboardNo2!=null)\r
+        keyboardNo2.append(value);\r
+      else\r
+        keyboardNo1.append(value);\r
     }\r
 \r
-    av.updateConservation();\r
-    av.updateConsensus();\r
+    int getKeyboardNo(StringBuffer kb)\r
+    {\r
+      if(kb==null)\r
+        return 1;\r
+      else\r
+        return Integer.parseInt(kb.toString());\r
+    }\r
 \r
-    // Y O Y CLUSTALX\r
-    ColourSchemeI cs = av.getGlobalColourScheme();\r
 \r
-    if (cs instanceof ConservationColourScheme)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void mouseReleased(MouseEvent evt)\r
     {\r
-      ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
+      mouseDragging = false;\r
+      mouseWheelPressed = false;\r
 \r
-      if (ccs.cs instanceof ClustalxColourScheme)\r
+      if (!editingSeqs)\r
       {\r
-        Conservation c = new Conservation("All",\r
-                                          ResidueProperties.propHash, 3,\r
-                                          av.alignment.getSequences(), 0,\r
-                                          av.alignment.getWidth() - 1);\r
-        c.calculate();\r
-        c.verdict(false, av.ConsPercGaps);\r
-\r
-        ClustalxColourScheme cxs = (ClustalxColourScheme) ccs.cs;\r
-        cxs.resetClustalX(av.alignment.getSequences(),\r
-                          av.alignment.getWidth());\r
-        ccs = new ConservationColourScheme(c, cxs);\r
-        av.setGlobalColourScheme(ccs);\r
+         doMouseReleasedDefineMode(evt);\r
+         return;\r
       }\r
-    }\r
 \r
-    if (cs instanceof ClustalxColourScheme)\r
-    {\r
-      ( (ClustalxColourScheme) cs).resetClustalX(av.alignment.getSequences(),\r
-                                                 av.alignment.getWidth());\r
-      av.setGlobalColourScheme(cs);\r
+       editOccurred();\r
+\r
+       ap.repaint();\r
     }\r
-  }\r
 \r
-  public void doMousePressedDefineMode(MouseEvent evt)\r
-  {\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-    int seq = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
-    oldSeq = seq;\r
 \r
-    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
 \r
-    if ( (sequence == null) || (res > sequence.getLength()))\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void mousePressed(MouseEvent evt)\r
     {\r
-      return;\r
-    }\r
+      lastMousePress = evt.getPoint();\r
 \r
-    stretchGroup = av.getSelectionGroup();\r
-\r
-    if (stretchGroup == null)\r
-    {\r
-      stretchGroup = av.alignment.findGroup(sequence);\r
+      if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))\r
+      {\r
+        mouseWheelPressed = true;\r
+        return;\r
+      }\r
 \r
-      if ( (stretchGroup != null) && (res > stretchGroup.getStartRes()) &&\r
-          (res < stretchGroup.getEndRes()))\r
+      if (evt.isShiftDown() || evt.isAltDown() ||\r
+          evt.isControlDown())\r
       {\r
-        av.setSelectionGroup(stretchGroup);\r
+        if (evt.isAltDown() || evt.isControlDown())\r
+        {\r
+          groupEditing = true;\r
+        }\r
+        editingSeqs = true;\r
       }\r
       else\r
       {\r
-        stretchGroup = null;\r
+        doMousePressedDefineMode(evt);\r
+        return;\r
       }\r
-    }\r
-    else if (!stretchGroup.sequences.contains(sequence) ||\r
-             (stretchGroup.getStartRes() > res) ||\r
-             (stretchGroup.getEndRes() < res))\r
-    {\r
-      stretchGroup = null;\r
 \r
-      SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);\r
 \r
-      if (allGroups != null)\r
-      {\r
-        for (int i = 0; i < allGroups.length; i++)\r
-        {\r
-          if ( (allGroups[i].getStartRes() <= res) &&\r
-              (allGroups[i].getEndRes() >= res))\r
-          {\r
-            stretchGroup = allGroups[i];\r
-            av.setSelectionGroup(stretchGroup);\r
 \r
-            break;\r
-          }\r
+      int seq = findSeq(evt);\r
+      int res = findRes(evt);\r
+\r
+      if(seq<0 || res<0)\r
+        return;\r
+\r
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
+                                                         av.alignment, HistoryItem.EDIT));\r
+\r
+        if ((seq < av.getAlignment().getHeight()) &&\r
+                (res < av.getAlignment().getSequenceAt(seq).getLength()))\r
+        {\r
+            startseq = seq;\r
+            lastres = res;\r
         }\r
-      }\r
+        else\r
+        {\r
+            startseq = -1;\r
+            lastres = -1;\r
+        }\r
+\r
+        return;\r
     }\r
 \r
-    if (stretchGroup == null)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void mouseMoved(MouseEvent evt)\r
     {\r
-      // define a new group here\r
-      SequenceGroup sg = new SequenceGroup();\r
-      sg.setStartRes(res);\r
-      sg.setEndRes(res);\r
-      sg.addSequence(sequence, false);\r
-      av.setSelectionGroup(sg);\r
-      stretchGroup = sg;\r
+      if (editingSeqs)\r
+      {\r
+       // This is because MacOSX creates a mouseMoved\r
+       // If control is down, other platforms will not.\r
+       mouseDragged(evt);\r
+      }\r
 \r
-      if (av.getConservationSelected())\r
+      int res = findRes(evt);\r
+      int seq = findSeq(evt);\r
+\r
+\r
+      if(res<0 || seq<0 || seq >= av.getAlignment().getHeight())\r
+            return;\r
+\r
+      SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
+\r
+      if (res > sequence.getLength())\r
       {\r
-        SliderPanel.setConservationSlider(ap,\r
-                                          av.getGlobalColourScheme(),\r
-                                          "Background");\r
+        return;\r
       }\r
 \r
-      if (av.getAbovePIDThreshold())\r
+      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
       {\r
-        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
-                                       "Background");\r
+        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
       }\r
-    }\r
-    else if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
-    {\r
-      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);\r
-      pop.show(this, evt.getX(), evt.getY());\r
 \r
-      // edit the properties of existing group\r
-    }\r
+      setStatusMessage(sequence, res, seq);\r
 \r
-    if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
-    {\r
-      // Edit end res position of selected group\r
-      changeEndRes = true;\r
-    }\r
-    else if ( (stretchGroup != null) && (stretchGroup.getStartRes() == res))\r
-    {\r
-      // Edit end res position of selected group\r
-      changeStartRes = true;\r
-    }\r
+        // use aa to see if the mouse pointer is on a\r
+        if (av.showSequenceFeatures)\r
+        {\r
+            SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures();\r
+            if(features!=null)\r
+            {\r
+              StringBuffer sbuffer = new StringBuffer("<html>");\r
+              StringBuffer seqSpecific =  new StringBuffer();\r
 \r
-    stretchGroup.getWidth();\r
+              for (int i = 0; i < features.length; i++)\r
+              {\r
 \r
-    seqCanvas.repaint();\r
-  }\r
+                if ( (features[i].getBegin() <= sequence.findPosition(res)) &&\r
+                    (features[i].getEnd() >= sequence.findPosition(res)))\r
+                {\r
+                  if(av.featuresDisplayed==null\r
+                    || !av.featuresDisplayed.containsKey(features[i].getType()))\r
+                  continue;\r
+\r
+\r
+                  if (features[i].getType().equals("disulfide bond"))\r
+                  {\r
+                    if (features[i].getBegin() == sequence.findPosition(res)\r
+                        || features[i].getEnd() == sequence.findPosition(res))\r
+                    {\r
+                      if (sbuffer.length() > 6)\r
+                        sbuffer.append("<br>");\r
+                      sbuffer.append("disulfide bond " + features[i].getBegin() + ":" +\r
+                                     features[i].getEnd());\r
+                      if (features[i].links != null)\r
+                      sbuffer.append(" <img src=\"" + linkImageURL + "\">");\r
+                    }\r
+                  }\r
+                  else\r
+                  {\r
+                    if (sbuffer.length() > 6)\r
+                      sbuffer.append("<br>");\r
+\r
+                    sbuffer.append(features[i].getType() + " " +\r
+                                   features[i].begin);\r
+                    if (features[i].begin != features[i].end)\r
+                      sbuffer.append(" " + features[i].end);\r
+\r
+                    if (features[i].getDescription() != null\r
+                        && !features[i].description.equals(features[i].getType()))\r
+                      sbuffer.append("; " + features[i].getDescription());\r
+\r
+                    if (features[i].getValue("status") != null)\r
+                    {\r
+                      sbuffer.append("; (" + features[i].getValue("status") + ")");\r
+                    }\r
+                    if (features[i].links != null)\r
+                      sbuffer.append(" <img src=\"" + linkImageURL + "\">");\r
+\r
+                  }\r
+                }\r
+                else if(features[i].begin==0 && features[i].end==0)\r
+                {\r
+                  // seqSpecific.append(features[i].featureGroup+": "\r
+                  //                   + features[i].getType()+" "\r
+                   //                   +features[i].getDescription()+"<br>");\r
+\r
+                }\r
+              }\r
 \r
-  public void doMouseReleasedDefineMode(MouseEvent evt)\r
-  {\r
-    if(mouseDragging)\r
-    {\r
-      stretchGroup.recalcConservation();\r
-      mouseDragging = false;\r
-    }\r
+              if(seqSpecific.length()>0)\r
+                seqSpecific.setLength(seqSpecific.length()-4);\r
 \r
-    if (stretchGroup == null)\r
-    {\r
-      return;\r
+              sbuffer.append(seqSpecific);\r
+              sbuffer.append("</html>");\r
+              if(sbuffer.length()==13) // <html></html>\r
+                setToolTipText("");\r
+              else\r
+               setToolTipText(sbuffer.toString());\r
+            }\r
+            else\r
+              setToolTipText("");\r
+        }\r
     }\r
 \r
-    if (stretchGroup.cs instanceof ClustalxColourScheme)\r
+    void setStatusMessage(SequenceI sequence, int res, int seq)\r
     {\r
-      ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.sequences,\r
-                                                     stretchGroup.getWidth());\r
-    }\r
+      StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
+                                           sequence.getName());\r
 \r
-    if (stretchGroup.cs instanceof ConservationColourScheme)\r
-    {\r
-      ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;\r
-      stretchGroup.cs = ccs;\r
-      SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
-                                        stretchGroup.getName());\r
+      Object obj = null;\r
+      if (av.alignment.isNucleotide())\r
+      {\r
+        obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +\r
+                                                   "");\r
+        if (obj != null)\r
+          text.append(" Nucleotide: ");\r
+      }\r
+      else\r
+      {\r
+        obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");\r
+        if (obj != null)\r
+          text.append("  Residue: ");\r
+      }\r
 \r
-    }\r
-    else\r
-    {\r
-      SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
-                                     stretchGroup.getName());\r
-    }\r
+      if (obj != null)\r
+      {\r
 \r
-    changeEndRes = false;\r
-    changeStartRes = false;\r
-    stretchGroup = null;\r
-    seqCanvas.repaint();\r
-    ap.idPanel.repaint();\r
-  }\r
+        if (obj != "")\r
+        {\r
+          text.append(obj + " (" + sequence.findPosition(res) +\r
+                      ")");\r
+        }\r
+      }\r
+      ap.alignFrame.statusBar.setText(text.toString());\r
 \r
-  public void doMouseDraggedDefineMode(MouseEvent evt)\r
-  {\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-    int y = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
-\r
-    if (stretchGroup == null)\r
-    {\r
-      return;\r
     }\r
 \r
-    if (res > av.alignment.getWidth())\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void mouseDragged(MouseEvent evt)\r
     {\r
-      res = av.alignment.getWidth() - 1;\r
-    }\r
+      if (mouseWheelPressed)\r
+      {\r
+        int oldWidth = av.charWidth;\r
+\r
+        //Which is bigger, left-right or up-down?\r
+        if (Math.abs(evt.getY() - lastMousePress.getY())\r
+            > Math.abs(evt.getX() - lastMousePress.getX()))\r
+        {\r
+          int fontSize = av.font.getSize();\r
+\r
+          if (evt.getY() < lastMousePress.getY())\r
+          {\r
+            fontSize--;\r
+          }\r
+          else if (evt.getY() > lastMousePress.getY())\r
+          {\r
+            fontSize++;\r
+          }\r
+\r
+          if(fontSize<1)\r
+            fontSize = 1;\r
+\r
+          av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));\r
+          av.charWidth = oldWidth;\r
+          ap.fontChanged();\r
+        }\r
+        else\r
+        {\r
+          if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)\r
+          {\r
+            av.charWidth--;\r
+          }\r
+          else if (evt.getX() > lastMousePress.getX())\r
+          {\r
+            av.charWidth++;\r
+          }\r
+\r
+          ap.repaint();\r
+        }\r
+\r
+        FontMetrics fm = getFontMetrics(av.getFont());\r
+        av.validCharWidth = fm.charWidth('M') <= av.charWidth;\r
+\r
+        lastMousePress = evt.getPoint();\r
+\r
+        return;\r
+      }\r
+\r
+      if (!editingSeqs)\r
+      {\r
+        doMouseDraggedDefineMode(evt);\r
+        return;\r
+      }\r
+\r
+        int res = findRes(evt);\r
+\r
+        if (res < 0)\r
+        {\r
+            res = 0;\r
+        }\r
+\r
+        if ((lastres == -1) || (lastres == res))\r
+        {\r
+            return;\r
+        }\r
+\r
+        if ( (res < av.getAlignment().getWidth()) && (res < lastres))\r
+        {\r
+          // dragLeft, delete gap\r
+          editSequence(false, res);\r
+        }\r
+        else\r
+          editSequence(true, res);\r
+\r
+        mouseDragging = true;\r
+        if(scrollThread!=null)\r
+          scrollThread.setEvent(evt);\r
 \r
-    if (stretchGroup.getEndRes() == res)\r
-    {\r
-      // Edit end res position of selected group\r
-      changeEndRes = true;\r
-    }\r
-    else if (stretchGroup.getStartRes() == res)\r
-    {\r
-      // Edit start res position of selected group\r
-      changeStartRes = true;\r
     }\r
 \r
-    if (res < av.getStartRes())\r
+    synchronized void editSequence(boolean insertGap, int startres)\r
     {\r
-      res = av.getStartRes();\r
+      int fixedLeft = -1;\r
+      int fixedRight = -1;\r
+      boolean fixedColumns = false;\r
+      SequenceGroup sg = av.getSelectionGroup();\r
+\r
+\r
+        if (!groupEditing && av.hasHiddenRows)\r
+        {\r
+          if (av.alignment.getSequenceAt(startseq).getHiddenSequences() != null)\r
+          {\r
+            groupEditing = true;\r
+          }\r
+        }\r
+\r
+        //No group, but the sequence may represent a group\r
+        if (groupEditing\r
+            && sg == null\r
+            && av.alignment.getSequenceAt(startseq).getHiddenSequences() == null)\r
+        {\r
+          groupEditing = false;\r
+        }\r
+\r
+        SequenceI seq = av.alignment.getSequenceAt(startseq);\r
+        StringBuffer message = new StringBuffer();\r
+        if (groupEditing)\r
+           message.append("Edit group:");\r
+        else\r
+           message.append("Edit sequence: "+seq.getName());\r
+\r
+       if(insertGap)\r
+         message.append(" insert ");\r
+       else\r
+         message.append(" delete ");\r
+\r
+       message.append(Math.abs(startres-lastres)+" gaps.");\r
+       ap.alignFrame.statusBar.setText(message.toString());\r
+\r
+\r
+        //Are we editing within a selection group?\r
+        if (groupEditing\r
+            || (sg != null && sg.getSequences(true).contains(seq)))\r
+        {\r
+          fixedColumns = true;\r
+\r
+          //sg might be null as the user may only see 1 sequence,\r
+          //but the sequence represents a group\r
+          if (sg == null)\r
+          {\r
+            sg = new SequenceGroup(null, null, false, false, false, 0,\r
+                                   av.alignment.getWidth()-1);\r
+            sg.addSequence(av.alignment.getSequenceAt(startseq), false);\r
+          }\r
+\r
+          fixedLeft = sg.getStartRes();\r
+          fixedRight = sg.getEndRes();\r
+\r
+          if (   (startres < fixedLeft && lastres >= fixedLeft)\r
+              || (startres >= fixedLeft && lastres < fixedLeft)\r
+              || (startres > fixedRight && lastres <=fixedRight)\r
+              || (startres <= fixedRight && lastres > fixedRight))\r
+          {\r
+            endEditing();\r
+            return;\r
+          }\r
+\r
+          if (fixedLeft > startres)\r
+          {\r
+            fixedRight = fixedLeft - 1;\r
+            fixedLeft = 0;\r
+          }\r
+          else if (fixedRight < startres)\r
+          {\r
+            fixedLeft = fixedRight;\r
+            fixedRight = -1;\r
+          }\r
+        }\r
+\r
+\r
+        if(av.hasHiddenColumns )\r
+        {\r
+            fixedColumns = true;\r
+            int y1 = av.getColumnSelection().getHiddenBoundaryLeft(startres);\r
+            int y2 = av.getColumnSelection().getHiddenBoundaryRight(startres);\r
+\r
+            if ( (insertGap && startres > y1 && lastres < y1)\r
+                || (!insertGap && startres < y2 && lastres > y2))\r
+            {\r
+              endEditing();\r
+              return;\r
+            }\r
+\r
+            //System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");\r
+            //Selection spans a hidden region\r
+            if(fixedLeft<y1 && (fixedRight>y2 || fixedRight==-1))\r
+            {\r
+              if(startres>=y2)\r
+              {\r
+                fixedLeft = y2;\r
+              }\r
+              else\r
+              {\r
+               fixedRight = y2 - 1;\r
+             }\r
+            }\r
+        }\r
+\r
+\r
+        if (groupEditing)\r
+        {\r
+          // drag to right\r
+          if (insertGap)\r
+          {\r
+              //If the user has selected the whole sequence, and is dragging to\r
+              // the right, we can still extend the alignment and selectionGroup\r
+              if(   sg.getStartRes() == 0\r
+                    && sg.getEndRes() == fixedRight\r
+                    && sg.getEndRes() == av.alignment.getWidth()-1\r
+                 )\r
+              {\r
+                sg.setEndRes(av.alignment.getWidth() + startres - lastres);\r
+                fixedRight = sg.getEndRes();\r
+              }\r
+\r
+            // Is it valid with fixed columns??\r
+            // Find the next gap before the end\r
+            // of the visible region boundary\r
+            boolean blank = false;\r
+            for (fixedRight = fixedRight;\r
+                 fixedRight > lastres;\r
+                 fixedRight--)\r
+            {\r
+              blank = true;\r
+              for (int s = 0; s < sg.getSize(true); s++)\r
+              {\r
+                seq = (SequenceI)sg.getSequences(true).elementAt(s);\r
+                for (int j = 0; j < startres - lastres; j++)\r
+                {\r
+                  if (!jalview.util.Comparison.isGap(\r
+                      seq.getCharAt(fixedRight - j)))\r
+                  {\r
+                    blank = false;\r
+                    break;\r
+                  }\r
+                }\r
+              }\r
+              if (blank)\r
+                break;\r
+            }\r
+\r
+            if (!blank)\r
+            {\r
+              if(sg.getSize(false) == av.alignment.getHeight()  )\r
+              {\r
+                if((av.hasHiddenColumns\r
+                    && startres<av.getColumnSelection().getHiddenBoundaryRight(startres)))\r
+                {\r
+                  endEditing();\r
+                  return;\r
+                }\r
+\r
+                int alWidth = av.alignment.getWidth();\r
+                if(av.hasHiddenRows)\r
+                {\r
+                  int hwidth = av.alignment.getHiddenSequences().getWidth();\r
+                  if(hwidth>alWidth)\r
+                    alWidth = hwidth;\r
+                }\r
+                //We can still insert gaps if the selectionGroup\r
+                //contains all the sequences\r
+                sg.setEndRes(sg.getEndRes()+startres-lastres);\r
+                fixedRight = alWidth+startres-lastres;\r
+              }\r
+              else\r
+              {\r
+                endEditing();\r
+                return;\r
+              }\r
+            }\r
+          }\r
+\r
+\r
+          // drag to left\r
+          else if(!insertGap)\r
+          {\r
+            /// Are we able to delete?\r
+            // ie are all columns blank?\r
+\r
+            for (int s = 0; s < sg.getSize(true); s++)\r
+            {\r
+              seq = (SequenceI)sg.getSequences(true).elementAt(s);\r
+\r
+              for (int j = startres; j < lastres; j++)\r
+              {\r
+                if (seq.getSequence().length() <= j)\r
+                {\r
+                  continue;\r
+                }\r
+\r
+                if (!jalview.util.Comparison.isGap(\r
+                    seq.getSequence().charAt(j)))\r
+                {\r
+                  // Not a gap, block edit not valid\r
+                  endEditing();\r
+                  return;\r
+                }\r
+              }\r
+            }\r
+          }\r
+\r
+\r
+          for (int i = 0; i < sg.getSize(true); i++)\r
+          {\r
+            seq = (SequenceI) sg.getSequences(true).elementAt(i);\r
+\r
+            if (insertGap)\r
+            {\r
+              // dragging to the right\r
+              for (int j = lastres; j < startres; j++)\r
+              {\r
+                if (fixedColumns && fixedRight != -1)\r
+                {\r
+                  insertChar(j, seq, fixedRight);\r
+                }\r
+                else\r
+                  insertChar(j, seq);\r
+              }\r
+            }\r
+            else\r
+            {\r
+              // dragging to the left\r
+              for (int j = lastres; j > startres; j--)\r
+              {\r
+                if (fixedColumns && fixedRight != -1)\r
+                {\r
+                  deleteChar(startres, seq, fixedRight);\r
+                }\r
+                else\r
+                {\r
+                  deleteChar(startres, seq);\r
+                }\r
+              }\r
+            }\r
+          }\r
+        }\r
+        else /////Editing a single sequence///////////\r
+        {\r
+          if (insertGap)\r
+          {\r
+            // dragging to the right\r
+            for (int j = lastres; j < startres; j++)\r
+            {\r
+              if (fixedColumns && fixedRight != -1)\r
+              {\r
+                  insertChar(j, seq, fixedRight);\r
+              }\r
+              else\r
+                insertChar(j, seq);\r
+            }\r
+          }\r
+          else\r
+          {\r
+            // dragging to the left\r
+            for (int j = lastres; j > startres; j--)\r
+            {\r
+              if (fixedColumns && fixedRight != -1)\r
+              {\r
+                deleteChar(startres, seq, fixedRight);\r
+              }\r
+              else\r
+              {\r
+                deleteChar(startres, seq);\r
+              }\r
+            }\r
+          }\r
+        }\r
+\r
+        lastres = startres;\r
+        seqCanvas.repaint();\r
     }\r
-    else if (res > av.getEndRes())\r
+\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param j DOCUMENT ME!\r
+     * @param seq DOCUMENT ME!\r
+     */\r
+    void insertChar(int j, SequenceI seq)\r
     {\r
-      res = av.getEndRes();\r
+        seq.insertCharAt(j, av.getGapCharacter());\r
+        seqEditOccurred = true;\r
     }\r
 \r
-    if (changeEndRes)\r
+    void insertChar(int j, SequenceI seq, int fixedColumn)\r
     {\r
-      if (res > (stretchGroup.getStartRes() - 1))\r
+      //Find the next gap before the end of the visible region boundary\r
+      //If lastCol > j, theres a boundary after the gap insertion\r
+      int blankColumn = fixedColumn;\r
+      for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)\r
+      {\r
+        if (jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))\r
+        {\r
+          //Theres a space, so break and insert the gap\r
+          break;\r
+        }\r
+      }\r
+\r
+      if (blankColumn <= j)\r
       {\r
-        stretchGroup.setEndRes(res);\r
+        blankColumn = fixedColumn;\r
+        endEditing();\r
+        return;\r
       }\r
+\r
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))\r
+      {\r
+        //Just Checking\r
+        System.out.println("Tried removing residue (INSERT)"+seq.getCharAt(fixedColumn));\r
+        return;\r
+      }\r
+\r
+      seq.deleteCharAt(blankColumn);\r
+      seq.insertCharAt(j, av.getGapCharacter());\r
+      seqEditOccurred = true;\r
     }\r
-    else if (changeStartRes)\r
+\r
+    void deleteChar(int j, SequenceI seq, int fixedColumn)\r
     {\r
-      if (res < (stretchGroup.getEndRes() + 1))\r
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))\r
       {\r
-        stretchGroup.setStartRes(res);\r
+        ap.alignFrame.statusBar.setText(\r
+            "End editing: Tried removing residue " + seq.getCharAt(j));\r
+        return;\r
       }\r
-    }\r
 \r
-    int dragDirection = 0;\r
+      seq.deleteCharAt(j);\r
+      seq.insertCharAt(fixedColumn, av.getGapCharacter());\r
+      seqEditOccurred = true;\r
+    }\r
 \r
-    if (y > oldSeq)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param j DOCUMENT ME!\r
+     * @param seq DOCUMENT ME!\r
+     */\r
+    void deleteChar(int j, SequenceI seq)\r
     {\r
-      dragDirection = 1;\r
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))\r
+      {\r
+        ap.alignFrame.statusBar.setText(\r
+            "End editing: Tried removing residue " + seq.getCharAt(j));\r
+        return;\r
+      }\r
+\r
+        seq.deleteCharAt(j);\r
+        seqEditOccurred = true;\r
+        seqCanvas.repaint();\r
     }\r
-    else if (y < oldSeq)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void mouseEntered(MouseEvent e)\r
     {\r
-      dragDirection = -1;\r
+        if(oldSeq < 0)\r
+          oldSeq = 0;\r
+\r
+        if (scrollThread != null)\r
+        {\r
+            scrollThread.running = false;\r
+            scrollThread = null;\r
+        }\r
     }\r
 \r
-    while ( (y != oldSeq) && (oldSeq > 0) && (y < av.alignment.getHeight()))\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void mouseExited(MouseEvent e)\r
     {\r
-      // This routine ensures we don't skip any sequences, as the\r
-      // selection is quite slow.\r
-      Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+        if (av.getWrapAlignment())\r
+        {\r
+            return;\r
+        }\r
 \r
-      oldSeq += dragDirection;\r
+        if (mouseDragging)\r
+        {\r
+            scrollThread = new ScrollThread();\r
+        }\r
+    }\r
 \r
-      Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+    public void mouseClicked(MouseEvent evt)\r
+    {}\r
 \r
-      if (stretchGroup.sequences.contains(nextSeq))\r
+    public void mouseWheelMoved(MouseWheelEvent e)\r
+    {\r
+      e.consume();\r
+     /* if (mouseWheelPressed)\r
       {\r
-        stretchGroup.deleteSequence(seq, false);\r
-        stretchGroup.deleteSequence(nextSeq, false);\r
+        Font font = av.getFont();\r
+        int fontSize = font.getSize();\r
+        if (e.getWheelRotation() > 0 && fontSize < 51)\r
+          fontSize++;\r
+        else if (fontSize > 1)\r
+          fontSize--;\r
+\r
+\r
+\r
+        av.setFont(new Font(font.getName(), font.getStyle(), fontSize));\r
+\r
+        ap.fontChanged();\r
       }\r
-      else\r
+      else*/\r
       {\r
-        if (seq != null)\r
-        {\r
-          stretchGroup.addSequence(seq, false);\r
-        }\r
-\r
-        stretchGroup.addSequence(nextSeq, false);\r
+        if (e.getWheelRotation() > 0)\r
+          ap.scrollUp(false);\r
+        else\r
+          ap.scrollUp(true);\r
       }\r
+\r
     }\r
 \r
-    oldSeq = y;\r
-    mouseDragging = true;\r
 \r
-    if (scrollThread != null)\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param i DOCUMENT ME!\r
+     */\r
+    void editOccurred()\r
     {\r
-      scrollThread.setEvent(evt);\r
-    }\r
+      if (!seqEditOccurred)\r
+      {\r
+        ap.alignFrame.historyList.pop();\r
+        ap.alignFrame.updateEditMenuBar();\r
+      }\r
 \r
-    seqCanvas.repaint();\r
-  }\r
+      endEditing();\r
 \r
-  public void doMouseEnteredDefineMode(MouseEvent e)\r
-  {\r
-    if (scrollThread != null)\r
-    {\r
-      scrollThread.running = false;\r
-    }\r
-  }\r
+      av.firePropertyChange("alignment", null,av.getAlignment().getSequences());\r
 \r
-  public void doMouseExitedDefineMode(MouseEvent e)\r
-  {\r
-    if (av.getWrapAlignment())\r
-    {\r
-      return;\r
     }\r
 \r
-    if (mouseDragging)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMousePressedDefineMode(MouseEvent evt)\r
     {\r
-      scrollThread = new ScrollThread();\r
-    }\r
-  }\r
+      int res = findRes(evt);\r
+      int seq = findSeq(evt);\r
+      oldSeq = seq;\r
 \r
-  // this class allows scrolling off the bottom of the visible alignment\r
-  class ScrollThread\r
-      extends Thread\r
-  {\r
-    MouseEvent evt;\r
-    boolean running = false;\r
+      startWrapBlock=wrappedBlock;\r
 \r
-    public ScrollThread()\r
-    {\r
-      start();\r
-    }\r
+      if(av.wrapAlignment && seq>av.alignment.getHeight())\r
+      {\r
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+              "Cannot edit annotations in wrapped view.",\r
+              "Wrapped view - no edit",\r
+              JOptionPane.WARNING_MESSAGE);\r
+          return;\r
+      }\r
 \r
-    public void setEvent(MouseEvent e)\r
-    {\r
-      evt = e;\r
-    }\r
+      if(seq<0 || res<0)\r
+            return;\r
 \r
-    public void stopScrolling()\r
-    {\r
-      running = false;\r
-    }\r
+        SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
 \r
-    public void run()\r
-    {\r
-      running = true;\r
+        if ((sequence == null) || (res > sequence.getLength()))\r
+        {\r
+            return;\r
+        }\r
 \r
-      while (running)\r
-      {\r
-        if (evt != null)\r
+        stretchGroup = av.getSelectionGroup();\r
+\r
+        if (stretchGroup == null)\r
+        {\r
+            stretchGroup = av.alignment.findGroup(sequence);\r
+\r
+            if ((stretchGroup != null) && (res > stretchGroup.getStartRes()) &&\r
+                    (res < stretchGroup.getEndRes()))\r
+            {\r
+                av.setSelectionGroup(stretchGroup);\r
+            }\r
+            else\r
+            {\r
+                stretchGroup = null;\r
+            }\r
+        }\r
+        else if (!stretchGroup.getSequences(false).contains(sequence) ||\r
+                (stretchGroup.getStartRes() > res) ||\r
+                (stretchGroup.getEndRes() < res))\r
+        {\r
+            stretchGroup = null;\r
+\r
+            SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);\r
+\r
+            if (allGroups != null)\r
+            {\r
+                for (int i = 0; i < allGroups.length; i++)\r
+                {\r
+                    if ((allGroups[i].getStartRes() <= res) &&\r
+                            (allGroups[i].getEndRes() >= res))\r
+                    {\r
+                        stretchGroup = allGroups[i];\r
+                        break;\r
+                    }\r
+                }\r
+            }\r
+\r
+            av.setSelectionGroup(stretchGroup);\r
+\r
+        }\r
+\r
+\r
+        if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
+        {\r
+          Vector allFeatures = getAllFeaturesAtRes(sequence.getDatasetSequence(),\r
+                                                  sequence.findPosition(res));\r
+          Vector links = new Vector();\r
+            for (int i = 0; i < allFeatures.size(); i++)\r
+            {\r
+              SequenceFeature sf = (SequenceFeature) allFeatures.elementAt(i);\r
+              if (sf.links != null)\r
+              {\r
+                for (int j = 0; j < sf.links.size(); j++)\r
+                {\r
+                  links.addElement(sf.links.elementAt(j));\r
+                }\r
+              }\r
+            }\r
+\r
+            jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);\r
+            pop.show(this, evt.getX(), evt.getY());\r
+            return;\r
+        }\r
+\r
+        if (av.cursorMode)\r
         {\r
-          if (mouseDragging && (evt.getY() < 0) &&\r
-              (av.getStartSeq() > 0))\r
+          seqCanvas.cursorX = findRes(evt);\r
+          seqCanvas.cursorY = findSeq(evt);\r
+          seqCanvas.repaint();\r
+          return;\r
+        }\r
+\r
+        if (stretchGroup == null)\r
+        {\r
+          //Only if left mouse button do we want to change group sizes\r
+\r
+          // define a new group here\r
+          SequenceGroup sg = new SequenceGroup();\r
+          sg.setStartRes(res);\r
+          sg.setEndRes(res);\r
+          sg.addSequence(sequence, false);\r
+          av.setSelectionGroup(sg);\r
+          stretchGroup = sg;\r
+\r
+          if (av.getConservationSelected())\r
           {\r
-            running = ap.scrollUp(true);\r
+            SliderPanel.setConservationSlider(ap,\r
+                                              av.getGlobalColourScheme(),\r
+                                              "Background");\r
           }\r
 \r
-          if (mouseDragging && (evt.getY() >= getHeight()) &&\r
-              (av.alignment.getHeight() > av.getEndSeq()))\r
+          if (av.getAbovePIDThreshold())\r
+          {\r
+            SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
+                                           "Background");\r
+          }\r
+          if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
+          {\r
+            // Edit end res position of selected group\r
+            changeEndRes = true;\r
+          }\r
+          else if ( (stretchGroup != null) &&\r
+                   (stretchGroup.getStartRes() == res))\r
           {\r
-            running = ap.scrollUp(false);\r
+            // Edit end res position of selected group\r
+            changeStartRes = true;\r
           }\r
+          stretchGroup.getWidth();\r
+        }\r
+\r
+        seqCanvas.repaint();\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseReleasedDefineMode(MouseEvent evt)\r
+    {\r
+        if (stretchGroup == null)\r
+        {\r
+            return;\r
+        }\r
 \r
-          if (mouseDragging && (evt.getX() < 0))\r
+\r
+        if(stretchGroup.cs!=null)\r
+        {\r
+          if (stretchGroup.cs instanceof ClustalxColourScheme)\r
+          {\r
+            ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(\r
+                stretchGroup.getSequences(true),\r
+                stretchGroup.getWidth());\r
+          }\r
+\r
+          if (stretchGroup.cs.conservationApplied())\r
           {\r
-            running = ap.scrollRight(true);\r
+            SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
+                                              stretchGroup.getName());\r
+            stretchGroup.recalcConservation();\r
           }\r
-          else if (mouseDragging && (evt.getX() >= getWidth()))\r
+          else\r
           {\r
-            running = ap.scrollRight(false);\r
+            SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
+                                           stretchGroup.getName());\r
           }\r
         }\r
+        changeEndRes = false;\r
+        changeStartRes = false;\r
+        stretchGroup = null;\r
+\r
+        PaintRefresher.Refresh(this, av.getSequenceSetId());\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseDraggedDefineMode(MouseEvent evt)\r
+    {\r
+      int res = findRes(evt);\r
+      int y = findSeq(evt);\r
+\r
+      if(wrappedBlock!=startWrapBlock)\r
+        return;\r
+\r
+       if (stretchGroup == null)\r
+       {\r
+            return;\r
+       }\r
+\r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
+        if (stretchGroup.getEndRes() == res)\r
+        {\r
+            // Edit end res position of selected group\r
+            changeEndRes = true;\r
+        }\r
+        else if (stretchGroup.getStartRes() == res)\r
+        {\r
+            // Edit start res position of selected group\r
+            changeStartRes = true;\r
+        }\r
 \r
-        try\r
+        if (res < av.getStartRes())\r
         {\r
-          Thread.sleep(75);\r
+            res = av.getStartRes();\r
         }\r
-        catch (Exception ex)\r
+\r
+        if (changeEndRes)\r
+        {\r
+            if (res > (stretchGroup.getStartRes() - 1))\r
+            {\r
+                stretchGroup.setEndRes(res);\r
+            }\r
+        }\r
+        else if (changeStartRes)\r
+        {\r
+            if (res < (stretchGroup.getEndRes() + 1))\r
+            {\r
+                stretchGroup.setStartRes(res);\r
+            }\r
+        }\r
+\r
+        int dragDirection = 0;\r
+\r
+        if (y > oldSeq)\r
         {\r
+            dragDirection = 1;\r
         }\r
+        else if (y < oldSeq)\r
+        {\r
+            dragDirection = -1;\r
+        }\r
+\r
+\r
+        while ((y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))\r
+        {\r
+            // This routine ensures we don't skip any sequences, as the\r
+            // selection is quite slow.\r
+            Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+\r
+            oldSeq += dragDirection;\r
+\r
+            if(oldSeq<0)\r
+              break;\r
+\r
+            Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+\r
+            if (stretchGroup.getSequences(false).contains(nextSeq))\r
+            {\r
+                stretchGroup.deleteSequence(seq, false);\r
+            }\r
+            else\r
+            {\r
+                if (seq != null)\r
+                {\r
+                    stretchGroup.addSequence(seq, false);\r
+                }\r
+\r
+                stretchGroup.addSequence(nextSeq, false);\r
+            }\r
+        }\r
+\r
+        if(oldSeq < 0)\r
+          oldSeq = -1;\r
+\r
+        mouseDragging = true;\r
+\r
+        if (scrollThread != null)\r
+        {\r
+            scrollThread.setEvent(evt);\r
+        }\r
+\r
+        seqCanvas.repaint();\r
+    }\r
+\r
+    void scrollCanvas(MouseEvent evt)\r
+    {\r
+      if(evt==null)\r
+      {\r
+        if(scrollThread!=null)\r
+        {\r
+          scrollThread.running = false;\r
+          scrollThread = null;\r
+        }\r
+        mouseDragging = false;\r
+      }\r
+      else\r
+      {\r
+        if (scrollThread == null)\r
+          scrollThread = new ScrollThread();\r
+\r
+        mouseDragging = true;\r
+        scrollThread.setEvent(evt);\r
       }\r
+\r
+    }\r
+\r
+\r
+    // this class allows scrolling off the bottom of the visible alignment\r
+    class ScrollThread extends Thread\r
+    {\r
+        MouseEvent evt;\r
+        boolean running = false;\r
+\r
+        public ScrollThread()\r
+        {\r
+            start();\r
+        }\r
+\r
+        public void setEvent(MouseEvent e)\r
+        {\r
+            evt = e;\r
+        }\r
+\r
+        public void stopScrolling()\r
+        {\r
+            running = false;\r
+        }\r
+\r
+        public void run()\r
+        {\r
+            running = true;\r
+\r
+            while (running)\r
+            {\r
+                if (evt != null)\r
+                {\r
+                    if (mouseDragging && (evt.getY() < 0) &&\r
+                            (av.getStartSeq() > 0))\r
+                    {\r
+                        running = ap.scrollUp(true);\r
+                    }\r
+\r
+                    if (mouseDragging && (evt.getY() >= getHeight()) &&\r
+                            (av.alignment.getHeight() > av.getEndSeq()))\r
+                    {\r
+                        running = ap.scrollUp(false);\r
+                    }\r
+\r
+                    if (mouseDragging && (evt.getX() < 0))\r
+                    {\r
+                        running = ap.scrollRight(false);\r
+                    }\r
+                    else if (mouseDragging && (evt.getX() >= getWidth()))\r
+                    {\r
+                        running = ap.scrollRight(true);\r
+                    }\r
+                }\r
+\r
+                try\r
+                {\r
+                    Thread.sleep(20);\r
+                }\r
+                catch (Exception ex)\r
+                {\r
+                }\r
+            }\r
+        }\r
     }\r
-  }\r
 }\r