X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=470fd643df5bd9e41031493993f656e3e901f4dc;hb=229c987fa6b3d5b98471ce0d4e83fbbf957e792b;hp=ec2c49fa3548a6924c090b711fe1bf29ba1c4b4d;hpb=348fe2d15827689d155df9345e4f10753cab6ac9;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index ec2c49f..470fd64 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -25,6 +25,7 @@ import jalview.bin.Cache; 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; @@ -132,7 +133,7 @@ public class OverviewCanvas extends JPanel * the renderer to transfer feature colouring from */ public void draw(boolean showSequenceFeatures, boolean showAnnotation, - FeatureRenderer transferRenderer) + FeatureRendererModel transferRenderer) { miniMe = null; @@ -181,7 +182,7 @@ public class OverviewCanvas extends JPanel @Override public void paintComponent(Graphics g) { - super.paintComponent(g); + // super.paintComponent(g); if (restart) { @@ -206,7 +207,8 @@ public class OverviewCanvas extends JPanel { // if there is annotation, scale the alignment and annotation // separately - if (od.getGraphHeight() > 0) + if (od.getGraphHeight() > 0 && od.getSequencesHeight() > 0 // BH 2019 + ) { BufferedImage topImage = lastMiniMe.getSubimage(0, 0, od.getWidth(), od.getSequencesHeight()); @@ -247,16 +249,16 @@ public class OverviewCanvas extends JPanel { 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;