X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FAlignmentAnnotation.java;h=8d8a118b63f2b17a4180f12b7379f3fbfa3a8d80;hb=0f3ec4858fa41dcc8b815402ba971fb2184ae27b;hp=4a3cad6b0f88c0af6a88b6ce8a09b5aff1040cd2;hpb=d8412f9b4ca9533eb56dc48e1d2273ee0e45bf3f;p=jalview.git

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 4a3cad6..8d8a118 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -1,23 +1,26 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program 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 2
-* of the License, or (at your option) any later version.
-*
-* This program 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 this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.datamodel;
 
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
  * DOCUMENT ME!
@@ -31,317 +34,459 @@ public class AlignmentAnnotation
    * eg consensus, quality or conservation graphs */
   public boolean autoCalculated = false;
 
-    public SequenceI sequenceRef;
+  public String annotationId;
 
-    /** DOCUMENT ME!! */
-    public String label;
+  public SequenceI sequenceRef;
 
-    /** DOCUMENT ME!! */
-    public String description;
+  /** DOCUMENT ME!! */
+  public String label;
 
-    /** DOCUMENT ME!! */
-    public Annotation[] annotations;
+  /** DOCUMENT ME!! */
+  public String description;
 
-    public java.util.Hashtable sequenceMapping;
+  /** DOCUMENT ME!! */
+  public Annotation[] annotations;
 
-    /** DOCUMENT ME!! */
-    public float graphMin;
+  public java.util.Hashtable sequenceMapping;
 
-    /** DOCUMENT ME!! */
-    public float graphMax;
+  /** DOCUMENT ME!! */
+  public float graphMin;
 
-    public GraphLine threshold;
+  /** DOCUMENT ME!! */
+  public float graphMax;
 
-    // Graphical hints and tips
+  public GraphLine threshold;
 
-    /** DOCUMENT ME!! */
-    public boolean editable = false;
+  // Graphical hints and tips
 
-    /** DOCUMENT ME!! */
-    public boolean hasIcons; //
+  /** DOCUMENT ME!! */
+  public boolean editable = false;
 
-    /** DOCUMENT ME!! */
-    public boolean hasText;
+  /** DOCUMENT ME!! */
+  public boolean hasIcons; //
 
-    /** DOCUMENT ME!! */
-    public boolean visible = true;
+  /** DOCUMENT ME!! */
+  public boolean hasText;
 
-    public int graphGroup = -1;
+  /** DOCUMENT ME!! */
+  public boolean visible = true;
 
-    /** DOCUMENT ME!! */
-    public int height = 0;
+  public int graphGroup = -1;
 
-    public int graph = 0;
+  /** DOCUMENT ME!! */
+  public int height = 0;
 
-    public int graphHeight = 40;
+  public int graph = 0;
 
-    public static final int NO_GRAPH = 0;
+  public int graphHeight = 40;
 
-    public static final int BAR_GRAPH = 1;
+  public static final int NO_GRAPH = 0;
 
-    public static final int LINE_GRAPH = 2;
+  public static final int BAR_GRAPH = 1;
 
-    public static int getGraphValueFromString(String string)
+  public static final int LINE_GRAPH = 2;
+
+  public static int getGraphValueFromString(String string)
+  {
+    if (string.equalsIgnoreCase("BAR_GRAPH"))
     {
-      if(string.equalsIgnoreCase("BAR_GRAPH"))
-        return BAR_GRAPH;
-      else if(string.equalsIgnoreCase("LINE_GRAPH"))
-        return LINE_GRAPH;
-      else
-        return NO_GRAPH;
+      return BAR_GRAPH;
     }
-
-    /**
-     * Creates a new AlignmentAnnotation object.
-     *
-     * @param label DOCUMENT ME!
-     * @param description DOCUMENT ME!
-     * @param annotations DOCUMENT ME!
-     */
-    public AlignmentAnnotation(String label, String description,
-        Annotation[] annotations)
+    else if (string.equalsIgnoreCase("LINE_GRAPH"))
     {
-        // always editable?
-        editable = true;
-        this.label = label;
-        this.description = description;
-        this.annotations = annotations;
-
-       areLabelsSecondaryStructure();
+      return LINE_GRAPH;
     }
-
-    void areLabelsSecondaryStructure()
+    else
     {
-      boolean nonSSLabel = false;
-      for (int i = 0; i < annotations.length; i++)
+      return NO_GRAPH;
+    }
+  }
+
+  /**
+   * Creates a new AlignmentAnnotation object.
+   *
+   * @param label DOCUMENT ME!
+   * @param description DOCUMENT ME!
+   * @param annotations DOCUMENT ME!
+   */
+  public AlignmentAnnotation(String label, String description,
+                             Annotation[] annotations)
+  {
+    // always editable?
+    editable = true;
+    this.label = label;
+    this.description = description;
+    this.annotations = annotations;
+
+    areLabelsSecondaryStructure();
+  }
+
+  void areLabelsSecondaryStructure()
+  {
+    boolean nonSSLabel = false;
+    for (int i = 0; i < annotations.length; i++)
+    {
+      if (annotations[i] == null)
       {
-        if(annotations[i]==null)
-          continue;
+        continue;
+      }
 
-        if (annotations[i].secondaryStructure == 'H' ||
-            annotations[i].secondaryStructure == 'E')
-        {
-          hasIcons = true;
-        }
+      if (annotations[i].secondaryStructure == 'H' ||
+          annotations[i].secondaryStructure == 'E')
+      {
+        hasIcons = true;
+      }
 
-        if (annotations[i].displayCharacter.length()==1
-            && !annotations[i].displayCharacter.equals("H")
-            && !annotations[i].displayCharacter.equals("E")
-            && !annotations[i].displayCharacter.equals("-"))
+      if (annotations[i].displayCharacter.length() == 1
+          && !annotations[i].displayCharacter.equals("H")
+          && !annotations[i].displayCharacter.equals("E")
+          && !annotations[i].displayCharacter.equals("-")
+          && !annotations[i].displayCharacter.equals("."))
+      {
+        if (jalview.schemes.ResidueProperties.aaIndex
+            [annotations[i].displayCharacter.charAt(0)] < 23)
         {
-          if(jalview.schemes.ResidueProperties.aaIndex
-             [annotations[i].displayCharacter.charAt(0)]>0)
-          {
-            nonSSLabel = true;
-          }
+          nonSSLabel = true;
         }
+      }
 
-        if (annotations[i].displayCharacter.length() > 0)
-        {
-          hasText = true;
-        }
+      if (annotations[i].displayCharacter.length() > 0)
+      {
+        hasText = true;
       }
+    }
 
-      if(nonSSLabel)
+    if (nonSSLabel)
+    {
+      hasIcons = false;
+      for (int j = 0; j < annotations.length; j++)
       {
-        hasIcons = false;
-        for (int j = 0; j < annotations.length; j++)
+        if (annotations[j] != null && annotations[j].secondaryStructure != ' ')
         {
-          if(annotations[j] !=null && annotations[j].secondaryStructure!=' ')
-          {
-            annotations[j].displayCharacter
-                =String.valueOf(annotations[j].secondaryStructure);
-            annotations[j].secondaryStructure = ' ';
-          }
-
+          annotations[j].displayCharacter
+              = String.valueOf(annotations[j].secondaryStructure);
+          annotations[j].secondaryStructure = ' ';
         }
 
       }
 
     }
 
-    /**
-     * Creates a new AlignmentAnnotation object.
-     *
-     * @param label DOCUMENT ME!
-     * @param description DOCUMENT ME!
-     * @param annotations DOCUMENT ME!
-     * @param min DOCUMENT ME!
-     * @param max DOCUMENT ME!
-     * @param winLength DOCUMENT ME!
-     */
-    public AlignmentAnnotation(String label, String description,
-        Annotation[] annotations, float min, float max, int graphType)
+    annotationId = this.hashCode() + "";
+  }
+  /**
+   * Creates a new AlignmentAnnotation object.
+   *
+   * @param label DOCUMENT ME!
+   * @param description DOCUMENT ME!
+   * @param annotations DOCUMENT ME!
+   * @param min DOCUMENT ME!
+   * @param max DOCUMENT ME!
+   * @param winLength DOCUMENT ME!
+   */
+  public AlignmentAnnotation(String label, String description,
+                             Annotation[] annotations, float min, float max,
+                             int graphType)
+  {
+    // graphs are not editable
+    this.label = label;
+    this.description = description;
+    this.annotations = annotations;
+    graph = graphType;
+    graphMin = min;
+    graphMax = max;
+    validateRangeAndDisplay();
+  }
+  /**
+   * checks graphMin and graphMax,
+   * secondary structure symbols,
+   * sets graphType appropriately,
+   * sets null labels to the empty string
+   * if appropriate.
+   */
+  private void validateRangeAndDisplay() {
+    int graphType = graph;
+    float min = graphMin;
+    float max = graphMax;
+    boolean drawValues = true;
+    
+    if (min == max)
     {
-        // graphs are not editable
-        this.label = label;
-        this.description = description;
-        this.annotations = annotations;
-        graph = graphType;
+      min = 999999999;
+      for (int i = 0; i < annotations.length; i++)
+      {
+        if (annotations[i] == null)
+        {
+          continue;
+        }
 
-        boolean drawValues = true;
+        if (drawValues && annotations[i].displayCharacter.length() > 1)
+        {
+          drawValues = false;
+        }
 
-        if (min == max)
+        if (annotations[i].value > max)
         {
-            min = 999999999;
-            for (int i = 0; i < annotations.length; i++)
-            {
-                if (annotations[i] == null)
-                {
-                    continue;
-                }
-
-                if(drawValues && annotations[i].displayCharacter.length() > 1 )
-                {
-                  drawValues = false;
-                }
-
-                if (annotations[i].value > max)
-                {
-                    max = annotations[i].value;
-                }
-
-                if (annotations[i].value < min)
-                {
-                    min = annotations[i].value;
-                }
-            }
+          max = annotations[i].value;
         }
 
-        graphMin = min;
-        graphMax = max;
+        if (annotations[i].value < min)
+        {
+          min = annotations[i].value;
+        }
+      }
+    }
+
+    graphMin = min;
+    graphMax = max;
 
-        areLabelsSecondaryStructure();
+    areLabelsSecondaryStructure();
 
-        if(!drawValues && graphType!=NO_GRAPH)
+    if (!drawValues && graphType != NO_GRAPH)
+    {
+      for (int i = 0; i < annotations.length; i++)
+      {
+        if (annotations[i] != null)
         {
-          for (int i = 0; i < annotations.length; i++)
-          {
-            if (annotations[i] != null)
-              annotations[i].displayCharacter = "";
+          annotations[i].displayCharacter = "";
+        }
+      }
+    }
+  }
+  
+  /**
+   * Copy constructor
+   * creates a new independent annotation row with the same associated sequenceRef 
+   * @param annotation
+   */
+  public AlignmentAnnotation(AlignmentAnnotation annotation)
+  {
+    this.label = new String(annotation.label);
+    this.description = new String(annotation.description);
+    this.graphMin = annotation.graphMin;
+    this.graphMax = annotation.graphMax;
+    this.graph = annotation.graph;
+    this.graphHeight = annotation.graphHeight;
+    this.graphGroup = annotation.graphGroup;
+    this.editable = annotation.editable;
+    this.autoCalculated = annotation.autoCalculated;
+    this.hasIcons = annotation.hasIcons;
+    this.hasText = annotation.hasText;
+    this.height = annotation.height;
+    this.label = annotation.label;
+    if (threshold!=null) {
+      threshold = new GraphLine(annotation.threshold);
+    }
+    if (annotation.annotations!=null) {
+      Vector anvec = new Vector();
+      Annotation[] ann = annotation.annotations;
+      this.annotations = new Annotation[ann.length];
+      for (int i=0; i<ann.length; i++) {
+        annotations[i] = new Annotation(ann[i]);
+        anvec.add(ann[i]); // for lookup if sequenceMapping exists.
+      };
+      if (annotation.sequenceRef!=null) {
+        this.sequenceRef = annotation.sequenceRef;
+        if (annotation.sequenceMapping!=null)
+        {
+          sequenceMapping = new Hashtable();
+          Enumeration pos=annotation.sequenceMapping.keys();
+          while (pos.hasMoreElements()) {
+            Integer p = (Integer) pos.nextElement();
+            Annotation a = (Annotation) sequenceMapping.get(p);
+            sequenceMapping.put(p, annotations[anvec.indexOf(a)]); 
           }
+          anvec.clear();
+        } else {
+          this.sequenceMapping = null;
         }
+      }
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public String toString()
+    validateRangeAndDisplay(); // construct hashcodes, etc.
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public String toString()
+  {
+    StringBuffer buffer = new StringBuffer();
+
+    for (int i = 0; i < annotations.length; i++)
     {
-        StringBuffer buffer = new StringBuffer();
-
-        for (int i = 0; i < annotations.length; i++)
+      if (annotations[i] != null)
+      {
+        if (graph != 0)
         {
-            if (annotations[i] != null)
-            {
-                if (graph!=0)
-                {
-                    buffer.append(annotations[i].value);
-                }
-                else if (hasIcons)
-                {
-                    buffer.append(annotations[i].secondaryStructure);
-                }
-                else
-                {
-                    buffer.append(annotations[i].displayCharacter);
-                }
-            }
-
-            buffer.append(", ");
+          buffer.append(annotations[i].value);
         }
-
-        if (label.equals("Consensus"))
+        else if (hasIcons)
+        {
+          buffer.append(annotations[i].secondaryStructure);
+        }
+        else
         {
-            buffer.append("\n");
+          buffer.append(annotations[i].displayCharacter);
+        }
+      }
+
+      buffer.append(", ");
+    }
 
-            for (int i = 0; i < annotations.length; i++)
-            {
-                if (annotations[i] != null)
-                {
-                    buffer.append(annotations[i].description);
-                }
+    if (label.equals("Consensus"))
+    {
+      buffer.append("\n");
 
-                buffer.append(", ");
-            }
+      for (int i = 0; i < annotations.length; i++)
+      {
+        if (annotations[i] != null)
+        {
+          buffer.append(annotations[i].description);
         }
 
-        return buffer.toString();
+        buffer.append(", ");
       }
+    }
 
-      public void setThreshold(GraphLine line)
-      {
-        threshold = line;
-      }
+    return buffer.toString();
+  }
+
+  public void setThreshold(GraphLine line)
+  {
+    threshold = line;
+  }
+
+  public GraphLine getThreshold()
+  {
+    return threshold;
+  }
+
+  /**
+   * Attach the annotation to seqRef, starting from startRes position. If alreadyMapped is true then the indices of the annotation[] array are sequence positions rather than alignment column positions.
+   * @param seqRef
+   * @param startRes
+   * @param alreadyMapped
+   */
+  public void createSequenceMapping(SequenceI seqRef,
+                                    int startRes,
+                                    boolean alreadyMapped)
+  {
+
+    if (seqRef == null)
+    {
+      return;
+    }
 
-      public GraphLine getThreshold()
-      {
-          return threshold;
-      }
+    sequenceMapping = new java.util.Hashtable();
 
-      /**
-       * Attach the annotation to seqRef, starting from startRes position. If alreadyMapped is true then the indices of the annotation[] array are sequence positions rather than alignment column positions.
-       * @param seqRef
-       * @param startRes
-       * @param alreadyMapped
-       */
-      public void createSequenceMapping(SequenceI seqRef,
-                                        int startRes,
-                                        boolean alreadyMapped)
+    sequenceRef = seqRef;
+    int seqPos;
+
+    for (int i = 0; i < annotations.length; i++)
+    {
+      if (annotations[i] != null)
       {
-        if(seqRef == null)
-          return;
+        if (alreadyMapped)
+        {
+          seqPos = seqRef.findPosition(i);
+        }
+        else
+        {
+          seqPos = i + startRes;
+        }
 
-        sequenceMapping = new java.util.Hashtable();
+        sequenceMapping.put(new Integer(seqPos), annotations[i]);
+      }
+    }
 
-        sequenceRef = seqRef;
-        int seqPos;
+  }
 
-        for(int i = 0; i < annotations.length; i++)
-        {
-            if (annotations[i] != null)
-            {
-              if(alreadyMapped)
-                seqPos = seqRef.findPosition(i);
-              else
-                seqPos = i+startRes;
+  public void adjustForAlignment()
+  {
+    if (sequenceRef==null)
+      return;
+    
+    int a = 0, aSize = sequenceRef.getLength();
 
-              sequenceMapping.put(new Integer(seqPos), annotations[i]);
-            }
-         }
+    if (aSize == 0)
+    {
+      //Its been deleted
+      return;
+    }
 
-        adjustForAlignment();
-      }
+    int position;
+    Annotation[] temp = new Annotation[aSize];
+    Integer index;
 
-      public void adjustForAlignment()
+    for (a = sequenceRef.getStart(); a <= sequenceRef.getEnd(); a++)
+    {
+      index = new Integer(a);
+      if (sequenceMapping.containsKey(index))
       {
-          int a=0, aSize = sequenceRef.getLength();
+        position = sequenceRef.findIndex(a) - 1;
 
-          if(aSize == 0)
-          {
-            //Its been deleted
-            return;
-          }
-
-          int position;
-          Annotation[] temp = new Annotation[aSize];
-          Integer index;
+        temp[position] = (Annotation) sequenceMapping.get(index);
+      }
+    }
 
-          for (a = sequenceRef.getStart(); a <= sequenceRef.getEnd(); a++)
+    annotations = temp;
+  }
+  /**
+   * remove any null entries in annotation row and return the
+   * 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];
+      }
+    }
+    Annotation[] ann = annotations;
+    annotations = new Annotation[j];
+    System.arraycopy(ann, 0, annotations, 0, j);
+    ann = null;
+    return j;
+  }
+  
+  /**
+   * Associate this annotion with the aligned residues of a particular sequence.
+   * sequenceMapping will be updated in the following way:
+   *   null sequenceI - existing mapping will be discarded but annotations left in mapped positions.
+   *   valid sequenceI not equal to current sequenceRef: mapping is discarded and rebuilt assuming 1:1 correspondence
+   *   TODO: overload with parameter to specify correspondence between current and new sequenceRef
+   * @param sequenceI
+   */
+  public void setSequenceRef(SequenceI sequenceI)
+  {
+    if (sequenceI!=null) {
+      if (sequenceRef!=null) {
+        if (sequenceRef!=sequenceI && !sequenceRef.equals(sequenceI)) {
+          // throw away old mapping and reconstruct.
+          sequenceRef=null;
+          if (sequenceMapping!=null) 
           {
-              index = new Integer(a);
-              if(sequenceMapping.containsKey(index))
-              {
-                position = sequenceRef.findIndex(a)-1;
-
-                temp[position] = (Annotation)sequenceMapping.get(index);
-              }
+            sequenceMapping=null;
+            // compactAnnotationArray();
           }
-
-          annotations = temp;
+          createSequenceMapping(sequenceI, 1,true);
+          adjustForAlignment();
+        } else {
+          // Mapping carried over
+          sequenceRef = sequenceI;
+        }
+      } else {
+        // No mapping exists
+        createSequenceMapping(sequenceI, 1, true);
+        adjustForAlignment();
       }
+    } else {
+      // throw away the mapping without compacting.
+      sequenceMapping=null;
+      sequenceRef = null;
+    }
+  }
 }
-
-