X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=64bf15c8fb348102ae53f77effafbd0d6b7bb391;hb=d476574d0dc6e4d98824f430e41c8965b8e93499;hp=e475c2cee3471c951434b44b314b22da728db830;hpb=536a4a9c407a4c07b71e86e75135eaa2ba5e8850;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index e475c2c..64bf15c 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -21,18 +21,29 @@ package jalview.gui; import jalview.api.AlignViewportI; -import jalview.renderer.seqfeatures.FeatureColourFinder; +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; public class OverviewCanvas extends JComponent { + 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 @@ -41,10 +52,14 @@ 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; @@ -53,18 +68,71 @@ public class OverviewCanvas extends JComponent private OverviewDimensions od; + private OverviewRenderer or = null; + private AlignViewportI av; + + private OverviewResColourFinder cf; + + private float alpha = 0f; + + 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); + + 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 + 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(); + } + } + }); + } /** @@ -89,6 +157,10 @@ public class OverviewCanvas extends JComponent if (updaterunning) { restart = true; + if (or != null) + { + or.setRedraw(true); + } } else { @@ -112,22 +184,22 @@ public class OverviewCanvas extends JComponent FeatureRenderer transferRenderer) { miniMe = null; + veryLastMiniMe = lastMiniMe; if (showSequenceFeatures) { fr.transferSettings(transferRenderer); } - FeatureColourFinder finder = new FeatureColourFinder(fr); - // why do we need to set preferred size again? was set in - // updateOverviewImage setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); - OverviewRenderer or = new OverviewRenderer(sr, finder, od); - miniMe = or.draw(od.getRows(av.getRanges(), av.getAlignment()), - od - .getColumns(av.getRanges(), av.getAlignment() - .getHiddenColumns())); + or = new OverviewRenderer(fr, od, av.getAlignment(), + av.getResidueShading(), cf); + + or.addPropertyChangeListener(progressPanel); + + miniMe = or.draw(od.getRows(av.getAlignment()), + od.getColumns(av.getAlignment())); Graphics mg = miniMe.getGraphics(); @@ -136,21 +208,27 @@ public class OverviewCanvas extends JComponent mg.translate(0, od.getSequencesHeight()); or.drawGraph(mg, av.getAlignmentConservationAnnotation(), av.getCharWidth(), od.getGraphHeight(), - od.getColumns( - av.getRanges(), av.getAlignment().getHiddenColumns())); + 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(); } } @@ -173,16 +251,88 @@ public class OverviewCanvas extends JComponent } else if (lastMiniMe != null) { - g.drawImage(lastMiniMe, 0, 0, this); - if (lastMiniMe != miniMe) + // is this a resize? + if ((getWidth() > 0) && (getHeight() > 0) + && ((getWidth() != od.getWidth()) + || (getHeight() != od.getHeight()))) { - g.setColor(TRANS_GREY); - g.fillRect(0, 0, getWidth(), getHeight()); + // if there is annotation, scale the alignment and annotation separately + if (od.getGraphHeight() > 0) + { + 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(); + } + else + { + od.setWidth(getWidth()); + 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 // not a resize + { + 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 + { + // fall back to normal behaviour + 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); + } + } + } }