X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=4e625e14aede3537513b21ca3936654100209011;hb=405376d6d7002b3818d10aebc474f14134d5bbae;hp=fad9dcd7137d4fd7e1057c950941698da6fb416d;hpb=d7989f319488cc56440f822261bc5014c27e03c6;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index fad9dcd..4e625e1 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -20,6 +20,16 @@ */ package jalview.gui; +import jalview.analysis.AlignmentUtils; +import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.Annotation; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; +import jalview.io.FormatAdapter; +import jalview.util.MessageManager; + import java.awt.Color; import java.awt.Dimension; import java.awt.Font; @@ -41,6 +51,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.regex.Pattern; import javax.swing.JCheckBoxMenuItem; @@ -50,16 +61,6 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; -import jalview.analysis.AlignmentUtils; -import jalview.datamodel.Alignment; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.Annotation; -import jalview.datamodel.Sequence; -import jalview.datamodel.SequenceGroup; -import jalview.datamodel.SequenceI; -import jalview.io.FormatAdapter; -import jalview.util.MessageManager; - /** * DOCUMENT ME! * @@ -874,8 +875,16 @@ public class AnnotationLabels extends JPanel implements MouseListener, sq.getLength(), seqs); } + int[] alignmentStartEnd = new int[] + { 0, ds.getWidth() - 1 }; + List hiddenCols = av.getColumnSelection().getHiddenColumns(); + if (hiddenCols != null) + { + alignmentStartEnd = AlignFrame.getStartEnd(alignmentStartEnd, + hiddenCols); + } String output = new FormatAdapter().formatSequences("Fasta", seqs, - omitHidden, null); + omitHidden, alignmentStartEnd); Toolkit.getDefaultToolkit().getSystemClipboard() .setContents(new StringSelection(output), Desktop.instance);