X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=479d77180df9706629d82684060638065275fdcf;hb=c1e70ea0a01d2c916675aa8020970c6696d0dba5;hp=1059dc7836b84cd7aaa47043997d83973f922e2c;hpb=dab5d2d84c25fdb88d1a454eeb263f7dc767ce17;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 1059dc7..479d771 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -337,7 +337,7 @@ public class AlignFrame extends Frame implements ActionListener,
 
         if(toggleSeqs)
         {
-          if (sg != null && sg.getSize(false) != viewport.alignment.getHeight())
+          if (sg != null && sg.getSize() != viewport.alignment.getHeight())
           {
             hide = true;
             viewport.hideAllSelectedSeqs();
@@ -504,7 +504,7 @@ public void itemStateChanged(ItemEvent evt)
     else if (source == outputAnnotations)
       outputAnnotations();
     else if(source == outputFeatures)
-      outputFeatures();
+      outputFeatures(true, "Jalview");
     else if(source==closeMenuItem)
       closeMenuItem_actionPerformed();
     else if(source==copy)
@@ -655,7 +655,7 @@ public void itemStateChanged(ItemEvent evt)
                                      "Alignment output - " + e.getActionCommand(),
                                      600, 500);
     cap.setText(new AppletFormatAdapter().formatSequences(e.getActionCommand(),
-                                              viewport.getAlignment().getSequences(),
+                                              viewport.getAlignment(),
                                                       viewport.showJVSuffix));
   }
 
@@ -672,7 +672,7 @@ public void itemStateChanged(ItemEvent evt)
 
   public void outputAnnotations()
   {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
     Frame frame = new Frame();
     frame.add(cap);
     jalview.bin.JalviewLite.addFrame(frame,
@@ -682,18 +682,32 @@ public void itemStateChanged(ItemEvent evt)
       viewport.alignment.getAlignmentAnnotation() ) );
   }
 
-  public void outputFeatures()
+  public String outputFeatures(boolean displayTextbox, String format)
   {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);
-    Frame frame = new Frame();
-    frame.add(cap);
-    jalview.bin.JalviewLite.addFrame(frame,
-                                     "Features",
-                                     600, 500);
+    String features;
+    if (format.equalsIgnoreCase("Jalview"))
+      features = new FeaturesFile().printJalviewFormat(
+              viewport.alignment.getSequencesArray(),
+              viewport.featuresDisplayed);
+    else
+      features = new FeaturesFile().printGFFFormat(
+             viewport.alignment.getSequencesArray(),
+             viewport.featuresDisplayed);
+
+
+    if(displayTextbox)
+    {
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
+      Frame frame = new Frame();
+      frame.add(cap);
+      jalview.bin.JalviewLite.addFrame(frame,
+                                       "Features",
+                                       600, 500);
+
+      cap.setText(features);
+    }
 
-    cap.setText(new FeaturesFile().printJalviewFormat(
-                viewport.alignment.getSequencesArray(),
-                viewport.featuresDisplayed));
+    return features;
   }
 
   void launchFullApplication()
@@ -916,13 +930,13 @@ public void itemStateChanged(ItemEvent evt)
       for (int i = 1; i < viewport.alignment.getHeight(); i++)
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
-        if (!sg.getSequences(false).contains(seq))
+        if (!sg.getSequences(null).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
-        if (sg.getSequences(false).contains(temp))
+        if (sg.getSequences(null).contains(temp))
         {
           continue;
         }
@@ -936,13 +950,13 @@ public void itemStateChanged(ItemEvent evt)
       for (int i = viewport.alignment.getHeight() - 2; i > -1; i--)
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
-        if (!sg.getSequences(true).contains(seq))
+        if (!sg.getSequences(viewport.hiddenRepSequences).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
-        if (sg.getSequences(true).contains(temp))
+        if (sg.getSequences(viewport.hiddenRepSequences).contains(temp))
         {
           continue;
         }
@@ -967,7 +981,7 @@ public void itemStateChanged(ItemEvent evt)
     SequenceGroup sg = viewport.getSelectionGroup();
     copiedSequences = new StringBuffer();
     Hashtable orderedSeqs = new Hashtable();
-    for (int i = 0; i < sg.getSize(false); i++)
+    for (int i = 0; i < sg.getSize(); i++)
     {
       SequenceI seq = sg.getSequenceAt(i);
       int index = viewport.alignment.findIndex(seq);
@@ -996,7 +1010,7 @@ public void itemStateChanged(ItemEvent evt)
       copiedHiddenColumns = null;
 
 
-    for (int i = 0; i < sg.getSize(false); i++)
+    for (int i = 0; i < sg.getSize(); i++)
     {
         SequenceI seq = null;
 
@@ -1161,7 +1175,7 @@ public void itemStateChanged(ItemEvent evt)
 
     Vector seqs = new Vector();
     SequenceI seq;
-    for (int i = 0; i < sg.getSize(false); i++)
+    for (int i = 0; i < sg.getSize(); i++)
     {
       seq = sg.getSequenceAt(i);
       seqs.addElement(seq);
@@ -1169,7 +1183,7 @@ public void itemStateChanged(ItemEvent evt)
 
 
    // If the cut affects all sequences, remove highlighted columns
-   if (sg.getSize(false) == viewport.alignment.getHeight())
+   if (sg.getSize() == viewport.alignment.getHeight())
    {
      viewport.getColumnSelection().removeElements(sg.getStartRes(),
          sg.getEndRes() + 1);
@@ -1267,7 +1281,7 @@ public void itemStateChanged(ItemEvent evt)
 
       SequenceI [] seqs;
       if(viewport.getSelectionGroup()!=null)
-        seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+        seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
       else
         seqs = viewport.alignment.getSequencesArray();
 
@@ -1326,7 +1340,7 @@ public void itemStateChanged(ItemEvent evt)
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
       start = viewport.getSelectionGroup().getStartRes();
       end = viewport.getSelectionGroup().getEndRes();
     }
@@ -1365,7 +1379,7 @@ public void itemStateChanged(ItemEvent evt)
     SequenceI[] seqs;
     if (viewport.getSelectionGroup() != null)
     {
-      seqs = viewport.getSelectionGroup().getSequencesAsArray(true);
+      seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
       start = viewport.getSelectionGroup().getStartRes();
       end = viewport.getSelectionGroup().getEndRes();
     }
@@ -1557,7 +1571,9 @@ public void itemStateChanged(ItemEvent evt)
         }
         if (cs instanceof ClustalxColourScheme)
         {
-          sg.cs = new ClustalxColourScheme(sg.getSequences(true), sg.getWidth());
+          sg.cs = new ClustalxColourScheme(
+              sg.getSequences(viewport.hiddenRepSequences),
+              sg.getWidth());
         }
         else
         {
@@ -1577,7 +1593,8 @@ public void itemStateChanged(ItemEvent evt)
             || cs instanceof Blosum62ColourScheme)
         {
           sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
-          sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, sg.getWidth()));
+          sg.cs.setConsensus(AAFrequency.calculate(
+              sg.getSequences(viewport.hiddenRepSequences), 0, sg.getWidth()));
         }
         else
           sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
@@ -1586,7 +1603,7 @@ public void itemStateChanged(ItemEvent evt)
         {
           Conservation c = new Conservation("Group",
                                             ResidueProperties.propHash, 3,
-                                            sg.getSequences(true), 0,
+                                            sg.getSequences(viewport.hiddenRepSequences), 0,
                                             viewport.alignment.getWidth() - 1);
           c.calculate();
           c.verdict(false, viewport.ConsPercGaps);
@@ -1692,7 +1709,7 @@ public void itemStateChanged(ItemEvent evt)
   public void pairwiseAlignmentMenuItem_actionPerformed()
   {
     if (viewport.getSelectionGroup()!=null
-        && viewport.getSelectionGroup().getSize(false) > 1)
+        && viewport.getSelectionGroup().getSize() > 1)
     {
       Frame frame = new Frame();
       frame.add(new PairwiseAlignPanel(alignPanel));
@@ -1722,8 +1739,8 @@ public void itemStateChanged(ItemEvent evt)
     }
 
     if ( (viewport.getSelectionGroup() != null &&
-          viewport.getSelectionGroup().getSize(false) < 4 &&
-          viewport.getSelectionGroup().getSize(false) > 0)
+          viewport.getSelectionGroup().getSize() < 4 &&
+          viewport.getSelectionGroup().getSize() > 0)
         || viewport.getAlignment().getHeight() < 4)
     {
       return;
@@ -1782,7 +1799,7 @@ public void itemStateChanged(ItemEvent evt)
     }
 
     if ( (viewport.getSelectionGroup() != null &&
-          viewport.getSelectionGroup().getSize(false) > 1)
+          viewport.getSelectionGroup().getSize() > 1)
       || (viewport.getSelectionGroup() == null
           && viewport.alignment.getHeight() > 1))
     {