X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=99dba3d97e39ce7b32c741d0895439dc3092eb2c;hb=a5928e2c1b9e2cea8d9c43f3d03f9cce2604f3b2;hp=2991889bb8a6e4ac09d7764dfdaff0058d53682e;hpb=f8b17a9e7363b8a9e7cd12d61bc6d611c7c97d7d;p=jalview.git

diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java
index 2991889..99dba3d 100644
--- a/src/jalview/gui/OverviewCanvas.java
+++ b/src/jalview/gui/OverviewCanvas.java
@@ -20,21 +20,35 @@
  */
 package jalview.gui;
 
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.awt.image.RasterFormatException;
+
+import javax.swing.JPanel;
+
 import jalview.api.AlignViewportI;
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.renderer.OverviewRenderer;
 import jalview.renderer.OverviewResColourFinder;
 import jalview.viewmodel.OverviewDimensions;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
+public class OverviewCanvas extends JPanel
+{
+  public static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray;
 
-import javax.swing.JComponent;
+  public static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white;
+
+  public static final Color OVERVIEW_DEFAULT_RESIDUE = Color.white;
+
+  public static final Color OVERVIEW_DEFAULT_LEGACY_RESIDUE = Color.lightGray;
+
+  public static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray
+          .darker();
 
-public class OverviewCanvas extends JComponent
-{
   private static final Color TRANS_GREY = new Color(100, 100, 100, 25);
 
   // This is set true if the alignment view changes whilst
@@ -78,10 +92,12 @@ public class OverviewCanvas extends JComponent
 
     boolean useLegacy = Cache.getDefault(Preferences.USE_LEGACY_GAP, false);
     Color gapCol = Cache.getDefaultColour(Preferences.GAP_COLOUR,
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP);
+            OVERVIEW_DEFAULT_GAP);
     Color hiddenCol = Cache.getDefaultColour(Preferences.HIDDEN_COLOUR,
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
-    cf = new OverviewResColourFinder(useLegacy, gapCol, hiddenCol);
+            OVERVIEW_DEFAULT_HIDDEN);
+    Color residueCol = useLegacy ? OVERVIEW_DEFAULT_LEGACY_RESIDUE : OVERVIEW_DEFAULT_RESIDUE;
+    
+    cf = new OverviewResColourFinder(gapCol, residueCol, hiddenCol);
 
     setSize(od.getWidth(), od.getHeight());
   }
@@ -132,7 +148,7 @@ public class OverviewCanvas extends JComponent
    *          the renderer to transfer feature colouring from
    */
   public void draw(boolean showSequenceFeatures, boolean showAnnotation,
-          FeatureRenderer transferRenderer)
+          FeatureRendererModel transferRenderer)
   {
     miniMe = null;
 
@@ -157,11 +173,9 @@ public class OverviewCanvas extends JComponent
     {
       mg.translate(0, od.getSequencesHeight());
       or.drawGraph(mg, av.getAlignmentConservationAnnotation(),
-              av.getCharWidth(), od.getGraphHeight(),
-              od.getColumns(av.getAlignment()));
+              od.getGraphHeight(), od.getColumns(av.getAlignment()));
       mg.translate(0, -od.getSequencesHeight());
     }
-    System.gc();
 
     or.removePropertyChangeListener(progressPanel);
     or = null;
@@ -208,29 +222,39 @@ public class OverviewCanvas extends JComponent
       {
         // if there is annotation, scale the alignment and annotation
         // separately
-        if (od.getGraphHeight() > 0)
+        if (od.getGraphHeight() > 0 && od.getSequencesHeight() > 0 // BH 2019
+        )
         {
-          BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
-                  od.getWidth(), od.getSequencesHeight());
-          BufferedImage bottomImage = lastMiniMe.getSubimage(0,
-                  od.getSequencesHeight(), od.getWidth(),
-                  od.getGraphHeight());
-
-          // must be done at this point as we rely on using old width/height
-          // above, and new width/height below
-          od.setWidth(getWidth());
-          od.setHeight(getHeight());
-
-          // stick the images back together so lastMiniMe is consistent in the
-          // event of a repaint - BUT probably not thread safe
-          lastMiniMe = new BufferedImage(od.getWidth(), od.getHeight(),
-                  BufferedImage.TYPE_INT_RGB);
-          Graphics lg = lastMiniMe.getGraphics();
-          lg.drawImage(topImage, 0, 0, od.getWidth(),
-                  od.getSequencesHeight(), null);
-          lg.drawImage(bottomImage, 0, od.getSequencesHeight(),
-                  od.getWidth(), od.getGraphHeight(), this);
-          lg.dispose();
+          try
+          {
+            BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
+                    od.getWidth(), od.getSequencesHeight());
+            BufferedImage bottomImage = lastMiniMe.getSubimage(0,
+                    od.getSequencesHeight(), od.getWidth(),
+                    od.getGraphHeight());
+
+            // must be done at this point as we rely on using old width/height
+            // above, and new width/height below
+            od.setWidth(getWidth());
+            od.setHeight(getHeight());
+
+            // stick the images back together so lastMiniMe is consistent in the
+            // event of a repaint - BUT probably not thread safe
+            lastMiniMe = new BufferedImage(od.getWidth(), od.getHeight(),
+                    BufferedImage.TYPE_INT_RGB);
+            Graphics lg = lastMiniMe.getGraphics();
+            lg.drawImage(topImage, 0, 0, od.getWidth(),
+                    od.getSequencesHeight(), null);
+            lg.drawImage(bottomImage, 0, od.getSequencesHeight(),
+                    od.getWidth(), od.getGraphHeight(), this);
+            lg.dispose();
+          } catch (RasterFormatException e)
+          {
+            Console.debug(
+                    "Scaling miscalculation resizing Overview window");
+            od.setWidth(getWidth());
+            od.setHeight(getHeight());
+          }
         }
         else
         {
@@ -249,16 +273,16 @@ public class OverviewCanvas extends JComponent
     {
       g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
     }
-    
+
     // draw the box
     g.setColor(Color.red);
     od.drawBox(g);
   }
 
-
   public void dispose()
   {
     dispose = true;
+    od = null;
     synchronized (this)
     {
       restart = true;
@@ -268,4 +292,31 @@ public class OverviewCanvas extends JComponent
       }
     }
   }
+
+  public Color getGapColour()
+  {
+    return cf.getGapColour();
+  }
+
+  public Color getHiddenColour()
+  {
+    return cf.getHiddenColour();
+  }
+
+  public Color getResidueColour()
+  {
+    return cf.getResidueColour();
+  }
+
+  /**
+   * Sets the colours to use for gaps, residues and hidden regions
+   * 
+   * @param gaps
+   * @param residues
+   * @param hidden
+   */
+  public void setColours(Color gaps, Color residues, Color hidden)
+  {
+    cf = new OverviewResColourFinder(gaps, residues, hidden);
+  }
 }