X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFeaturesFile.java;h=2ac0e13458f32eb1076948cc6a5332bee5191504;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=3e0314ae75bb029642b1070d2d579621fd2e4f76;hpb=167476e350f385aa0fcb334b79722ddaa1b3a368;p=jalview.git
diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java
index 3e0314a..2ac0e13 100755
--- a/src/jalview/io/FeaturesFile.java
+++ b/src/jalview/io/FeaturesFile.java
@@ -1,28 +1,29 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ *
+ * 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.
+ *
+ * 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 .
*/
package jalview.io;
import java.io.*;
import java.util.*;
+import jalview.analysis.SequenceIdMatcher;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.util.Format;
/**
* Parse and create Jalview Features files Detects GFF format features files and
@@ -36,6 +37,12 @@ import jalview.schemes.*;
public class FeaturesFile extends AlignFile
{
/**
+ * work around for GFF interpretation bug where source string becomes
+ * description rather than a group
+ */
+ private boolean doGffSource = true;
+
+ /**
* Creates a new FeaturesFile object.
*/
public FeaturesFile()
@@ -46,12 +53,12 @@ public class FeaturesFile extends AlignFile
* Creates a new FeaturesFile object.
*
* @param inFile
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param type
- * DOCUMENT ME!
+ * DOCUMENT ME!
*
* @throws IOException
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public FeaturesFile(String inFile, String type) throws IOException
{
@@ -64,28 +71,60 @@ public class FeaturesFile extends AlignFile
}
/**
- * The Application can render HTML, but the applet will remove HTML tags and
- * replace links with %LINK% Both need to read links in HTML however
- *
- * @throws IOException
- * DOCUMENT ME!
+ * Parse GFF or sequence features file using case-independent matching, discarding URLs
+ * @param align - alignment/dataset containing sequences that are to be annotated
+ * @param colours - hashtable to store feature colour definitions
+ * @param removeHTML - process html strings into plain text
+ * @return true if features were added
*/
public boolean parse(AlignmentI align, Hashtable colours,
boolean removeHTML)
{
- return parse(align, colours, null, removeHTML);
+ return parse(align, colours, null, removeHTML, false);
}
/**
- * The Application can render HTML, but the applet will remove HTML tags and
- * replace links with %LINK% Both need to read links in HTML however
- *
- * @throws IOException
- * DOCUMENT ME!
+ * Parse GFF or sequence features file optionally using case-independent matching, discarding URLs
+ * @param align - alignment/dataset containing sequences that are to be annotated
+ * @param colours - hashtable to store feature colour definitions
+ * @param removeHTML - process html strings into plain text
+ * @param relaxedIdmatching - when true, ID matches to compound sequence IDs are allowed
+ * @return true if features were added
+ */
+ public boolean parse(AlignmentI align,
+ Hashtable colours, boolean removeHTML, boolean relaxedIdMatching)
+ {
+ return parse(align, colours, null, removeHTML, relaxedIdMatching);
+ }
+
+ /**
+ * Parse GFF or sequence features file optionally using case-independent matching
+ * @param align - alignment/dataset containing sequences that are to be annotated
+ * @param colours - hashtable to store feature colour definitions
+ * @param featureLink - hashtable to store associated URLs
+ * @param removeHTML - process html strings into plain text
+ * @return true if features were added
*/
public boolean parse(AlignmentI align, Hashtable colours,
Hashtable featureLink, boolean removeHTML)
{
+ return parse(align, colours, featureLink, removeHTML, false);
+ }
+
+ /**
+ /**
+ * Parse GFF or sequence features file
+ * @param align - alignment/dataset containing sequences that are to be annotated
+ * @param colours - hashtable to store feature colour definitions
+ * @param featureLink - hashtable to store associated URLs
+ * @param removeHTML - process html strings into plain text
+ * @param relaxedIdmatching - when true, ID matches to compound sequence IDs are allowed
+ * @return true if features were added
+ */
+ public boolean parse(AlignmentI align,
+ Hashtable colours, Hashtable featureLink, boolean removeHTML, boolean relaxedIdmatching)
+ {
+
String line = null;
try
{
@@ -98,9 +137,10 @@ public class FeaturesFile extends AlignFile
SequenceFeature sf;
String featureGroup = null, groupLink = null;
Hashtable typeLink = new Hashtable();
-
+ /**
+ * when true, assume GFF style features rather than Jalview style.
+ */
boolean GFFFile = true;
-
while ((line = nextLine()) != null)
{
if (line.startsWith("#"))
@@ -109,6 +149,15 @@ public class FeaturesFile extends AlignFile
}
st = new StringTokenizer(line, "\t");
+ if (st.countTokens() == 1)
+ {
+ if (line.trim().equalsIgnoreCase("GFF"))
+ {
+ // Start parsing file as if it might be GFF again.
+ GFFFile = true;
+ continue;
+ }
+ }
if (st.countTokens() > 1 && st.countTokens() < 4)
{
GFFFile = false;
@@ -132,8 +181,205 @@ public class FeaturesFile extends AlignFile
}
else
{
- UserColourScheme ucs = new UserColourScheme(st.nextToken());
- colours.put(type, ucs.findColour('A'));
+ Object colour = null;
+ String colscheme = st.nextToken();
+ if (colscheme.indexOf("|") > -1
+ || colscheme.trim().equalsIgnoreCase("label"))
+ {
+ // Parse '|' separated graduated colourscheme fields:
+ // [label|][mincolour|maxcolour|[absolute|]minvalue|maxvalue|thresholdtype|thresholdvalue]
+ // can either provide 'label' only, first is optional, next two
+ // colors are required (but may be
+ // left blank), next is optional, nxt two min/max are required.
+ // first is either 'label'
+ // first/second and third are both hexadecimal or word equivalent
+ // colour.
+ // next two are values parsed as floats.
+ // fifth is either 'above','below', or 'none'.
+ // sixth is a float value and only required when fifth is either
+ // 'above' or 'below'.
+ StringTokenizer gcol = new StringTokenizer(colscheme, "|",
+ true);
+ // set defaults
+ int threshtype = AnnotationColourGradient.NO_THRESHOLD;
+ float min = Float.MIN_VALUE, max = Float.MAX_VALUE, threshval = Float.NaN;
+ boolean labelCol = false;
+ // Parse spec line
+ String mincol = gcol.nextToken();
+ if (mincol == "|")
+ {
+ System.err
+ .println("Expected either 'label' or a colour specification in the line: "
+ + line);
+ continue;
+ }
+ String maxcol = null;
+ if (mincol.toLowerCase().indexOf("label") == 0)
+ {
+ labelCol = true;
+ mincol = (gcol.hasMoreTokens() ? gcol.nextToken() : null); // skip
+ // '|'
+ mincol = (gcol.hasMoreTokens() ? gcol.nextToken() : null);
+ }
+ String abso = null, minval, maxval;
+ if (mincol != null)
+ {
+ // at least four more tokens
+ if (mincol.equals("|"))
+ {
+ mincol = "";
+ }
+ else
+ {
+ gcol.nextToken(); // skip next '|'
+ }
+ // continue parsing rest of line
+ maxcol = gcol.nextToken();
+ if (maxcol.equals("|"))
+ {
+ maxcol = "";
+ }
+ else
+ {
+ gcol.nextToken(); // skip next '|'
+ }
+ abso = gcol.nextToken();
+ gcol.nextToken(); // skip next '|'
+ if (abso.toLowerCase().indexOf("abso") != 0)
+ {
+ minval = abso;
+ abso = null;
+ }
+ else
+ {
+ minval = gcol.nextToken();
+ gcol.nextToken(); // skip next '|'
+ }
+ maxval = gcol.nextToken();
+ if (gcol.hasMoreTokens())
+ {
+ gcol.nextToken(); // skip next '|'
+ }
+ try
+ {
+ if (minval.length() > 0)
+ {
+ min = new Float(minval).floatValue();
+ }
+ } catch (Exception e)
+ {
+ System.err
+ .println("Couldn't parse the minimum value for graduated colour for type ("
+ + colscheme
+ + ") - did you misspell 'auto' for the optional automatic colour switch ?");
+ e.printStackTrace();
+ }
+ try
+ {
+ if (maxval.length() > 0)
+ {
+ max = new Float(maxval).floatValue();
+ }
+ } catch (Exception e)
+ {
+ System.err
+ .println("Couldn't parse the maximum value for graduated colour for type ("
+ + colscheme + ")");
+ e.printStackTrace();
+ }
+ }
+ else
+ {
+ // add in some dummy min/max colours for the label-only
+ // colourscheme.
+ mincol = "FFFFFF";
+ maxcol = "000000";
+ }
+ try
+ {
+ colour = new jalview.schemes.GraduatedColor(
+ new UserColourScheme(mincol).findColour('A'),
+ new UserColourScheme(maxcol).findColour('A'), min,
+ max);
+ } catch (Exception e)
+ {
+ System.err
+ .println("Couldn't parse the graduated colour scheme ("
+ + colscheme + ")");
+ e.printStackTrace();
+ }
+ if (colour != null)
+ {
+ ((jalview.schemes.GraduatedColor) colour)
+ .setColourByLabel(labelCol);
+ ((jalview.schemes.GraduatedColor) colour)
+ .setAutoScaled(abso == null);
+ // add in any additional parameters
+ String ttype = null, tval = null;
+ if (gcol.hasMoreTokens())
+ {
+ // threshold type and possibly a threshold value
+ ttype = gcol.nextToken();
+ if (ttype.toLowerCase().startsWith("below"))
+ {
+ ((jalview.schemes.GraduatedColor) colour)
+ .setThreshType(AnnotationColourGradient.BELOW_THRESHOLD);
+ }
+ else if (ttype.toLowerCase().startsWith("above"))
+ {
+ ((jalview.schemes.GraduatedColor) colour)
+ .setThreshType(AnnotationColourGradient.ABOVE_THRESHOLD);
+ }
+ else
+ {
+ ((jalview.schemes.GraduatedColor) colour)
+ .setThreshType(AnnotationColourGradient.NO_THRESHOLD);
+ if (!ttype.toLowerCase().startsWith("no"))
+ {
+ System.err
+ .println("Ignoring unrecognised threshold type : "
+ + ttype);
+ }
+ }
+ }
+ if (((GraduatedColor) colour).getThreshType() != AnnotationColourGradient.NO_THRESHOLD)
+ {
+ try
+ {
+ gcol.nextToken();
+ tval = gcol.nextToken();
+ ((jalview.schemes.GraduatedColor) colour)
+ .setThresh(new Float(tval).floatValue());
+ } catch (Exception e)
+ {
+ System.err
+ .println("Couldn't parse threshold value as a float: ("
+ + tval + ")");
+ e.printStackTrace();
+ }
+ }
+ // parse the thresh-is-min token ?
+ if (gcol.hasMoreTokens())
+ {
+ System.err
+ .println("Ignoring additional tokens in parameters in graduated colour specification\n");
+ while (gcol.hasMoreTokens())
+ {
+ System.err.println("|" + gcol.nextToken());
+ }
+ System.err.println("\n");
+ }
+ }
+ }
+ else
+ {
+ UserColourScheme ucs = new UserColourScheme(colscheme);
+ colour = ucs.findColour('A');
+ }
+ if (colour != null)
+ {
+ colours.put(type, colour);
+ }
if (st.hasMoreElements())
{
String link = st.nextToken();
@@ -144,11 +390,10 @@ public class FeaturesFile extends AlignFile
}
featureLink.put(type, link);
}
-
}
continue;
}
- String seqId="";
+ String seqId = "";
while (st.hasMoreElements())
{
@@ -157,24 +402,53 @@ public class FeaturesFile extends AlignFile
// Still possible this is an old Jalview file,
// which does not have type colours at the beginning
seqId = token = st.nextToken();
- seq = align.findName(seqId, true);
+ seq = findName(align, seqId, relaxedIdmatching);
if (seq != null)
{
desc = st.nextToken();
+ String group = null;
+ if (doGffSource && desc.indexOf(' ') == -1)
+ {
+ // could also be a source term rather than description line
+ group = new String(desc);
+ }
type = st.nextToken();
try
{
- start = Integer.parseInt(st.nextToken());
+ String stt = st.nextToken();
+ if (stt.length() == 0 || stt.equals("-"))
+ {
+ start = 0;
+ }
+ else
+ {
+ start = Integer.parseInt(stt);
+ }
} catch (NumberFormatException ex)
{
start = 0;
}
try
{
- end = Integer.parseInt(st.nextToken());
+ String stt = st.nextToken();
+ if (stt.length() == 0 || stt.equals("-"))
+ {
+ end = 0;
+ }
+ else
+ {
+ end = Integer.parseInt(stt);
+ }
} catch (NumberFormatException ex)
{
- end = -1;
+ end = 0;
+ }
+ // TODO: decide if non positional feature assertion for input data
+ // where end==0 is generally valid
+ if (end == 0)
+ {
+ // treat as non-positional feature, regardless.
+ start = 0;
}
try
{
@@ -184,7 +458,7 @@ public class FeaturesFile extends AlignFile
score = 0;
}
- sf = new SequenceFeature(type, desc, start, end, score, null);
+ sf = new SequenceFeature(type, desc, start, end, score, group);
try
{
@@ -201,11 +475,14 @@ public class FeaturesFile extends AlignFile
{
attributes.append("\t" + st.nextElement());
}
+ // TODO validate and split GFF2 attributes field ? parse out
+ // ([A-Za-z][A-Za-z0-9_]*) ; and add as
+ // sf.setValue(attrib, val);
sf.setValue("ATTRIBUTES", attributes.toString());
}
seq.addSequenceFeature(sf);
- while ((seq=align.findName(seq, seqId, true))!=null)
+ while ((seq = align.findName(seq, seqId, true)) != null)
{
seq.addSequenceFeature(new SequenceFeature(sf));
}
@@ -234,12 +511,12 @@ public class FeaturesFile extends AlignFile
if (!token.equals("ID_NOT_SPECIFIED"))
{
- seq = align.findName(seqId=token, true);
+ seq = findName(align, seqId = token, relaxedIdmatching);
st.nextToken();
}
else
{
- seqId=null;
+ seqId = null;
try
{
index = Integer.parseInt(st.nextToken());
@@ -267,9 +544,19 @@ public class FeaturesFile extends AlignFile
UserColourScheme ucs = new UserColourScheme(type);
colours.put(type, ucs.findColour('A'));
}
-
sf = new SequenceFeature(type, desc, "", start, end, featureGroup);
-
+ if (st.hasMoreTokens())
+ {
+ try
+ {
+ score = new Float(st.nextToken()).floatValue();
+ // update colourgradient bounds if allowed to
+ } catch (NumberFormatException ex)
+ {
+ score = 0;
+ }
+ sf.setScore(score);
+ }
if (groupLink != null && removeHTML)
{
sf.addLink(groupLink);
@@ -285,7 +572,8 @@ public class FeaturesFile extends AlignFile
seq.addSequenceFeature(sf);
- while (seqId!=null && (seq=align.findName(seq, seqId, false))!=null)
+ while (seqId != null
+ && (seq = align.findName(seq, seqId, false)) != null)
{
seq.addSequenceFeature(new SequenceFeature(sf));
}
@@ -293,139 +581,170 @@ public class FeaturesFile extends AlignFile
GFFFile = false;
}
}
+ resetMatcher();
} catch (Exception ex)
{
System.out.println(line);
System.out.println("Error parsing feature file: " + ex + "\n" + line);
ex.printStackTrace(System.err);
+ resetMatcher();
return false;
}
return true;
}
- public void parseDescriptionHTML(SequenceFeature sf, boolean removeHTML)
+ private AlignmentI lastmatchedAl = null;
+
+ private SequenceIdMatcher matcher = null;
+
+ /**
+ * clear any temporary handles used to speed up ID matching
+ */
+ private void resetMatcher()
{
- if (sf.getDescription() == null)
+ lastmatchedAl = null;
+ matcher = null;
+ }
+
+ private SequenceI findName(AlignmentI align, String seqId,
+ boolean relaxedIdMatching)
+ {
+ SequenceI match = null;
+ if (relaxedIdMatching)
{
- return;
+ if (lastmatchedAl != align)
+ {
+ matcher = new SequenceIdMatcher(
+ (lastmatchedAl = align).getSequencesArray());
+ }
+ match = matcher.findIdMatch(seqId);
}
-
- if (removeHTML
- && sf.getDescription().toUpperCase().indexOf("") == -1)
+ else
{
- removeHTML = false;
+ match = align.findName(seqId, true);
}
+ return match;
+ }
- StringBuffer sb = new StringBuffer();
- StringTokenizer st = new StringTokenizer(sf.getDescription(), "<");
- String token, link;
- int startTag;
- String tag = null;
- while (st.hasMoreElements())
+ public void parseDescriptionHTML(SequenceFeature sf, boolean removeHTML)
+ {
+ if (sf.getDescription() == null)
{
- token = st.nextToken("&>");
- if (token.equalsIgnoreCase("html") || token.startsWith("/"))
- {
- continue;
- }
-
- tag = null;
- startTag = token.indexOf("<");
-
- if (startTag > -1)
- {
- tag = token.substring(startTag + 1);
- token = token.substring(0, startTag);
- }
-
- if (tag != null && tag.toUpperCase().startsWith("A HREF="))
- {
- if (token.length() > 0)
- {
- sb.append(token);
- }
- link = tag.substring(tag.indexOf("\"") + 1, tag.length() - 1);
- String label = st.nextToken("<>");
- sf.addLink(label + "|" + link);
- sb.append(label + "%LINK%");
- }
- else if (tag != null && tag.equalsIgnoreCase("br"))
- {
- sb.append("\n");
- }
- else if (token.startsWith("lt;"))
- {
- sb.append("<" + token.substring(3));
- }
- else if (token.startsWith("gt;"))
- {
- sb.append(">" + token.substring(3));
- }
- else if (token.startsWith("amp;"))
- {
- sb.append("&" + token.substring(4));
- }
- else
- {
- sb.append(token);
- }
+ return;
}
+ jalview.util.ParseHtmlBodyAndLinks parsed = new jalview.util.ParseHtmlBodyAndLinks(sf.getDescription(), removeHTML, newline);
- if (removeHTML)
+ sf.description = (removeHTML) ? parsed.getNonHtmlContent() : sf.description;
+ for (String link:parsed.getLinks())
{
- sf.description = sb.toString();
+ sf.addLink(link);
}
}
-/**
- * generate a features file for seqs
- * @param seqs source of sequence features
- * @param visible hash of feature types and colours
- * @return features file contents
- */
+ /**
+ * generate a features file for seqs includes non-pos features by default.
+ *
+ * @param seqs
+ * source of sequence features
+ * @param visible
+ * hash of feature types and colours
+ * @return features file contents
+ */
public String printJalviewFormat(SequenceI[] seqs, Hashtable visible)
{
- return printJalviewFormat(seqs, visible, true);
+ return printJalviewFormat(seqs, visible, true, true);
}
/**
* generate a features file for seqs with colours from visible (if any)
- * @param seqs source of features
- * @param visible hash of Colours for each feature type
- * @param visOnly when true only feature types in 'visible' will be output
+ *
+ * @param seqs
+ * source of features
+ * @param visible
+ * hash of Colours for each feature type
+ * @param visOnly
+ * when true only feature types in 'visible' will be output
+ * @param nonpos
+ * indicates if non-positional features should be output (regardless
+ * of group or type)
* @return features file contents
*/
public String printJalviewFormat(SequenceI[] seqs, Hashtable visible,
- boolean visOnly)
+ boolean visOnly, boolean nonpos)
{
StringBuffer out = new StringBuffer();
SequenceFeature[] next;
-
- if (visOnly && (visible == null || visible.size() < 1))
+ boolean featuresGen = false;
+ if (visOnly && !nonpos && (visible == null || visible.size() < 1))
{
+ // no point continuing.
return "No Features Visible";
}
+
if (visible != null && visOnly)
{
- // write feature colours only if we're given them and we are generating viewed features
+ // write feature colours only if we're given them and we are generating
+ // viewed features
+ // TODO: decide if feature links should also be written here ?
Enumeration en = visible.keys();
- String type;
- int color;
+ String type, color;
while (en.hasMoreElements())
{
type = en.nextElement().toString();
- color = Integer.parseInt(visible.get(type).toString());
- out.append(type
- + "\t"
- + jalview.util.Format
- .getHexString(new java.awt.Color(color)) + "\n");
+
+ if (visible.get(type) instanceof GraduatedColor)
+ {
+ GraduatedColor gc = (GraduatedColor) visible.get(type);
+ color = (gc.isColourByLabel() ? "label|" : "")
+ + Format.getHexString(gc.getMinColor()) + "|"
+ + Format.getHexString(gc.getMaxColor())
+ + (gc.isAutoScale() ? "|" : "|abso|") + gc.getMin() + "|"
+ + gc.getMax() + "|";
+ if (gc.getThreshType() != AnnotationColourGradient.NO_THRESHOLD)
+ {
+ if (gc.getThreshType() == AnnotationColourGradient.BELOW_THRESHOLD)
+ {
+ color += "below";
+ }
+ else
+ {
+ if (gc.getThreshType() != AnnotationColourGradient.ABOVE_THRESHOLD)
+ {
+ System.err.println("WARNING: Unsupported threshold type ("
+ + gc.getThreshType() + ") : Assuming 'above'");
+ }
+ color += "above";
+ }
+ // add the value
+ color += "|" + gc.getThresh();
+ }
+ else
+ {
+ color += "none";
+ }
+ }
+ else if (visible.get(type) instanceof java.awt.Color)
+ {
+ color = Format.getHexString((java.awt.Color) visible.get(type));
+ }
+ else
+ {
+ // legacy support for integer objects containing colour triplet values
+ color = Format.getHexString(new java.awt.Color(Integer
+ .parseInt(visible.get(type).toString())));
+ }
+ out.append(type);
+ out.append("\t");
+ out.append(color);
+ out.append(newline);
}
}
// Work out which groups are both present and visible
Vector groups = new Vector();
int groupIndex = 0;
+ boolean isnonpos = false;
for (int i = 0; i < seqs.length; i++)
{
@@ -434,7 +753,10 @@ public class FeaturesFile extends AlignFile
{
for (int j = 0; j < next.length; j++)
{
- if (visOnly && !visible.containsKey(next[j].type))
+ isnonpos = next[j].begin == 0 && next[j].end == 0;
+ if ((!nonpos && isnonpos)
+ || (!isnonpos && visOnly && !visible
+ .containsKey(next[j].type)))
{
continue;
}
@@ -449,14 +771,16 @@ public class FeaturesFile extends AlignFile
}
String group = null;
-
do
{
if (groups.size() > 0 && groupIndex < groups.size())
{
group = groups.elementAt(groupIndex).toString();
- out.append("\nSTARTGROUP\t" + group + "\n");
+ out.append(newline);
+ out.append("STARTGROUP\t");
+ out.append(group);
+ out.append(newline);
}
else
{
@@ -470,8 +794,13 @@ public class FeaturesFile extends AlignFile
{
for (int j = 0; j < next.length; j++)
{
- if (visOnly && !visible.containsKey(next[j].type))
+ isnonpos = next[j].begin == 0 && next[j].end == 0;
+ if ((!nonpos && isnonpos)
+ || (!isnonpos && visOnly && !visible
+ .containsKey(next[j].type)))
{
+ // skip if feature is nonpos and we ignore them or if we only
+ // output visible and it isn't non-pos and it's not visible
continue;
}
@@ -486,7 +815,8 @@ public class FeaturesFile extends AlignFile
{
continue;
}
-
+ // we have features to output
+ featuresGen = true;
if (next[j].description == null
|| next[j].description.equals(""))
{
@@ -511,9 +841,7 @@ public class FeaturesFile extends AlignFile
if (next[j].description.indexOf(href) == -1)
{
- out
- .append("" + label
- + "");
+ out.append("" + label + "");
}
}
@@ -525,16 +853,28 @@ public class FeaturesFile extends AlignFile
out.append("\t");
}
-
- out.append(seqs[i].getName() + "\t-1\t" + next[j].begin + "\t"
- + next[j].end + "\t" + next[j].type + "\n");
+ out.append(seqs[i].getName());
+ out.append("\t-1\t");
+ out.append(next[j].begin);
+ out.append("\t");
+ out.append(next[j].end);
+ out.append("\t");
+ out.append(next[j].type);
+ if (next[j].score != Float.NaN)
+ {
+ out.append("\t");
+ out.append(next[j].score);
+ }
+ out.append(newline);
}
}
}
if (group != null)
{
- out.append("ENDGROUP\t" + group + "\n");
+ out.append("ENDGROUP\t");
+ out.append(group);
+ out.append(newline);
groupIndex++;
}
else
@@ -544,21 +884,34 @@ public class FeaturesFile extends AlignFile
} while (groupIndex < groups.size() + 1);
+ if (!featuresGen)
+ {
+ return "No Features Visible";
+ }
+
return out.toString();
}
+ /**
+ * generate a gff file for sequence features includes non-pos features by
+ * default.
+ *
+ * @param seqs
+ * @param visible
+ * @return
+ */
public String printGFFFormat(SequenceI[] seqs, Hashtable visible)
{
- return printGFFFormat(seqs, visible, true);
+ return printGFFFormat(seqs, visible, true, true);
}
public String printGFFFormat(SequenceI[] seqs, Hashtable visible,
- boolean visOnly)
+ boolean visOnly, boolean nonpos)
{
StringBuffer out = new StringBuffer();
SequenceFeature[] next;
String source;
-
+ boolean isnonpos;
for (int i = 0; i < seqs.length; i++)
{
if (seqs[i].getSequenceFeatures() != null)
@@ -566,7 +919,10 @@ public class FeaturesFile extends AlignFile
next = seqs[i].getSequenceFeatures();
for (int j = 0; j < next.length; j++)
{
- if (visOnly && !visible.containsKey(next[j].type))
+ isnonpos = next[j].begin == 0 && next[j].end == 0;
+ if ((!nonpos && isnonpos)
+ || (!isnonpos && visOnly && !visible
+ .containsKey(next[j].type)))
{
continue;
}
@@ -577,13 +933,23 @@ public class FeaturesFile extends AlignFile
source = next[j].getDescription();
}
- out.append(seqs[i].getName() + "\t" + source + "\t"
- + next[j].type + "\t" + next[j].begin + "\t"
- + next[j].end + "\t" + next[j].score + "\t");
+ out.append(seqs[i].getName());
+ out.append("\t");
+ out.append(source);
+ out.append("\t");
+ out.append(next[j].type);
+ out.append("\t");
+ out.append(next[j].begin);
+ out.append("\t");
+ out.append(next[j].end);
+ out.append("\t");
+ out.append(next[j].score);
+ out.append("\t");
if (next[j].getValue("STRAND") != null)
{
- out.append(next[j].getValue("STRAND") + "\t");
+ out.append(next[j].getValue("STRAND"));
+ out.append("\t");
}
else
{
@@ -598,13 +964,15 @@ public class FeaturesFile extends AlignFile
{
out.append(".");
}
+ // TODO: verify/check GFF - should there be a /t here before attribute
+ // output ?
if (next[j].getValue("ATTRIBUTES") != null)
{
out.append(next[j].getValue("ATTRIBUTES"));
}
- out.append("\n");
+ out.append(newline);
}
}
@@ -630,4 +998,5 @@ public class FeaturesFile extends AlignFile
{
return "USE printGFFFormat() or printJalviewFormat()";
}
+
}