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
Pull from develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
OverviewPanel.java
diff --git
a/src/jalview/appletgui/OverviewPanel.java
b/src/jalview/appletgui/OverviewPanel.java
index
2fc5716
..
3ef2936
100755
(executable)
--- a/
src/jalview/appletgui/OverviewPanel.java
+++ b/
src/jalview/appletgui/OverviewPanel.java
@@
-77,7
+77,8
@@
public class OverviewPanel extends Panel implements Runnable,
sr.forOverview = true;
fr = new FeatureRenderer(av);
sr.forOverview = true;
fr = new FeatureRenderer(av);
- od = new OverviewDimensions(av.getRanges(), av.isShowAnnotation());
+ od = new OverviewDimensions(av.getRanges(),
+ (av.isShowAnnotation() && av.getSequenceConsensusHash() != null));
setSize(new Dimension(od.getWidth(), od.getHeight()));
addComponentListener(new ComponentAdapter()
setSize(new Dimension(od.getWidth(), od.getHeight()));
addComponentListener(new ComponentAdapter()
@@
-209,7
+210,9
@@
public class OverviewPanel extends Panel implements Runnable,
buildImage(sampleRow, sampleCol, mg);
buildImage(sampleRow, sampleCol, mg);
- if (av.isShowAnnotation())
+ // check for conservation annotation to make sure overview works for DNA too
+ if (av.isShowAnnotation()
+ && (av.getAlignmentConservationAnnotation() != null))
{
for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
{
{
for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
{