git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2609 progress on scroll left draw new columns
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationExporter.java
diff --git
a/src/jalview/gui/AnnotationExporter.java
b/src/jalview/gui/AnnotationExporter.java
index
136a38e
..
42913de
100644
(file)
--- a/
src/jalview/gui/AnnotationExporter.java
+++ b/
src/jalview/gui/AnnotationExporter.java
@@
-20,6
+20,7
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import jalview.api.FeatureColourI;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.SequenceI;
import jalview.io.AnnotationFile;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.SequenceI;
import jalview.io.AnnotationFile;
@@
-33,6
+34,7
@@
import java.awt.Color;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.List;
import java.util.Map;
import javax.swing.BorderFactory;
import java.util.Map;
import javax.swing.BorderFactory;
@@
-156,20
+158,21
@@
public class AnnotationExporter extends JPanel
if (features)
{
FeaturesFile formatter = new FeaturesFile();
if (features)
{
FeaturesFile formatter = new FeaturesFile();
- SequenceI[] sequences = ap.av.getAlignment().getDataset()
- .getSequencesArray();
- Map<String, Object> featureColours = ap.getFeatureRenderer()
+ SequenceI[] sequences = ap.av.getAlignment().getSequencesArray();
+ Map<String, FeatureColourI> featureColours = ap.getFeatureRenderer()
.getDisplayedFeatureCols();
.getDisplayedFeatureCols();
+ List<String> featureGroups = ap.getFeatureRenderer()
+ .getDisplayedFeatureGroups();
boolean includeNonPositional = ap.av.isShowNPFeats();
if (GFFFormat.isSelected())
{
boolean includeNonPositional = ap.av.isShowNPFeats();
if (GFFFormat.isSelected())
{
- text = formatter.printGffFormat(sequences, featureColours, true,
- includeNonPositional);
+ text = formatter.printGffFormat(sequences, featureColours,
+ featureGroups, includeNonPositional);
}
else
{
text = formatter.printJalviewFormat(sequences, featureColours,
}
else
{
text = formatter.printJalviewFormat(sequences, featureColours,
- true, includeNonPositional);
+ featureGroups, includeNonPositional);
}
}
else
}
}
else