Descriptions can be added to annotations
authoramwaterhouse <Andrew Waterhouse>
Thu, 18 Jan 2007 16:15:22 +0000 (16:15 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 18 Jan 2007 16:15:22 +0000 (16:15 +0000)
src/jalview/io/AnnotationFile.java

index 1f5a7ad..749d2a7 100755 (executable)
@@ -50,6 +50,10 @@ public class AnnotationFile
     for(int i=0; i<annotations.length; i++)\r
     {\r
       row = annotations[i];\r
+\r
+      if(!row.visible)\r
+        continue;\r
+\r
       color = null;\r
 \r
       if( row.sequenceRef == null)\r
@@ -99,6 +103,8 @@ public class AnnotationFile
       }\r
 \r
       text.append(row.label+"\t");\r
+      if(row.description!=null)\r
+        text.append(row.description+"\t");\r
 \r
       for(int j=0; j<row.annotations.length; j++)\r
       {\r
@@ -264,7 +270,12 @@ public class AnnotationFile
 \r
 \r
         graphStyle = AlignmentAnnotation.getGraphValueFromString(token);\r
-        label = description = st.nextToken();\r
+        label = st.nextToken();\r
+\r
+        if(st.countTokens()>1)\r
+          description = st.nextToken();\r
+        else\r
+          description = null;\r
 \r
         line = st.nextToken();\r
 \r