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 trialMerge
[jalview.git]
/
src
/
jalview
/
gui
/
AlignViewport.java
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
62a3698
..
5ef2568
100644
(file)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-290,7
+290,7
@@
public class AlignViewport extends AlignmentViewport
ResidueColourScheme.NONE);
}
ColourSchemeI colourScheme = ColourSchemeProperty
ResidueColourScheme.NONE);
}
ColourSchemeI colourScheme = ColourSchemeProperty
- .getColourScheme(alignment, schemeName);
+ .getColourScheme(this, alignment, schemeName);
residueShading = new ResidueShader(colourScheme);
if (colourScheme instanceof UserColourScheme)
residueShading = new ResidueShader(colourScheme);
if (colourScheme instanceof UserColourScheme)
@@
-304,6
+304,7
@@
public class AlignViewport extends AlignmentViewport
{
residueShading.setConsensus(hconsensus);
}
{
residueShading.setConsensus(hconsensus);
}
+ setColourAppliesToAllGroups(true);
}
boolean validCharWidth;
}
boolean validCharWidth;