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
JAL-360 JAL-3975 update parent for text colour dialog - doesn't seem to help but...
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewCanvas.java
diff --git
a/src/jalview/gui/OverviewCanvas.java
b/src/jalview/gui/OverviewCanvas.java
index
2991889
..
470fd64
100644
(file)
--- 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.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 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);
{
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,
* the renderer to transfer feature colouring from
*/
public void draw(boolean showSequenceFeatures, boolean showAnnotation,
- FeatureRenderer transferRenderer)
+ FeatureRendererModel transferRenderer)
{
miniMe = null;
{
miniMe = null;
@@
-157,11
+158,9
@@
public class OverviewCanvas extends JComponent
{
mg.translate(0, od.getSequencesHeight());
or.drawGraph(mg, av.getAlignmentConservationAnnotation(),
{
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());
}
mg.translate(0, -od.getSequencesHeight());
}
- System.gc();
or.removePropertyChangeListener(progressPanel);
or = null;
or.removePropertyChangeListener(progressPanel);
or = null;
@@
-208,7
+207,8
@@
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());
@@
-249,16
+249,16
@@
public class OverviewCanvas extends JComponent
{
g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
}
{
g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
}
-
+
// draw the box
g.setColor(Color.red);
od.drawBox(g);
}
// draw the box
g.setColor(Color.red);
od.drawBox(g);
}
-
public void dispose()
{
dispose = true;
public void dispose()
{
dispose = true;
+ od = null;
synchronized (this)
{
restart = true;
synchronized (this)
{
restart = true;