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-736 relocate group associated conservation symbols to alignment column position
[jalview.git]
/
src
/
jalview
/
analysis
/
Conservation.java
diff --git
a/src/jalview/analysis/Conservation.java
b/src/jalview/analysis/Conservation.java
index
76323bc
..
b8f1d92
100755
(executable)
--- a/
src/jalview/analysis/Conservation.java
+++ b/
src/jalview/analysis/Conservation.java
@@
-698,8
+698,11
@@
public class Conservation
float vprop = value - min;
vprop /= max;
float vprop = value - min;
vprop /= max;
+ int consp = i - start;
+ String conssym = (value > 0 && consp > -1 && consp < consSymbs.length) ? consSymbs[consp]
+ : "";
conservation.annotations[i] = new Annotation(String.valueOf(c),
conservation.annotations[i] = new Annotation(String.valueOf(c),
- consSymbs[i-start], ' ', value, new Color(minR
+ conssym, ' ', value, new Color(minR
+ (maxR * vprop), minG + (maxG * vprop), minB
+ (maxB * vprop)));
+ (maxR * vprop), minG + (maxG * vprop), minB
+ (maxB * vprop)));