package jalview.gui;
import jalview.api.AlignViewportI;
+import jalview.bin.Cache;
import jalview.renderer.OverviewRenderer;
+import jalview.renderer.OverviewResColourFinder;
import jalview.viewmodel.OverviewDimensions;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
-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
{
- private static final long RUNNING_TIME = 2000;
-
- 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 BufferedImage veryLastMiniMe = null;
-
// Can set different properties in this seqCanvas than
// main visible SeqCanvas
private SequenceRenderer sr;
private AlignViewportI av;
- private float alpha = 0f;
-
- private long startTime = -1;
-
- private final Timer timer;
+ private OverviewResColourFinder cf;
private ProgressPanel progressPanel;
sr = new SequenceRenderer(av);
sr.renderGaps = false;
- sr.forOverview = true;
fr = new jalview.renderer.seqfeatures.FeatureRenderer(av);
- timer = new Timer(SPEED, 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);
- @Override
- public void actionPerformed(ActionEvent e)
- {
- if (startTime < 0)
- {
- startTime = System.currentTimeMillis();
- }
- else
- {
-
- 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());
}
/**
* the renderer to transfer feature colouring from
*/
public void draw(boolean showSequenceFeatures, boolean showAnnotation,
- FeatureRenderer transferRenderer)
+ FeatureRendererModel transferRenderer)
{
miniMe = null;
- veryLastMiniMe = lastMiniMe;
if (showSequenceFeatures)
{
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()));
{
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;
- alpha = 1f;
- timer.start();
}
}
@Override
public void paintComponent(Graphics g)
{
+ // super.paintComponent(g);
if (restart)
{
}
else if (lastMiniMe != null)
{
+ // is this a resize?
if ((getWidth() > 0) && (getHeight() > 0)
&& ((getWidth() != od.getWidth())
|| (getHeight() != od.getHeight())))
{
- // 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());
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 (alpha != 0) // this is a timer triggered dissolve
- {
- Graphics2D g2d = (Graphics2D) g.create();
-
- // 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);
-
- g2d.dispose();
- }
- else if (lastMiniMe != miniMe)
- {
- g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
- g.setColor(TRANS_GREY);
- g.fillRect(0, 0, getWidth(), getHeight());
- }
- else
- {
- // fall back to normal behaviour
- g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
- }
-
- }
-
+ // 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;
+ od = null;
+ synchronized (this)
+ {
+ restart = true;
+ if (or != null)
+ {
+ or.setRedraw(true);
+ }
+ }
+ }
}
git://source.jalview.org / jalview.git / blobdiff