X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=39881303b6a9ac59124118f86a228dc61ab110a3;hb=6ba38b203398282826e738a5ac792fb689479241;hp=2c67388020d8384241c37a76bebcd20a0440af90;hpb=8635a55d2c94dca49e62d5bda3211cb9e4f31dcc;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 2c67388..3988130 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -13,7 +13,7 @@ public class OverviewPanel extends JPanel
   float scalew = 1f;
   float scaleh = 1f;
 
-  int sequencesWidth=400, sequencesHeight=150;
+  int sequencesWidth, sequencesHeight;
   int graphHeight=30;
   int boxX=-1, boxY=-1, boxWidth=-1, boxHeight=-1;
 
@@ -21,6 +21,25 @@ public class OverviewPanel extends JPanel
   {
     this.av = av;
     this.ap = ap;
+
+    // scale the initial size of overviewpanel to shape of alignment
+
+    float initialScale = (float)av.getAlignment().getWidth()/(float)av.getAlignment().getHeight();
+    if(av.getAlignment().getWidth() > av.getAlignment().getHeight())
+    {
+      // wider
+      sequencesWidth = 400;
+      sequencesHeight = (int)(400f/initialScale);
+    }
+    else
+    {
+      // taller
+      sequencesWidth = (int)(400f*initialScale);
+      sequencesHeight = 300;
+    }
+
+
+
     setSize(sequencesWidth, sequencesHeight+graphHeight);
     setLayout(null);
 
@@ -97,14 +116,17 @@ public class OverviewPanel extends JPanel
 
   public void updateOverviewImage()
   {
+
+  boolean oldRenderGaps = av.renderGaps;
+  av.setRenderGaps(false);
    miniMe = null;
    setPreferredSize (new Dimension(sequencesWidth, sequencesHeight+graphHeight));
    sequencesWidth=getWidth();
    sequencesHeight=this.getHeight()-graphHeight;
 
 
-    int fullsizeWidth = (int)(av.getAlignment().getWidth()*av.getCharWidth());
-    int fullsizeHeight = av.getAlignment().getHeight()*av.getCharHeight();
+    int fullsizeWidth  = av.getAlignment().getWidth() * av.getCharWidth();
+    int fullsizeHeight = av.getAlignment().getHeight()* av.getCharHeight();
 
 
     BufferedImage fullSize = new BufferedImage(fullsizeWidth,
@@ -141,6 +163,8 @@ public class OverviewPanel extends JPanel
       miniMe = null;
     }
 
+    av.setRenderGaps(oldRenderGaps);
+
   }
 
   public void setBoxPosition()
@@ -156,6 +180,8 @@ public class OverviewPanel extends JPanel
 
   public void paintComponent(Graphics g)
   {
+    g.setColor(Color.white);
+    g.fillRect(0,0,getWidth(),getHeight());
     if(miniMe!=null)
       g.drawImage(miniMe, 0,0,this);