X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fgff%2FGffHelperBase.java;h=48c33e5deff795985bf817080dd4a06d80c30140;hb=ff8c06845590fd9fd423aa59809dcce9610ab295;hp=fbde9d99c5e6887b0cedc62a71cf563bb6ccb151;hpb=8f920d337154e092f5f9056ffde3cdf2735eca43;p=jalview.git
diff --git a/src/jalview/io/gff/GffHelperBase.java b/src/jalview/io/gff/GffHelperBase.java
index fbde9d9..48c33e5 100644
--- a/src/jalview/io/gff/GffHelperBase.java
+++ b/src/jalview/io/gff/GffHelperBase.java
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.io.gff;
import jalview.analysis.SequenceIdMatcher;
@@ -321,18 +341,27 @@ public abstract class GffHelperBase implements GffHelperI
{
int start = Integer.parseInt(gff[START_COL]);
int end = Integer.parseInt(gff[END_COL]);
- float score = Float.NaN;
+
+ /*
+ * default 'score' is 0 rather than Float.NaN as the latter currently
+ * disables the 'graduated colour => colour by label' option
+ */
+ float score = 0f;
try
{
score = Float.parseFloat(gff[SCORE_COL]);
} catch (NumberFormatException nfe)
{
- // e.g. '.' - leave as NaN to indicate no score
+ // e.g. '.' - leave as zero
}
SequenceFeature sf = new SequenceFeature(gff[TYPE_COL],
gff[SOURCE_COL], start, end, score, gff[SOURCE_COL]);
+ sf.setStrand(gff[STRAND_COL]);
+
+ sf.setPhase(gff[PHASE_COL]);
+
if (attributes != null)
{
/*
@@ -347,7 +376,7 @@ public abstract class GffHelperBase implements GffHelperI
for (Entry> attr : attributes.entrySet())
{
String values = StringUtils.listToDelimitedString(
- attr.getValue(), "; ");
+ attr.getValue(), ",");
sf.setValue(attr.getKey(), values);
if (NOTE.equals(attr.getKey()))
{
@@ -383,7 +412,8 @@ public abstract class GffHelperBase implements GffHelperI
* @param toSeq
* @return
*/
- protected AlignedCodonFrame getMapping(AlignmentI align, SequenceI fromSeq, SequenceI toSeq)
+ protected AlignedCodonFrame getMapping(AlignmentI align,
+ SequenceI fromSeq, SequenceI toSeq)
{
AlignedCodonFrame acf = align.getMapping(fromSeq, toSeq);
if (acf == null)