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;
public class OverviewCanvas extends JComponent
{
- public static final long RUNNING_TIME = 2000;
+ private static final long RUNNING_TIME = 1000;
+
+ private static final int SPEED = 40;
+
private static final Color TRANS_GREY = new Color(100, 100, 100, 25);
// This is set true if the alignment view changes whilst
private volatile boolean updaterunning = false;
+ private boolean dispose = false;
+
private BufferedImage miniMe;
private BufferedImage lastMiniMe = null;
private AlignViewportI av;
- private boolean resize = false;
+
+ private OverviewResColourFinder cf;
private float alpha = 0f;
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()
+ 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);
+
+ setSize(od.getWidth(), od.getHeight());
+
+ timer = new Timer(SPEED, new ActionListener()
{
@Override
}
}
});
+
}
/**
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()));
}
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;
+ alpha = 1f;
timer.start();
}
}
@Override
public void paintComponent(Graphics g)
{
-
if (restart)
{
if (lastMiniMe == null)
}
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 there is annotation, scale the alignment and annotation separately
if (od.getGraphHeight() > 0)
{
BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
od.setBoxPosition(av.getAlignment().getHiddenSequences(),
av.getAlignment().getHiddenColumns());
}
- else
+ else // not a resize
{
-
- 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)
+ if (alpha != 0) // this is a timer triggered dissolve
{
Graphics2D g2d = (Graphics2D) g.create();
- g2d.setComposite(AlphaComposite.SrcOver.derive(alpha));
+ // draw the original image
g2d.drawImage(veryLastMiniMe, 0, 0, getWidth(), getHeight(),
this);
+ // draw the new image on top with varying degrees of transparency
g2d.setComposite(AlphaComposite.SrcOver.derive(1f - alpha));
g2d.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
}
else
{
- // fall back if everything goes wrong somehow
+ // fall back to normal behaviour
g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
}
- resize = false;
}
-
}
// 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);
+ }
+ }
+ }
}