X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FAnnotationColourGradient.java;h=1a3e9efe49a8b0b105afc08aaefdb55f1c3b51d0;hb=400b50efffaa43ae2c3b4d3f653bf8215c5d1edc;hp=17af427897bd434f2752addb738f0593a66d8801;hpb=e5ecde79316259cf913da454373e9f5ee7488798;p=jalview.git
diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java
index 17af427..1a3e9ef 100755
--- a/src/jalview/schemes/AnnotationColourGradient.java
+++ b/src/jalview/schemes/AnnotationColourGradient.java
@@ -1,24 +1,29 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.Annotation;
import jalview.datamodel.GraphLine;
import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
@@ -27,7 +32,7 @@ import java.awt.Color;
import java.util.IdentityHashMap;
import java.util.Map;
-public class AnnotationColourGradient extends ResidueColourScheme
+public class AnnotationColourGradient extends FollowerColourScheme
{
public static final int NO_THRESHOLD = -1;
@@ -43,16 +48,42 @@ public class AnnotationColourGradient extends ResidueColourScheme
GraphLine annotationThreshold;
- float r1, g1, b1, rr, gg, bb, dr, dg, db;
-
- ColourSchemeI colourScheme;
+ float r1, g1, b1, rr, gg, bb;
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
+ * they exist
+ */
+ private boolean noGradient = false;
+
IdentityHashMap seqannot = null;
+ @Override
+ public ColourSchemeI getInstance(AnnotatedCollectionI sg,
+ Map hiddenRepSequences)
+ {
+ AnnotationColourGradient acg = new AnnotationColourGradient(annotation,
+ getColourScheme(), aboveAnnotationThreshold);
+ acg.thresholdIsMinMax = thresholdIsMinMax;
+ acg.annotationThreshold = (annotationThreshold == null) ? null
+ : new GraphLine(annotationThreshold);
+ acg.r1 = r1;
+ acg.g1 = g1;
+ acg.b1 = b1;
+ acg.rr = rr;
+ acg.gg = gg;
+ acg.bb = bb;
+ acg.predefinedColours = predefinedColours;
+ acg.seqAssociated = seqAssociated;
+ acg.noGradient = noGradient;
+ return acg;
+ }
+
/**
* Creates a new AnnotationColourGradient object.
*/
@@ -61,11 +92,12 @@ public class AnnotationColourGradient extends ResidueColourScheme
{
if (originalColour instanceof AnnotationColourGradient)
{
- colourScheme = ((AnnotationColourGradient) originalColour).colourScheme;
+ setColourScheme(((AnnotationColourGradient) originalColour)
+ .getColourScheme());
}
else
{
- colourScheme = originalColour;
+ setColourScheme(originalColour);
}
this.annotation = annotation;
@@ -76,6 +108,16 @@ public class AnnotationColourGradient extends ResidueColourScheme
{
annotationThreshold = annotation.threshold;
}
+ // clear values so we don't get weird black bands...
+ r1 = 254;
+ g1 = 254;
+ b1 = 254;
+ rr = 0;
+ gg = 0;
+ bb = 0;
+
+ noGradient = true;
+ checkLimits();
}
/**
@@ -100,13 +142,27 @@ public class AnnotationColourGradient extends ResidueColourScheme
rr = maxColour.getRed() - r1;
gg = maxColour.getGreen() - g1;
bb = maxColour.getBlue() - b1;
+
+ noGradient = false;
+ checkLimits();
+ }
+
+ private void checkLimits()
+ {
+ aamax = annotation.graphMax;
+ aamin = annotation.graphMin;
+ if (annotation.isRNA())
+ {
+ // reset colour palette
+ ColourSchemeProperty.resetRnaHelicesShading();
+ ColourSchemeProperty.initRnaHelicesShading(1 + (int) aamax);
+ }
}
@Override
public void alignmentChanged(AnnotatedCollectionI alignment,
Map hiddenReps)
{
- // TODO Auto-generated method stub
super.alignmentChanged(alignment, hiddenReps);
if (seqAssociated && annotation.getCalcId() != null)
@@ -119,19 +175,42 @@ public class AnnotationColourGradient extends ResidueColourScheme
{
seqannot = new IdentityHashMap();
}
- for (AlignmentAnnotation alan : alignment.findAnnotation(annotation
+ // 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()))
{
if (alan.sequenceRef != null
&& (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;
@@ -154,11 +233,6 @@ public class AnnotationColourGradient extends ResidueColourScheme
}
}
- public ColourSchemeI getBaseColour()
- {
- return colourScheme;
- }
-
public Color getMinColour()
{
return new Color((int) r1, (int) g1, (int) b1);
@@ -177,6 +251,7 @@ public class AnnotationColourGradient extends ResidueColourScheme
*
* @return DOCUMENT ME!
*/
+ @Override
public Color findColour(char c)
{
return Color.red;
@@ -196,78 +271,136 @@ public class AnnotationColourGradient extends ResidueColourScheme
public Color findColour(char c, int j, SequenceI seq)
{
Color currentColour = Color.white;
- AlignmentAnnotation annotation = (seqAssociated ? seqannot.get(seq)
- : this.annotation);
+ AlignmentAnnotation annotation = (seqAssociated && seqannot != null ? seqannot
+ .get(seq) : this.annotation);
if (annotation == null)
{
return currentColour;
}
- if ((threshold == 0) || aboveThreshold(c, j))
+ // if ((threshold == 0) || aboveThreshold(c, j))
+ // {
+ if (annotation.annotations != null && j < annotation.annotations.length
+ && annotation.annotations[j] != null
+ && !jalview.util.Comparison.isGap(c))
{
- if (j < annotation.annotations.length
- && annotation.annotations[j] != null
- && !jalview.util.Comparison.isGap(c))
+ Annotation aj = annotation.annotations[j];
+ // 'use original colours' => colourScheme != null
+ // -> look up colour to be used
+ // predefined colours => preconfigured shading
+ // -> only use original colours reference if thresholding enabled &
+ // minmax exists
+ // annotation.hasIcons => null or black colours replaced with glyph
+ // colours
+ // -> reuse original colours if present
+ // -> if thresholding enabled then return colour on non-whitespace glyph
+
+ if (aboveAnnotationThreshold == NO_THRESHOLD
+ || (annotationThreshold != null && (aboveAnnotationThreshold == ABOVE_THRESHOLD ? aj.value >= annotationThreshold.value
+ : aj.value <= annotationThreshold.value)))
{
-
- if (predefinedColours)
+ if (predefinedColours && aj.colour != null
+ && !aj.colour.equals(Color.black))
{
- if (annotation.annotations[j].colour != null)
- return annotation.annotations[j].colour;
- else
- return currentColour;
+ currentColour = aj.colour;
}
-
- if (aboveAnnotationThreshold == NO_THRESHOLD
- || (annotationThreshold != null
- && aboveAnnotationThreshold == ABOVE_THRESHOLD && annotation.annotations[j].value >= annotationThreshold.value)
- || (annotationThreshold != null
- && aboveAnnotationThreshold == BELOW_THRESHOLD && annotation.annotations[j].value <= annotationThreshold.value))
+ else if (annotation.hasIcons
+ && annotation.graph == AlignmentAnnotation.NO_GRAPH)
{
-
- 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)
+ if (aj.secondaryStructure > ' ' && aj.secondaryStructure != '.'
+ && aj.secondaryStructure != '-')
{
- range = (annotation.annotations[j].value - annotation.graphMin)
- / (annotation.threshold.value - annotation.graphMin);
+ if (getColourScheme() != null)
+ {
+ currentColour = getColourScheme().findColour(c, j, seq, null,
+ 0f);
+ }
+ else
+ {
+ 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
{
- range = (annotation.annotations[j].value - annotation.graphMin)
- / (annotation.graphMax - annotation.graphMin);
+ //
+ return Color.white;
}
-
- if (colourScheme != null)
+ }
+ else if (noGradient)
+ {
+ if (getColourScheme() != null)
{
- currentColour = colourScheme.findColour(c, j, seq);
+ currentColour = getColourScheme().findColour(c, j, seq, null,
+ 0f);
}
- else
+ else
{
- dr = rr * range + r1;
- dg = gg * range + g1;
- db = bb * range + b1;
-
- currentColour = new Color((int) dr, (int) dg, (int) db);
+ if (aj.colour != null)
+ {
+ currentColour = aj.colour;
+ }
}
}
+ else
+ {
+ currentColour = shadeCalculation(annotation, j);
+ }
}
+ // if (conservationColouring)
+ // {
+ // currentColour = applyConservation(currentColour, j);
+ // }
}
+ // }
+ return currentColour;
+ }
+
+ private Color shadeCalculation(AlignmentAnnotation annotation, int j)
+ {
- if (conservationColouring)
+ // 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
{
- currentColour = applyConservation(currentColour, j);
+ if (annotation.graphMax != annotation.graphMin)
+ {
+ range = (annotation.annotations[j].value - annotation.graphMin)
+ / (annotation.graphMax - annotation.graphMin);
+ }
+ else
+ {
+ range = 0f;
+ }
}
- return currentColour;
+ 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()
@@ -289,4 +422,16 @@ public class AnnotationColourGradient extends ResidueColourScheme
{
seqAssociated = sassoc;
}
+
+ @Override
+ public String getSchemeName()
+ {
+ return "Annotation";
+ }
+
+ @Override
+ public boolean isSimple()
+ {
+ return false;
+ }
}