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-2388 Reinstated original overview checks for annotation display
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
ac2138f
..
c530fdc
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-90,7
+90,9
@@
public class OverviewPanel extends JPanel implements Runnable
sr.forOverview = true;
fr = new FeatureRenderer(ap);
sr.forOverview = true;
fr = new FeatureRenderer(ap);
- od = new OverviewDimensions(av.getRanges(), av.isShowAnnotation());
+ od = new OverviewDimensions(av.getRanges(),
+ (av.isShowAnnotation() && av
+ .getAlignmentConservationAnnotation() != null));
addComponentListener(new ComponentAdapter()
{
addComponentListener(new ComponentAdapter()
{
@@
-201,7
+203,9
@@
public class OverviewPanel extends JPanel implements Runnable
buildImage(sampleRow, sampleCol);
buildImage(sampleRow, sampleCol);
- if (av.isShowAnnotation())
+ // check for conservation annotation to make sure overview works for DNA too
+ if (av.isShowAnnotation()
+ && (av.getAlignmentConservationAnnotation() != null))
{
renderer.updateFromAlignViewport(av);
for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
{
renderer.updateFromAlignViewport(av);
for (int col = 0; col < od.getWidth() && !resizeAgain; col++)