X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=0827208e664fb4d010d5007b54f7f3b782155d7a;hb=ccc53e88e3260886f5d3bdacc619c0f374be9b8f;hp=301387bffd0a15e0e7d551ff36f4e3170d48815c;hpb=547480978230204efda55a1ec533b7b25be2a06f;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index 301387b..0827208 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -20,21 +20,35 @@ */ package jalview.gui; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.image.BufferedImage; +import java.awt.image.RasterFormatException; + +import javax.swing.JPanel; + import jalview.api.AlignViewportI; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.renderer.OverviewRenderer; import jalview.renderer.OverviewResColourFinder; import jalview.viewmodel.OverviewDimensions; +import jalview.viewmodel.seqfeatures.FeatureRendererModel; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.image.BufferedImage; +public class OverviewCanvas extends JPanel +{ + public static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray; -import javax.swing.JComponent; + public static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white; + + public static final Color OVERVIEW_DEFAULT_RESIDUE = Color.white; + + public static final Color OVERVIEW_DEFAULT_LEGACY_RESIDUE = Color.lightGray; + + public static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray + .darker(); -public class OverviewCanvas extends JComponent -{ private static final Color TRANS_GREY = new Color(100, 100, 100, 25); // This is set true if the alignment view changes whilst @@ -43,6 +57,8 @@ public class OverviewCanvas extends JComponent private volatile boolean updaterunning = false; + private boolean dispose = false; + private BufferedImage miniMe; private BufferedImage lastMiniMe = null; @@ -59,15 +75,32 @@ public class OverviewCanvas extends JComponent private AlignViewportI av; + private OverviewResColourFinder cf; + + 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; fr = new jalview.renderer.seqfeatures.FeatureRenderer(av); + + boolean useLegacy = Cache.getDefault(Preferences.USE_LEGACY_GAP, false); + Color gapCol = Cache.getDefaultColour(Preferences.GAP_COLOUR, + OVERVIEW_DEFAULT_GAP); + Color hiddenCol = Cache.getDefaultColour(Preferences.HIDDEN_COLOUR, + OVERVIEW_DEFAULT_HIDDEN); + Color residueCol = useLegacy ? OVERVIEW_DEFAULT_LEGACY_RESIDUE + : OVERVIEW_DEFAULT_RESIDUE; + + cf = new OverviewResColourFinder(gapCol, residueCol, hiddenCol); + + setSize(od.getWidth(), od.getHeight()); } /** @@ -116,7 +149,7 @@ public class OverviewCanvas extends JComponent * the renderer to transfer feature colouring from */ public void draw(boolean showSequenceFeatures, boolean showAnnotation, - FeatureRenderer transferRenderer) + FeatureRendererModel transferRenderer) { miniMe = null; @@ -127,14 +160,11 @@ public class OverviewCanvas extends JComponent setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); - boolean useLegacy = Cache.getDefault("USE_LEGACY_GAP", false); - Color gapCol = Cache.getDefaultColour("GAP_COLOUR", Color.lightGray); - Color hiddenCol = Cache.getDefaultColour("HIDDEN_COLOUR", Color.DARK_GRAY.darker()); - OverviewResColourFinder cf = new OverviewResColourFinder(useLegacy, - gapCol, hiddenCol); - or = new OverviewRenderer(fr, od, av.getAlignment(), av.getResidueShading(), cf); + + or.addPropertyChangeListener(progressPanel); + miniMe = or.draw(od.getRows(av.getAlignment()), od.getColumns(av.getAlignment())); @@ -144,16 +174,19 @@ 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 { @@ -165,6 +198,8 @@ public class OverviewCanvas extends JComponent @Override public void paintComponent(Graphics g) { + // super.paintComponent(g); + if (restart) { if (lastMiniMe == null) @@ -181,16 +216,108 @@ 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 && od.getSequencesHeight() > 0 // BH 2019 + ) + { + 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(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(); + } catch (RasterFormatException e) + { + Console.debug( + "Scaling miscalculation resizing Overview window"); + od.setWidth(getWidth()); + od.setHeight(getHeight()); + } + } + else + { + od.setWidth(getWidth()); + od.setHeight(getHeight()); + } + + // 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 + { + 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); + } + } + } + + public Color getGapColour() + { + return cf.getGapColour(); + } + + public Color getHiddenColour() + { + return cf.getHiddenColour(); + } + + public Color getResidueColour() + { + return cf.getResidueColour(); + } + + /** + * Sets the colours to use for gaps, residues and hidden regions + * + * @param gaps + * @param residues + * @param hidden + */ + public void setColours(Color gaps, Color residues, Color hidden) + { + cf = new OverviewResColourFinder(gaps, residues, hidden); + } }