/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
public String printAnnotations(AlignmentAnnotation[] annotations,
List<SequenceGroup> list, Hashtable properties)
{
- return printAnnotations(annotations, list, properties, null);
+ return printAnnotations(annotations, list, properties, null, null, null);
}
* @return annotation file
*/
public String printAnnotations(AlignmentAnnotation[] annotations,
- List<SequenceGroup> list, Hashtable properties, ViewDef[] views)
+ List<SequenceGroup> list, Hashtable properties,
+ ColumnSelection cs, AlignmentI al, ViewDef view)
{
- // TODO: resolve views issue : annotationFile could contain visible region,
- // or full data + hidden region specifications for a view.
- if (views != null)
+ if (view != null)
{
- // are views defined and then annotation added to alignment or the other
- // way around ?
-
+ 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");
+ List<int[]> hc = cs.getHiddenColumns();
+ boolean comma = false;
+ for (int[] r : hc)
+ {
+ if (!comma)
+ {
+ comma = true;
+ }
+ else
+ {
+ text.append(",");
+ }
+ text.append(r[0]);
+ text.append("-");
+ text.append(r[1]);
+ }
+ text.append("\n");
}
+ // TODO: allow efficient recovery of annotation data shown in several
+ // different views
if (annotations != null)
{
boolean oneColour = true;
&& 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
+ hasValues |= (!Float.isNaN(row.annotations[j].value)); // NaNs can't
// be
// rendered..
hasText |= (row.annotations[j].description != null && row.annotations[j].description
}
else
{
- graphGroup_refs.put(key, new Object[]
- { refSeq, refGroup });
+ graphGroup_refs.put(key, new Object[] { refSeq, refGroup });
graphGroup.put(key, row.label);
}
}
}
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 = ",";
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();
}
boolean rslt = readAnnotationFile(viewport.getAlignment(), colSel,
file, protocol);
- if (rslt
- && (colSel.hasSelectedColumns() || colSel.hasHiddenColumns()))
+ if (rslt && (colSel.hasSelectedColumns() || colSel.hasHiddenColumns()))
{
viewport.setColumnSelection(colSel);
}
return rslt;
}
+
public boolean readAnnotationFile(AlignmentI al, String file,
String protocol)
{
private static String GRAPHLINE = "GRAPHLINE", COMBINE = "COMBINE";
public boolean parseAnnotationFrom(AlignmentI al, ColumnSelection colSel,
- BufferedReader in)
- throws Exception
+ BufferedReader in) throws Exception
{
nlinesread = 0;
ArrayList<Object[]> combineAnnotation_calls = new ArrayList<Object[]>();
else if (token.equalsIgnoreCase(COMBINE))
{
// keep a record of current state and resolve groupRef at end
- combineAnnotation_calls.add(new Object[]
- { st, refSeq, groupRef });
+ combineAnnotation_calls
+ .add(new Object[] { st, refSeq, groupRef });
modified = true;
continue;
}
else if (token.equalsIgnoreCase(GRAPHLINE))
{
// resolve at end
- deferredAnnotation_calls.add(new Object[]
- { GRAPHLINE, st, refSeq, groupRef });
+ deferredAnnotation_calls.add(new Object[] { GRAPHLINE, st,
+ refSeq, groupRef });
modified = true;
continue;
}
modified = true;
continue;
}
+ // else if (token.equalsIgnoreCase("VIEW_DEF"))
+ // {
+ // addOrSetView(al,st);
+ // modified = true;
+ // continue;
+ // }
else if (token.equalsIgnoreCase("VIEW_SETREF"))
{
if (refSeq != null)
modified = true;
continue;
}
+ else if (token.equalsIgnoreCase("VIEW_HIDECOLS"))
+ {
+ if (st.hasMoreTokens())
+ {
+ if (colSel == null)
+ {
+ colSel = new ColumnSelection();
+ }
+ parseHideCols(colSel, st.nextToken());
+ }
+ modified = true;
+ continue;
+ }
else if (token.equalsIgnoreCase("HIDE_INSERTIONS"))
{
SequenceI sr = refSeq == null ? al.getSeqrep() : refSeq;
(SequenceI) _deferred_args[2], // refSeq
(_deferred_args[3] == null) ? null : groupRefLookup
.get(_deferred_args[3]) // the reference
- // group, or null
+ // group, or null
);
}
}
(SequenceI) _combine_args[1], // refSeq
(_combine_args[2] == null) ? null : groupRefLookup
.get(_combine_args[2]) // the reference group,
- // or null
+ // or null
);
}
}
return modified;
}
+ private void parseHideCols(ColumnSelection colSel, String nextToken)
+ {
+ StringTokenizer inval = new StringTokenizer(nextToken, ",");
+ while (inval.hasMoreTokens())
+ {
+ String range = inval.nextToken().trim();
+ int from, to = range.indexOf("-");
+ if (to == -1)
+ {
+ from = to = Integer.parseInt(range);
+ if (from >= 0)
+ {
+ colSel.hideColumns(from, to);
+ }
+ }
+ else
+ {
+ from = Integer.parseInt(range.substring(0, to));
+ if (to < range.length() - 1)
+ {
+ to = Integer.parseInt(range.substring(to + 1));
+ }
+ else
+ {
+ to = from;
+ }
+ if (from > 0 && to >= from)
+ {
+ colSel.hideColumns(from, to);
+ }
+ }
+ }
+ }
+
private Object autoAnnotsKey(AlignmentAnnotation annotation,
SequenceI refSeq, String groupRef)
{
}
}
if (hasSymbols
- && (token.equals("H") || token.equals("E")
- || token.equals("S") || token.equals(" ")))
+ && (token.length() == 1 && "()<>[]{}AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+ .contains(token)))
{
// Either this character represents a helix or sheet
// or an integer which can be displayed
return printAnnotations(viewport.isShowAnnotation() ? viewport
.getAlignment().getAlignmentAnnotation() : null, viewport
.getAlignment().getGroups(), viewport.getAlignment()
- .getProperties());
+ .getProperties(), viewport.getColumnSelection(),
+ viewport.getAlignment(), null);
}
public String printAnnotationsForAlignment(AlignmentI al)
{
return printAnnotations(al.getAlignmentAnnotation(), al.getGroups(),
- al.getProperties());
+ al.getProperties(), null, al, null);
}
}
git://source.jalview.org / jalview.git / blobdiff