X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=2fe27b381bf84bffe35aac5fb94700b32ef764fa;hb=e25f63a72efddff9e071abdeff0ae5599431e4f8;hp=9dcebd2159718af8b3ce2adeeb98e0fef0f13582;hpb=4b9d13acc586d87c53ce21078fb380405164e19b;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 9dcebd2..2fe27b3 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,455 +1,1127 @@
+/*
+ * 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 jalview.schemes.*;
-import jalview.analysis.*;
 
 
-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;
+    int startEdit = -1;
+    int endEdit = -1;
+    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    parent;
+        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)
+    {
+
+      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);
 
-    parent = 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)
-      {   doMouseMoved(evt);    }
+        res = (x / av.getCharWidth()) + av.getStartRes();
+    }
+
+    if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+    return res;
+
+   }
 
-      public void mouseDragged(MouseEvent evt)
+   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();
+     }
+
+     return seq;
+   }
+
+   void endEditing()
+   {
+     startseq = -1;
+     lastres = -1;
+     seqEditOccurred = false;
+     editingSeqs = false;
+     groupEditing = false;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent evt)
+    {
+      mouseDragging = false;
+
+      if (!editingSeqs)
       {
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMouseDragged(evt);
-        else
-          doMouseDraggedDefineMode(evt);
+         doMouseReleasedDefineMode(evt);
+         return;
       }
-    });
 
-    addMouseListener( new MouseAdapter()
+        if (seqEditOccurred)
+        {
+            editOccurred();
+        }
+
+        endEditing();
+        ap.repaint();
+    }
+
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent evt)
     {
-      public void mouseReleased(MouseEvent evt)
+      if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
       {
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMouseReleased(evt);
-        else
-          doMouseReleasedDefineMode(evt);
+        mouseWheelPressed = true;
+        return;
+      }
+
+      if (evt.isShiftDown() || evt.isAltDown() ||
+          evt.isControlDown())
+      {
+        if (evt.isAltDown() || evt.isControlDown())
+        {
+          groupEditing = true;
+        }
+        editingSeqs = true;
       }
-      public void mousePressed(MouseEvent evt)
+      else
       {
-        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
-          doMousePressed(evt);
+        doMousePressedDefineMode(evt);
+        return;
+      }
+
+
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
+                                                   av.alignment, HistoryItem.EDIT));
+
+      int seq = findSeq(evt);
+      int res = findRes(evt);
+
+      if(seq<0 || res<0)
+        return;
+
+        if ((seq < av.getAlignment().getHeight()) &&
+                (res < av.getAlignment().getSequenceAt(seq).getLength()))
+        {
+            startseq = seq;
+            lastres = res;
+        }
         else
-          doMousePressedDefineMode(evt);
+        {
+            startseq = -1;
+            lastres = -1;
+        }
+
+        startEdit = lastres;
+        endEdit = lastres;
+
+        return;
+    }
+
+    /**
+     * 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);
       }
 
-    });
-    repaint();
-  }
+      int res = findRes(evt);
+      int seq = findSeq(evt);
 
+      if(res<0 || seq<0 || seq >= av.getAlignment().getHeight())
+            return;
 
-  public void doMouseReleased(MouseEvent evt) {
+      SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
-    int x = evt.getX();
-    int res = x/av.getCharWidth() + av.getStartRes();
+      if (res > sequence.getLength())
+      {
+        return;
+      }
 
-    endres = res;
+      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)
+      {
+        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));
+      }
 
-    startseq = -1;
-    startres = -1;
-    lastres  = -1;
-    if(seqEditOccurred>-1)
-      updateConservation(seqEditOccurred);
 
-    seqEditOccurred = -1;
+        StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
+                sequence.getName());
 
-    parent.RefreshPanels();
-    repaint();
+        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)
+        {
 
-  public void doMousePressed(MouseEvent evt) {
-    parent.alignFrame.addHistoryItem("sequence edit");
-    int seq;
-    int res;
+          if (obj != "")
+          {
+            text.append( obj + " (" +
+                        av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");
+          }
+        }
 
-    int x = evt.getX();
-    int y = evt.getY();
+        ap.alignFrame.statusBar.setText(text.toString());
 
-    res = x/av.getCharWidth() + av.getStartRes();
-    seq = y/av.getCharHeight() + av.getStartSeq();
+        // 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>");
 
-    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
+              for (int i = 0; i < features.length; i++)
+              {
 
-      startseq = seq;
+                if ( (features[i].getBegin() <= sequence.findPosition(res)) &&
+                    (features[i].getEnd() >= sequence.findPosition(res)))
+                {
+                  if(!av.featuresDisplayed.containsKey(features[i].getType()))
+                  continue;
 
-      if (startseq == (av.getAlignment().getHeight() - 1))
-        padseq = 1;
-      else
-        padseq = 1;
 
-      startres = res;
-      lastres = res;
+                  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+";");
 
+                    sbuffer.append(features[i].getType());
+
+                    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
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseDragged(MouseEvent evt)
     {
-      startseq = -1;
-      startres = -1;
-      lastres = -1;
-    }
+      if (!editingSeqs)
+      {
+        doMouseDraggedDefineMode(evt);
+        return;
+      }
 
-    return;
-  }
+        int res = findRes(evt);
 
-  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 (res < 0)
+        {
+            res = 0;
+        }
 
+        if ((lastres == -1) || (lastres == res))
+        {
+            return;
+        }
 
-      res =   (int)((y/chunkHeight)*(getWidth()/av.charWidth)) +  x/av.getCharWidth() + av.getStartRes();
+        boolean dragRight = true;
 
-      y %= chunkHeight;
-      seq =     y / av.getCharHeight() + av.getStartSeq();
+        if ((res < av.getAlignment().getWidth()) && (res < lastres))
+        {
+            dragRight = false;
+        }
+        else if(av.hasHiddenColumns)
+        {
+          //Stop editing if the user has dragged beyond hiddenBoundary
+          int lastCol = av.getColumnSelection().getHiddenRegionBoundary(lastres);
+          if( lastCol < res)
+          {
+            if(lastres!=lastCol)
+            {
+              endEditing();
+              return;
+            }
+          }
+        }
 
-      //   chunkHeight =  (da.getHeight() + 2)*charHeight;
-      //  startx += chunkWidth;
-    }
-    else
-    {
-      res = x / av.getCharWidth()  + av.getStartRes();
-      seq = y / av.getCharHeight() + av.getStartSeq();
-    }
+        if(!groupEditing && av.hasHiddenRows)
+        {
+          if(av.alignment.getSequenceAt(startseq).getHiddenSequences()!=null)
+          {
+            groupEditing = true;
+          }
+        }
 
 
-    if(seq>=av.getAlignment().getHeight())
-      return;
+        if (res != lastres)
+        {
+            SequenceI seq;
+            // Group editing
+            if (groupEditing)
+            {
+                SequenceGroup sg = av.getSelectionGroup();
 
-    Object obj = ResidueProperties.aa2Triplet.get( av.getAlignment().getSequenceAt(seq).getCharAt(res)+"" ) ;
-    String aa = "";
-    if(obj!=null)
-         aa = obj.toString();
+                if (av.hasHiddenRows)
+                {
+                  //sg might be null as the user may only see 1 sequence
+                  if(sg==null)
+                  {
+                    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);
+                    }
+                  }
 
-    StringBuffer text = new StringBuffer("Sequence " +(seq+1)+" ID: "+av.getAlignment().getSequenceAt(seq).getName());
-    if(aa!="")
-      text.append("  Residue: "+aa+" ("+  av.getAlignment().getSequenceAt(seq).findPosition(res)+")");
+                  sg = tmp;
+                }
 
-    parent.alignFrame.statusBar.setText(text.toString());
 
-  }
+                if (sg == null)
+                {
+                    endEditing();
+                    return;
+                }
 
-  public void doMouseDragged(MouseEvent evt) {
-    // If we're dragging we're editing
+                int blankColumn = -1;
 
-    int x = evt.getX();
+                // drag to right
+                if (dragRight)
+                {
 
-    int res = x/av.getCharWidth() + av.getStartRes();
-    if (res < 0)
-      res = 0;
+                  // Is it valid??
+                  // Find the next gap before the end
+                  // of the visible region boundary
+                  if (av.hasHiddenColumns)
+                  {
+                    if(res-lastres > 1)
+                    {
+                      res = lastres+1;
+                    }
+
+
+                    int lastCol = av.getColumnSelection().
+                          getHiddenRegionBoundary(res);
+
+                    if(lastCol!=res)
+                    {
+                      for (blankColumn = lastCol;
+                           blankColumn > lastres;
+                           blankColumn--)
+                      {
+                        boolean blank = true;
+                        for (int s = 0; s < sg.getSize(); s++)
+                        {
+                          seq = sg.getSequenceAt(s);
+
+                          if (seq.getSequence().length() <= blankColumn)
+                          {
+                            continue;
+                          }
+
+                          if (!jalview.util.Comparison.isGap(
+                              seq.getSequence().charAt(blankColumn)))
+                          {
+                            blank = false;
+                            continue;
+                          }
+                        }
+                        if (blank)
+                          break;
+                      }
+
+
+                      if (blankColumn <= lastres)
+                      {
+                        endEditing();
+                        return;
+                      }
+                    }
+                    else
+                      blankColumn = -1;
+
+                  }
+
+                  sg.setEndRes(sg.getEndRes() + (res - lastres));
+                }
+
+                // 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 = res; 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;
+                            }
+                        }
+                    }
+
+                    if(res<sg.getStartRes())
+                    {
+                      sg.setStartRes(sg.getStartRes() - 1);
+                    }
+                    sg.setEndRes(sg.getEndRes() - (lastres - res));
+                }
+
+                for (int i = 0; i < sg.getSize(); i++)
+                {
+                    seq = sg.getSequenceAt(i);
+
+                    // drag to right
+                    if (dragRight)
+                    {
+                        for (int j = lastres; j < res; j++)
+                        {
+                            insertChar(j, seq, blankColumn);
+                        }
+                    }
+
+                    // drag to left
+                    else
+                    {
+                        for (int j = res; j < lastres; j++)
+                        {
+                            if (seq.getLength()-1 > res)
+                            {
+                                deleteChar(res, seq);
+                            }
+                        }
+                    }
+                }
+            }
+            else /////Editing a single sequence///////////
+            {
+                seq = av.alignment.getSequenceAt(startseq);
+                if ((res < av.getAlignment().getWidth()) && (res > lastres))
+                {
+                    // dragging to the right
+                    for (int j = lastres; j < res; j++)
+                    {
+                        insertChar(j, seq, j);
+                    }
+                }
+                else if ((res < av.getAlignment().getWidth()) &&
+                        (res < lastres))
+                {
+                    // dragging to the left
+                    for (int j = lastres; j > res; j--)
+                    {
+                        if (jalview.util.Comparison.isGap(
+                                    av.alignment.getSequenceAt(startseq)
+                                                    .getSequence().charAt(res)))
+                        {
+                            deleteChar(res, seq);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        mouseDragging = true;
+        if(scrollThread!=null)
+          scrollThread.setEvent(evt);
 
-    if (res != lastres)
+        endEdit = res;
+        lastres = res;
+        seqCanvas.repaint();
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseEntered(MouseEvent e)
     {
-	// Group editing
-	if (evt.isAltDown() || evt.isControlDown())
+        if(oldSeq < 0)
+          oldSeq = 0;
+
+        if (scrollThread != null)
         {
-	  SequenceGroup sg = av.getAlignment().findGroup(startseq);
-          if (sg != null)
+            scrollThread.running = false;
+            scrollThread = null;
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseExited(MouseEvent e)
+    {
+        if (av.getWrapAlignment())
+        {
+            return;
+        }
+
+        if (mouseDragging)
+        {
+            scrollThread = new ScrollThread();
+        }
+    }
+
+    public void mouseClicked(MouseEvent evt)
+    {}
+
+    public void mouseWheelMoved(MouseWheelEvent e)
+    {
+      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);
+      }
+
+    }
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param j DOCUMENT ME!
+     * @param seq DOCUMENT ME!
+     */
+    void insertChar(int j, SequenceI seq, int blankColumn)
+    {
+        if(av.hasHiddenColumns)
+        {
+          //Find the next gap before the end of the visible region boundary
+          int lastCol = av.getColumnSelection().getHiddenRegionBoundary(j);
+          if(lastCol != j)
           {
-            boolean deleteAllowed = false;
-            if (res < av.getAlignment().getWidth() && res < lastres)
+            if (!groupEditing || lastCol <= j)
             {
-              /// Are we able to delete?
-              boolean allGaps = true;
-              for (int i = 0; i < sg.getSize(); i++)
+              blankColumn = lastCol;
+              //If lastCol > j, theres a boundary after the gap insertion
+              if (lastCol > j)
               {
-                SequenceI s = sg.getSequenceAt(i);
-                for (int j = lastres-1; j >= res && allGaps; j--)
+                for (blankColumn = lastCol; blankColumn > j; blankColumn--)
                 {
-                    if (!jalview.util.Comparison.isGap(s.getSequence().charAt(j)))
-                    {
-                      res = j + 1;
-                      allGaps = false;
-                    }
+                  if (jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))
+                  {
+                    //Theres a space, so break and insert the gap
+                    break;
+                  }
                 }
 
-                if(!deleteAllowed && allGaps)
-                  deleteAllowed = true;
+                if (blankColumn <= j)
+                {
+                  endEditing();
+                  return;
+                }
               }
+
             }
 
-            // drag to right
-            if (res < av.getAlignment().getWidth() && res > lastres)
-                sg.setEndRes(sg.getEndRes() + 1);
+            // Editing with hidden regions only!!
+            seq.deleteCharAt(blankColumn);
+          }
+      }
+
+        seq.insertCharAt(j, av.getGapCharacter());
+        seqEditOccurred = true;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param j DOCUMENT ME!
+     * @param seq DOCUMENT ME!
+     */
+    public void deleteChar(int j, SequenceI seq)
+    {
+      if (av.hasHiddenColumns)
+      {
+        //Find the next gap before the end of the visible region boundary
+        int lastCol = av.getColumnSelection().getHiddenRegionBoundary(j);
 
-            // drag to left
-            else if (deleteAllowed && res < av.getAlignment().getWidth() &&
-                     res < lastres)
-                sg.setEndRes(sg.getEndRes() - 1);
+        //If lastCol > j, theres a boundary after the gap insertion
+        if (lastCol > j)
+        {
+          seq.insertCharAt(lastCol, av.getGapCharacter());
+        }
+      }
 
+        seq.deleteCharAt(j);
+        seqEditOccurred = true;
 
+        seqCanvas.repaint();
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param i DOCUMENT ME!
+     */
+    void editOccurred()
+    {
+      if (endEdit == startEdit)
+      {
+        ap.alignFrame.historyList.pop();
+        ap.alignFrame.updateEditMenuBar();
+      }
 
+      av.firePropertyChange("alignment", null,av.getAlignment().getSequences());
 
-            for (int i = 0; i < sg.getSize(); i++)
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMousePressedDefineMode(MouseEvent evt)
+    {
+      int res = findRes(evt);
+      int seq = findSeq(evt);
+      oldSeq = seq;
+
+      startWrapBlock=wrappedBlock;
+
+      if(av.wrapAlignment && seq>av.alignment.getHeight())
+      {
+          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);
+
+        if ((sequence == null) || (res > sequence.getLength()))
+        {
+            return;
+        }
+
+        stretchGroup = av.getSelectionGroup();
+
+        if (stretchGroup == null)
+        {
+            stretchGroup = av.alignment.findGroup(sequence);
+
+            if ((stretchGroup != null) && (res > stretchGroup.getStartRes()) &&
+                    (res < stretchGroup.getEndRes()))
             {
-              SequenceI s = sg.getSequenceAt(i);
-              int k = av.alignment.findIndex(s);
+                av.setSelectionGroup(stretchGroup);
+            }
+            else
+            {
+                stretchGroup = null;
+            }
+        }
+        else if (!stretchGroup.sequences.contains(sequence) ||
+                (stretchGroup.getStartRes() > res) ||
+                (stretchGroup.getEndRes() < res))
+        {
+            stretchGroup = null;
 
-              // drag to right
-              if (res < av.getAlignment().getWidth() && res > lastres)
-                for (int j = lastres; j < res; j++)
-                  insertChar(j, k);
+            SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);
 
-              // drag to left
-              else if (deleteAllowed && res < av.getAlignment().getWidth() && res < lastres)
-              {
-                for (int j = res; j < lastres; j++)
+            if (allGroups != null)
+            {
+                for (int i = 0; i < allGroups.length; i++)
                 {
-                  deleteChar(j, k);
-                  startres = res;
+                    if ((allGroups[i].getStartRes() <= res) &&
+                            (allGroups[i].getEndRes() >= res))
+                    {
+                        stretchGroup = allGroups[i];
+                        av.setSelectionGroup(stretchGroup);
+
+                        break;
+                    }
                 }
-              }
             }
-          }
         }
-        else /////Editing a single sequence///////////
+
+        if (stretchGroup == null)
         {
-          if (res < av.getAlignment().getWidth() && res > lastres)
-          {
-            // dragging to the right
-            for (int j = lastres; j < res; j++)
-              insertChar(j, startseq);
-          }
-          else if (res < av.getAlignment().getWidth() && res < lastres)
-          {
-            // dragging to the left
-            for (int j = res; j < lastres; j++)
+            // 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())
             {
-              deleteChar(j, startseq);
-              startres = res;
+                SliderPanel.setConservationSlider(ap,
+                    av.getGlobalColourScheme(), "Background");
             }
-	  }
 
-	}
+            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());
 
-    }
+            // edit the properties of existing group
+        }
 
-    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)
-  {
-  /*  Alignment al = (Alignment) av.getAlignment();
-    SequenceGroup sg = av.alignment.findGroup( al.getSequenceAt(i));
-    if(sg==null || !(sg.cs instanceof ConservationColourScheme))
-      return;
-
-    Conservation c = sg.getConservation();
-
-    c = new Conservation("All", al.cons,
-                         ResidueProperties.propHash, 3, sg.sequences, 0,
-                         al.getWidth());
-    c.calculate();
-    c.verdict(false, 100);
-    sg.setConservation(c);
-    ConservationColourScheme ccs = (ConservationColourScheme)sg.cs;
-    ccs.conserve = c;*/
-  }
-
-//////////////////////////////////////////
-/////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;
-
-    stretchGroup = av.getRubberbandGroup();
-
-    if(stretchGroup == null)
-        stretchGroup = av.alignment.findGroup((Sequence)av.getAlignment().getSequenceAt(seq));
-
-    else if(!stretchGroup.sequences.contains((Sequence)av.getAlignment().getSequenceAt(seq))
-            || stretchGroup.getStartRes()>res
-            || stretchGroup.getEndRes()<res)
-     {
-       stretchGroup = null;
-     }
+        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;
+        }
 
-    if(stretchGroup==null)
-    {
-      // define a new group here
-      SequenceGroup sg = new SequenceGroup();
-      sg.setStartRes(res);
-      sg.setEndRes(res);
-      sg.addSequence( (Sequence)av.getAlignment().getSequenceAt(seq) );
-      av.setRubberbandGroup( sg );
-      stretchGroup = sg;
+        stretchGroup.getWidth();
+
+        seqCanvas.repaint();
     }
-    else if( javax.swing.SwingUtilities.isRightMouseButton(evt))
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMouseReleasedDefineMode(MouseEvent evt)
     {
-        jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu( parent , null);
-        pop.show(this, evt.getX(), evt.getY());
+        if (stretchGroup == null)
+        {
+            return;
+        }
 
-    // edit the properties of existing group
+
+        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);
     }
 
-    if(stretchGroup!=null && stretchGroup.getEndRes()==res)
-      // Edit end res position of selected group
-      changeEndRes = true;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void doMouseDraggedDefineMode(MouseEvent evt)
+    {
+      int res = findRes(evt);
+      int y = findSeq(evt);
 
-   else if(stretchGroup!=null && stretchGroup.getStartRes()==res)
-      // Edit end res position of selected group
-      changeStartRes = true;
+      if(wrappedBlock!=startWrapBlock)
+        return;
 
+       if (stretchGroup == null)
+       {
+            return;
+       }
 
-    seqCanvas.paintFlag = true;
-    repaint();
 
+        if(y > av.alignment.getHeight())
+        {
+          y = av.alignment.getHeight() -1;
+        }
 
-  }
+        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;
+        }
 
-  boolean changeEndSeq = false;
-  boolean changeStartSeq = false;
-  boolean changeEndRes = false;
-  boolean changeStartRes = false;
-  SequenceGroup stretchGroup = null;
+        if (res < av.getStartRes())
+        {
+            res = av.getStartRes();
+        }
 
-  public void doMouseReleasedDefineMode(MouseEvent evt)
-  {
-    changeEndRes = false;
-    changeStartRes = false;
-    stretchGroup = null;
-  }
+        if (changeEndRes)
+        {
+            if (res > (stretchGroup.getStartRes() - 1))
+            {
+                stretchGroup.setEndRes(res);
+            }
+        }
+        else if (changeStartRes)
+        {
+            if (res < (stretchGroup.getEndRes() + 1))
+            {
+                stretchGroup.setStartRes(res);
+            }
+        }
 
+        int dragDirection = 0;
 
-  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 (y > oldSeq)
+        {
+            dragDirection = 1;
+        }
+        else if (y < oldSeq)
+        {
+            dragDirection = -1;
+        }
 
 
-    if(stretchGroup.getEndRes()==res)
-      // Edit end res position of selected group
-      changeEndRes = true;
+        while ((y != oldSeq) && (oldSeq > -1) && (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);
 
-    else if(stretchGroup.getStartRes()==res)
-      // Edit end res position of selected group
-      changeStartRes = true;
+            oldSeq += dragDirection;
 
+            if(oldSeq<0)
+              break;
 
-    if(res<av.getStartRes())
-      res = av.getStartRes();
-    else if(res>av.getEndRes())
-      res = av.getEndRes();
+            Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
 
-    if(changeEndRes)
-    {
-      if(res>stretchGroup.getStartRes()-1)
-        stretchGroup.setEndRes( res );
-    }
-    else if(changeStartRes)
-    {
-      if(res<stretchGroup.getEndRes()+1)
-        stretchGroup.setStartRes( res );
-    }
+            if (stretchGroup.sequences.contains(nextSeq))
+            {
+                stretchGroup.deleteSequence(seq, false);
+            }
+            else
+            {
+                if (seq != null)
+                {
+                    stretchGroup.addSequence(seq, false);
+                }
 
+                stretchGroup.addSequence(nextSeq, false);
+            }
+        }
 
-    int dragDirection = 0;
-    if (y > oldSeq)
-      dragDirection = 1;
-    else if (y < oldSeq)
-      dragDirection = -1;
+        if(oldSeq < 0)
+          oldSeq = -1;
 
-    while (y != oldSeq)
-    {
-      // This routine ensures we don't skip any sequences, as the
-      // selection is quite slow.
-      Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+        mouseDragging = true;
 
-      oldSeq += dragDirection;
-      Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+        if (scrollThread != null)
+        {
+            scrollThread.setEvent(evt);
+        }
 
-      if (stretchGroup.sequences.contains(nextSeq))
-      {
-        stretchGroup.deleteSequence(seq);
-        stretchGroup.deleteSequence(nextSeq);
-      }
-      else
-      {
-        stretchGroup.addSequence(seq);
-        stretchGroup.addSequence(nextSeq);
-      }
+        seqCanvas.repaint();
     }
-    oldSeq = y;
 
-    seqCanvas.paintFlag = true;
-    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(true);
+                    }
+                    else if (mouseDragging && (evt.getX() >= getWidth()))
+                    {
+                        running = ap.scrollRight(false);
+                    }
+                }
 
+                try
+                {
+                    Thread.sleep(20);
+                }
+                catch (Exception ex)
+                {
+                }
+            }
+        }
+    }
+}