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
Use font.getName, not font.getFontName
[jalview.git]
/
src
/
jalview
/
schemes
/
ScoreColourScheme.java
diff --git
a/src/jalview/schemes/ScoreColourScheme.java
b/src/jalview/schemes/ScoreColourScheme.java
index
12f252d
..
b69e536
100755
(executable)
--- a/
src/jalview/schemes/ScoreColourScheme.java
+++ b/
src/jalview/schemes/ScoreColourScheme.java
@@
-21,12
+21,32
@@
package jalview.schemes;
import java.awt.*;
\r
\r
\r
import java.awt.*;
\r
\r
\r
-public class ScoreColourScheme extends ResidueColourScheme {
\r
+/**
\r
+ * DOCUMENT ME!
\r
+ *
\r
+ * @author $author$
\r
+ * @version $Revision$
\r
+ */
\r
+public class ScoreColourScheme extends ResidueColourScheme
\r
+{
\r
+ /** DOCUMENT ME!! */
\r
public double min;
\r
public double min;
\r
+
\r
+ /** DOCUMENT ME!! */
\r
public double max;
\r
public double max;
\r
+
\r
+ /** DOCUMENT ME!! */
\r
public double[] scores;
\r
\r
public double[] scores;
\r
\r
- public ScoreColourScheme(double[] scores, double min, double max) {
\r
+ /**
\r
+ * Creates a new ScoreColourScheme object.
\r
+ *
\r
+ * @param scores DOCUMENT ME!
\r
+ * @param min DOCUMENT ME!
\r
+ * @param max DOCUMENT ME!
\r
+ */
\r
+ public ScoreColourScheme(double[] scores, double min, double max)
\r
+ {
\r
super();
\r
\r
this.scores = scores;
\r
super();
\r
\r
this.scores = scores;
\r
@@
-34,9
+54,20
@@
public class ScoreColourScheme extends ResidueColourScheme {
this.max = max;
\r
}
\r
\r
this.max = max;
\r
}
\r
\r
- public Color findColour(String s, int j) {
\r
- if (threshold > 0) {
\r
- if (!aboveThreshold(s, j)) {
\r
+ /**
\r
+ * DOCUMENT ME!
\r
+ *
\r
+ * @param s DOCUMENT ME!
\r
+ * @param j DOCUMENT ME!
\r
+ *
\r
+ * @return DOCUMENT ME!
\r
+ */
\r
+ public Color findColour(String s, int j)
\r
+ {
\r
+ if (threshold > 0)
\r
+ {
\r
+ if (!aboveThreshold(s, j))
\r
+ {
\r
return Color.white;
\r
}
\r
}
\r
return Color.white;
\r
}
\r
}
\r
@@
-44,17
+75,20
@@
public class ScoreColourScheme extends ResidueColourScheme {
float red = (float) (scores[((Integer) ResidueProperties.aaHash.get(s)).intValue()] -
\r
(float) min) / (float) (max - min);
\r
\r
float red = (float) (scores[((Integer) ResidueProperties.aaHash.get(s)).intValue()] -
\r
(float) min) / (float) (max - min);
\r
\r
- if (red > 1.0f) {
\r
+ if (red > 1.0f)
\r
+ {
\r
red = 1.0f;
\r
}
\r
\r
red = 1.0f;
\r
}
\r
\r
- if (red < 0.0f) {
\r
+ if (red < 0.0f)
\r
+ {
\r
red = 0.0f;
\r
}
\r
\r
char c = s.charAt(0);
\r
\r
red = 0.0f;
\r
}
\r
\r
char c = s.charAt(0);
\r
\r
- if (jalview.util.Comparison.isGap((c))) {
\r
+ if (jalview.util.Comparison.isGap((c)))
\r
+ {
\r
return Color.white;
\r
}
\r
\r
return Color.white;
\r
}
\r
\r
@@
-62,7
+96,15
@@
public class ScoreColourScheme extends ResidueColourScheme {
return makeColour(red);
\r
}
\r
\r
return makeColour(red);
\r
}
\r
\r
- public Color makeColour(float c) {
\r
+ /**
\r
+ * DOCUMENT ME!
\r
+ *
\r
+ * @param c DOCUMENT ME!
\r
+ *
\r
+ * @return DOCUMENT ME!
\r
+ */
\r
+ public Color makeColour(float c)
\r
+ {
\r
return new Color(c, (float) 0.0, (float) 1.0 - c);
\r
}
\r
}
\r
return new Color(c, (float) 0.0, (float) 1.0 - c);
\r
}
\r
}
\r