JAL-629 - remove TODO from jalview.bin.Jalview since it is now done via jalview.bin...

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

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 636088b..de98c64 100755 (executable)
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -34,6 +34,7 @@ import java.util.Map.Entry;
 import jalview.analysis.Rna;
 import jalview.analysis.SecStrConsensus.SimpleBP;
 import jalview.analysis.WUSSParseException;
+import jalview.structure.StructureImportSettings;
 
 /**
  * DOCUMENT ME!
@@ -96,22 +97,17 @@ public class AlignmentAnnotation
    */
   private long invalidrnastruc = -2;
 
-  public static enum TFType
-  {
-    DEFAULT, PLDDT, DOSE;
-  }
-
   /**
    * the type of temperature factor plot (if it is one)
    */
-  private TFType tfType = TFType.DEFAULT;
+  private StructureImportSettings.TFType tfType = StructureImportSettings.TFType.DEFAULT;
 
-  public void setTFType(TFType t)
+  public void setTFType(StructureImportSettings.TFType t)
   {
     tfType = t;
   }
 
-  public TFType getTFType()
+  public StructureImportSettings.TFType getTFType()
   {
     return tfType;
   }
@@ -310,7 +306,12 @@ public class AlignmentAnnotation
 
   public static final int LINE_GRAPH = 2;
 
-  public static final int CUSTOMRENDERER = 4;
+  public static final int CONTACT_MAP = 4;
+
+  /**
+   * property that when set to non-empty string disables display of column groups defined on the contact matrix
+   */
+  public static final String CONTACT_MAP_NOGROUPS = "CMNOGRPS";
 
   public boolean belowAlignment = true;
 
@@ -572,12 +573,12 @@ public class AlignmentAnnotation
                       : annotations[index + offset].displayCharacter == null
                               || annotations[index
                                       + offset].displayCharacter
-                                      .length() == 0
-                                              ? annotations[index
-                                                      + offset].secondaryStructure
-                                              : annotations[index
-                                                      + offset].displayCharacter
-                                                      .charAt(0));
+                                              .length() == 0
+                                                      ? annotations[index
+                                                              + offset].secondaryStructure
+                                                      : annotations[index
+                                                              + offset].displayCharacter
+                                                                      .charAt(0));
     }
 
     @Override
@@ -1749,5 +1750,23 @@ public class AlignmentAnnotation
     }
     return aa;
   }
+  
+  /**
+   * convenience method to check for the 'CONTACT_MAP_NOGROUPS' property for this alignment annotation row
+   * @return true if no CONTACT_MAP_NOGROUPS property is found, or it is set to ""
+   */
+  public boolean isShowGroupsForContactMatrix()
+  {
+    return getProperty(AlignmentAnnotation.CONTACT_MAP_NOGROUPS)==null || "".equals(getProperty(AlignmentAnnotation.CONTACT_MAP_NOGROUPS));
+  }
+  /**
+   * set the 'CONTACT_MAP_NOGROUPS' property for this alignment annotation row
+   * @see isShowGroupsForContactMatrix
+   */
+  public void setShowGroupsForContactMatrix(boolean showGroups)
+  {
+    setProperty(AlignmentAnnotation.CONTACT_MAP_NOGROUPS, showGroups ? "" : "nogroups");
+  }
+
 
 }