added aligned codon frames, and dataset reference ids for sequenceSet and sequences...

[jalview.git] / src / jalview / datamodel / AlignmentAnnotation.java

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index bd50cd7..87c113f 100755 (executable)
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -88,7 +88,7 @@ public class AlignmentAnnotation
 
   public int graphHeight = 40;
 
-  public boolean padGaps = true;
+  public boolean padGaps = false;
 
   public static final int NO_GRAPH = 0;
 
@@ -142,7 +142,6 @@ Loading...
     {
       if (annotations[i] == null)
       {
-        padGaps = false;
         continue;
       }
       if (annotations[i].secondaryStructure == 'H' ||
@@ -153,7 +152,6 @@ Loading...
 
       if(annotations[i].displayCharacter==null)
       {
-        padGaps = false;
         continue;
       }
 
@@ -174,8 +172,6 @@ Loading...
         {
           hasText = true;
         }
-        else
-          padGaps = false;
       }
 
     if (nonSSLabel)
@@ -361,12 +357,18 @@ Loading...
    */
   public void restrict(int startRes, int endRes)
   {
+    if (startRes<0)
+      startRes=0;
+    if (startRes>=annotations.length)
+      startRes = annotations.length-1;
+    if (endRes>=annotations.length)
+      endRes = annotations.length-1;
     if (annotations==null)
       return;
     Annotation[] temp = new Annotation[endRes-startRes+1];
     if (startRes<annotations.length)
     {
-      System.arraycopy(annotations, startRes, temp, 0, Math.min(endRes, annotations.length-1)-startRes+1);
+      System.arraycopy(annotations, startRes, temp, 0, endRes-startRes+1);
     }
     if (sequenceRef!=null) {
       // Clip the mapping, if it exists.
@@ -398,8 +400,7 @@ Loading...
   public boolean padAnnotation(int length) {
     if (annotations==null)
     {
-      annotations = new Annotation[length];
-      return true;
+      return true; // annotation row is correct - null == not visible and undefined length
     }
     if (annotations.length<length)
     {
@@ -553,18 +554,23 @@ Loading...
    * number of non-null annotation elements.
    * @return
    */
-  private int compactAnnotationArray() {
-    int j=0;
-    for (int i=0;i<annotations.length; i++) {
-      if (annotations[i]!=null && j!=i) {
-        annotations[j++] = annotations[i];
+  public int compactAnnotationArray() {
+    int i=0,iSize=annotations.length;
+    while (i<iSize)
+    {
+      if (annotations[i]==null) {
+        if (i+1<iSize)
+          System.arraycopy(annotations, i+1, annotations, i, iSize-i-1);
+        iSize--;
+      } else {
+        i++;
       }
     }
     Annotation[] ann = annotations;
-    annotations = new Annotation[j];
-    System.arraycopy(ann, 0, annotations, 0, j);
+    annotations = new Annotation[i];
+    System.arraycopy(ann, 0, annotations, 0, i);
     ann = null;
-    return j;
+    return iSize;
   }
 
   /**
@@ -639,4 +645,31 @@ Loading...
   {
     return hasScore || !Double.isNaN(score);
   }
+  /**
+   * Score only annotation
+   * @param label
+   * @param description
+   * @param score
+   */
+  public AlignmentAnnotation(String label, String description, double score)
+  {
+    this(label, description, null);
+    setScore(score);
+  }
+
+  public void setPadGaps(boolean padgaps, char gapchar)
+  {
+    this.padGaps = padgaps;
+    if(padgaps)
+    {
+      hasText = true;
+      for(int i=0; i<annotations.length; i++)
+      {
+        if(annotations[i]==null)
+          annotations[i] = new Annotation(String.valueOf(gapchar),null,' ',0f);
+        else if(annotations[i].displayCharacter==null ||annotations[i].displayCharacter.equals(" "))
+          annotations[i].displayCharacter=String.valueOf(gapchar);
+      }
+    }
+  }
 }