From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 30 Oct 2014 15:26:11 +0000 (+0000)
Subject: patch for JAL-795 - use base secondary structure colour if no colour defined on annot... 
X-Git-Tag: Jalview_2_9~155^2~15^2~21
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b266a0f6122df2213d1cdcbdc609013287575deb;p=jalview.git

patch for JAL-795 - use base secondary structure colour if no colour defined on annotation row element
---

diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java
index e975884..3bca94b 100755
--- a/src/jalview/schemes/AnnotationColourGradient.java
+++ b/src/jalview/schemes/AnnotationColourGradient.java
@@ -244,7 +244,10 @@ public class AnnotationColourGradient extends FollowerColourScheme
         {
           if (predefinedColours)
           {
-            return currentColour;
+            return (annotation.annotations[j].secondaryStructure == 'H' ? jalview.renderer.AnnotationRenderer.HELIX_COLOUR
+                    : annotation.annotations[j].secondaryStructure == 'E' ? jalview.renderer.AnnotationRenderer.SHEET_COLOUR
+                            : annotation.annotations[j].secondaryStructure != ' ' ? jalview.renderer.AnnotationRenderer.STEM_COLOUR
+                                    : currentColour);
           }
         }
         if (aboveAnnotationThreshold == NO_THRESHOLD