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-2774 Fixed merge issues
[jalview.git]
/
src
/
jalview
/
renderer
/
ResidueShader.java
diff --git
a/src/jalview/renderer/ResidueShader.java
b/src/jalview/renderer/ResidueShader.java
index
7e4f211
..
c031170
100644
(file)
--- a/
src/jalview/renderer/ResidueShader.java
+++ b/
src/jalview/renderer/ResidueShader.java
@@
-235,6
+235,11
@@
public class ResidueShader implements ResidueShaderI
@Override
public Color findColour(char symbol, int position, SequenceI seq)
{
@Override
public Color findColour(char symbol, int position, SequenceI seq)
{
+ if (colourScheme == null)
+ {
+ return Color.white; // Colour is 'None'
+ }
+
/*
* get 'base' colour
*/
/*
* get 'base' colour
*/
@@
-243,14
+248,16
@@
public class ResidueShader implements ResidueShaderI
: profile.getModalResidue();
float pid = profile == null ? 0f
: profile.getPercentageIdentity(ignoreGaps);
: profile.getModalResidue();
float pid = profile == null ? 0f
: profile.getPercentageIdentity(ignoreGaps);
- Color colour = colourScheme == null ? Color.white
- : colourScheme.findColour(symbol, position, seq, modalResidue,
- pid);
+ Color colour = colourScheme.findColour(symbol, position, seq,
+ modalResidue, pid);
/*
* apply PID threshold and consensus fading if in force
*/
/*
* apply PID threshold and consensus fading if in force
*/
- colour = adjustColour(symbol, position, colour);
+ if (!Comparison.isGap(symbol))
+ {
+ colour = adjustColour(symbol, position, colour);
+ }
return colour;
}
return colour;
}