X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationExporter.java;h=0d47e36bdd5c71d1dec26f62d42113a650ee363c;hb=3ba37699f5f799d357e0cb6f041f32fc490b6eda;hp=d688ddd7a98240484ec9370bccbd01d081c8c7a4;hpb=212ef83be8ca4e967dc1d3e2b9e76750f9175e14;p=jalview.git diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java index d688ddd..0d47e36 100644 --- a/src/jalview/gui/AnnotationExporter.java +++ b/src/jalview/gui/AnnotationExporter.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.api.FeatureColourI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.SequenceI; import jalview.io.AnnotationFile; @@ -155,18 +156,26 @@ public class AnnotationExporter extends JPanel .getString("label.no_features_on_alignment"); if (features) { + Map displayedFeatureColours = ap + .getFeatureRenderer().getDisplayedFeatureCols(); FeaturesFile formatter = new FeaturesFile(); SequenceI[] sequences = ap.av.getAlignment().getSequencesArray(); - Map featureColours = ap.getFeatureRenderer() + Map featureColours = ap.getFeatureRenderer() .getDisplayedFeatureCols(); boolean includeNonPositional = ap.av.isShowNPFeats(); if (GFFFormat.isSelected()) { + text = new FeaturesFile().printGffFormat(ap.av.getAlignment() + .getDataset().getSequencesArray(), displayedFeatureColours, + true, ap.av.isShowNPFeats()); text = formatter.printGffFormat(sequences, featureColours, true, includeNonPositional); } else { + text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment() + .getDataset().getSequencesArray(), displayedFeatureColours, + true, ap.av.isShowNPFeats()); // ap.av.featuresDisplayed); text = formatter.printJalviewFormat(sequences, featureColours, true, includeNonPositional); }