Dont export annotations if not visible

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 7b1dfeb..1eb72e9 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -36,8 +36,6 @@ import jalview.schemes.*;
 import jalview.commands.*;
 import jalview.ws.*;
 import java.awt.dnd.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
 
 /**
  * DOCUMENT ME!
@@ -472,6 +470,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     idRightAlign.setSelected(av.rightAlignIds);
     renderGapsMenuItem.setSelected(av.renderGaps);
     wrapMenuItem.setSelected(av.wrapAlignment);
+    scaleAbove.setVisible(av.wrapAlignment);
+    scaleLeft.setVisible(av.wrapAlignment);
+    scaleRight.setVisible(av.wrapAlignment);
     annotationPanelMenuItem.setState(av.showAnnotation);
     viewBoxesMenuItem.setSelected(av.showBoxes);
     viewTextMenuItem.setSelected(av.showText);
@@ -853,8 +854,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void exportAnnotations_actionPerformed(ActionEvent e)
   {
     new AnnotationExporter().exportAnnotations(
-      alignPanel,
-      viewport.alignment.getAlignmentAnnotation()
+        alignPanel,
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+        viewport.alignment.getGroups()
         );
   }