fixed JAL-1086: pass column index so colourscheme profile data is used to calculate...

[jalview.git] / src / jalview / renderer / AnnotationRenderer.java

diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index 34df24f..c6b95e4 100644 (file)
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -876,7 +876,7 @@ public class AnnotationRenderer
 
         int profl[] = getProfileFor(aa, column);
         // just try to draw the logo if profl is not null
-        if (profl != null)
+        if (profl != null && profl[1] != 0)
         {
           float ht = normaliseProfile ? y - aa.graphHeight : y1;
           double htn = normaliseProfile ? aa.graphHeight : (y2 - y1);// aa.graphHeight;
@@ -928,7 +928,7 @@ public class AnnotationRenderer
               // g.drawRect(x*av.charWidth, (int)ht, av.charWidth,
               // (int)(scl));
               // g.setColor(profcolour.findColour(dc[0]).darker());
-              g.setColor(profcolour.findColour(dc[0]));
+              g.setColor(profcolour.findColour(dc[0], column));
 
               hght = (ht + (scl - lm.getDescent() - lm.getBaselineOffsets()[lm
                       .getBaselineIndex()]));