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-2422 ChimeraX added to Preferences
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewCanvas.java
diff --git
a/src/jalview/gui/OverviewCanvas.java
b/src/jalview/gui/OverviewCanvas.java
index
34fbc97
..
0f49381
100644
(file)
--- 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.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.Color;
import java.awt.Dimension;
@@
-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,8
+158,7
@@
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());
}
@@
-182,7
+182,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)
{
@@
-258,6
+258,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;