X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=ae6138371c1c611539ed6872247eb2a364085d26;hb=c1cbfffa52f43d3b0dd74eca5e7d4e30af3b83dc;hp=e31251080e9bbf895d6e1f31b365933cda7cefad;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index e312510..ae61383 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -18,8 +18,6 @@
  */
 package jalview.gui;
 
-import jalview.analysis.*;
-
 import jalview.datamodel.*;
 
 import jalview.jbgui.*;
@@ -125,7 +123,13 @@ public class AlignmentPanel extends GAlignmentPanel
                         alignFrame.moveSelectedSequences(true);
 
                         break;
+
+                    case KeyEvent.VK_BACK_SPACE:
+                    case KeyEvent.VK_DELETE:
+                      alignFrame.cut_actionPerformed(null);
+                      break;
                     }
+
                 }
             });
     }
@@ -145,12 +149,30 @@ public class AlignmentPanel extends GAlignmentPanel
                 av.charHeight + fm.getDescent()));
 
         idPanel.idCanvas.gg = null;
+        seqPanel.seqCanvas.img = null;
         annotationPanel.adjustPanelHeight();
 
         Dimension d = calculateIdWidth();
         d.setSize(d.width + 4, d.height);
         idPanel.idCanvas.setPreferredSize(d);
         hscrollFillerPanel.setPreferredSize(d);
+
+        if (av.getWrapAlignment())
+        {
+          int max = av.alignment.getWidth() /
+              seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+          vscroll.setMaximum(max);
+          vscroll.setUnitIncrement(1);
+          vscroll.setVisibleAmount(1);
+        }
+        else
+        {
+          setScrollValues(av.getStartRes(), av.getStartSeq());
+        }
+
+        if(overviewPanel!=null)
+          overviewPanel.updateOverviewImage();
+
         repaint();
     }
 
@@ -161,16 +183,9 @@ public class AlignmentPanel extends GAlignmentPanel
      */
     public Dimension calculateIdWidth()
     {
-        Graphics g = this.getGraphics();
+      Container c = new Container();
 
-        if (g == null)
-        {
-            javax.swing.JFrame f = new javax.swing.JFrame();
-            f.addNotify();
-            g = f.getGraphics();
-        }
-
-        FontMetrics fm = g.getFontMetrics(av.font);
+        FontMetrics fm = c.getFontMetrics(av.font);
         AlignmentI al = av.getAlignment();
 
         int i = 0;
@@ -203,7 +218,7 @@ public class AlignmentPanel extends GAlignmentPanel
 
         if (al.getAlignmentAnnotation() != null)
         {
-            fm = g.getFontMetrics(alabels.getFont());
+            fm = c.getFontMetrics(alabels.getFont());
 
             while (i < al.getAlignmentAnnotation().length)
             {
@@ -284,6 +299,7 @@ public class AlignmentPanel extends GAlignmentPanel
      */
     public void setWrapAlignment(boolean wrap)
     {
+        av.startSeq = 0;
         scalePanelHolder.setVisible(!wrap);
         hscroll.setVisible(!wrap);
         idwidthAdjuster.setVisible(!wrap);
@@ -296,30 +312,6 @@ public class AlignmentPanel extends GAlignmentPanel
         repaint();
     }
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void setColourScheme()
-    {
-        ColourSchemeI cs = av.getGlobalColourScheme();
-
-        if (av.getConservationSelected())
-        {
-            Alignment al = (Alignment) av.getAlignment();
-            Conservation c = new Conservation("All",
-                    ResidueProperties.propHash, 3, al.getSequences(), 0,
-                    al.getWidth());
-
-            c.calculate();
-            c.verdict(false, av.ConsPercGaps);
-
-            ConservationColourScheme ccs = new ConservationColourScheme(c, cs);
-
-            av.setGlobalColourScheme(ccs);
-        }
-
-        repaint();
-    }
 
     // return value is true if the scroll is valid
     public boolean scrollUp(boolean up)
@@ -433,14 +425,6 @@ public class AlignmentPanel extends GAlignmentPanel
         vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());
     }
 
-    public void this_mouseWheelMoved(MouseWheelEvent e)
-    {
-      if(e.getWheelRotation()>0)
-        scrollUp(false);
-      else
-        scrollUp(true);
-    }
-
 
     /**
      * DOCUMENT ME!