X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=20ed37d6a7d5ea6df0c193290aaea166f9e86b96;hb=6d02241d48fdb8111b3987b95e1289f9d75d0871;hp=dfa757ec2823d269e727001c14aa2d24407d26ec;hpb=ad34a24a75ab680fcbdef1376a311fb0e0fcf2cd;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index dfa757e..20ed37d 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -32,6 +32,8 @@ import java.io.*;
 
 import javax.swing.*;
 
+import org.biojava.dasobert.eventmodel.*;
+
 
 /**
  * DOCUMENT ME!
@@ -40,7 +42,7 @@ import javax.swing.*;
  * @version $Revision$
  */
 public class AlignmentPanel extends GAlignmentPanel
-    implements AdjustmentListener, Printable
+    implements AdjustmentListener, Printable, FeatureListener
 {
   public AlignViewport av;
   OverviewPanel overviewPanel;
@@ -92,11 +94,8 @@ public class AlignmentPanel extends GAlignmentPanel
 
     setScrollValues(0, 0);
 
-    annotationPanel.adjustPanelHeight();
-    annotationSpaceFillerHolder.setPreferredSize(annotationPanel.
-                                                 getPreferredSize());
-    annotationScroller.setPreferredSize(annotationPanel.
-                                        getPreferredSize());
+    adjustAnnotationHeight();
+
     setAnnotationVisible(av.getShowAnnotation());
 
     hscroll.addAdjustmentListener(this);
@@ -156,23 +155,20 @@ public class AlignmentPanel extends GAlignmentPanel
           case KeyEvent.VK_SPACE:
             if(av.cursorMode)
             {
-              seqPanel.insertGapAtCursor(evt.isControlDown());
+              seqPanel.insertGapAtCursor(evt.isControlDown() || evt.isShiftDown());
             }
             break;
 
           case KeyEvent.VK_DELETE:
-            if(av.cursorMode)
-            {
-              seqPanel.deleteGapAtCursor(evt.isControlDown());
-            }
-            break;
-
           case KeyEvent.VK_BACK_SPACE:
             if(!av.cursorMode)
             {
               alignFrame.cut_actionPerformed(null);
               seqPanel.seqCanvas.repaint();
             }
+            else
+              seqPanel.deleteGapAtCursor(evt.isControlDown() || evt.isShiftDown());
+
             break;
 
           case KeyEvent.VK_S:
@@ -249,6 +245,15 @@ public class AlignmentPanel extends GAlignmentPanel
     });
   }
 
+  public void comeBackLater(FeatureEvent evt)
+  {}
+
+  public void newFeatures(FeatureEvent evt)
+  {
+    seqPanel.seqCanvas.fr.findAllFeatures();
+    repaint();
+  }
+
   /**
    * DOCUMENT ME!
    */
@@ -371,16 +376,21 @@ public class AlignmentPanel extends GAlignmentPanel
       }
       else
       {
-        int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
-        if( start<av.getStartRes() || start>(av.getStartRes()+cwidth) )
-        {
-          vscroll.setValue(start / cwidth);
-          av.startRes = vscroll.getValue() * cwidth;
-        }
+        scrollToWrappedVisible(start);
       }
     }
   }
 
+  void scrollToWrappedVisible(int res)
+  {
+    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+    if( res<=av.getStartRes() || res>=(av.getStartRes()+cwidth) )
+    {
+      vscroll.setValue(res / cwidth);
+      av.startRes = vscroll.getValue() * cwidth;
+    }
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -416,6 +426,37 @@ public class AlignmentPanel extends GAlignmentPanel
     repaint();
   }
 
+  public void adjustAnnotationHeight()
+  {
+    javax.swing.SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+          while(alignFrame.getHeight()==0)
+          {
+            Thread.yield();
+          }
+
+        int height = annotationPanel.adjustPanelHeight();
+
+        if (height > alignFrame.getHeight() / 2)
+        {
+          height = alignFrame.getHeight() / 2;
+        }
+
+        annotationScroller.setPreferredSize(
+            new Dimension(annotationScroller.getWidth(),
+                          height));
+
+        annotationSpaceFillerHolder.setPreferredSize(new Dimension(
+            annotationSpaceFillerHolder.getWidth(),
+            height));
+
+        annotationPanel.repaint();
+      }
+    });
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -941,7 +982,6 @@ public class AlignmentPanel extends GAlignmentPanel
   {
     int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;
     int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);
-
     if (idPanel.getWidth() == 0)
     {
       width += calculateIdWidth().getWidth() + 4;
@@ -950,7 +990,15 @@ public class AlignmentPanel extends GAlignmentPanel
     if (av.getWrapAlignment())
     {
       height = getWrappedHeight();
-      width = seqPanel.getWidth() + idPanel.getWidth();
+      if (System.getProperty("java.awt.headless") != null
+          && System.getProperty("java.awt.headless").equals("true"))
+      {
+        width = alignFrame.getWidth() - 22;
+      }
+      else
+
+        width = seqPanel.getWidth() + idPanel.getWidth();
+
     }
     else if (av.getShowAnnotation())
     {
@@ -1153,9 +1201,19 @@ public class AlignmentPanel extends GAlignmentPanel
 
   int getWrappedHeight()
   {
+    int seqPanelWidth = seqPanel.seqCanvas.getWidth();
+
+    //If headless, seqPanel will have 0 width
+    if (System.getProperty("java.awt.headless") != null
+              && System.getProperty("java.awt.headless").equals("true"))
+    {
+      int idWidth = calculateIdWidth().width + 4;
+      seqPanelWidth = alignFrame.getWidth() - idWidth;
+    }
 
     int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(
-        seqPanel.seqCanvas.getWidth());
+        seqPanelWidth
+          );
 
     int hgap = av.charHeight;
     if (av.scaleAboveWrapped)