git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into Jalview-JS/develop
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewCanvas.java
diff --git
a/src/jalview/gui/OverviewCanvas.java
b/src/jalview/gui/OverviewCanvas.java
index
1f55ea6
..
ca27a9c
100644
(file)
--- 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 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);
{
private static final Color TRANS_GREY = new Color(100, 100, 100, 25);
@@
-160,7
+160,6
@@
public class OverviewCanvas extends JComponent
od.getGraphHeight(), od.getColumns(av.getAlignment()));
mg.translate(0, -od.getSequencesHeight());
}
od.getGraphHeight(), od.getColumns(av.getAlignment()));
mg.translate(0, -od.getSequencesHeight());
}
- System.gc();
or.removePropertyChangeListener(progressPanel);
or = null;
or.removePropertyChangeListener(progressPanel);
or = null;
@@
-182,7
+181,7
@@
public class OverviewCanvas extends JComponent
@Override
public void paintComponent(Graphics g)
{
@Override
public void paintComponent(Graphics g)
{
- super.paintComponent(g);
+ //super.paintComponent(g);
if (restart)
{
if (restart)
{
@@
-207,7
+206,9
@@
public class OverviewCanvas extends JComponent
{
// if there is annotation, scale the alignment and annotation
// separately
{
// 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());
{
BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
od.getWidth(), od.getSequencesHeight());
@@
-258,6
+259,7
@@
public class OverviewCanvas extends JComponent
public void dispose()
{
dispose = true;
public void dispose()
{
dispose = true;
+ od = null;
synchronized (this)
{
restart = true;
synchronized (this)
{
restart = true;