X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignmentAnnotation.java;h=989d62ad2cb4f5d70fce59505828399fa866451e;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=9037008c77d42adc59f76005e011318166110f85;hpb=57d863cc978bfd638da0e21a37b425be6251ce13;p=jalview.git
diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 9037008..989d62a 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -1,27 +1,36 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.datamodel;
import jalview.analysis.Rna;
+import jalview.analysis.SecStrConsensus.SimpleBP;
+
+import jalview.analysis.WUSSParseException;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
+import fr.orsay.lri.varna.models.rna.RNA;
+
/**
* DOCUMENT ME!
*
@@ -49,25 +58,47 @@ public class AlignmentAnnotation
/** DOCUMENT ME!! */
public Annotation[] annotations;
+ public ArrayList bps = null;
+
/**
* RNA secondary structure contact positions
*/
public SequenceFeature[] _rnasecstr = null;
/**
+ * position of annotation resulting in invalid WUSS parsing or -1
+ */
+ private long invalidrnastruc = -1;
+
+ /**
* Updates the _rnasecstr field Determines the positions that base pair and
* the positions of helices based on secondary structure from a Stockholm file
*
* @param RNAannot
*/
- private void _updateRnaSecStr(String RNAannot)
+ private void _updateRnaSecStr(CharSequence RNAannot)
{
- _rnasecstr = Rna.GetBasePairs(RNAannot);
+ try
+ {
+ _rnasecstr = Rna.GetBasePairs(RNAannot);
+ bps = Rna.GetModeleBP(RNAannot);
+ invalidrnastruc = -1;
+ } catch (WUSSParseException px)
+ {
+ // DEBUG System.out.println(px);
+ invalidrnastruc = px.getProblemPos();
+ }
+ if (invalidrnastruc > -1)
+ {
+ return;
+ }
Rna.HelixMap(_rnasecstr);
+ // setRNAStruc(RNAannot);
if (_rnasecstr != null && _rnasecstr.length > 0)
{
// show all the RNA secondary structure annotation symbols.
+ isrna = true;
showAllColLabels = true;
scaleColLabel = true;
}
@@ -144,6 +175,8 @@ public class AlignmentAnnotation
*/
public boolean centreColLabels = false;
+ private boolean isrna;
+
/*
* (non-Javadoc)
*
@@ -172,6 +205,12 @@ public class AlignmentAnnotation
}
}
+ // JBPNote: what does this do ?
+ public void ConcenStru(CharSequence RNAannot) throws WUSSParseException
+ {
+ bps = Rna.GetModeleBP(RNAannot);
+ }
+
/**
* Creates a new AlignmentAnnotation object.
*
@@ -201,7 +240,7 @@ public class AlignmentAnnotation
void areLabelsSecondaryStructure()
{
boolean nonSSLabel = false;
- boolean isrna = false;
+ isrna = false;
StringBuffer rnastring = new StringBuffer();
char firstChar = 0;
@@ -219,7 +258,37 @@ public class AlignmentAnnotation
else
// Check for RNA secondary structure
{
- if (annotations[i].secondaryStructure == 'S')
+ // System.out.println(annotations[i].secondaryStructure);
+ if (annotations[i].secondaryStructure == '('
+ || annotations[i].secondaryStructure == '['
+ || annotations[i].secondaryStructure == '<'
+ || annotations[i].secondaryStructure == '{'
+ || annotations[i].secondaryStructure == 'A'
+ || annotations[i].secondaryStructure == 'B'
+ || annotations[i].secondaryStructure == 'C'
+ || annotations[i].secondaryStructure == 'D'
+ || annotations[i].secondaryStructure == 'E'
+ || annotations[i].secondaryStructure == 'F'
+ || annotations[i].secondaryStructure == 'G'
+ || annotations[i].secondaryStructure == 'H'
+ || annotations[i].secondaryStructure == 'I'
+ || annotations[i].secondaryStructure == 'J'
+ || annotations[i].secondaryStructure == 'K'
+ || annotations[i].secondaryStructure == 'L'
+ || annotations[i].secondaryStructure == 'M'
+ || annotations[i].secondaryStructure == 'N'
+ || annotations[i].secondaryStructure == 'O'
+ || annotations[i].secondaryStructure == 'P'
+ || annotations[i].secondaryStructure == 'Q'
+ || annotations[i].secondaryStructure == 'R'
+ || annotations[i].secondaryStructure == 'S'
+ || annotations[i].secondaryStructure == 'T'
+ || annotations[i].secondaryStructure == 'U'
+ || annotations[i].secondaryStructure == 'V'
+ || annotations[i].secondaryStructure == 'W'
+ || annotations[i].secondaryStructure == 'X'
+ || annotations[i].secondaryStructure == 'Y'
+ || annotations[i].secondaryStructure == 'Z')
{
hasIcons |= true;
isrna |= true;
@@ -250,9 +319,40 @@ public class AlignmentAnnotation
// &&
// annotations[i].displayCharacter.charAt(0)==annotations[i].secondaryStructure
firstChar != ' '
- && firstChar != 'H'
+ && firstChar != '$'
+ && firstChar != '�' // JBPNote should explicitly express as
+ // unicode number to avoid source code
+ // translation problems
+ && firstChar != '('
+ && firstChar != '['
+ && firstChar != '>'
+ && firstChar != '{'
+ && firstChar != 'A'
+ && firstChar != 'B'
+ && firstChar != 'C'
+ && firstChar != 'D'
&& firstChar != 'E'
+ && firstChar != 'F'
+ && firstChar != 'G'
+ && firstChar != 'H'
+ && firstChar != 'I'
+ && firstChar != 'J'
+ && firstChar != 'K'
+ && firstChar != 'L'
+ && firstChar != 'M'
+ && firstChar != 'N'
+ && firstChar != 'O'
+ && firstChar != 'P'
+ && firstChar != 'Q'
+ && firstChar != 'R'
&& firstChar != 'S'
+ && firstChar != 'T'
+ && firstChar != 'U'
+ && firstChar != 'V'
+ && firstChar != 'W'
+ && firstChar != 'X'
+ && firstChar != 'Y'
+ && firstChar != 'Z'
&& firstChar != '-'
&& firstChar < jalview.schemes.ResidueProperties.aaIndex.length)
{
@@ -297,7 +397,7 @@ public class AlignmentAnnotation
{
if (isrna)
{
- _updateRnaSecStr(rnastring.toString());
+ _updateRnaSecStr(new AnnotCharSequence());
}
}
@@ -305,6 +405,85 @@ public class AlignmentAnnotation
}
/**
+ * flyweight access to positions in the alignment annotation row for RNA
+ * processing
+ *
+ * @author jimp
+ *
+ */
+ private class AnnotCharSequence implements CharSequence
+ {
+ int offset = 0;
+
+ int max = 0;
+
+ public AnnotCharSequence()
+ {
+ this(0, annotations.length);
+ }
+
+ public AnnotCharSequence(int start, int end)
+ {
+ offset = start;
+ max = end;
+ }
+
+ @Override
+ public CharSequence subSequence(int start, int end)
+ {
+ return new AnnotCharSequence(offset + start, offset + end);
+ }
+
+ @Override
+ public int length()
+ {
+ return max - offset;
+ }
+
+ @Override
+ public char charAt(int index)
+ {
+ String dc;
+ return ((index + offset < 0) || (index + offset) >= max
+ || annotations[index + offset] == null || (dc = annotations[index
+ + offset].displayCharacter.trim()).length() < 1) ? '.' : dc
+ .charAt(0);
+ }
+
+ public String toString()
+ {
+ char[] string = new char[max - offset];
+ int mx = annotations.length;
+
+ for (int i = offset; i < mx; i++)
+ {
+ String dc;
+ string[i] = (annotations[i] == null || (dc = annotations[i].displayCharacter
+ .trim()).length() < 1) ? '.' : dc.charAt(0);
+ }
+ return new String(string);
+ }
+ };
+
+ private long _lastrnaannot = -1;
+
+ public String getRNAStruc()
+ {
+ if (isrna)
+ {
+ String rnastruc = new AnnotCharSequence().toString();
+ if (_lastrnaannot != rnastruc.hashCode())
+ {
+ // ensure rna structure contacts are up to date
+ _lastrnaannot = rnastruc.hashCode();
+ _updateRnaSecStr(rnastruc);
+ }
+ return rnastruc;
+ }
+ return null;
+ }
+
+ /**
* Creates a new AlignmentAnnotation object.
*
* @param label
@@ -352,7 +531,7 @@ public class AlignmentAnnotation
float min = graphMin;
float max = graphMax;
boolean drawValues = true;
-
+ _linecolour = null;
if (min == max)
{
min = 999999999;
@@ -378,6 +557,10 @@ public class AlignmentAnnotation
{
min = annotations[i].value;
}
+ if (_linecolour == null && annotations[i].colour != null)
+ {
+ _linecolour = annotations[i].colour;
+ }
}
// ensure zero is origin for min/max ranges on only one side of zero
if (min > 0)
@@ -404,7 +587,7 @@ public class AlignmentAnnotation
{
if (annotations[i] != null)
{
- annotations[i].displayCharacter = "";
+ annotations[i].displayCharacter = "X";
}
}
}
@@ -435,6 +618,10 @@ public class AlignmentAnnotation
this.label = annotation.label;
this.padGaps = annotation.padGaps;
this.visible = annotation.visible;
+ this.centreColLabels = annotation.centreColLabels;
+ this.scaleColLabel = annotation.scaleColLabel;
+ this.showAllColLabels = annotation.showAllColLabels;
+ this.calcId = annotation.calcId;
if (this.hasScore = annotation.hasScore)
{
this.score = annotation.score;
@@ -449,7 +636,14 @@ public class AlignmentAnnotation
this.annotations = new Annotation[ann.length];
for (int i = 0; i < ann.length; i++)
{
- annotations[i] = new Annotation(ann[i]);
+ if (ann[i] != null)
+ {
+ annotations[i] = new Annotation(ann[i]);
+ if (_linecolour != null)
+ {
+ _linecolour = annotations[i].colour;
+ }
+ }
}
;
if (annotation.sequenceRef != null)
@@ -484,6 +678,11 @@ public class AlignmentAnnotation
}
}
}
+ // TODO: check if we need to do this: JAL-952
+ // if (this.isrna=annotation.isrna)
+ {
+ // _rnasecstr=new SequenceFeature[annotation._rnasecstr];
+ }
validateRangeAndDisplay(); // construct hashcodes, etc.
}
@@ -853,7 +1052,7 @@ public class AlignmentAnnotation
{
if (annotations[i] == null)
annotations[i] = new Annotation(String.valueOf(gapchar), null,
- ' ', 0f);
+ ' ', 0f, null);
else if (annotations[i].displayCharacter == null
|| annotations[i].displayCharacter.equals(" "))
annotations[i].displayCharacter = String.valueOf(gapchar);
@@ -872,8 +1071,46 @@ public class AlignmentAnnotation
{
if (seqname && this.sequenceRef != null)
{
+ int i = description.toLowerCase().indexOf("");
+ if (i > -1)
+ {
+ // move the html tag to before the sequence reference.
+ return "" + sequenceRef.getName() + " : "
+ + description.substring(i + 6);
+ }
return sequenceRef.getName() + " : " + description;
}
return description;
}
+
+ public boolean isValidStruc()
+ {
+ return invalidrnastruc == -1;
+ }
+
+ public long getInvalidStrucPos()
+ {
+ return invalidrnastruc;
+ }
+
+ /**
+ * machine readable ID string indicating what generated this annotation
+ */
+ protected String calcId = "";
+
+ /**
+ * base colour for line graphs. If null, will be set automatically by
+ * searching the alignment annotation
+ */
+ public java.awt.Color _linecolour;
+
+ public String getCalcId()
+ {
+ return calcId;
+ }
+
+ public void setCalcId(String calcId)
+ {
+ this.calcId = calcId;
+ }
}