git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
formatting
[jalview.git]
/
src
/
jalview
/
datamodel
/
AlignmentAnnotation.java
diff --git
a/src/jalview/datamodel/AlignmentAnnotation.java
b/src/jalview/datamodel/AlignmentAnnotation.java
index
9de07dd
..
59cb02b
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentAnnotation.java
+++ b/
src/jalview/datamodel/AlignmentAnnotation.java
@@
-38,7
+38,7
@@
public class AlignmentAnnotation
public boolean autoCalculated = false;
public String annotationId;
public boolean autoCalculated = false;
public String annotationId;
-
+
public SequenceI sequenceRef;
/** DOCUMENT ME!! */
public SequenceI sequenceRef;
/** DOCUMENT ME!! */
@@
-54,10
+54,12
@@
public class AlignmentAnnotation
* RNA secondary structure contact positions
*/
public SequenceFeature[] _rnasecstr = null;
* RNA secondary structure contact positions
*/
public SequenceFeature[] _rnasecstr = null;
+
/**
* position of annotation resulting in invalid WUSS parsing or -1
*/
/**
* position of annotation resulting in invalid WUSS parsing or -1
*/
- private long invalidrnastruc=-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
/**
* Updates the _rnasecstr field Determines the positions that base pair and
* the positions of helices based on secondary structure from a Stockholm file
@@
-66,30
+68,31
@@
public class AlignmentAnnotation
*/
private void _updateRnaSecStr(CharSequence RNAannot)
{
*/
private void _updateRnaSecStr(CharSequence RNAannot)
{
- try {
- _rnasecstr = Rna.GetBasePairs(RNAannot);
- invalidrnastruc=-1;
- }
- catch (WUSSParseException px)
+ try
+ {
+ _rnasecstr = Rna.GetBasePairs(RNAannot);
+ invalidrnastruc = -1;
+ } catch (WUSSParseException px)
{
{
- invalidrnastruc=px.getProblemPos();
+ invalidrnastruc = px.getProblemPos();
}
}
- if (invalidrnastruc>-1)
+ if (invalidrnastruc > -1)
{
return;
}
Rna.HelixMap(_rnasecstr);
// setRNAStruc(RNAannot);
{
return;
}
Rna.HelixMap(_rnasecstr);
// setRNAStruc(RNAannot);
-
+
if (_rnasecstr != null && _rnasecstr.length > 0)
{
// show all the RNA secondary structure annotation symbols.
if (_rnasecstr != null && _rnasecstr.length > 0)
{
// show all the RNA secondary structure annotation symbols.
- isrna=true;
+ isrna = true;
showAllColLabels = true;
scaleColLabel = true;
}
// System.out.println("featuregroup " + _rnasecstr[0].getFeatureGroup());
}
showAllColLabels = true;
scaleColLabel = true;
}
// System.out.println("featuregroup " + _rnasecstr[0].getFeatureGroup());
}
+
public java.util.Hashtable sequenceMapping;
/** DOCUMENT ME!! */
public java.util.Hashtable sequenceMapping;
/** DOCUMENT ME!! */
@@
-321,65
+324,79
@@
public class AlignmentAnnotation
annotationId = this.hashCode() + "";
}
annotationId = this.hashCode() + "";
}
+
/**
/**
- * flyweight access to positions in the alignment annotation row for RNA processing
+ * flyweight access to positions in the alignment annotation row for RNA
+ * processing
+ *
* @author jimp
* @author jimp
- *
+ *
*/
*/
- private class AnnotCharSequence implements CharSequence
+ private class AnnotCharSequence implements CharSequence
{
{
- int offset=0;
- int max=0;
-
- public AnnotCharSequence() {
- this(0,annotations.length);
+ int offset = 0;
+
+ int max = 0;
+
+ public AnnotCharSequence()
+ {
+ this(0, annotations.length);
}
}
- public AnnotCharSequence(int start, int end) {
- offset=start;
- max=end;
+
+ public AnnotCharSequence(int start, int end)
+ {
+ offset = start;
+ max = end;
}
}
+
@Override
public CharSequence subSequence(int start, int end)
{
@Override
public CharSequence subSequence(int start, int end)
{
- return new AnnotCharSequence(offset+start, offset+end);
+ return new AnnotCharSequence(offset + start, offset + end);
}
}
-
+
@Override
public int length()
{
@Override
public int length()
{
- return max-offset;
+ return max - offset;
}
}
-
+
@Override
public char charAt(int index)
{
String dc;
@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);
+ 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()
{
public String toString()
{
- char[] string=new char[max-offset];
- int mx=annotations.length;
-
- for (int i=offset;i<mx;i++)
+ char[] string = new char[max - offset];
+ int mx = annotations.length;
+
+ for (int i = offset; i < mx; i++)
{
String dc;
{
String dc;
- string[i]=(annotations[i]==null || (dc=annotations[i].displayCharacter.trim()).length()<1 )? '.' : dc.charAt(0);
+ string[i] = (annotations[i] == null || (dc = annotations[i].displayCharacter
+ .trim()).length() < 1) ? '.' : dc.charAt(0);
}
return new String(string);
}
};
}
return new String(string);
}
};
-
- private long _lastrnaannot=-1;
- public String getRNAStruc(){
+
+ private long _lastrnaannot = -1;
+
+ public String getRNAStruc()
+ {
if (isrna)
{
String rnastruc = new AnnotCharSequence().toString();
if (isrna)
{
String rnastruc = new AnnotCharSequence().toString();
- if (_lastrnaannot!=rnastruc.hashCode())
+ if (_lastrnaannot != rnastruc.hashCode())
{
// ensure rna structure contacts are up to date
{
// ensure rna structure contacts are up to date
- _lastrnaannot=rnastruc.hashCode();
+ _lastrnaannot = rnastruc.hashCode();
_updateRnaSecStr(rnastruc);
}
return rnastruc;
_updateRnaSecStr(rnastruc);
}
return rnastruc;
@@
-387,7
+404,7
@@
public class AlignmentAnnotation
return null;
}
return null;
}
-/**
+ /**
* Creates a new AlignmentAnnotation object.
*
* @param label
* Creates a new AlignmentAnnotation object.
*
* @param label
@@
-435,7
+452,7
@@
public class AlignmentAnnotation
float min = graphMin;
float max = graphMax;
boolean drawValues = true;
float min = graphMin;
float max = graphMax;
boolean drawValues = true;
-
+ _linecolour = null;
if (min == max)
{
min = 999999999;
if (min == max)
{
min = 999999999;
@@
-461,6
+478,10
@@
public class AlignmentAnnotation
{
min = annotations[i].value;
}
{
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)
}
// ensure zero is origin for min/max ranges on only one side of zero
if (min > 0)
@@
-518,6
+539,10
@@
public class AlignmentAnnotation
this.label = annotation.label;
this.padGaps = annotation.padGaps;
this.visible = annotation.visible;
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;
if (this.hasScore = annotation.hasScore)
{
this.score = annotation.score;
@@
-532,7
+557,14
@@
public class AlignmentAnnotation
this.annotations = new Annotation[ann.length];
for (int i = 0; i < ann.length; i++)
{
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)
}
;
if (annotation.sequenceRef != null)
@@
-567,6
+599,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.
}
validateRangeAndDisplay(); // construct hashcodes, etc.
}
@@
-955,11
+992,12
@@
public class AlignmentAnnotation
{
if (seqname && this.sequenceRef != null)
{
{
if (seqname && this.sequenceRef != null)
{
- int i=description.toLowerCase().indexOf("<html>");
- if (i>-1)
+ int i = description.toLowerCase().indexOf("<html>");
+ if (i > -1)
{
// move the html tag to before the sequence reference.
{
// move the html tag to before the sequence reference.
- return "<html>"+sequenceRef.getName()+" : "+description.substring(i+6);
+ return "<html>" + sequenceRef.getName() + " : "
+ + description.substring(i + 6);
}
return sequenceRef.getName() + " : " + description;
}
}
return sequenceRef.getName() + " : " + description;
}
@@
-968,8
+1006,9
@@
public class AlignmentAnnotation
public boolean isValidStruc()
{
public boolean isValidStruc()
{
- return invalidrnastruc==-1;
+ return invalidrnastruc == -1;
}
}
+
public long getInvalidStrucPos()
{
return invalidrnastruc;
public long getInvalidStrucPos()
{
return invalidrnastruc;
@@
-978,7
+1017,14
@@
public class AlignmentAnnotation
/**
* machine readable ID string indicating what generated this annotation
*/
/**
* machine readable ID string indicating what generated this annotation
*/
- protected String calcId="";
+ 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 String getCalcId()
{
return calcId;
@@
-988,5
+1034,5
@@
public class AlignmentAnnotation
{
this.calcId = calcId;
}
{
this.calcId = calcId;
}
-
+
}
}