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 'develop' into bug/JAL-2431splitFrameNewView
[jalview.git]
/
src
/
jalview
/
workers
/
ConsensusThread.java
diff --git
a/src/jalview/workers/ConsensusThread.java
b/src/jalview/workers/ConsensusThread.java
index
1cce3ff
..
284f1a1
100644
(file)
--- a/
src/jalview/workers/ConsensusThread.java
+++ b/
src/jalview/workers/ConsensusThread.java
@@
-28,7
+28,7
@@
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.ProfilesI;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Annotation;
import jalview.datamodel.ProfilesI;
import jalview.datamodel.SequenceI;
-import jalview.schemes.ColourSchemeI;
+import jalview.renderer.ResidueShaderI;
public class ConsensusThread extends AlignCalcWorker
{
public class ConsensusThread extends AlignCalcWorker
{
@@
-153,11
+153,10
@@
public class ConsensusThread extends AlignCalcWorker
*/
protected void setColourSchemeConsensus(ProfilesI hconsensus)
{
*/
protected void setColourSchemeConsensus(ProfilesI hconsensus)
{
- ColourSchemeI globalColourScheme = alignViewport
- .getGlobalColourScheme();
- if (globalColourScheme != null)
+ ResidueShaderI cs = alignViewport.getResidueShading();
+ if (cs != null)
{
{
- globalColourScheme.setConsensus(hconsensus);
+ cs.setConsensus(hconsensus);
}
}
}
}