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-2371 CollectionColourScheme wraps ColourSchemeI
[jalview.git]
/
src
/
jalview
/
schemes
/
ScoreColourScheme.java
diff --git
a/src/jalview/schemes/ScoreColourScheme.java
b/src/jalview/schemes/ScoreColourScheme.java
index
ec06e06
..
6850d79
100755
(executable)
--- a/
src/jalview/schemes/ScoreColourScheme.java
+++ b/
src/jalview/schemes/ScoreColourScheme.java
@@
-23,6
+23,7
@@
package jalview.schemes;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
import java.awt.Color;
import java.util.Map;
import java.awt.Color;
import java.util.Map;
@@
-97,27
+98,12
@@
public class ScoreColourScheme extends ResidueColourScheme
@Override
public Color findColour(char c, int j, SequenceI seq)
{
@Override
public Color findColour(char c, int j, SequenceI seq)
{
- if (threshold > 0)
- {
- if (!aboveThreshold(c, j))
- {
- return Color.white;
- }
- }
-
- if (jalview.util.Comparison.isGap(c))
+ if (Comparison.isGap(c))
{
return Color.white;
}
{
return Color.white;
}
- Color currentColour = colors[ResidueProperties.aaIndex[c]];
-
- if (conservationColouring)
- {
- currentColour = applyConservation(currentColour, j);
- }
-
- return currentColour;
+ return colors[ResidueProperties.aaIndex[c]];
}
/**
}
/**