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-1569 formatting
[jalview.git]
/
src
/
jalview
/
renderer
/
AnnotationRenderer.java
diff --git
a/src/jalview/renderer/AnnotationRenderer.java
b/src/jalview/renderer/AnnotationRenderer.java
index
e731910
..
5348aaa
100644
(file)
--- a/
src/jalview/renderer/AnnotationRenderer.java
+++ b/
src/jalview/renderer/AnnotationRenderer.java
@@
-617,9
+617,13
@@
public class AnnotationRenderer
charOffset = (int) ((charWidth - fmWidth) / 2f);
if (row_annotations[column].colour == null)
charOffset = (int) ((charWidth - fmWidth) / 2f);
if (row_annotations[column].colour == null)
+ {
g.setColor(Color.black);
g.setColor(Color.black);
+ }
else
else
+ {
g.setColor(row_annotations[column].colour);
g.setColor(row_annotations[column].colour);
+ }
if (column == 0 || row.graph > 0)
{
if (column == 0 || row.graph > 0)
{
@@
-1190,9
+1194,13
@@
public class AnnotationRenderer
}
if (aa_annotations[column].colour == null)
}
if (aa_annotations[column].colour == null)
+ {
g.setColor(Color.black);
g.setColor(Color.black);
+ }
else
else
+ {
g.setColor(aa_annotations[column].colour);
g.setColor(aa_annotations[column].colour);
+ }
y1 = y
- (int) (((aa_annotations[column - 1].value - min) / range) * graphHeight);
y1 = y
- (int) (((aa_annotations[column - 1].value - min) / range) * graphHeight);
@@
-1264,9
+1272,13
@@
public class AnnotationRenderer
continue;
}
if (aa_annotations[column].colour == null)
continue;
}
if (aa_annotations[column].colour == null)
+ {
g.setColor(Color.black);
g.setColor(Color.black);
+ }
else
else
+ {
g.setColor(aa_annotations[column].colour);
g.setColor(aa_annotations[column].colour);
+ }
y1 = y
- (int) (((aa_annotations[column].value - min) / (range)) * _aa.graphHeight);
y1 = y
- (int) (((aa_annotations[column].value - min) / (range)) * _aa.graphHeight);
@@
-1384,9
+1396,13
@@
public class AnnotationRenderer
if (aa_annotations[j] != null)
{
if (aa_annotations[j].colour == null)
if (aa_annotations[j] != null)
{
if (aa_annotations[j].colour == null)
+ {
g.setColor(Color.black);
g.setColor(Color.black);
+ }
else
else
+ {
g.setColor(aa_annotations[j].colour);
g.setColor(aa_annotations[j].colour);
+ }
height = (int) ((aa_annotations[j].value / _aa.graphMax) * y);
if (height > y)
height = (int) ((aa_annotations[j].value / _aa.graphMax) * y);
if (height > y)