X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewCanvas.java;h=8e6799203478411dc3ba6ff1341dfa08e3b534de;hb=339d1bf247a3b0d000044892bee3d5668a8d9b11;hp=cc361a5010cbf3090c365b034b3a9f20e1b47017;hpb=77b160b053c41a5d5c95bf1bbc0fbd066435f70d;p=jalview.git diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index cc361a5..8e67992 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -25,15 +25,16 @@ 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; 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); @@ -132,7 +133,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; @@ -181,7 +182,7 @@ public class OverviewCanvas extends JComponent @Override public void paintComponent(Graphics g) { - super.paintComponent(g); + //super.paintComponent(g); if (restart) { @@ -206,7 +207,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()); @@ -257,6 +260,7 @@ public class OverviewCanvas extends JComponent public void dispose() { dispose = true; + od = null; synchronized (this) { restart = true;