X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=8ec234d12128745ff90f873ed3fa50611d9448c0;hb=dd74fc4938723fe5ec48d4e5fdcfbe58ac42a48d;hp=a7c67cd0638dd6b4520fbc588ee33cf5c02ed3f7;hpb=d70d7e5bc8da1189f44709b6ec59ea1e23f6f557;p=jalview.git

diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java
index a7c67cd..8ec234d 100755
--- a/src/jalview/io/AnnotationFile.java
+++ b/src/jalview/io/AnnotationFile.java
@@ -24,149 +24,207 @@ import jalview.datamodel.*;
 import java.util.*;
 import java.net.URL;
 import jalview.schemes.*;
+import jalview.analysis.Conservation;
 
 
 public class AnnotationFile
 {
-
-  public String printAnnotations(AlignmentAnnotation [] annotations)
-  {
-    StringBuffer text = new StringBuffer(
-      "JALVIEW_ANNOTATION\n"
-      +"# Created: "
+  StringBuffer text = new StringBuffer(
+        "JALVIEW_ANNOTATION\n"
+        +"# Created: "
       +new java.util.Date()+"\n\n");
 
-    AlignmentAnnotation row;
-    String comma;
-    SequenceI seqref = null;
-
-    StringBuffer colours = new StringBuffer();
-    StringBuffer graphLine = new StringBuffer();
+  public String printAnnotations(AlignmentAnnotation [] annotations,
+                                Vector groups)
+  {
+    if(annotations!=null)
+    {
+      AlignmentAnnotation row;
+      String comma;
+      SequenceI seqref = null;
 
-    Hashtable graphGroup = new Hashtable();
+      StringBuffer colours = new StringBuffer();
+      StringBuffer graphLine = new StringBuffer();
 
-    java.awt.Color color;
+      Hashtable graphGroup = new Hashtable();
 
-    for(int i=0; i<annotations.length; i++)
-    {
-      row = annotations[i];
+      java.awt.Color color;
 
-      if(!row.visible)
-        continue;
+      for (int i = 0; i < annotations.length; i++)
+      {
+        row = annotations[i];
 
-      color = null;
+        if (!row.visible)
+          continue;
 
-      if( row.sequenceRef == null)
-      {
-        if(seqref!=null)
-          text.append("\nSEQUENCE_REF\tALIGNMENT\n");
+        color = null;
 
-        seqref = null;
-      }
+        if (row.sequenceRef == null)
+        {
+          if (seqref != null)
+            text.append("\nSEQUENCE_REF\tALIGNMENT\n");
 
-      else if (seqref == null || seqref != row.sequenceRef)
-      {
-        seqref = row.sequenceRef;
-        text.append("\nSEQUENCE_REF\t" + seqref.getName() + "\n");
-      }
+          seqref = null;
+        }
 
+        else if (seqref == null || seqref != row.sequenceRef)
+        {
+          seqref = row.sequenceRef;
+          text.append("\nSEQUENCE_REF\t" + seqref.getName() + "\n");
+        }
 
-      if( row.graph == AlignmentAnnotation.NO_GRAPH)
-      {
+        if (row.graph == AlignmentAnnotation.NO_GRAPH)
+        {
           text.append("NO_GRAPH\t");
-      }
-      else
-      {
-        if( row.graph == AlignmentAnnotation.BAR_GRAPH)
-          text.append("BAR_GRAPH\t");
-        else if(row.graph == AlignmentAnnotation.LINE_GRAPH)
-          text.append("LINE_GRAPH\t");
+        }
+        else
+        {
+          if (row.graph == AlignmentAnnotation.BAR_GRAPH)
+            text.append("BAR_GRAPH\t");
+          else if (row.graph == AlignmentAnnotation.LINE_GRAPH)
+            text.append("LINE_GRAPH\t");
 
-        if(row.getThreshold()!=null)
+          if (row.getThreshold() != null)
             graphLine.append("GRAPHLINE\t"
                              + row.label + "\t"
                              + row.getThreshold().value + "\t"
                              + row.getThreshold().label + "\t"
                              + jalview.util.Format.getHexString(
-                                 row.getThreshold().colour)+"\n"
+                                 row.getThreshold().colour) + "\n"
                 );
 
-          if(row.graphGroup>-1)
+          if (row.graphGroup > -1)
           {
             String key = String.valueOf(row.graphGroup);
-            if(graphGroup.containsKey(key))
+            if (graphGroup.containsKey(key))
               graphGroup.put(key, graphGroup.get(key)
-                             +"\t"+row.label);
+                             + "\t" + row.label);
             else
               graphGroup.put(key, row.label);
           }
-      }
-
-      text.append(row.label+"\t");
-      if(row.description!=null)
-        text.append(row.description+"\t");
+        }
 
-      for(int j=0; j<row.annotations.length; j++)
-      {
-        if (seqref != null && jalview.util.Comparison.isGap(seqref.getCharAt(j)))
-          continue;
+        text.append(row.label + "\t");
+        if (row.description != null)
+          text.append(row.description + "\t");
 
-        if(row.annotations[j]!=null)
+        for (int j = 0; j < row.annotations.length; j++)
         {
-          comma = "";
-          if (row.annotations[j].secondaryStructure!=' ')
-          {
-            text.append(comma + row.annotations[j].secondaryStructure);
-            comma = ",";
-          }
-          if (row.annotations[j].displayCharacter.length() > 0
-                  && !row.annotations[j].displayCharacter.equals(" "))
-              {
-                text.append(comma + row.annotations[j].displayCharacter);
-                comma = ",";
-              }
-
-          if (row.annotations[j]!=null)
+          if (seqref != null &&
+              jalview.util.Comparison.isGap(seqref.getCharAt(j)))
+            continue;
+
+          if (row.annotations[j] != null)
           {
-            color = row.annotations[j].colour;
-            if (row.annotations[j].value!=0f)
-              text.append(comma + row.annotations[j].value);
+            comma = "";
+            if (row.annotations[j].secondaryStructure != ' ')
+            {
+              text.append(comma + row.annotations[j].secondaryStructure);
+              comma = ",";
+            }
+            if (row.annotations[j].displayCharacter.length() > 0
+                && !row.annotations[j].displayCharacter.equals(" "))
+            {
+              text.append(comma + row.annotations[j].displayCharacter);
+              comma = ",";
+            }
+
+            if (row.annotations[j] != null)
+            {
+              color = row.annotations[j].colour;
+              if (row.annotations[j].value != 0f)
+                text.append(comma + row.annotations[j].value);
+            }
           }
+          text.append("|");
         }
-        text.append("|");
+
+        text.append("\n");
+
+        if (color != null && color != java.awt.Color.black)
+        {
+          colours.append("COLOUR\t"
+                         + row.label + "\t"
+                         + jalview.util.Format.getHexString(color) + "\n");
+        }
+
       }
 
       text.append("\n");
 
-      if(color!=null && color!=java.awt.Color.black)
+      text.append(colours.toString());
+      text.append(graphLine.toString());
+      if (graphGroup.size() > 0)
       {
-        colours.append("COLOUR\t"
-                       +row.label+"\t"
-                       +jalview.util.Format.getHexString(color)+"\n");
+        text.append("COMBINE\t");
+        Enumeration en = graphGroup.elements();
+        while (en.hasMoreElements())
+        {
+          text.append(en.nextElement() + "\n");
+        }
       }
+    }
 
+
+    if(groups!=null)
+    {
+      printGroups(groups);
     }
 
-    text.append("\n");
+    return text.toString();
+  }
+
 
-    text.append(colours.toString());
-    text.append(graphLine.toString());
-    if(graphGroup.size()>0)
+  public void printGroups(Vector sequenceGroups)
+  {
+    SequenceGroup sg;
+    for (int i = 0; i < sequenceGroups.size(); i++)
     {
-      text.append("COMBINE\t");
-      Enumeration en = graphGroup.elements();
-      while(en.hasMoreElements())
+      sg = (SequenceGroup) sequenceGroups.elementAt(i);
+      text.append("SEQUENCE_GROUP\t"
+                  + sg.getName() + "\t"
+                  + (sg.getStartRes()+1) + "\t"
+                  + (sg.getEndRes()+1)  + "\t" + "-1\t");
+      for(int s=0; s<sg.getSize(); s++)
       {
-        text.append(en.nextElement()+"\n");
+        text.append(sg.getSequenceAt(s).getName()+"\t");
       }
-    }
 
-    return text.toString();
+      text.append("\nPROPERTIES\t"+sg.getName()+"\t");
+
+      if(sg.getDescription()!=null)
+        text.append("description="+sg.getDescription()+"\t");
+      if(sg.cs!=null)
+      {
+        text.append("colour="+ColourSchemeProperty.getColourName(sg.cs)+"\t");
+        if(sg.cs.getThreshold()!=0)
+          text.append("pidThreshold="+sg.cs.getThreshold());
+        if(sg.cs.conservationApplied())
+          text.append("consThreshold="+sg.cs.getConservationInc()+"\t");
+      }
+      text.append("outlineColour="+
+                  jalview.util.Format.getHexString(sg.getOutlineColour())+"\t");
+
+      text.append("displayBoxes=" + sg.getDisplayBoxes() + "\t");
+      text.append("displayText=" + sg.getDisplayText() + "\t");
+      text.append("colourText=" + sg.getColourText() + "\t");
+
+      if (sg.textColour != java.awt.Color.black)
+        text.append("textCol1=" +
+                    jalview.util.Format.getHexString(sg.textColour) + "\t");
+      if (sg.textColour2 != java.awt.Color.white)
+        text.append("textCol2=" +
+                    jalview.util.Format.getHexString(sg.textColour2) + "\t");
+      if(sg.thresholdTextColour!=0)
+      text.append("textColThreshold="+sg.thresholdTextColour);
+
+      text.append("\n\n");
+
+    }
   }
 
 
   SequenceI refSeq = null;
-  Hashtable annotationsHash = new Hashtable();
   public boolean readAnnotationFile(AlignmentI al,
                                     String file,
                                     String protocol)
@@ -529,9 +587,10 @@ public class AnnotationFile
       sg.setEndRes(   refSeq.findIndex( sg.getEndRes() +1) -1 );
     }
 
-
-    al.addGroup(sg);
-    annotationsHash.put(sg.getName(), sg);
+    if(sg.getSize()>0)
+    {
+      al.addGroup(sg);
+    }
   }
 
   void addProperties(AlignmentI al, StringTokenizer st)
@@ -540,7 +599,21 @@ public class AnnotationFile
     //So far we have only added groups to the annotationHash,
     //the idea is in the future properties can be added to
     //alignments, other annotations etc
-    SequenceGroup sg = (SequenceGroup)annotationsHash.get(st.nextToken());
+    if(al.getGroups()==null)
+      return;
+    SequenceGroup sg = null;
+
+    String name = st.nextToken();
+
+    Vector groups = al.getGroups();
+    for(int i=0; i<groups.size(); i++)
+    {
+      sg = (SequenceGroup)groups.elementAt(i);
+      if(sg.getName().equals(name))
+        break;
+      else
+        sg = null;
+    }
 
     if(sg!=null)
     {
@@ -556,13 +629,29 @@ public class AnnotationFile
         else if(key.equalsIgnoreCase("colour"))
           sg.cs = ColourSchemeProperty.getColour(al, value);
         else if (key.equalsIgnoreCase("pidThreshold"))
-          sg.cs.setThreshold(Integer.parseInt(value), false);//
+        {
+          sg.cs.setThreshold(Integer.parseInt(value), true);
+
+        }
+        else if (key.equalsIgnoreCase("consThreshold"))
+        {
+          sg.cs.setConservationInc(Integer.parseInt(value));
+          Conservation c = new Conservation("Group",
+                    ResidueProperties.propHash, 3,
+                    sg.getSequences(null),
+                    sg.getStartRes(),
+                    sg.getEndRes() + 1);
+
+            c.calculate();
+            c.verdict(false, 25);
+
+            sg.cs.setConservation(c);
+
+        }
         else if (key.equalsIgnoreCase("outlineColour"))
          {
            sg.setOutlineColour(new UserColourScheme(value).findColour('A'));
          }
-
-         //Boolean.valueOf(string).booleanValue();
         else if (key.equalsIgnoreCase("displayBoxes"))
          sg.setDisplayBoxes( Boolean.valueOf(value).booleanValue() );
         else if (key.equalsIgnoreCase("displayText"))
@@ -580,6 +669,7 @@ public class AnnotationFile
         else if (key.equalsIgnoreCase("textColThreshold"))
          sg.thresholdTextColour = Integer.parseInt(value);
 
+       sg.recalcConservation();
       }
     }
   }