X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=14bf680152cf531a5830cb72e69725f6b4ac20ac;hb=2ef43e1e505af2742f1c3a59619c8a4357ea82c4;hp=a52481d6ed32400333558cf161859442c531d7d9;hpb=2a4a2961667c0ee0b7eec89b78e9c73d46e1ac9d;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a52481d..14bf680 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -35,7 +35,7 @@ import jalview.jbgui.*;
 import jalview.schemes.*;
 import jalview.ws.*;
 import java.awt.dnd.*;
-import jalview.biojava.dasobert.eventmodel.*;
+import org.biojava.dasobert.eventmodel.*;
 
 /**
  * DOCUMENT ME!
@@ -60,15 +60,14 @@ public class AlignFrame
   Stack redoList = new Stack();
   private int treeCount = 0;
 
-
   /**
-   * Creates a new AlignFrame object.
-   *
-   * @param al DOCUMENT ME!
+   * new alignment window with hidden columns
+   * @param al AlignmentI
+   * @param hiddenColumns ColumnSelection or null
    */
-  public AlignFrame(AlignmentI al)
-  {
-    viewport = new AlignViewport(al);
+  public AlignFrame(AlignmentI al, ColumnSelection hiddenColumns) {
+
+    viewport = new AlignViewport(al, hiddenColumns);
 
     this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
 
@@ -140,6 +139,17 @@ public class AlignFrame
 
   }
 
+
+  /**
+   * Creates a new AlignFrame object.
+   *
+   * @param al DOCUMENT ME!
+   */
+  public AlignFrame(AlignmentI al)
+  {
+    this(al, null);
+  }
+
   public AlignViewport getViewport()
   {
     return viewport;
@@ -783,7 +793,6 @@ public class AlignFrame
 
       if (newAlignment)
       {
-        System.out.println(format +" 2");
         alignment = new Alignment(sequences);
 
         if(Desktop.jalviewClipboard!=null)
@@ -794,7 +803,6 @@ public class AlignFrame
       }
       else
       {
-        System.out.println(format +" 24");
         alignment = viewport.getAlignment();
 
         //!newAlignment
@@ -857,7 +865,7 @@ public class AlignFrame
            for(int i=0; i<hc.size(); i++)
            {
              int [] region = (int[]) hc.elementAt(i);
-             af.viewport.hideColumns(region[0], region[1]+1);
+             af.viewport.hideColumns(region[0], region[1]);
            }
          }
 
@@ -1415,7 +1423,7 @@ public class AlignFrame
 
   public void showAllColumns_actionPerformed(ActionEvent e)
   {
-    viewport.getColumnSelection().revealAllHiddenColumns(viewport);
+    viewport.showAllHiddenColumns();
   }
 
   public void hideSelSequences_actionPerformed(ActionEvent e)
@@ -2199,6 +2207,9 @@ public class AlignFrame
         return;
       }
 
+      if(viewport.alignment.getHeight()<2)
+        return;
+
       tp = new TreePanel(viewport, type, pwType);
     }
 
@@ -2287,27 +2298,28 @@ public class AlignFrame
    * or just the selected set will be submitted for multiple alignment.
    *
    */
-  private SequenceI[] gatherSequencesForAlignment()
+  private jalview.datamodel.AlignmentView gatherSequencesForAlignment()
   {
     // Now, check we have enough sequences
-    SequenceI[] msa = null;
+    AlignmentView msa = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
         (viewport.getSelectionGroup().getSize(false) > 1))
     {
       // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!
-      SequenceGroup seqs = viewport.getSelectionGroup();
+      /*SequenceGroup seqs = viewport.getSelectionGroup();
       int sz;
       msa = new SequenceI[sz = seqs.getSize(false)];
 
       for (int i = 0; i < sz; i++)
       {
         msa[i] = (SequenceI) seqs.getSequenceAt(i);
-      }
+      } */
+      msa = viewport.getAlignmentView(true);
     }
     else
     {
-      Vector seqs = viewport.getAlignment().getSequences();
+      /*Vector seqs = viewport.getAlignment().getSequences();
 
       if (seqs.size() > 1)
       {
@@ -2317,7 +2329,8 @@ public class AlignFrame
         {
           msa[i] = (SequenceI) seqs.elementAt(i);
         }
-      }
+      }*/
+      msa = viewport.getAlignmentView(false);
     }
     return msa;
   }
@@ -2521,7 +2534,7 @@ public class AlignFrame
           {
             public void actionPerformed(ActionEvent e)
             {
-              SequenceI[] msa = gatherSequencesForAlignment();
+              AlignmentView msa = gatherSequencesForAlignment();
               new jalview.ws.MsaWSClient(sh, title, msa,
                   false, true, viewport.getAlignment().getDataset(), af);
 
@@ -2538,7 +2551,7 @@ public class AlignFrame
             {
               public void actionPerformed(ActionEvent e)
               {
-                SequenceI[] msa = gatherSequencesForAlignment();
+                AlignmentView msa = gatherSequencesForAlignment();
                 new jalview.ws.MsaWSClient(sh, title, msa,
                     true, true, viewport.getAlignment().getDataset(), af);