X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FAnnotationColourGradient.java;h=efad430126b12c20e749a4508b05bcd2b50276d6;hb=ba831154b9f32a28d7b0171cc89da59e3d677085;hp=713e55d7ea4e94e0ff050dbd867d21a87544c162;hpb=1accb13ab2b4c22d52eb068fcd9749876f8446d9;p=jalview.git

diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java
index 713e55d..efad430 100755
--- a/src/jalview/schemes/AnnotationColourGradient.java
+++ b/src/jalview/schemes/AnnotationColourGradient.java
@@ -53,7 +53,6 @@ public class AnnotationColourGradient extends FollowerColourScheme
   private boolean predefinedColours = false;
 
   private boolean seqAssociated = false;
-
   /**
    * false if the scheme was constructed without a minColour and maxColour used
    * to decide if existing colours should be taken from annotation elements when
@@ -141,6 +140,12 @@ public class AnnotationColourGradient extends FollowerColourScheme
     bb = maxColour.getBlue() - b1;
 
     noGradient = false;
+    aamax = annotation.graphMax;
+    aamin = annotation.graphMin;
+    if (annotation.isRNA())
+    {
+      ColourSchemeProperty.initRnaHelicesShading(1 + (int) aamax);
+    }
   }
 
   @Override
@@ -162,6 +167,7 @@ public class AnnotationColourGradient extends FollowerColourScheme
       // resolve the context containing all the annotation for the sequence
       AnnotatedCollectionI alcontext = alignment instanceof AlignmentI ? alignment
               : alignment.getContext();
+      boolean f = true,rna=false;
       for (AlignmentAnnotation alan : alcontext.findAnnotation(annotation
               .getCalcId()))
       {
@@ -169,12 +175,30 @@ public class AnnotationColourGradient extends FollowerColourScheme
                 && (alan.label != null && annotation != null && alan.label
                         .equals(annotation.label)))
         {
+          if (!rna && alan.isRNA())
+          {
+            rna = true;
+          }
           seqannot.put(alan.sequenceRef, alan);
+          if (f || alan.graphMax > aamax)
+          {
+            aamax = alan.graphMax;
+          }
+          if (f || alan.graphMin < aamin)
+          {
+            aamin = alan.graphMin;
+          }
+          f = false;
         }
       }
+      if (rna)
+      {
+        ColourSchemeProperty.initRnaHelicesShading(1 + (int) aamax);
+      }
     }
   }
 
+  float aamin = 0f, aamax = 0f;
   public String getAnnotation()
   {
     return annotation.label;
@@ -262,7 +286,8 @@ public class AnnotationColourGradient extends FollowerColourScheme
                 || (annotationThreshold != null && (aboveAnnotationThreshold == ABOVE_THRESHOLD ? aj.value >= annotationThreshold.value
                         : aj.value <= annotationThreshold.value)))
         {
-          if (predefinedColours && aj.colour != null)
+          if (predefinedColours && aj.colour != null
+                  && !aj.colour.equals(Color.black))
           {
             currentColour = aj.colour;
           }
@@ -278,9 +303,16 @@ public class AnnotationColourGradient extends FollowerColourScheme
               }
               else
               {
-              currentColour = annotation.annotations[j].secondaryStructure == 'H' ? jalview.renderer.AnnotationRenderer.HELIX_COLOUR
-                      : annotation.annotations[j].secondaryStructure == 'E' ? jalview.renderer.AnnotationRenderer.SHEET_COLOUR
-                              : jalview.renderer.AnnotationRenderer.STEM_COLOUR;
+                if (annotation.isRNA())
+                {
+                  currentColour = ColourSchemeProperty.rnaHelices[(int) aj.value];
+                }
+                else
+                {
+                  currentColour = annotation.annotations[j].secondaryStructure == 'H' ? jalview.renderer.AnnotationRenderer.HELIX_COLOUR
+                          : annotation.annotations[j].secondaryStructure == 'E' ? jalview.renderer.AnnotationRenderer.SHEET_COLOUR
+                                  : jalview.renderer.AnnotationRenderer.STEM_COLOUR;
+                }
               }
             }
             else
@@ -305,35 +337,7 @@ public class AnnotationColourGradient extends FollowerColourScheme
           }
           else
           {
-            // calculate a shade
-            float range = 1f;
-            if (thresholdIsMinMax
-                    && annotation.threshold != null
-                    && aboveAnnotationThreshold == ABOVE_THRESHOLD
-                    && annotation.annotations[j].value >= annotation.threshold.value)
-            {
-              range = (annotation.annotations[j].value - annotation.threshold.value)
-                      / (annotation.graphMax - annotation.threshold.value);
-            }
-            else if (thresholdIsMinMax
-                    && annotation.threshold != null
-                    && aboveAnnotationThreshold == BELOW_THRESHOLD
-                    && annotation.annotations[j].value >= annotation.graphMin)
-            {
-              range = (annotation.annotations[j].value - annotation.graphMin)
-                      / (annotation.threshold.value - annotation.graphMin);
-            }
-            else
-            {
-              range = (annotation.annotations[j].value - annotation.graphMin)
-                      / (annotation.graphMax - annotation.graphMin);
-            }
-
-            int dr = (int) (rr * range + r1), dg = (int) (gg * range + g1), db = (int) (bb
-                    * range + b1);
-
-            currentColour = new Color(dr, dg, db);
-
+            currentColour = shadeCalculation(annotation, j);
           }
         }
         if (conservationColouring)
@@ -345,6 +349,45 @@ public class AnnotationColourGradient extends FollowerColourScheme
     return currentColour;
   }
 
+  private Color shadeCalculation(AlignmentAnnotation annotation, int j)
+  {
+
+    // calculate a shade
+    float range = 1f;
+    if (thresholdIsMinMax
+            && annotation.threshold != null
+            && aboveAnnotationThreshold == ABOVE_THRESHOLD
+            && annotation.annotations[j].value >= annotation.threshold.value)
+    {
+      range = (annotation.annotations[j].value - annotation.threshold.value)
+              / (annotation.graphMax - annotation.threshold.value);
+    }
+    else if (thresholdIsMinMax && annotation.threshold != null
+            && aboveAnnotationThreshold == BELOW_THRESHOLD
+            && annotation.annotations[j].value >= annotation.graphMin)
+    {
+      range = (annotation.annotations[j].value - annotation.graphMin)
+              / (annotation.threshold.value - annotation.graphMin);
+    }
+    else
+    {
+      if (annotation.graphMax != annotation.graphMin)
+      {
+        range = (annotation.annotations[j].value - annotation.graphMin)
+                / (annotation.graphMax - annotation.graphMin);
+      }
+      else
+      {
+        range = 0f;
+      }
+    }
+
+    int dr = (int) (rr * range + r1), dg = (int) (gg * range + g1), db = (int) (bb
+            * range + b1);
+
+    return new Color(dr, dg, db);
+
+  }
   public boolean isPredefinedColours()
   {
     return predefinedColours;