X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=ca27a9cfb77322252f0630735638ea289b7a096c;hb=5d4b4eb70fb510e1720259328bfc7ac201373c5e;hp=34fbc971b1661e5cd97ef40636eb524d38cde40b;hpb=a958faf67348b6360f735e51b9b23c24976014cf;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index 34fbc97..ca27a9c 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -31,9 +31,9 @@ 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 +public class OverviewCanvas extends JPanel { private static final Color TRANS_GREY = new Color(100, 100, 100, 25); @@ -157,8 +157,7 @@ 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()); } @@ -182,7 +181,7 @@ public class OverviewCanvas extends JComponent @Override public void paintComponent(Graphics g) { - // super.paintComponent(g); + //super.paintComponent(g); if (restart) { @@ -207,7 +206,9 @@ public class OverviewCanvas extends JComponent { // 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()); @@ -258,6 +259,7 @@ public class OverviewCanvas extends JComponent public void dispose() { dispose = true; + od = null; synchronized (this) { restart = true;