From b229ec679dc73300e7183cd5de71149df833a49c Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Sun, 23 Nov 2014 16:42:55 +0000 Subject: [PATCH] JAL-1569 formatting --- src/jalview/renderer/AnnotationRenderer.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index e731910..5348aaa 100644 --- 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) + { g.setColor(Color.black); + } else + { g.setColor(row_annotations[column].colour); + } if (column == 0 || row.graph > 0) { @@ -1190,9 +1194,13 @@ public class AnnotationRenderer } if (aa_annotations[column].colour == null) + { g.setColor(Color.black); + } else + { g.setColor(aa_annotations[column].colour); + } 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) + { g.setColor(Color.black); + } else + { g.setColor(aa_annotations[column].colour); + } 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) + { g.setColor(Color.black); + } else + { g.setColor(aa_annotations[j].colour); + } height = (int) ((aa_annotations[j].value / _aa.graphMax) * y); if (height > y) -- 1.7.10.2