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-4366 allow a 3di alignment to be loaded and shown as a split frame with existing...
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationExporter.java
diff --git
a/src/jalview/gui/AnnotationExporter.java
b/src/jalview/gui/AnnotationExporter.java
index
894db79
..
a23496d
100644
(file)
--- a/
src/jalview/gui/AnnotationExporter.java
+++ b/
src/jalview/gui/AnnotationExporter.java
@@
-163,6
+163,14
@@
public class AnnotationExporter extends JPanel
frame.setTitle(MessageManager.getString("label.export_annotations"));
}
frame.setTitle(MessageManager.getString("label.export_annotations"));
}
+ public void setExportAsCSV()
+ {
+ if (CSVFormat != null)
+ {
+ CSVFormat.setSelected(true);
+ }
+ }
+
private void toFile_actionPerformed()
{
// TODO: JAL-3048 JalviewFileChooser - Save option
private void toFile_actionPerformed()
{
// TODO: JAL-3048 JalviewFileChooser - Save option
@@
-202,7
+210,7
@@
public class AnnotationExporter extends JPanel
*
* @return
*/
*
* @return
*/
- private String getText()
+ public String getText()
{
return exportFeatures ? getFeaturesText() : getAnnotationsText();
}
{
return exportFeatures ? getFeaturesText() : getAnnotationsText();
}
@@
-213,12
+221,14
@@
public class AnnotationExporter extends JPanel
*
* @return
*/
*
* @return
*/
- private String getAnnotationsText()
+ public String getAnnotationsText()
{
String text;
if (CSVFormat.isSelected())
{
{
String text;
if (CSVFormat.isSelected())
{
- text = new AnnotationFile().printCSVAnnotations(annotations);
+ text = new AnnotationFile().printCSVAnnotations(
+ wholeView ? ap.av.getAlignment().getAlignmentAnnotation()
+ : annotations);
}
else
{
}
else
{
@@
-241,7
+251,7
@@
public class AnnotationExporter extends JPanel
*
* @return
*/
*
* @return
*/
- private String getFeaturesText()
+ public String getFeaturesText()
{
String text;
SequenceI[] sequences = ap.av.getAlignment().getSequencesArray();
{
String text;
SequenceI[] sequences = ap.av.getAlignment().getSequencesArray();