X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationExporter.java;fp=src%2Fjalview%2Fgui%2FAnnotationExporter.java;h=469e495f9665026c79b4366293eb2b6ef9c87cc8;hb=bf0d052fef43e9809b7170dbfd372b3ea116391b;hp=383dd1b8ad78384227eca6dfffb08061d6e16e58;hpb=3e943322f9d66e8718316ba8bd03669adce65149;p=jalview.git diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java index 383dd1b..469e495 100644 --- a/src/jalview/gui/AnnotationExporter.java +++ b/src/jalview/gui/AnnotationExporter.java @@ -22,6 +22,7 @@ package jalview.gui; import jalview.api.FeatureColourI; import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.SequenceI; import jalview.io.AnnotationFile; import jalview.io.FeaturesFile; import jalview.io.JalviewFileChooser; @@ -157,15 +158,25 @@ public class AnnotationExporter extends JPanel { Map displayedFeatureColours = ap .getFeatureRenderer().getDisplayedFeatureCols(); + FeaturesFile formatter = new FeaturesFile(); + SequenceI[] sequences = ap.av.getAlignment().getSequencesArray(); + 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());// ap.av.featuresDisplayed//); + 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); } } else