X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=de55996b1bf7f0249f647ab9b799c8db8e247448;hb=a83adb45bdf9554e270921b4baad94defd314b36;hp=34fbc971b1661e5cd97ef40636eb524d38cde40b;hpb=a958faf67348b6360f735e51b9b23c24976014cf;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index 34fbc97..de55996 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -22,6 +22,7 @@ package jalview.gui; import jalview.api.AlignViewportI; import jalview.bin.Cache; +import jalview.datamodel.AlignmentI; import jalview.renderer.OverviewRenderer; import jalview.renderer.OverviewResColourFinder; import jalview.viewmodel.OverviewDimensions; @@ -31,9 +32,10 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.image.BufferedImage; -import javax.swing.JComponent; +import javax.swing.JPanel; -public class OverviewCanvas extends JComponent +@SuppressWarnings("serial") +public class OverviewCanvas extends JPanel { private static final Color TRANS_GREY = new Color(100, 100, 100, 25); @@ -43,11 +45,9 @@ public class OverviewCanvas extends JComponent private volatile boolean updaterunning = false; - private boolean dispose = false; + private boolean disposed = false; - private BufferedImage miniMe; - - private BufferedImage lastMiniMe = null; + BufferedImage lastMiniMe = null; // Can set different properties in this seqCanvas than // main visible SeqCanvas @@ -65,13 +65,26 @@ public class OverviewCanvas extends JComponent private ProgressPanel progressPanel; - public OverviewCanvas(OverviewDimensions overviewDims, + private boolean showSequenceFeatures; + + private boolean showAnnotation; + + private jalview.api.FeatureRenderer featureRenderer; + + private OverviewPanel panel; + + private boolean showProgress; + + public OverviewCanvas(OverviewPanel panel, + OverviewDimensions overviewDims, AlignViewportI alignvp, ProgressPanel pp) { + this.panel = panel; od = overviewDims; + lastMiniMe = null; av = alignvp; progressPanel = pp; - + showProgress = (pp != null); sr = new SequenceRenderer(av); sr.renderGaps = false; fr = new jalview.renderer.seqfeatures.FeatureRenderer(av); @@ -84,6 +97,7 @@ public class OverviewCanvas extends JComponent cf = new OverviewResColourFinder(useLegacy, gapCol, hiddenCol); setSize(od.getWidth(), od.getHeight()); + setPreferredSize(getSize()); // BH 2019.07.29 added } /** @@ -95,6 +109,7 @@ public class OverviewCanvas extends JComponent public void resetOviewDims(OverviewDimensions overviewDims) { od = overviewDims; + lastMiniMe = null; } /** @@ -107,20 +122,27 @@ public class OverviewCanvas extends JComponent { if (updaterunning) { - restart = true; - if (or != null) - { - or.setRedraw(true); - } + setRestart("restartDraw"); } else { updaterunning = true; + restart = false; } return restart; } } + private void setRestart(String why) + { + // System.out.println("OC restart true " + why); + restart = true; + if (or != null) + { + or.setRedraw(true); + } + } + /** * Draw the overview sequences * @@ -128,143 +150,173 @@ public class OverviewCanvas extends JComponent * true if sequence features are to be shown * @param showAnnotation * true if the annotation is to be shown - * @param transferRenderer + * @param featureRenderer * the renderer to transfer feature colouring from */ public void draw(boolean showSequenceFeatures, boolean showAnnotation, - FeatureRenderer transferRenderer) + jalview.api.FeatureRenderer featureRenderer) { - miniMe = null; - + this.showSequenceFeatures = showSequenceFeatures; + this.showAnnotation = showAnnotation; + this.featureRenderer = featureRenderer; if (showSequenceFeatures) { - fr.transferSettings(transferRenderer); + fr.transferSettings(featureRenderer); } - setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); + AlignmentI al = av.getAlignment(); + or = new OverviewRenderer(panel.ap, fr, od, al, av.getResidueShading(), + cf, showProgress); + if (showProgress) + { + or.addPropertyChangeListener(progressPanel); + } + or.drawMiniMe(); + } - 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(); + synchronized void finalizeDraw(BufferedImage miniMe) + { - if (showAnnotation) + if (showProgress && or != null) { - mg.translate(0, od.getSequencesHeight()); - or.drawGraph(mg, av.getAlignmentConservationAnnotation(), - av.getCharWidth(), od.getGraphHeight(), - od.getColumns(av.getAlignment())); - mg.translate(0, -od.getSequencesHeight()); + or.removePropertyChangeListener(progressPanel); } - - or.removePropertyChangeListener(progressPanel); - or = null; if (restart) { + or = null; restart = false; - if (!dispose) + if (!disposed) { - draw(showSequenceFeatures, showAnnotation, transferRenderer); + draw(showSequenceFeatures, showAnnotation, featureRenderer); } } else { + if (showAnnotation && or != null) + { + or.drawGraph(av.getAlignmentConservationAnnotation()); + } + or = null; updaterunning = false; lastMiniMe = miniMe; + repaint(); } } @Override public void paintComponent(Graphics g) { - // super.paintComponent(g); + int w = getWidth(); + int h = getHeight(); + if (w == 0 || od.getBoxWidth() <= 0) + { + // BH 2019.07.27 removes two unnecessary paints, since boxwidth can be -1 + // or 0 during early-stage painting + return; + } + + boolean drawMe = (lastMiniMe != null); if (restart) { - if (lastMiniMe == null) + if (drawMe) { - g.setColor(Color.white); - g.fillRect(0, 0, getWidth(), getHeight()); + g.drawImage(lastMiniMe, 0, 0, w, h, this); } else { - g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this); + g.setColor(Color.white); + g.fillRect(0, 0, w, h); } g.setColor(TRANS_GREY); - g.fillRect(0, 0, getWidth(), getHeight()); + g.fillRect(0, 0, w, h); + drawMe = false; } - else if (lastMiniMe != null) + else if (drawMe) { // is this a resize? - if ((getWidth() > 0) && (getHeight() > 0) - && ((getWidth() != od.getWidth()) - || (getHeight() != od.getHeight()))) + if (w != od.getWidth() || h != od.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()); - } - - // make sure the box is in the right place - od.setBoxPosition(av.getAlignment().getHiddenSequences(), - av.getAlignment().getHiddenColumns()); + + lastMiniMe = null; + return; + // // if there is annotation, scale the alignment and annotation + // // separately + // if (od.getGraphHeight() <= 0 && od.getSequencesHeight() <= 0) + // { + // od.setWidth(w); + // od.setHeight(h); + // return; + // } + // 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(w); + // od.setHeight(h); + // + // // stick the images back together so lastMiniMe is consistent in the + // // event of a repaint - BUT probably not thread safe + // + // // right -- this fails with fast user action. + // + // lastMiniMe = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); + // Graphics lg = lastMiniMe.getGraphics(); + // lg.drawImage(topImage, 0, 0, w, od.getSequencesHeight(), null); + // lg.drawImage(bottomImage, 0, od.getSequencesHeight(), w, + // od.getGraphHeight(), this); + // lg.dispose(); + // + // } catch (RasterFormatException e) + // { + // System.out.println("OC Raster Exception " + lastMiniMe.getWidth() + // + "/" + w + "," + lastMiniMe.getHeight() + "/" + h + " " + // + od.getSequencesHeight() + " " + od.getGraphHeight()); + // } + // BH 2019: removed -- this is now taken care of using vpbox in + // OverviewDimension + // // make sure the box is in the right place + // od.setBoxPosition(av.getAlignment().getHiddenSequences(), + // av.getAlignment().getHiddenColumns()); } - // fall back to normal behaviour - g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this); } - else + + if (drawMe) { - g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this); + g.drawImage(lastMiniMe, 0, 0, w, h, this); } - // draw the box g.setColor(Color.red); + // System.out.println("OC paintComponent nd=" + ndraw + " nr=" + nrepaint + // + " np=" + ++npaint); od.drawBox(g); } + // private int ndraw, npaint, nrepaint; + + // @Override + // public void repaint() + // { + // System.out.println("OC repaint " + (++nrepaint)); + // super.repaint(); + // } public void dispose() { - dispose = true; + disposed = true; + od = null; + lastMiniMe = null; synchronized (this) { - restart = true; - if (or != null) - { - or.setRedraw(true); - } + setRestart("dispose"); } } + }