X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=3f49cc49ca923ab2972778efa65f26fc3e9a3c15;hb=99f3f01792321efb671ac7ad946efffc3a3319a4;hp=fc93fbcb402ca145aa53fe89ae05409eadc8c610;hpb=5a94d9b984758398146faef8b78ff5954b5ddd91;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index fc93fbc..3f49cc4 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,306 +1,791 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
+import jalview.datamodel.*;
+
+import jalview.schemes.*;
+
 import java.awt.*;
 import java.awt.event.*;
-import jalview.datamodel.*;
+
 import javax.swing.*;
-import java.util.*;
-import jalview.schemes.*;
 
-public class SeqPanel extends JPanel
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class SeqPanel extends JPanel implements MouseListener,
+    MouseMotionListener, MouseWheelListener
+
 {
+    /** DOCUMENT ME!! */
+    public SeqCanvas seqCanvas;
+
+    /** DOCUMENT ME!! */
+    public AlignmentPanel ap;
+    protected int lastres;
+    protected int startseq;
+    protected AlignViewport av;
+
+    // if character is inserted or deleted, we will need to recalculate the conservation
+    boolean seqEditOccurred = false;
+    ScrollThread scrollThread = null;
+    boolean mouseDragging = false;
+    boolean editingSeqs = false;
+    boolean groupEditing = false;
+
+    //////////////////////////////////////////
+    /////Everything below this is for defining the boundary of the rubberband
+    //////////////////////////////////////////
+    int oldSeq = -1;
+    boolean changeEndSeq = false;
+    boolean changeStartSeq = false;
+    boolean changeEndRes = false;
+    boolean changeStartRes = false;
+    SequenceGroup stretchGroup = null;
+    boolean remove = false;
+
+    boolean mouseWheelPressed = false;
+
+    /**
+     * Creates a new SeqPanel object.
+     *
+     * @param avp DOCUMENT ME!
+     * @param p DOCUMENT ME!
+     */
+    public SeqPanel(AlignViewport avp, AlignmentPanel p)
+    {
+        ToolTipManager.sharedInstance().registerComponent(this);
+        ToolTipManager.sharedInstance().setInitialDelay(0);
+        ToolTipManager.sharedInstance().setDismissDelay(10000);
+        this.av = avp;
+        setBackground(Color.white);
 
-  public    SeqCanvas         seqCanvas;
-  public    AlignmentPanel    ap;
+        seqCanvas = new SeqCanvas(avp);
+        setLayout(new BorderLayout());
+        add(seqCanvas, BorderLayout.CENTER);
 
-  protected int startres;
-  protected int lastres;
-  protected int endres;
+        ap = p;
 
-  protected int startseq;
-  protected int padseq;
+        if(!av.isDataset())
+        {
+          addMouseMotionListener(this);
+          addMouseListener(this);
+          addMouseWheelListener(this);
+        }
+    }
 
-  protected AlignViewport av;
+    int startWrapBlock=-1;
+    int wrappedBlock=-1;
+    int findRes(MouseEvent evt)
+   {
+     int res = 0;
+     int x = evt.getX();
 
-  // if character is inserted or deleted, we will need to recalculate the conservation
-  int seqEditOccurred = -1;
+    if (av.wrapAlignment)
+    {
 
-  ScrollThread scrollThread = null;
-  boolean mouseDragging = false;
+      int hgap = av.charHeight;
+      if (av.scaleAboveWrapped)
+        hgap += av.charHeight;
 
+      int cHeight = av.getAlignment().getHeight() * av.charHeight
+          + hgap + seqCanvas.getAnnotationHeight();
 
-  public SeqPanel(AlignViewport avp, AlignmentPanel p) {
-    this.av         = avp;
+        int y = evt.getY();
+        y -= hgap;
+        x -= seqCanvas.LABEL_WEST;
 
-    seqCanvas  = new SeqCanvas(avp);
-    setLayout(new BorderLayout());
-    add(seqCanvas, BorderLayout.CENTER);
 
-    ap = p;
+        int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());
 
-    addMouseMotionListener( new MouseMotionAdapter()
+        wrappedBlock = y / cHeight;
+        wrappedBlock += av.getStartRes() / cwidth;
+
+        res = wrappedBlock * cwidth + x / av.getCharWidth();
+
+    }
+    else
     {
-      public void mouseMoved(MouseEvent evt)
-      {
-       if(av.getWrapAlignment())
-         return;
-        doMouseMoved(evt);    }
+        res = (x / av.getCharWidth()) + av.getStartRes();
+    }
+
+    if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+    return res;
+
+   }
+
+   int findSeq(MouseEvent evt)
+   {
+
+     int seq = 0;
+     int y = evt.getY();
+
+     if (av.wrapAlignment)
+     {
+       int hgap = av.charHeight;
+       if (av.scaleAboveWrapped)
+         hgap += av.charHeight;
+
+       int cHeight = av.getAlignment().getHeight() * av.charHeight
+           + hgap + seqCanvas.getAnnotationHeight();
+
+         y -= hgap;
+
+       seq = ( (y % cHeight) / av.getCharHeight());
+     }
+     else
+     {
+       seq = (y / av.getCharHeight()) + av.getStartSeq();
+     }
 
-      public void mouseDragged(MouseEvent evt)
+     return seq;
+   }
+
+   void endEditing()
+   {
+     startseq = -1;
+     lastres = -1;
+     seqEditOccurred = false;
+     editingSeqs = false;
+     groupEditing = false;
+     keyboardGaps = null;
+    }
+
+
+    void moveCursor(int dx, int dy)
+    {
+      seqCanvas.cursorX += dx;
+      seqCanvas.cursorY += dy;
+
+      if(seqCanvas.cursorX<0)
+        seqCanvas.cursorX = 0;
+      else if(seqCanvas.cursorX>av.alignment.getWidth()-1)
+        seqCanvas.cursorX = av.alignment.getWidth()-1;
+      if(seqCanvas.cursorX<av.startRes)
+        ap.scrollRight(false);
+      else if(seqCanvas.cursorX>av.endRes)
+        ap.scrollRight(true);
+
+      if(seqCanvas.cursorY<0)
+        seqCanvas.cursorY=0;
+      else if(seqCanvas.cursorY>av.alignment.getHeight()-1)
+        seqCanvas.cursorY = av.alignment.getHeight()-1;
+      if(seqCanvas.cursorY<av.startSeq)
+        ap.scrollUp(true);
+      else if(seqCanvas.cursorY+1>av.endSeq)
+        ap.scrollUp(false);
+
+      setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
+                       seqCanvas.cursorX, seqCanvas.cursorY);
+      seqCanvas.repaint();
+    }
+
+    void setSelectionAreaAtCursor(boolean topLeft)
+    {
+      SequenceI sequence =
+          (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+
+      if(av.getSelectionGroup()!=null)
       {
-        if(av.getWrapAlignment())
-         return;
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMouseDragged(evt);
+        SequenceGroup sg = av.selectionGroup;
+        //Find the top and bottom of this group
+        int min = av.alignment.getHeight(), max = 0;
+        for(int i=0; i<sg.getSize(); i++)
+        {
+          int index = av.alignment.findIndex( sg.getSequenceAt(i) );
+          if(index > max)
+            max = index;
+          if(index < min)
+            min = index;
+        }
+
+        max ++;
+
+        if(topLeft)
+        {
+          sg.setStartRes(seqCanvas.cursorX);
+          if(sg.getEndRes()<seqCanvas.cursorX)
+            sg.setEndRes(seqCanvas.cursorX);
+
+          min = seqCanvas.cursorY;
+        }
+        else
+        {
+          sg.setEndRes(seqCanvas.cursorX);
+          if(sg.getStartRes()>seqCanvas.cursorX)
+            sg.setStartRes(seqCanvas.cursorX);
+
+          max = seqCanvas.cursorY+1;
+        }
+
+        if(min>max)
+        {
+          // Only the user can do this
+          av.setSelectionGroup(null);
+        }
         else
-          doMouseDraggedDefineMode(evt);
+        {
+          // Now add any sequences between min and max
+          sg.sequences.clear();
+          for (int i = min; i < max; i++)
+          {
+            sg.addSequence(av.alignment.getSequenceAt(i), false);
+          }
+        }
       }
-    });
 
-    addMouseListener( new MouseAdapter()
-    {
-      public void mouseReleased(MouseEvent evt)
+      if (av.getSelectionGroup() == null)
       {
-        if(av.getWrapAlignment())
-         return;
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMouseReleased(evt);
-        else
-          doMouseReleasedDefineMode(evt);
+        SequenceGroup sg = new SequenceGroup();
+        sg.setStartRes(seqCanvas.cursorX);
+        sg.setEndRes(seqCanvas.cursorX);
+        sg.addSequence(sequence, false);
+        av.setSelectionGroup(sg);
       }
-      public void mousePressed(MouseEvent evt)
+
+
+      ap.repaint();
+    }
+
+    void insertGapAtCursor(boolean group)
+    {
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
+                                                   av.alignment, HistoryItem.EDIT));
+      groupEditing = group;
+      startseq = seqCanvas.cursorY;
+      lastres = seqCanvas.cursorX;
+      editSequence(true, seqCanvas.cursorX+getKeyboardGaps());
+      editOccurred();
+    }
+
+    void deleteGapAtCursor(boolean group)
+    {
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
+                                                   av.alignment, HistoryItem.EDIT));
+      groupEditing = group;
+      startseq = seqCanvas.cursorY;
+      lastres = seqCanvas.cursorX+getKeyboardGaps();
+      editSequence(false, seqCanvas.cursorX);
+      editOccurred();
+    }
+
+    void numberPressed(char value)
+    {
+      if(keyboardGaps==null)
+        keyboardGaps = new StringBuffer();
+
+      keyboardGaps.append(value);
+    }
+
+    StringBuffer keyboardGaps;
+    int getKeyboardGaps()
+    {
+      if(keyboardGaps==null)
+        return 1;
+      else
+        return Integer.parseInt(keyboardGaps.toString());
+    }
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent evt)
+    {
+      mouseDragging = false;
+      mouseWheelPressed = false;
+
+      if (!editingSeqs)
       {
-        if(av.getWrapAlignment())
+         doMouseReleasedDefineMode(evt);
          return;
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMousePressed(evt);
-        else
-          doMousePressedDefineMode(evt);
       }
-      public void mouseExited(MouseEvent evt)
+
+       editOccurred();
+
+       endEditing();
+       ap.repaint();
+    }
+
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent evt)
+    {
+      if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
       {
-        if (av.getWrapAlignment() || evt.isShiftDown() || evt.isAltDown() ||
-                  evt.isControlDown())
-                return;
-              doMouseExitedDefineMode(evt);
+        mouseWheelPressed = true;
+        return;
+      }
 
+      if (evt.isShiftDown() || evt.isAltDown() ||
+          evt.isControlDown())
+      {
+        if (evt.isAltDown() || evt.isControlDown())
+        {
+          groupEditing = true;
+        }
+        editingSeqs = true;
       }
-      public void mouseEntered(MouseEvent evt)
+      else
       {
-        if (av.getWrapAlignment() || evt.isShiftDown() || evt.isAltDown() ||
-            evt.isControlDown())
-          return;
-        doMouseEnteredDefineMode(evt);
+        doMousePressedDefineMode(evt);
+        return;
       }
 
-    });
-    repaint();
-  }
 
 
-  public void doMouseReleased(MouseEvent evt) {
+      int seq = findSeq(evt);
+      int res = findRes(evt);
 
-    int x = evt.getX();
-    int res = x/av.getCharWidth() + av.getStartRes();
+      if(seq<0 || res<0)
+        return;
 
-    endres = res;
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
+                                                         av.alignment, HistoryItem.EDIT));
 
-    startseq = -1;
-    startres = -1;
-    lastres  = -1;
-    if(seqEditOccurred>-1)
-      updateConservation(seqEditOccurred);
+        if ((seq < av.getAlignment().getHeight()) &&
+                (res < av.getAlignment().getSequenceAt(seq).getLength()))
+        {
+            startseq = seq;
+            lastres = res;
+        }
+        else
+        {
+            startseq = -1;
+            lastres = -1;
+        }
 
-    seqEditOccurred = -1;
+        return;
+    }
 
-    ap.repaint();
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseMoved(MouseEvent evt)
+    {
+      if (editingSeqs)
+      {
+       // This is because MacOSX creates a mouseMoved
+       // If control is down, other platforms will not.
+       mouseDragged(evt);
+      }
 
-  }
+      int res = findRes(evt);
+      int seq = findSeq(evt);
 
-  public void doMousePressed(MouseEvent evt) {
-    ap.alignFrame.addHistoryItem("sequence edit");
-    int seq;
-    int res;
 
-    int x = evt.getX();
-    int y = evt.getY();
+      if(res<0 || seq<0 || seq >= av.getAlignment().getHeight())
+            return;
 
-    res = x/av.getCharWidth() + av.getStartRes();
-    seq = y/av.getCharHeight() + av.getStartSeq();
+      SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
-    if (seq < av.getAlignment().getHeight() &&
-        res < av.getAlignment().getSequenceAt(seq).getLength())
-    {
-      //char resstr = align.getSequenceAt(seq).getSequence().charAt(res);
-      // Find the residue's position in the sequence (res is the position
-      // in the alignment
+      if (res > sequence.getLength())
+      {
+        return;
+      }
 
-      startseq = seq;
+      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)
+      {
+        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));
+      }
 
-      if (startseq == (av.getAlignment().getHeight() - 1))
-        padseq = 1;
-      else
-        padseq = 1;
+      setStatusMessage(sequence, res, seq);
 
-      startres = res;
-      lastres = res;
+        // use aa to see if the mouse pointer is on a
+        if (av.showSequenceFeatures)
+        {
+            SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures();
+            if(features!=null)
+            {
+              StringBuffer sbuffer = new StringBuffer("<html>");
 
-    }
-    else
-    {
-      startseq = -1;
-      startres = -1;
-      lastres = -1;
-    }
+              for (int i = 0; i < features.length; i++)
+              {
 
-    return;
-  }
+                if ( (features[i].getBegin() <= sequence.findPosition(res)) &&
+                    (features[i].getEnd() >= sequence.findPosition(res)))
+                {
+                  if(av.featuresDisplayed==null
+                    || !av.featuresDisplayed.containsKey(features[i].getType()))
+                  continue;
 
-  public void doMouseMoved(MouseEvent evt)
-  {
-    int res=0, seq=0;
-    int x = evt.getX();
-    int y = evt.getY();
-    if(av.wrapAlignment)
-    {
-      y -= 2*av.charHeight;
-      int chunkHeight = (av.getAlignment().getHeight()+2)*av.charHeight;
 
+                  if (features[i].getType().equals("disulfide bond"))
+                  {
+                    if (features[i].getBegin() == sequence.findPosition(res)
+                        || features[i].getEnd() == sequence.findPosition(res))
+                    {
+                      if (sbuffer.length() > 6)
+                        sbuffer.append("<br>");
+                      sbuffer.append("disulfide bond " + features[i].getBegin() + ":" +
+                                     features[i].getEnd());
+                    }
+                  }
+                  else
+                  {
+                    if (sbuffer.length() > 6)
+                      sbuffer.append("<br>");
+                    if(features[i].featureGroup!=null)
+                      sbuffer.append(features[i].featureGroup+";");
 
-      res =   (int)((y/chunkHeight)*(getWidth()/av.charWidth)) +  x/av.getCharWidth() + av.getStartRes();
+                    sbuffer.append(features[i].getType());
 
-      y %= chunkHeight;
-      seq =     y / av.getCharHeight() + av.getStartSeq();
+                    if (features[i].getDescription() != null
+                        && !features[i].description.equals(features[i].getType()))
+                      sbuffer.append("; " + features[i].getDescription());
 
+                    if (features[i].getStatus() != null && features[i].getStatus().length()>0)
+                    {
+                      sbuffer.append("; (" + features[i].getStatus() + ")");
+                    }
+                  }
+                }
+
+              }
+
+              sbuffer.append("</html>");
+              if(sbuffer.length()==13) // <html></html>
+                setToolTipText("");
+              else
+               setToolTipText(sbuffer.toString());
+            }
+            else
+              setToolTipText("");
+        }
     }
-    else
+
+    void setStatusMessage(SequenceI sequence, int res, int seq)
     {
-      res = x / av.getCharWidth()  + av.getStartRes();
-      seq = y / av.getCharHeight() + av.getStartSeq();
+      StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
+                                           sequence.getName());
+
+      Object obj = null;
+      if (av.alignment.isNucleotide())
+      {
+        obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
+                                                   "");
+        if (obj != null)
+          text.append(" Nucleotide: ");
+      }
+      else
+      {
+        obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");
+        if (obj != null)
+          text.append("  Residue: ");
+      }
+
+      if (obj != null)
+      {
+
+        if (obj != "")
+        {
+          text.append(obj + " (" + sequence.findPosition(res) +
+                      ")");
+        }
+      }
+      ap.alignFrame.statusBar.setText(text.toString());
+
     }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseDragged(MouseEvent evt)
+    {
+      if (!editingSeqs)
+      {
+        doMouseDraggedDefineMode(evt);
+        return;
+      }
 
-    if(seq>=av.getAlignment().getHeight())
-      return;
+        int res = findRes(evt);
 
-    SequenceI sequence = av.getAlignment().getSequenceAt(seq);
-    if(res>sequence.getLength())
-      return;
+        if (res < 0)
+        {
+            res = 0;
+        }
 
-    Object obj = ResidueProperties.aa2Triplet.get( sequence.getCharAt(res)+"" ) ;
-    String aa = "";
-    if(obj!=null)
-         aa = obj.toString();
+        if ((lastres == -1) || (lastres == res))
+        {
+            return;
+        }
 
-    StringBuffer text = new StringBuffer("Sequence " +(seq+1)+" ID: "+sequence.getName());
-    if(aa!="")
-      text.append("  Residue: "+aa+" ("+  av.getAlignment().getSequenceAt(seq).findPosition(res)+")");
+        if ( (res < av.getAlignment().getWidth()) && (res < lastres))
+        {
+          // dragLeft, delete gap
+          editSequence(false, res);
+        }
+        else
+          editSequence(true, res);
 
-    ap.alignFrame.statusBar.setText(text.toString());
+        mouseDragging = true;
+        if(scrollThread!=null)
+          scrollThread.setEvent(evt);
 
-    // use aa to see if the mouse pointer is on a
-    if(  av.showSequenceFeatures)
+    }
+
+    void editSequence(boolean insertGap, int startres)
     {
-      Vector features = sequence.getSequenceFeatures();
-      Enumeration e = features.elements();
-      StringBuffer sbuffer = new StringBuffer();
+      int fixedLeft = -1;
+      int fixedRight = -1;
+      boolean fixedColumns = false;
 
+       if(insertGap && av.hasHiddenColumns)
+        {
+          //Stop editing if the user has dragged beyond hiddenBoundary
+          fixedRight = av.getColumnSelection().getHiddenRegionBoundary(lastres);
+          if( fixedRight < lastres)
+          {
+            if(lastres!=fixedRight)
+            {
+              endEditing();
+              return;
+            }
+          }
+        }
 
-      while (e.hasMoreElements())
-      {
-        SequenceFeature sf = (SequenceFeature) e.nextElement();
-        if (sf.getStart() <= sequence.findPosition(res) &&
-            sf.getEnd() >= sequence.findPosition(res))
+        if (!groupEditing && av.hasHiddenRows)
         {
-          if(sbuffer.length()>0)
-            sbuffer.append("; ");
-          sbuffer.append(sf.getType() + " " + sf.getDescription());
-          if(sf.getStatus().length()>0)
-            sbuffer.append(" ("+sf.getStatus()+")");
+          if (av.alignment.getSequenceAt(startseq).getHiddenSequences() != null)
+          {
+            groupEditing = true;
+          }
         }
 
-      }
 
-      ToolTipManager.sharedInstance().registerComponent(this);
-      this.setToolTipText(sbuffer.toString());
-    }
+        SequenceI seq = av.alignment.getSequenceAt(startseq);
+        StringBuffer message = new StringBuffer();
+        if (groupEditing)
+          message.append("Edit group:");
+       else
+            message.append("Edit sequence: "+seq.getName());
 
+       if(insertGap)
+         message.append(" insert ");
+       else
+         message.append(" delete ");
 
-  }
+       message.append(Math.abs(startres-lastres)+" gaps.");
+       ap.alignFrame.statusBar.setText(message.toString());
 
-  public void doMouseDragged(MouseEvent evt) {
-    // If we're dragging we're editing
 
-    if(lastres==-1)
-      return;
+        //Are we editing within a selection group?
+        if (groupEditing
+            || (av.getSelectionGroup() != null &&
+                av.getSelectionGroup().sequences.contains(seq)))
+        {
+          fixedColumns = true;
 
-    int x = evt.getX();
+          fixedLeft = av.getSelectionGroup().getStartRes();
+          fixedRight = av.getSelectionGroup().getEndRes();
 
-    int res = x/av.getCharWidth() + av.getStartRes();
-    if (res < 0)
-      res = 0;
+          if (   (startres < fixedLeft && lastres >= fixedLeft)
+              || (startres >= fixedLeft && lastres < fixedLeft)
+              || (startres > fixedRight && lastres <=fixedRight)
+              || (startres <= fixedRight && lastres > fixedRight))
+          {
+            endEditing();
+            return;
+          }
 
-    if (res != lastres)
-    {
-	// Group editing
-	if (evt.isAltDown() || evt.isControlDown())
+          if (fixedLeft > startres)
+          {
+            fixedRight = fixedLeft - 1;
+            fixedLeft = 0;
+          }
+          else if (fixedRight < startres)
+          {
+            fixedLeft = fixedRight;
+            fixedRight = -1;
+          }
+        }
+
+        if (groupEditing)
         {
-	  SequenceGroup sg = av.getSelectionGroup();
-          if(sg==null)
-            av.getAlignment().findGroup(startseq);
-          if (sg != null)
+          SequenceGroup sg = av.getSelectionGroup();
+          if(fixedLeft>sg.getEndRes()
+          ||fixedRight<sg.getStartRes())
+       {
+         endEditing();
+         return;
+       }
+
+          if (av.hasHiddenRows)
           {
-            boolean deleteAllowed = false;
-            if (res < av.getAlignment().getWidth() && res < lastres)
+            //sg might be null as the user may only see 1 sequence
+            if (sg == null)
             {
-              /// Are we able to delete?
-              boolean allGaps = true;
-              for (int i = 0; i < sg.getSize(); i++)
+              sg = new SequenceGroup();
+              sg.addSequence(av.alignment.getSequenceAt(startseq), false);
+            }
+
+            SequenceGroup tmp = new SequenceGroup();
+
+            //Do any of the sequences have hidden associates?
+            for (int s = 0; s < sg.getSize(); s++)
+            {
+              seq = sg.getSequenceAt(s);
+              tmp.addSequence(seq, false);
+              if (seq.getHiddenSequences() != null)
+              {
+                for (int h = 0; h < seq.getHiddenSequences().getSize(); h++)
+                  tmp.addSequence(seq.getHiddenSequences().getSequenceAt(h),
+                                  false);
+              }
+            }
+
+            sg = tmp;
+          }
+
+          if (sg == null)
+          {
+            endEditing();
+            return;
+          }
+
+         // int blankColumn = -1;
+
+          // drag to right
+          if (insertGap)
+          {
+            // Is it valid??
+            // Find the next gap before the end
+            // of the visible region boundary
+            if (av.hasHiddenColumns)
+            {
+             // int lastCol = av.getColumnSelection().
+             //     getHiddenRegionBoundary(res);
+
+            }
+
+              if (fixedRight != startres && fixedRight<av.alignment.getWidth()-1)
               {
-                SequenceI s = sg.getSequenceAt(i);
-                for (int j = lastres-1; j >= res && allGaps; j--)
+                for (fixedRight = fixedRight;
+                     fixedRight > lastres;
+                     fixedRight --)
                 {
-                    if (!jalview.util.Comparison.isGap(s.getSequence().charAt(j)))
+                  boolean blank = true;
+                  for (int s = 0; s < sg.getSize(); s++)
+                  {
+                    seq = sg.getSequenceAt(s);
+
+                    if (seq.getSequence().length() <= fixedRight)
+                    {
+                      continue;
+                    }
+
+                    if (!jalview.util.Comparison.isGap(
+                        seq.getCharAt(fixedRight)))
                     {
-                      res = j + 1;
-                      allGaps = false;
+                      blank = false;
+                      continue;
                     }
+                  }
+                  if (blank)
+                    break;
                 }
+              }
 
-                if(!deleteAllowed && allGaps)
-                  deleteAllowed = true;
+              if (fixedRight <= startres)
+              {
+                endEditing();
+                return;
               }
             }
 
-            // drag to right
-            if (res < av.getAlignment().getWidth() && res > lastres)
-                sg.setEndRes(sg.getEndRes() + 1);
 
-            // drag to left
-            else if (deleteAllowed && res < av.getAlignment().getWidth() &&
-                     res < lastres)
-                sg.setEndRes(sg.getEndRes() - 1);
+          // drag to left
+          else
+          {
+            /// Are we able to delete?
+            // ie are all columns blank?
 
+            for (int s = 0; s < sg.getSize(); s++)
+            {
+              seq = sg.getSequenceAt(s);
 
+              for (int j = startres; j < lastres; j++)
+              {
+                if (seq.getSequence().length() <= j)
+                {
+                  continue;
+                }
 
+                if (!jalview.util.Comparison.isGap(
+                    seq.getSequence().charAt(j)))
+                {
+                  // Not a gap, block edit not valid
+                  endEditing();
+                  return;
+                }
+              }
+            }
+          }
 
-            for (int i = 0; i < sg.getSize(); i++)
-            {
-              SequenceI s = sg.getSequenceAt(i);
-              int k = av.alignment.findIndex(s);
 
-              // drag to right
-              if (res < av.getAlignment().getWidth() && res > lastres)
-                for (int j = lastres; j < res; j++)
-                  insertChar(j, k);
+          for (int i = 0; i < sg.getSize(); i++)
+          {
+            seq = sg.getSequenceAt(i);
 
-              // drag to left
-              else if (deleteAllowed && res < av.getAlignment().getWidth() && res < lastres)
+            if (insertGap)
+            {
+              // dragging to the right
+              for (int j = lastres; j < startres; j++)
               {
-                for (int j = res; j < lastres; j++)
+                if (fixedColumns && fixedRight != -1)
                 {
-                  deleteChar(j, k);
-                  startres = res;
+                  insertChar(j, seq, fixedRight);
+                }
+                else
+                  insertChar(j, seq);
+              }
+            }
+            else
+            {
+              // dragging to the left
+              for (int j = lastres; j > startres; j--)
+              {
+                if (fixedColumns && fixedRight != -1)
+                {
+                  deleteChar(startres, seq, fixedRight);
+                }
+                else
+                {
+                  deleteChar(startres, seq);
                 }
               }
             }
@@ -308,335 +793,537 @@ public class SeqPanel extends JPanel
         }
         else /////Editing a single sequence///////////
         {
-          if (res < av.getAlignment().getWidth() && res > lastres)
+
+          if (insertGap)
           {
             // dragging to the right
-            for (int j = lastres; j < res; j++)
-              insertChar(j, startseq);
+            for (int j = lastres; j < startres; j++)
+            {
+              if (fixedColumns && fixedRight != -1)
+                insertChar(j, seq, fixedRight);
+              else
+                insertChar(j, seq);
+            }
           }
-          else if (res < av.getAlignment().getWidth() && res < lastres)
+          else
           {
             // dragging to the left
-            for (int j = res; j < lastres; j++)
+            for (int j = lastres; j > startres; j--)
             {
-              deleteChar(j, startseq);
-              startres = res;
+              if (fixedColumns && fixedRight != -1)
+              {
+                deleteChar(startres, seq, fixedRight);
+              }
+              else
+              {
+                deleteChar(startres, seq);
+              }
             }
-	  }
-
-	}
+          }
+        }
 
+        lastres = startres;
+        seqCanvas.repaint();
     }
 
-    lastres = res;
-    repaint();
-  }
-
-  public void drawChars(int seqstart, int seqend, int start) {
-    seqCanvas.drawPanel(seqCanvas.gg, start,av.getEndRes(),seqstart,seqend,av.getStartRes(),av.getStartSeq(),0);
-    repaint();
-  }
-
-  public void insertChar(int j, int seq)
-  {
-    av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());
-    seqEditOccurred=seq;
-  }
-
-  public void deleteChar(int j, int seq)
-  {
-
-    if ( jalview.util.Comparison.isGap( av.alignment.getSequenceAt(seq).getSequence().charAt(j)))
-        av.alignment.getSequenceAt(seq).deleteCharAt(j);
-
-    av.alignment.getWidth();
-    repaint();
-    seqEditOccurred=seq;
-  }
-
 
-  void updateConservation(int i)
-  {
-    if(av.getGlobalColourScheme() instanceof jalview.schemes.ClustalxColourScheme)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param j DOCUMENT ME!
+     * @param seq DOCUMENT ME!
+     */
+    void insertChar(int j, SequenceI seq)
     {
-      av.setGlobalColourScheme(
-          new jalview.schemes.ClustalxColourScheme(av.alignment.getSequences(),av.alignment.getWidth() ));
+        seq.insertCharAt(j, av.getGapCharacter());
+        seqEditOccurred = true;
     }
-    av.updateConservation();
-    av.updateConsensus();
-  }
 
-//////////////////////////////////////////
-/////Everything below this is for defining the boundary of the rubberband
-//////////////////////////////////////////
-  int oldSeq = -1;
-  public void doMousePressedDefineMode(MouseEvent evt)
-  {
-    int res = evt.getX()/av.getCharWidth() + av.getStartRes();
-    int seq = evt.getY()/av.getCharHeight() + av.getStartSeq();
-    oldSeq = seq;
+    void insertChar(int j, SequenceI seq, int fixedColumn)
+    {
+      //Find the next gap before the end of the visible region boundary
+      //If lastCol > j, theres a boundary after the gap insertion
+      int blankColumn = fixedColumn;
+      for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)
+      {
+        if (jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))
+    {
+          //Theres a space, so break and insert the gap
+          break;
+        }
+      }
 
-    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
+      if (blankColumn <= j)
+      {
+        endEditing();
+        return;
+      }
 
-    if(sequence==null || res>sequence.getLength())
-      return;
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))
+      {
+        //Just Checking
+        System.out.println("Tried removing residue (INSERT)"+seq.getCharAt(fixedColumn));
+        return;
+      }
 
-    stretchGroup = av.getSelectionGroup();
+      seq.deleteCharAt(blankColumn);
+      seq.insertCharAt(j, av.getGapCharacter());
+      seqEditOccurred = true;
+    }
 
-    if(stretchGroup == null)
-     {
-       stretchGroup = av.alignment.findGroup( sequence );
-       if(stretchGroup!=null && res>stretchGroup.getStartRes() && res<stretchGroup.getEndRes())
-         av.setSelectionGroup(stretchGroup);
-       else
-         stretchGroup = null;
-     }
+    void deleteChar(int j, SequenceI seq, int fixedColumn)
+    {
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))
+      {
+        ap.alignFrame.statusBar.setText(
+            "End editing: Tried removing residue " + seq.getCharAt(j));
+        return;
+      }
 
-    else if(!stretchGroup.sequences.contains(sequence)
-            || stretchGroup.getStartRes()>res
-            || stretchGroup.getEndRes()<res)
-     {
-       stretchGroup = null;
-
-       SequenceGroup[] allGroups = av.alignment.findAllGroups( sequence );
-
-       if (allGroups != null)
-         for (int i = 0; i < allGroups.length; i++)
-           if (allGroups[i].getStartRes() <= res &&
-               allGroups[i].getEndRes() >= res)
-           {
-             stretchGroup = allGroups[i];
-             av.setSelectionGroup(stretchGroup);
-             break;
-           }
-     }
+      seq.deleteCharAt(j);
+      seq.insertCharAt(fixedColumn, av.getGapCharacter());
+      seqEditOccurred = true;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param j DOCUMENT ME!
+     * @param seq DOCUMENT ME!
+     */
+    void deleteChar(int j, SequenceI seq)
+    {
+      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))
+      {
+        ap.alignFrame.statusBar.setText(
+            "End editing: Tried removing residue " + seq.getCharAt(j));
+        return;
+      }
 
-    if(stretchGroup==null)
+        seq.deleteCharAt(j);
+        seqEditOccurred = true;
+        seqCanvas.repaint();
+    }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseEntered(MouseEvent e)
     {
-      // define a new group here
-      SequenceGroup sg = new SequenceGroup();
-      sg.setStartRes(res);
-      sg.setEndRes(res);
-      sg.addSequence( sequence );
-      av.setSelectionGroup( sg );
-      stretchGroup = sg;
-
-      if(av.getConservationSelected())
-        SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(), "Background");
-      if(av.getAbovePIDThreshold())
-        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(), "Background");
+        if(oldSeq < 0)
+          oldSeq = 0;
 
+        if (scrollThread != null)
+        {
+            scrollThread.running = false;
+            scrollThread = null;
+        }
     }
-    else if( javax.swing.SwingUtilities.isRightMouseButton(evt))
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseExited(MouseEvent e)
     {
-        jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu( ap , null);
-        pop.show(this, evt.getX(), evt.getY());
+        if (av.getWrapAlignment())
+        {
+            return;
+        }
 
-    // edit the properties of existing group
+        if (mouseDragging)
+        {
+            scrollThread = new ScrollThread();
+        }
     }
 
-    if(stretchGroup!=null && stretchGroup.getEndRes()==res)
-      // Edit end res position of selected group
-      changeEndRes = true;
+    public void mouseClicked(MouseEvent evt)
+    {}
 
-   else if(stretchGroup!=null && stretchGroup.getStartRes()==res)
-      // Edit end res position of selected group
-      changeStartRes = true;
+    public void mouseWheelMoved(MouseWheelEvent e)
+    {
+      e.consume();
+      if (mouseWheelPressed)
+      {
+        Font font = av.getFont();
+        int fontSize = font.getSize();
+        if (e.getWheelRotation() > 0 && fontSize < 51)
+          fontSize++;
+        else if (fontSize > 1)
+          fontSize--;
+
+        av.setFont(new Font(font.getName(), font.getStyle(), fontSize));
+        ap.fontChanged();
+      }
+      else
+      {
+        if (e.getWheelRotation() > 0)
+          ap.scrollUp(false);
+        else
+          ap.scrollUp(true);
+      }
 
+    }
 
-    repaint();
 
-  }
 
-  boolean changeEndSeq = false;
-  boolean changeStartSeq = false;
-  boolean changeEndRes = false;
-  boolean changeStartRes = false;
-  SequenceGroup stretchGroup = null;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param i DOCUMENT ME!
+     */
+    void editOccurred()
+    {
+      if (!seqEditOccurred)
+      {
+        ap.alignFrame.historyList.pop();
+        ap.alignFrame.updateEditMenuBar();
+      }
 
-  public void doMouseReleasedDefineMode(MouseEvent evt)
-  {
-    mouseDragging = false;
+      endEditing();
 
-    if(stretchGroup==null)
-      return;
+      av.firePropertyChange("alignment", null,av.getAlignment().getSequences());
 
-    if(stretchGroup.cs instanceof ClustalxColourScheme)
-    {
-      stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences, av.alignment.getWidth());
-      repaint();
     }
 
-    else if(stretchGroup.cs instanceof ConservationColourScheme)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMousePressedDefineMode(MouseEvent evt)
     {
-       ConservationColourScheme ccs = (ConservationColourScheme)stretchGroup.cs;
-       stretchGroup.cs = ccs;
-       SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup.getName()) ;
+      int res = findRes(evt);
+      int seq = findSeq(evt);
+      oldSeq = seq;
 
-       repaint();
-    }
-    else
-    {
-      if(stretchGroup.cs !=null && stretchGroup.cs.canThreshold())
+      startWrapBlock=wrappedBlock;
+
+      if(av.wrapAlignment && seq>av.alignment.getHeight())
       {
-        ResidueColourScheme rcs =  (ResidueColourScheme) stretchGroup.cs;
-        SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup.getName());
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,
+              "Cannot edit annotations in wrapped view.",
+              "Wrapped view - no edit",
+              JOptionPane.WARNING_MESSAGE);
+        return;
       }
 
-    }
+      if(seq<0 || res<0)
+            return;
 
+        SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
 
-    changeEndRes = false;
-    changeStartRes = false;
-    stretchGroup = null;
-    ap.idPanel.repaint();
-  }
+        if ((sequence == null) || (res > sequence.getLength()))
+        {
+            return;
+        }
 
+        stretchGroup = av.getSelectionGroup();
 
-  boolean remove = false;
-  public void doMouseDraggedDefineMode(MouseEvent evt)
-  {
-    int res = evt.getX()/av.getCharWidth() + av.getStartRes();
-    int y = evt.getY()/av.getCharHeight() + av.getStartSeq();
+        if (stretchGroup == null)
+        {
+            stretchGroup = av.alignment.findGroup(sequence);
 
-    if(stretchGroup==null)
-      return;
+            if ((stretchGroup != null) && (res > stretchGroup.getStartRes()) &&
+                    (res < stretchGroup.getEndRes()))
+            {
+                av.setSelectionGroup(stretchGroup);
+            }
+            else
+            {
+                stretchGroup = null;
+            }
+        }
+        else if (!stretchGroup.sequences.contains(sequence) ||
+                (stretchGroup.getStartRes() > res) ||
+                (stretchGroup.getEndRes() < res))
+        {
+            stretchGroup = null;
 
-    if(res>av.alignment.getWidth())
-      res = av.alignment.getWidth()-1;
+            SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);
 
+            if (allGroups != null)
+            {
+                for (int i = 0; i < allGroups.length; i++)
+                {
+                    if ((allGroups[i].getStartRes() <= res) &&
+                            (allGroups[i].getEndRes() >= res))
+                    {
+                        stretchGroup = allGroups[i];
+                        av.setSelectionGroup(stretchGroup);
 
-    if(stretchGroup.getEndRes()==res)
-      // Edit end res position of selected group
-      changeEndRes = true;
+                        break;
+                    }
+                }
+            }
+        }
 
-    else if(stretchGroup.getStartRes()==res)
-      // Edit start res position of selected group
-      changeStartRes = true;
+        if (av.cursorMode)
+        {
+          seqCanvas.cursorX = findRes(evt);
+          seqCanvas.cursorY = findSeq(evt);
+          seqCanvas.repaint();
+          return;
+        }
 
 
-    if(res<av.getStartRes())
-      res = av.getStartRes();
-    else if(res>av.getEndRes())
-      res = av.getEndRes();
+        if (stretchGroup == null)
+        {
+            // define a new group here
+            SequenceGroup sg = new SequenceGroup();
+            sg.setStartRes(res);
+            sg.setEndRes(res);
+            sg.addSequence(sequence, false);
+            av.setSelectionGroup(sg);
+            stretchGroup = sg;
+
+            if (av.getConservationSelected())
+            {
+                SliderPanel.setConservationSlider(ap,
+                    av.getGlobalColourScheme(), "Background");
+            }
 
-    if(changeEndRes)
-    {
-      if(res>stretchGroup.getStartRes()-1)
-        stretchGroup.setEndRes( res );
-    }
-    else if(changeStartRes)
-    {
-      if(res<stretchGroup.getEndRes()+1)
-        stretchGroup.setStartRes( res );
-    }
+            if (av.getAbovePIDThreshold())
+            {
+                SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
+                    "Background");
+            }
+        }
+        else if (javax.swing.SwingUtilities.isRightMouseButton(evt))
+        {
+            jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);
+            pop.show(this, evt.getX(), evt.getY());
 
-    int dragDirection = 0;
-    if (y > oldSeq)
-      dragDirection = 1;
-    else if (y < oldSeq)
-      dragDirection = -1;
+            // edit the properties of existing group
+        }
 
-    while (y != oldSeq && oldSeq>0 && y<av.alignment.getHeight())
-    {
-      // This routine ensures we don't skip any sequences, as the
-      // selection is quite slow.
-      Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+        if ((stretchGroup != null) && (stretchGroup.getEndRes() == res))
+        {
+            // Edit end res position of selected group
+            changeEndRes = true;
+        }
+        else if ((stretchGroup != null) && (stretchGroup.getStartRes() == res))
+        {
+            // Edit end res position of selected group
+            changeStartRes = true;
+        }
 
-      oldSeq += dragDirection;
-      Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+        stretchGroup.getWidth();
 
-      if (stretchGroup.sequences.contains(nextSeq))
-      {
-        stretchGroup.deleteSequence(seq);
-        stretchGroup.deleteSequence(nextSeq);
-      }
-      else
-      {
-       if(seq!=null)
-        stretchGroup.addSequence(seq);
-        stretchGroup.addSequence(nextSeq);
-      }
-    }
-    oldSeq = y;
-    mouseDragging = true;
-    if(scrollThread!=null)
-      scrollThread.setEvent(evt);
-
-    repaint();
-  }
-
-  public void doMouseEnteredDefineMode(MouseEvent e)
-  {
-    if (scrollThread != null)
-      scrollThread.running = false;
-  }
-
-  public void doMouseExitedDefineMode(MouseEvent e)
-  {
-    if (av.getWrapAlignment())
-      return;
-
-    if(mouseDragging)
-      scrollThread = new ScrollThread();
-
-  }
-  // this class allows scrolling off the bottom of the visible alignment
-  class ScrollThread extends Thread
-  {
-    MouseEvent evt;
-    boolean running = false;
-    public ScrollThread()
-    {
-      start();
+        seqCanvas.repaint();
     }
 
-    public void setEvent(MouseEvent e)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMouseReleasedDefineMode(MouseEvent evt)
     {
-      evt = e;
-    }
+        if (stretchGroup == null)
+        {
+            return;
+        }
 
-    public void stopScrolling()
-    {
-      running = false;
+
+        if(stretchGroup.cs!=null)
+        {
+          if (stretchGroup.cs instanceof ClustalxColourScheme)
+          {
+            ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.
+                sequences,
+                stretchGroup.getWidth());
+          }
+
+          if (stretchGroup.cs.conservationApplied())
+          {
+            SliderPanel.setConservationSlider(ap, stretchGroup.cs,
+                                              stretchGroup.getName());
+            stretchGroup.recalcConservation();
+          }
+          else
+          {
+            SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
+                                           stretchGroup.getName());
+          }
+        }
+        changeEndRes = false;
+        changeStartRes = false;
+        stretchGroup = null;
+        PaintRefresher.Refresh(av.alignment);
     }
 
-    public void run()
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMouseDraggedDefineMode(MouseEvent evt)
     {
-      running = true;
-      while (running)
-      {
-        if(evt!=null)
+      int res = findRes(evt);
+      int y = findSeq(evt);
+
+      if(wrappedBlock!=startWrapBlock)
+        return;
+
+       if (stretchGroup == null)
+       {
+            return;
+       }
+
+
+        if(y > av.alignment.getHeight())
         {
+          y = av.alignment.getHeight() -1;
+        }
 
-          if (mouseDragging && evt.getY() < 0 && av.getStartSeq() > 0)
-            running = ap.scrollUp(true);
+        if (stretchGroup.getEndRes() == res)
+        {
+            // Edit end res position of selected group
+            changeEndRes = true;
+        }
+        else if (stretchGroup.getStartRes() == res)
+        {
+            // Edit start res position of selected group
+            changeStartRes = true;
+        }
 
-          if (mouseDragging && evt.getY() >= getHeight() &&
-              av.alignment.getHeight() > av.getEndSeq())
-            running = ap.scrollUp(false);
+        if (res < av.getStartRes())
+        {
+            res = av.getStartRes();
+        }
 
-          if (mouseDragging && evt.getX() < 0)
-            running = ap.scrollRight(true);
+        if (changeEndRes)
+        {
+            if (res > (stretchGroup.getStartRes() - 1))
+            {
+                stretchGroup.setEndRes(res);
+            }
+        }
+        else if (changeStartRes)
+        {
+            if (res < (stretchGroup.getEndRes() + 1))
+            {
+                stretchGroup.setStartRes(res);
+            }
+        }
 
-          else if (mouseDragging && evt.getX() >= getWidth())
-            running = ap.scrollRight(false);
+        int dragDirection = 0;
+
+        if (y > oldSeq)
+        {
+            dragDirection = 1;
         }
+        else if (y < oldSeq)
+        {
+            dragDirection = -1;
+        }
+
 
-        try
+        while ((y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
         {
-          Thread.sleep(75);
+            // This routine ensures we don't skip any sequences, as the
+            // selection is quite slow.
+            Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+
+            oldSeq += dragDirection;
+
+            if(oldSeq<0)
+              break;
+
+            Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+
+            if (stretchGroup.sequences.contains(nextSeq))
+            {
+                stretchGroup.deleteSequence(seq, false);
+            }
+            else
+            {
+                if (seq != null)
+                {
+                    stretchGroup.addSequence(seq, false);
+                }
+
+                stretchGroup.addSequence(nextSeq, false);
+            }
         }
-        catch (Exception ex)
-        {}
-      }
+
+        if(oldSeq < 0)
+          oldSeq = -1;
+
+        mouseDragging = true;
+
+        if (scrollThread != null)
+        {
+            scrollThread.setEvent(evt);
+        }
+
+        seqCanvas.repaint();
     }
-}
 
 
 
-}
+    // this class allows scrolling off the bottom of the visible alignment
+    class ScrollThread extends Thread
+    {
+        MouseEvent evt;
+        boolean running = false;
 
+        public ScrollThread()
+        {
+            start();
+        }
 
+        public void setEvent(MouseEvent e)
+        {
+            evt = e;
+        }
 
+        public void stopScrolling()
+        {
+            running = false;
+        }
+
+        public void run()
+        {
+            running = true;
+
+            while (running)
+            {
+                if (evt != null)
+                {
+                    if (mouseDragging && (evt.getY() < 0) &&
+                            (av.getStartSeq() > 0))
+                    {
+                        running = ap.scrollUp(true);
+                    }
+
+                    if (mouseDragging && (evt.getY() >= getHeight()) &&
+                            (av.alignment.getHeight() > av.getEndSeq()))
+                    {
+                        running = ap.scrollUp(false);
+                    }
+
+                    if (mouseDragging && (evt.getX() < 0))
+                    {
+                        running = ap.scrollRight(false);
+                    }
+                    else if (mouseDragging && (evt.getX() >= getWidth()))
+                    {
+                        running = ap.scrollRight(true);
+                    }
+                }
 
+                try
+                {
+                    Thread.sleep(20);
+                }
+                catch (Exception ex)
+                {
+                }
+            }
+        }
+    }
+}