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 'JAL-1755_npe_groupconsensus' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
OverviewPanel.java
diff --git
a/src/jalview/appletgui/OverviewPanel.java
b/src/jalview/appletgui/OverviewPanel.java
index
2c2c41a
..
3301543
100755
(executable)
--- a/
src/jalview/appletgui/OverviewPanel.java
+++ b/
src/jalview/appletgui/OverviewPanel.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-69,7
+69,6
@@
public class OverviewPanel extends Panel implements Runnable,
sr.renderGaps = false;
sr.forOverview = true;
fr = new FeatureRenderer(av);
sr.renderGaps = false;
sr.forOverview = true;
fr = new FeatureRenderer(av);
- fr.overview = true;
// scale the initial size of overviewpanel to shape of alignment
float initialScale = (float) av.getAlignment().getWidth()
// scale the initial size of overviewpanel to shape of alignment
float initialScale = (float) av.getAlignment().getWidth()
@@
-229,10
+228,9
@@
public class OverviewPanel extends Panel implements Runnable,
return;
}
return;
}
- if (av.showSequenceFeatures)
+ if (av.isShowSequenceFeatures())
{
{
- fr.featureGroups = ap.seqPanel.seqCanvas.getFeatureRenderer().featureGroups;
- fr.featureColours = ap.seqPanel.seqCanvas.getFeatureRenderer().featureColours;
+ fr.transferSettings(ap.seqPanel.seqCanvas.fr);
}
resizing = true;
}
resizing = true;
@@
-260,7
+258,7
@@
public class OverviewPanel extends Panel implements Runnable,
int alwidth = av.getAlignment().getWidth();
int alheight = av.getAlignment().getHeight();
int alwidth = av.getAlignment().getWidth();
int alheight = av.getAlignment().getHeight();
- if (av.showSequenceFeatures)
+ if (av.isShowSequenceFeatures())
{
fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer());
}
{
fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer());
}
@@
-337,7
+335,7
@@
public class OverviewPanel extends Panel implements Runnable,
{
color = sr.getResidueBoxColour(seq, lastcol);
{
color = sr.getResidueBoxColour(seq, lastcol);
- if (av.showSequenceFeatures)
+ if (av.isShowSequenceFeatures())
{
color = fr.findFeatureColour(color, seq, lastcol);
}
{
color = fr.findFeatureColour(color, seq, lastcol);
}