X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2FAnnotationSorter.java;h=81398ebcd8683cdf5bbc54c5d3ae28ecef58a438;hb=c4609f79463d463d471b207a092f4d5af807391d;hp=4ee2b8661c0efcde1edcf8301d11c3c279f79339;hpb=ec493e27abc6b3be84b3c8a873c295a3f589bd53;p=jalview.git

diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java
index 4ee2b86..81398eb 100644
--- a/src/jalview/analysis/AnnotationSorter.java
+++ b/src/jalview/analysis/AnnotationSorter.java
@@ -6,6 +6,8 @@ import jalview.datamodel.SequenceI;
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A helper class to sort all annotations associated with an alignment in
@@ -17,11 +19,66 @@ import java.util.Comparator;
 public class AnnotationSorter
 {
 
+  /**
+   * enum for annotation sort options. The text description is used in the
+   * Preferences drop-down options. The enum name is saved in the preferences
+   * file.
+   * 
+   * @author gmcarstairs
+   *
+   */
+  public enum SequenceAnnotationOrder
+  {
+    // Text descriptions surface in the Preferences Sort by... options
+    SEQUENCE_AND_LABEL("Sequence"), LABEL_AND_SEQUENCE("Label"), NONE(
+            "No sort");
+
+    private String description;
+
+    private SequenceAnnotationOrder(String s)
+    {
+      description = s;
+    }
+
+    @Override
+    public String toString()
+    {
+      return description;
+    }
+
+    public static SequenceAnnotationOrder forDescription(String d) {
+      for (SequenceAnnotationOrder order : values())
+      {
+        if (order.toString().equals(d))
+        {
+          return order;
+        }
+      }
+      return null;
+    }
+  }
+
+  // the alignment with respect to which annotations are sorted
   private final AlignmentI alignment;
 
-  public AnnotationSorter(AlignmentI alignmentI)
+  // user preference for placement of non-sequence annotations
+  private boolean showAutocalcAbove;
+
+  // working map of sequence index in alignment
+  private final Map<SequenceI, Integer> sequenceIndices = new HashMap<SequenceI, Integer>();
+
+  /**
+   * Constructor given an alignment and the location (top or bottom) of
+   * Consensus and similar.
+   * 
+   * @param alignmentI
+   * @param showAutocalculatedAbove
+   */
+  public AnnotationSorter(AlignmentI alignmentI,
+          boolean showAutocalculatedAbove)
   {
     this.alignment = alignmentI;
+    this.showAutocalcAbove = showAutocalculatedAbove;
   }
 
   /**
@@ -34,7 +91,7 @@ public class AnnotationSorter
    * <li>within the same sequence ref, sort by label (non-case-sensitive)</li>
    * </ul>
    */
-  private final Comparator<? super AlignmentAnnotation> bySequenceAndType = new Comparator<AlignmentAnnotation>()
+  private final Comparator<? super AlignmentAnnotation> bySequenceAndLabel = new Comparator<AlignmentAnnotation>()
   {
     @Override
     public int compare(AlignmentAnnotation o1, AlignmentAnnotation o2)
@@ -74,7 +131,7 @@ public class AnnotationSorter
    * <li>within the same label, sort by order of the related sequences</li>
    * </ul>
    */
-  private final Comparator<? super AlignmentAnnotation> byTypeAndSequence = new Comparator<AlignmentAnnotation>()
+  private final Comparator<? super AlignmentAnnotation> byLabelAndSequence = new Comparator<AlignmentAnnotation>()
   {
     @Override
     public int compare(AlignmentAnnotation o1, AlignmentAnnotation o2)
@@ -102,15 +159,15 @@ public class AnnotationSorter
       }
 
       /*
-       * Sort non-sequence-related after sequence-related.
+       * Sort non-sequence-related before or after sequence-related.
        */
       if (o1.sequenceRef == null)
       {
-        return 1;
+        return showAutocalcAbove ? -1 : 1;
       }
       if (o2.sequenceRef == null)
       {
-        return -1;
+        return showAutocalcAbove ? 1 : -1;
       }
       int labelOrder = compareLabels(o1, o2);
       return labelOrder == 0 ? compareSequences(o1, o2) : labelOrder;
@@ -118,42 +175,105 @@ public class AnnotationSorter
   };
 
   /**
-   * Sort by annotation type (label), within sequence order.
-   * Non-sequence-related annotations sort to the end.
+   * noSort leaves sort order unchanged, within sequence- and
+   * non-sequence-related annotations, but may switch the ordering of these
+   * groups. Note this is guaranteed (at least in Java 7) as Arrays.sort() is
+   * guaranteed to be 'stable' (not change ordering of equal items).
+   */
+  private Comparator<? super AlignmentAnnotation> noSort = new Comparator<AlignmentAnnotation>()
+  {
+    @Override
+    public int compare(AlignmentAnnotation o1, AlignmentAnnotation o2)
+    {
+      if (o1 != null && o2 != null)
+      {
+        if (o1.sequenceRef == null && o2.sequenceRef != null)
+        {
+          return showAutocalcAbove ? -1 : 1;
+        }
+        if (o1.sequenceRef != null && o2.sequenceRef == null)
+        {
+          return showAutocalcAbove ? 1 : -1;
+        }
+      }
+      return 0;
+    }
+  };
+
+  /**
+   * Sort by the specified ordering of sequence-specific annotations.
    * 
    * @param alignmentAnnotations
+   * @param order
    */
-  public void sortBySequenceAndType(
-          AlignmentAnnotation[] alignmentAnnotations)
+  public void sort(AlignmentAnnotation[] alignmentAnnotations,
+          SequenceAnnotationOrder order)
   {
+    if (alignmentAnnotations == null)
+    {
+      return;
+    }
+    // cache 'alignment sequence position' for the annotations
+    saveSequenceIndices(alignmentAnnotations);
+
+    Comparator<? super AlignmentAnnotation> comparator = getComparator(order);
+
     if (alignmentAnnotations != null)
     {
       synchronized (alignmentAnnotations)
       {
-        Arrays.sort(alignmentAnnotations, bySequenceAndType);
+        Arrays.sort(alignmentAnnotations, comparator);
       }
     }
   }
 
   /**
-   * Sort by sequence order within annotation type (label). Non-sequence-related
-   * annotations sort to the end.
+   * Calculate and save in a temporary map the position of each annotation's
+   * sequence (if it has one) in the alignment. Faster to do this once than for
+   * every annotation comparison.
    * 
    * @param alignmentAnnotations
    */
-  public void sortByTypeAndSequence(
+  private void saveSequenceIndices(
           AlignmentAnnotation[] alignmentAnnotations)
   {
-    if (alignmentAnnotations != null)
-    {
-      synchronized (alignmentAnnotations)
-      {
-        Arrays.sort(alignmentAnnotations, byTypeAndSequence);
+    sequenceIndices.clear();
+    for (AlignmentAnnotation ann : alignmentAnnotations) {
+      SequenceI seq = ann.sequenceRef;
+      if (seq != null) {
+        int index = AlignmentUtils.getSequenceIndex(alignment, seq);
+        sequenceIndices.put(seq, index);
       }
     }
   }
 
   /**
+   * Get the comparator for the specified sort order.
+   * 
+   * @param order
+   * @return
+   */
+  private Comparator<? super AlignmentAnnotation> getComparator(
+          SequenceAnnotationOrder order)
+  {
+    if (order == null)
+    {
+      return noSort;
+    }
+    switch (order)
+    {
+    case NONE:
+      return this.noSort;
+    case SEQUENCE_AND_LABEL:
+      return this.bySequenceAndLabel;
+    case LABEL_AND_SEQUENCE:
+      return this.byLabelAndSequence;
+    default:
+      throw new UnsupportedOperationException(order.toString());
+    }
+  }
+
+  /**
    * Non-case-sensitive comparison of annotation labels. Returns zero if either
    * argument is null.
    * 
@@ -201,17 +321,20 @@ public class AnnotationSorter
     {
       return 0;
     }
+    /*
+     * Sort non-sequence-related before or after sequence-related.
+     */
     if (seq1 == null)
     {
-      return 1;
+      return showAutocalcAbove ? -1 : 1;
     }
     if (seq2 == null)
     {
-      return -1;
+      return showAutocalcAbove ? 1 : -1;
     }
     // get sequence index - but note -1 means 'at end' so needs special handling
-    int index1 = AlignmentUtils.getSequenceIndex(alignment, seq1);
-    int index2 = AlignmentUtils.getSequenceIndex(alignment, seq2);
+    int index1 = sequenceIndices.get(seq1);
+    int index2 = sequenceIndices.get(seq2);
     if (index1 == index2)
     {
       return 0;