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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
appletgui
/
OverviewCanvas.java
diff --git
a/src/jalview/appletgui/OverviewCanvas.java
b/src/jalview/appletgui/OverviewCanvas.java
index
a0466d3
..
e99c021
100644
(file)
--- a/
src/jalview/appletgui/OverviewCanvas.java
+++ b/
src/jalview/appletgui/OverviewCanvas.java
@@
-21,6
+21,7
@@
package jalview.appletgui;
import jalview.renderer.OverviewRenderer;
package jalview.appletgui;
import jalview.renderer.OverviewRenderer;
+import jalview.renderer.OverviewResColourFinder;
import jalview.viewmodel.OverviewDimensions;
import java.awt.Color;
import jalview.viewmodel.OverviewDimensions;
import java.awt.Color;
@@
-48,10
+49,6
@@
public class OverviewCanvas extends Component
private AlignViewport av;
private AlignViewport av;
- // Can set different properties in this seqCanvas than
- // main visible SeqCanvas
- private SequenceRenderer sr;
-
private jalview.renderer.seqfeatures.FeatureRenderer fr;
private Frame nullFrame;
private jalview.renderer.seqfeatures.FeatureRenderer fr;
private Frame nullFrame;
@@
-65,10
+62,6
@@
public class OverviewCanvas extends Component
nullFrame = new Frame();
nullFrame.addNotify();
nullFrame = new Frame();
nullFrame.addNotify();
- sr = new SequenceRenderer(av);
- sr.graphics = nullFrame.getGraphics();
- sr.renderGaps = false;
- sr.forOverview = true;
fr = new jalview.renderer.seqfeatures.FeatureRenderer(av);
}
fr = new jalview.renderer.seqfeatures.FeatureRenderer(av);
}
@@
-119,7
+112,8
@@
public class OverviewCanvas extends Component
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
- or = new OverviewRenderer(sr, fr, od);
+ or = new OverviewRenderer(fr, od, av.getAlignment(),
+ av.getResidueShading(), new OverviewResColourFinder());
miniMe = nullFrame.createImage(od.getWidth(), od.getHeight());
offscreen = nullFrame.createImage(od.getWidth(), od.getHeight());
miniMe = nullFrame.createImage(od.getWidth(), od.getHeight());
offscreen = nullFrame.createImage(od.getWidth(), od.getHeight());
@@
-134,11
+128,9
@@
public class OverviewCanvas extends Component
{
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();
if (restart)
{
if (restart)
{