X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=042f9374f584c1a88fab7869a7050b8a9aba1942;hb=7fb89dadbc3eac97602fc84e519014582abe4649;hp=3bd365e405aa8a862a6cc6fc682da67884e1b848;hpb=d1a0432ceea31261f2df4eb728f58ef4d0a30c90;p=jalview.git

diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java
index 3bd365e..042f937 100644
--- a/src/jalview/gui/OverviewCanvas.java
+++ b/src/jalview/gui/OverviewCanvas.java
@@ -21,24 +21,20 @@
 package jalview.gui;
 
 import jalview.api.AlignViewportI;
+import jalview.bin.Cache;
 import jalview.renderer.OverviewRenderer;
+import jalview.renderer.OverviewResColourFinder;
 import jalview.viewmodel.OverviewDimensions;
 
-import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 
-import javax.swing.JComponent;
-import javax.swing.Timer;
+import javax.swing.JPanel;
 
-public class OverviewCanvas extends JComponent
+public class OverviewCanvas extends JPanel
 {
-  public static final long RUNNING_TIME = 2000;
   private static final Color TRANS_GREY = new Color(100, 100, 100, 25);
 
   // This is set true if the alignment view changes whilst
@@ -47,12 +43,12 @@ public class OverviewCanvas extends JComponent
 
   private volatile boolean updaterunning = false;
 
+  private boolean dispose = false;
+
   private BufferedImage miniMe;
 
   private BufferedImage lastMiniMe = null;
 
-  private BufferedImage veryLastMiniMe = null;
-
   // Can set different properties in this seqCanvas than
   // main visible SeqCanvas
   private SequenceRenderer sr;
@@ -65,54 +61,29 @@ public class OverviewCanvas extends JComponent
 
   private AlignViewportI av;
 
-  private boolean resize = false;
-
-  private float alpha = 0f;
+  private OverviewResColourFinder cf;
 
-  private long startTime = -1;
-
-  private final Timer timer;
+  private ProgressPanel progressPanel;
 
   public OverviewCanvas(OverviewDimensions overviewDims,
-          AlignViewportI alignvp)
+          AlignViewportI alignvp, ProgressPanel pp)
   {
     od = overviewDims;
     av = alignvp;
+    progressPanel = pp;
 
     sr = new SequenceRenderer(av);
     sr.renderGaps = false;
-    sr.forOverview = true;
     fr = new jalview.renderer.seqfeatures.FeatureRenderer(av);
 
-    timer = new Timer(40, new ActionListener()
-    {
-
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        if (startTime < 0)
-        {
-          startTime = System.currentTimeMillis();
-        }
-        else
-        {
+    boolean useLegacy = Cache.getDefault(Preferences.USE_LEGACY_GAP, false);
+    Color gapCol = Cache.getDefaultColour(Preferences.GAP_COLOUR,
+            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP);
+    Color hiddenCol = Cache.getDefaultColour(Preferences.HIDDEN_COLOUR,
+            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
+    cf = new OverviewResColourFinder(useLegacy, gapCol, hiddenCol);
 
-          long time = System.currentTimeMillis();
-          long duration = time - startTime;
-          if (duration >= RUNNING_TIME)
-          {
-            startTime = -1;
-            ((Timer) e.getSource()).stop();
-            alpha = 0f;
-          }
-          else
-          {
-            alpha = 1f - ((float) duration / (float) RUNNING_TIME);
-          }
-          repaint();
-        }
-      }
-    });
+    setSize(od.getWidth(), od.getHeight());
   }
 
   /**
@@ -164,7 +135,6 @@ public class OverviewCanvas extends JComponent
           FeatureRenderer transferRenderer)
   {
     miniMe = null;
-    veryLastMiniMe = lastMiniMe;
 
     if (showSequenceFeatures)
     {
@@ -173,7 +143,11 @@ public class OverviewCanvas extends JComponent
 
     setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
-    or = new OverviewRenderer(sr, fr, od);
+    or = new OverviewRenderer(fr, od, av.getAlignment(),
+            av.getResidueShading(), cf);
+
+    or.addPropertyChangeListener(progressPanel);
+
     miniMe = or.draw(od.getRows(av.getAlignment()),
             od.getColumns(av.getAlignment()));
 
@@ -183,28 +157,31 @@ 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;
     if (restart)
     {
       restart = false;
-      draw(showSequenceFeatures, showAnnotation, transferRenderer);
+      if (!dispose)
+      {
+        draw(showSequenceFeatures, showAnnotation, transferRenderer);
+      }
     }
     else
     {
       updaterunning = false;
       lastMiniMe = miniMe;
-      timer.start();
     }
   }
 
   @Override
   public void paintComponent(Graphics g)
   {
+    //super.paintComponent(g);
 
     if (restart)
     {
@@ -222,15 +199,16 @@ public class OverviewCanvas extends JComponent
     }
     else if (lastMiniMe != null)
     {
+      // is this a resize?
       if ((getWidth() > 0) && (getHeight() > 0)
               && ((getWidth() != od.getWidth())
                       || (getHeight() != od.getHeight())))
       {
-        resize = true;
-
-        // scale the alignment and annotation separately *** if there is
-        // annotation ***
-        if (od.getGraphHeight() > 0)
+        // if there is annotation, scale the alignment and annotation
+        // separately
+        if (od.getGraphHeight() > 0 
+        		&& od.getSequencesHeight() > 0  // BH 2019
+        		)
         {
           BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
                   od.getWidth(), od.getSequencesHeight());
@@ -260,47 +238,34 @@ public class OverviewCanvas extends JComponent
           od.setHeight(getHeight());
         }
 
-        // scale lastMiniMe to the new size
-        g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-
         // make sure the box is in the right place
         od.setBoxPosition(av.getAlignment().getHiddenSequences(),
                 av.getAlignment().getHiddenColumns());
       }
-      else
-      {
-
-        if (lastMiniMe != miniMe && !resize)
-        {
-          g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-          g.setColor(TRANS_GREY);
-          g.fillRect(0, 0, getWidth(), getHeight());
-        }
-        else if (veryLastMiniMe != null)
-        {
-          Graphics2D g2d = (Graphics2D) g.create();
-          
-          g2d.setComposite(AlphaComposite.SrcOver.derive(alpha));
-          g2d.drawImage(veryLastMiniMe, 0, 0, getWidth(), getHeight(),
-                  this);
-
-          g2d.setComposite(AlphaComposite.SrcOver.derive(1f - alpha));
-          g2d.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-
-          g2d.dispose();
-        }
-        else
-        {
-          // fall back if everything goes wrong somehow
-          g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-        }
-        resize = false;
-      }
-
+      // fall back to normal behaviour
+      g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
     }
-
+    else
+    {
+      g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
+    }
+    
     // draw the box
     g.setColor(Color.red);
     od.drawBox(g);
   }
+
+
+  public void dispose()
+  {
+    dispose = true;
+    synchronized (this)
+    {
+      restart = true;
+      if (or != null)
+      {
+        or.setRedraw(true);
+      }
+    }
+  }
 }