X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=6b02022c61ac1ec1b9bc33577e0200889da48b7a;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=6f24361ebeff768076bd893004da0922a0581339;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java
index 6f24361..6b02022 100755
--- a/src/jalview/io/AnnotationFile.java
+++ b/src/jalview/io/AnnotationFile.java
@@ -1,30 +1,54 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview 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 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview 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 Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import jalview.analysis.*;
-import jalview.datamodel.*;
-import jalview.schemes.*;
+import jalview.analysis.Conservation;
+import jalview.api.AlignViewportI;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.GraphLine;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.HiddenSequences;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.util.ColorUtils;
+
+import java.awt.Color;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
public class AnnotationFile
{
@@ -65,18 +89,19 @@ public class AnnotationFile
}
/**
- * convenience method for pre-2.4 feature files which have no view, hidden
+ * convenience method for pre-2.9 annotation files which have no view, hidden
* columns or hidden row keywords.
*
* @param annotations
* @param list
* @param properties
- * @return feature file as a string.
+ * @return annotation file as a string.
*/
public String printAnnotations(AlignmentAnnotation[] annotations,
List list, Hashtable properties)
{
- return printAnnotations(annotations, list, properties, null);
+ return printAnnotations(annotations, list, properties, null, null,
+ null);
}
@@ -86,23 +111,22 @@ public class AnnotationFile
*/
public class ViewDef
{
- public String viewname;
-
- public HiddenSequences hidseqs;
+ // TODO this class is not used - remove?
+ public final String viewname;
- public ColumnSelection hiddencols;
+ public final HiddenSequences hidseqs;
- public Vector visibleGroups;
+ public final HiddenColumns hiddencols;
- public Hashtable hiddenRepSeqs;
+ public final Hashtable hiddenRepSeqs;
- public ViewDef(String viewname, HiddenSequences hidseqs,
- ColumnSelection hiddencols, Hashtable hiddenRepSeqs)
+ public ViewDef(String vname, HiddenSequences hseqs, HiddenColumns hcols,
+ Hashtable hRepSeqs)
{
- this.viewname = viewname;
- this.hidseqs = hidseqs;
- this.hiddencols = hiddencols;
- this.hiddenRepSeqs = hiddenRepSeqs;
+ this.viewname = vname;
+ this.hidseqs = hseqs;
+ this.hiddencols = hcols;
+ this.hiddenRepSeqs = hRepSeqs;
}
}
@@ -117,10 +141,43 @@ public class AnnotationFile
* @return annotation file
*/
public String printAnnotations(AlignmentAnnotation[] annotations,
- List list, Hashtable properties, ViewDef[] views)
+ List list, Hashtable properties, HiddenColumns cs,
+ AlignmentI al, ViewDef view)
{
- // TODO: resolve views issue : annotationFile could contain visible region,
- // or full data + hidden region specifications for a view.
+ if (view != null)
+ {
+ if (view.viewname != null)
+ {
+ text.append("VIEW_DEF\t" + view.viewname + "\n");
+ }
+ if (list == null)
+ {
+ // list = view.visibleGroups;
+ }
+ if (cs == null)
+ {
+ cs = view.hiddencols;
+ }
+ if (al == null)
+ {
+ // add hidden rep sequences.
+ }
+ }
+ // first target - store and restore all settings for a view.
+ if (al != null && al.hasSeqrep())
+ {
+ text.append("VIEW_SETREF\t" + al.getSeqrep().getName() + "\n");
+ }
+ if (cs != null && cs.hasHiddenColumns())
+ {
+ text.append("VIEW_HIDECOLS\t");
+
+ String regions = cs.regionsToString(",", "-");
+ text.append(regions);
+ text.append("\n");
+ }
+ // TODO: allow efficient recovery of annotation data shown in several
+ // different views
if (annotations != null)
{
boolean oneColour = true;
@@ -132,8 +189,8 @@ public class AnnotationFile
StringBuffer colours = new StringBuffer();
StringBuffer graphLine = new StringBuffer();
StringBuffer rowprops = new StringBuffer();
- Hashtable graphGroup = new Hashtable();
- Hashtable graphGroup_refs = new Hashtable();
+ Hashtable graphGroup = new Hashtable<>();
+ Hashtable graphGroup_refs = new Hashtable<>();
BitSet graphGroupSeen = new BitSet();
java.awt.Color color;
@@ -142,22 +199,24 @@ public class AnnotationFile
{
row = annotations[i];
- if (!row.visible && !row.hasScore() && !(row.graphGroup>-1 && graphGroupSeen.get(row.graphGroup)))
+ if (!row.visible && !row.hasScore() && !(row.graphGroup > -1
+ && graphGroupSeen.get(row.graphGroup)))
{
continue;
}
color = null;
oneColour = true;
-
+
// mark any sequence references for the row
- writeSequence_Ref(refSeq ,row.sequenceRef);
+ writeSequence_Ref(refSeq, row.sequenceRef);
refSeq = row.sequenceRef;
// mark any group references for the row
writeGroup_Ref(refGroup, row.groupRef);
refGroup = row.groupRef;
- boolean hasGlyphs = row.hasIcons, hasLabels = row.hasText, hasValues = row.hasScore, hasText = false;
+ boolean hasGlyphs = row.hasIcons, hasLabels = row.hasText,
+ hasValues = row.hasScore, hasText = false;
// lookahead to check what the annotation row object actually contains.
for (int j = 0; row.annotations != null
&& j < row.annotations.length
@@ -166,14 +225,15 @@ public class AnnotationFile
if (row.annotations[j] != null)
{
hasLabels |= (row.annotations[j].displayCharacter != null
- && row.annotations[j].displayCharacter.length() > 0 && !row.annotations[j].displayCharacter
- .equals(" "));
- hasGlyphs |= (row.annotations[j].secondaryStructure != 0 && row.annotations[j].secondaryStructure != ' ');
- hasValues |= (row.annotations[j].value != Float.NaN); // NaNs can't
+ && row.annotations[j].displayCharacter.length() > 0
+ && !row.annotations[j].displayCharacter.equals(" "));
+ hasGlyphs |= (row.annotations[j].secondaryStructure != 0
+ && row.annotations[j].secondaryStructure != ' ');
+ hasValues |= (!Float.isNaN(row.annotations[j].value)); // NaNs can't
// be
// rendered..
- hasText |= (row.annotations[j].description != null && row.annotations[j].description
- .length() > 0);
+ hasText |= (row.annotations[j].description != null
+ && row.annotations[j].description.length() > 0);
}
}
@@ -206,8 +266,8 @@ public class AnnotationFile
graphLine.append("\t");
graphLine.append(row.getThreshold().label);
graphLine.append("\t");
- graphLine.append(jalview.util.Format.getHexString(row
- .getThreshold().colour));
+ graphLine.append(jalview.util.Format
+ .getHexString(row.getThreshold().colour));
graphLine.append(newline);
}
@@ -218,11 +278,11 @@ public class AnnotationFile
if (graphGroup.containsKey(key))
{
graphGroup.put(key, graphGroup.get(key) + "\t" + row.label);
-
+
}
else
{
- graphGroup_refs.put(key, new Object[] { refSeq, refGroup});
+ graphGroup_refs.put(key, new Object[] { refSeq, refGroup });
graphGroup.put(key, row.label);
}
}
@@ -258,13 +318,13 @@ public class AnnotationFile
}
if (hasValues)
{
- if (row.annotations[j].value != Float.NaN)
+ if (!Float.isNaN(row.annotations[j].value))
{
text.append(comma + row.annotations[j].value);
}
else
{
- System.err.println("Skipping NaN - not valid value.");
+ // System.err.println("Skipping NaN - not valid value.");
text.append(comma + 0f);// row.annotations[j].value);
}
comma = ",";
@@ -302,11 +362,8 @@ public class AnnotationFile
if (row.annotations[j].colour != null
&& row.annotations[j].colour != java.awt.Color.black)
{
- text.append(comma
- + "["
- + jalview.util.Format
- .getHexString(row.annotations[j].colour)
- + "]");
+ text.append(comma + "[" + jalview.util.Format
+ .getHexString(row.annotations[j].colour) + "]");
comma = ",";
}
}
@@ -314,7 +371,9 @@ public class AnnotationFile
}
if (row.hasScore())
+ {
text.append("\t" + row.score);
+ }
text.append(newline);
@@ -339,7 +398,8 @@ public class AnnotationFile
rowprops.append(row.centreColLabels);
rowprops.append(newline);
}
- if (graphLine.length()>0) {
+ if (graphLine.length() > 0)
+ {
text.append(graphLine.toString());
graphLine.setLength(0);
}
@@ -352,22 +412,24 @@ public class AnnotationFile
{
SequenceI oldRefSeq = refSeq;
SequenceGroup oldRefGroup = refGroup;
- for (Map.Entry combine_statement:graphGroup.entrySet())
- {
- Object[] seqRefAndGroup=graphGroup_refs.get(combine_statement.getKey());
-
- writeSequence_Ref(refSeq, (SequenceI)seqRefAndGroup[0]);
- refSeq = (SequenceI)seqRefAndGroup[0];
-
- writeGroup_Ref(refGroup, (SequenceGroup)seqRefAndGroup[1]);
- refGroup = (SequenceGroup)seqRefAndGroup[1];
+ for (Map.Entry combine_statement : graphGroup
+ .entrySet())
+ {
+ Object[] seqRefAndGroup = graphGroup_refs
+ .get(combine_statement.getKey());
+
+ writeSequence_Ref(refSeq, (SequenceI) seqRefAndGroup[0]);
+ refSeq = (SequenceI) seqRefAndGroup[0];
+
+ writeGroup_Ref(refGroup, (SequenceGroup) seqRefAndGroup[1]);
+ refGroup = (SequenceGroup) seqRefAndGroup[1];
text.append("COMBINE\t");
text.append(combine_statement.getValue());
text.append(newline);
}
writeSequence_Ref(refSeq, oldRefSeq);
refSeq = oldRefSeq;
-
+
writeGroup_Ref(refGroup, oldRefGroup);
refGroup = oldRefGroup;
}
@@ -394,13 +456,16 @@ public class AnnotationFile
text.append(properties.get(key));
}
// TODO: output alignment visualization settings here if required
-
+ // iterate through one or more views, defining, marking columns and rows
+ // as visible/hidden, and emmitting view properties.
+ // View specific annotation is
}
return text.toString();
}
- private Object writeGroup_Ref(SequenceGroup refGroup, SequenceGroup next_refGroup)
+ private Object writeGroup_Ref(SequenceGroup refGroup,
+ SequenceGroup next_refGroup)
{
if (next_refGroup == null)
{
@@ -425,13 +490,13 @@ public class AnnotationFile
return true;
}
}
- return false;
+ return false;
}
-
+
private boolean writeSequence_Ref(SequenceI refSeq, SequenceI next_refSeq)
{
- if (next_refSeq==null)
+ if (next_refSeq == null)
{
if (refSeq != null)
{
@@ -456,7 +521,7 @@ public class AnnotationFile
return false;
}
- public void printGroups(List list)
+ protected void printGroups(List list)
{
SequenceI seqrep = null;
for (SequenceGroup sg : list)
@@ -502,7 +567,8 @@ public class AnnotationFile
if (sg.cs != null)
{
text.append("colour=");
- text.append(ColourSchemeProperty.getColourName(sg.cs));
+ text.append(ColourSchemeProperty
+ .getColourName(sg.cs.getColourScheme()));
text.append("\t");
if (sg.cs.getThreshold() != 0)
{
@@ -580,26 +646,56 @@ public class AnnotationFile
String refSeqId = null;
+ public boolean annotateAlignmentView(AlignViewportI viewport, Object file,
+ DataSourceType protocol)
+ {
+ ColumnSelection colSel = viewport.getColumnSelection();
+ HiddenColumns hidden = viewport.getAlignment().getHiddenColumns();
+ if (colSel == null)
+ {
+ colSel = new ColumnSelection();
+ }
+ if (hidden == null)
+ {
+ hidden = new HiddenColumns();
+ }
+ boolean rslt = readAnnotationFile(viewport.getAlignment(), hidden, file,
+ protocol);
+ if (rslt && (colSel.hasSelectedColumns() || hidden.hasHiddenColumns()))
+ {
+ viewport.setColumnSelection(colSel);
+ viewport.getAlignment().setHiddenColumns(hidden);
+ }
+
+ return rslt;
+ }
+
public boolean readAnnotationFile(AlignmentI al, String file,
- String protocol)
+ DataSourceType sourceType)
+ {
+ return readAnnotationFile(al, null, file, sourceType);
+ }
+
+ public boolean readAnnotationFile(AlignmentI al, HiddenColumns hidden,
+ Object file, DataSourceType sourceType)
{
BufferedReader in = null;
try
{
- if (protocol.equals(AppletFormatAdapter.FILE))
+ if (sourceType == DataSourceType.FILE)
{
- in = new BufferedReader(new FileReader(file));
+ in = FileLoader.getBuffereReader(file);
}
- else if (protocol.equals(AppletFormatAdapter.URL))
+ else if (sourceType == DataSourceType.URL)
{
- URL url = new URL(file);
+ URL url = new URL(file.toString());
in = new BufferedReader(new InputStreamReader(url.openStream()));
}
- else if (protocol.equals(AppletFormatAdapter.PASTE))
+ else if (sourceType == DataSourceType.PASTE)
{
- in = new BufferedReader(new StringReader(file));
+ in = new BufferedReader(new StringReader(file.toString()));
}
- else if (protocol.equals(AppletFormatAdapter.CLASSLOADER))
+ else if (sourceType == DataSourceType.CLASSLOADER)
{
java.io.InputStream is = getClass().getResourceAsStream("/" + file);
if (is != null)
@@ -609,29 +705,35 @@ public class AnnotationFile
}
if (in != null)
{
- return parseAnnotationFrom(al, in);
+ return parseAnnotationFrom(al, hidden, in);
}
} catch (Exception ex)
{
ex.printStackTrace();
System.out.println("Problem reading annotation file: " + ex);
- if (nlinesread>0) {
- System.out.println("Last read line "+nlinesread+": '"+lastread+"' (first 80 chars) ...");
+ if (nlinesread > 0)
+ {
+ System.out.println("Last read line " + nlinesread + ": '" + lastread
+ + "' (first 80 chars) ...");
}
return false;
}
return false;
}
- long nlinesread=0;
- String lastread="";
- private static String GRAPHLINE="GRAPHLINE", COMBINE="COMBINE";
- public boolean parseAnnotationFrom(AlignmentI al, BufferedReader in)
- throws Exception
+
+ long nlinesread = 0;
+
+ String lastread = "";
+
+ private static String GRAPHLINE = "GRAPHLINE", COMBINE = "COMBINE";
+
+ public boolean parseAnnotationFrom(AlignmentI al, HiddenColumns hidden,
+ BufferedReader in) throws Exception
{
nlinesread = 0;
- ArrayList