X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationExporter.java;h=a619997e3591695fc2fe05e8047d344b51a58b00;hb=53b99b41ed7f26f2724f3ed87d524eb83c5208f4;hp=ced0fef4f4823d87067f45e48af183098e00f3a0;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java
index ced0fef..a619997 100644
--- a/src/jalview/gui/AnnotationExporter.java
+++ b/src/jalview/gui/AnnotationExporter.java
@@ -1,34 +1,52 @@
/*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.util.*;
-import java.util.List;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.io.*;
+import jalview.api.FeatureColourI;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.SequenceI;
+import jalview.io.AnnotationFile;
+import jalview.io.FeaturesFile;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
+import java.awt.BorderLayout;
+import java.awt.Color;
+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 javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.SwingConstants;
+
/**
*
* GUI dialog for exporting features or alignment annotations depending upon
@@ -45,11 +63,9 @@ public class AnnotationExporter extends JPanel
boolean features = true;
- AlignmentAnnotation[] annotations;
-
- List sequenceGroups;
+ private AlignmentAnnotation[] annotations;
- Hashtable alignmentProperties;
+ private boolean wholeView;
public AnnotationExporter()
{
@@ -73,21 +89,33 @@ public class AnnotationExporter extends JPanel
this.ap = ap;
features = true;
CSVFormat.setVisible(false);
- frame.setTitle("Export Features");
+ frame.setTitle(MessageManager.getString("label.export_features"));
}
- public void exportAnnotations(AlignmentPanel ap,
- AlignmentAnnotation[] annotations, List list,
- Hashtable alProperties)
+ public void exportAnnotations(AlignmentPanel ap)
{
this.ap = ap;
+ annotations = ap.av.isShowAnnotation() ? null
+ : ap.av.getAlignment().getAlignmentAnnotation();
+ wholeView = true;
+ startExportAnnotation();
+ }
+
+ public void exportAnnotations(AlignmentPanel alp,
+ AlignmentAnnotation[] toExport)
+ {
+ ap = alp;
+ annotations = toExport;
+ wholeView = false;
+ startExportAnnotation();
+ }
+
+ private void startExportAnnotation()
+ {
features = false;
GFFFormat.setVisible(false);
CSVFormat.setVisible(true);
- this.annotations = annotations;
- this.sequenceGroups = list;
- this.alignmentProperties = alProperties;
- frame.setTitle("Export Annotations");
+ frame.setTitle(MessageManager.getString("label.export_annotations"));
}
public void toFile_actionPerformed(ActionEvent e)
@@ -96,42 +124,16 @@ public class AnnotationExporter extends JPanel
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(features ? "Save Features to File"
- : "Save Annotation to File");
+ chooser.setDialogTitle(features
+ ? MessageManager.getString("label.save_features_to_file")
+ : MessageManager.getString("label.save_annotation_to_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- String text = "No features found on alignment";
- if (features)
- {
- if (GFFFormat.isSelected())
- {
- text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
- .getDataset().getSequencesArray(),
- getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());// ap.av.featuresDisplayed//);
- }
- else
- {
- text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
- .getDataset().getSequencesArray(),
- getDisplayedFeatureCols(), true, ap.av.isShowNpFeats()); // ap.av.featuresDisplayed);
- }
- }
- else
- {
- if (CSVFormat.isSelected())
- {
- text = new AnnotationFile().printCSVAnnotations(annotations);
- }
- else
- {
- text = new AnnotationFile().printAnnotations(annotations,
- sequenceGroups, alignmentProperties);
- }
- }
+ String text = getFileContents();
try
{
@@ -149,25 +151,31 @@ public class AnnotationExporter extends JPanel
close_actionPerformed(null);
}
- public void toTextbox_actionPerformed(ActionEvent e)
+ private String getFileContents()
{
- String text = "No features found on alignment";
+ String text = MessageManager
+ .getString("label.no_features_on_alignment");
if (features)
{
+ FeaturesFile formatter = new FeaturesFile();
+ SequenceI[] sequences = ap.av.getAlignment().getSequencesArray();
+ Map featureColours = ap.getFeatureRenderer()
+ .getDisplayedFeatureCols();
+ List featureGroups = ap.getFeatureRenderer()
+ .getDisplayedFeatureGroups();
+ boolean includeNonPositional = ap.av.isShowNPFeats();
if (GFFFormat.isSelected())
{
- text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
- .getDataset().getSequencesArray(),
- getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
+ text = formatter.printGffFormat(sequences, featureColours,
+ featureGroups, includeNonPositional);
}
else
{
- text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
- .getDataset().getSequencesArray(),
- getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
+ text = formatter.printJalviewFormat(sequences, featureColours,
+ featureGroups, includeNonPositional);
}
}
- else if (!features)
+ else
{
if (CSVFormat.isSelected())
{
@@ -175,47 +183,51 @@ public class AnnotationExporter extends JPanel
}
else
{
- text = new AnnotationFile().printAnnotations(annotations,
- sequenceGroups, alignmentProperties);
+ if (wholeView)
+ {
+ text = new AnnotationFile().printAnnotationsForView(ap.av);
+ }
+ else
+ {
+ text = new AnnotationFile().printAnnotations(annotations, null,
+ null);
+ }
}
}
+ return text;
+ }
+ public void toTextbox_actionPerformed(ActionEvent e)
+ {
CutAndPasteTransfer cap = new CutAndPasteTransfer();
+
try
{
+ String text = getFileContents();
cap.setText(text);
- Desktop.addInternalFrame(cap, (features ? MessageManager.formatMessage("label.features_for_params", new String[]{ap.alignFrame.getTitle()})
- : MessageManager.formatMessage("label.annotations_for_params", new String[]{ap.alignFrame.getTitle()})), 600, 500);
+ Desktop.addInternalFrame(cap, (features ? MessageManager
+ .formatMessage("label.features_for_params", new String[]
+ { ap.alignFrame.getTitle() })
+ : MessageManager.formatMessage("label.annotations_for_params",
+ new String[]
+ { ap.alignFrame.getTitle() })),
+ 600, 500);
} catch (OutOfMemoryError oom)
{
- new OOMWarning((features ? MessageManager.formatMessage("label.generating_features_for_params", new String[]{ap.alignFrame.getTitle()}) : MessageManager.formatMessage("label.generating_annotations_for_params", new String[]{ap.alignFrame.getTitle()}))
- , oom);
+ new OOMWarning((features ? MessageManager.formatMessage(
+ "label.generating_features_for_params", new String[]
+ { ap.alignFrame.getTitle() })
+ : MessageManager.formatMessage(
+ "label.generating_annotations_for_params",
+ new String[]
+ { ap.alignFrame.getTitle() })),
+ oom);
cap.dispose();
}
close_actionPerformed(null);
}
- private Hashtable getDisplayedFeatureCols()
- {
- Hashtable fcols = new Hashtable();
- if (ap.av.featuresDisplayed == null)
- {
- return fcols;
- }
- Enumeration en = ap.av.featuresDisplayed.keys();
- FeatureRenderer fr = ap.seqPanel.seqCanvas.getFeatureRenderer(); // consider
- // higher
- // level
- // method ?
- while (en.hasMoreElements())
- {
- Object col = en.nextElement();
- fcols.put(col, fr.featureColours.get(col));
- }
- return fcols;
- }
-
public void close_actionPerformed(ActionEvent e)
{
try
@@ -233,6 +245,7 @@ public class AnnotationExporter extends JPanel
toFile.setText(MessageManager.getString("label.to_file"));
toFile.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
toFile_actionPerformed(e);
@@ -241,6 +254,7 @@ public class AnnotationExporter extends JPanel
toTextbox.setText(MessageManager.getString("label.to_textbox"));
toTextbox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
toTextbox_actionPerformed(e);
@@ -249,6 +263,7 @@ public class AnnotationExporter extends JPanel
close.setText(MessageManager.getString("action.close"));
close.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
close_actionPerformed(e);
@@ -302,5 +317,4 @@ public class AnnotationExporter extends JPanel
JPanel jPanel3 = new JPanel();
FlowLayout flowLayout1 = new FlowLayout();
-
}