X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=0edc57849ada3639a9322ac25e762225236ad05c;hb=21b2c08c209b0c4eb1111dab1d81e8408c245ddd;hp=32a50cfbfa30c359defac13060d2ebab1b8adf1b;hpb=e30c8f0736f711e2dc7c32680ac57a28c77d567d;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 32a50cf..0edc578 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -35,6 +35,7 @@ import jalview.jbgui.*;
 import jalview.schemes.*;
 import jalview.ws.*;
 import java.awt.dnd.*;
+import org.biojava.dasobert.eventmodel.*;
 
 
 /**
@@ -44,7 +45,7 @@ import java.awt.dnd.*;
  * @version $Revision$
  */
 public class AlignFrame
-    extends GAlignFrame implements DropTargetListener
+    extends GAlignFrame implements DropTargetListener, FeatureListener
 {
   /** DOCUMENT ME!! */
   public static final int NEW_WINDOW_WIDTH = 700;
@@ -131,11 +132,18 @@ public class AlignFrame
       setGUINucleotide(al.isNucleotide());
     }
 
-    if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false))
+
+    if (jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false))
     {
       wrapMenuItem.setSelected(true);
       wrapMenuItem_actionPerformed(null);
     }
+
+  }
+
+  public AlignViewport getViewport()
+  {
+    return viewport;
   }
 
   /* Set up intrinsic listeners for dynamically generated GUI bits. */
@@ -169,7 +177,6 @@ public class AlignFrame
       }
       ;
     });
-
   }
 
   public void setGUINucleotide(boolean nucleotide)
@@ -187,6 +194,58 @@ public class AlignFrame
     }
   }
 
+  public void comeBackLater(FeatureEvent evt)
+  {}
+
+  public void newFeatures(FeatureEvent evt)
+  {
+    if (evt.getFeatures().length > 0)
+    {
+      alignPanel.seqPanel.seqCanvas.fr.featuresAdded();
+      alignPanel.repaint();
+      if(featureSettings!=null)
+        featureSettings.setTableData();
+    }
+  }
+
+  Hashtable progressBars;
+  public void setProgressBar(String message, long id)
+  {
+    if(progressBars == null)
+      progressBars = new Hashtable();
+
+    JPanel progressPanel;
+    GridLayout layout = (GridLayout) statusPanel.getLayout();
+    if(progressBars.get( new Long(id) )!=null)
+     {
+       progressPanel = (JPanel)progressBars.get( new Long(id) );
+       statusPanel.remove(progressPanel);
+       progressBars.remove( progressPanel );
+       progressPanel = null;
+       if(message!=null)
+         statusBar.setText(message);
+
+       layout.setRows(layout.getRows() - 1);
+     }
+    else
+    {
+      progressPanel = new JPanel(new BorderLayout(10, 5));
+
+      JProgressBar progressBar = new JProgressBar();
+      progressBar.setIndeterminate(true);
+
+      progressPanel.add(new JLabel(message), BorderLayout.WEST);
+      progressPanel.add(progressBar, BorderLayout.CENTER);
+
+      layout.setRows(layout.getRows() + 1);
+      statusPanel.add(progressPanel);
+
+      progressBars.put(new Long(id), progressPanel);
+    }
+
+    validate();
+  }
+
 
   /*
    Added so Castor Mapping file can obtain Jalview Version
@@ -288,9 +347,22 @@ public class AlignFrame
     }
     else
     {
-      String output = new FormatAdapter().formatSequences(format,
-          viewport.getAlignment().
-          getSequences());
+
+      String[] omitHidden = null;
+
+      if (viewport.hasHiddenColumns)
+      {
+        System.out.println("PROMPT USER HERE");
+        omitHidden = viewport.getSelectionAsString();
+      }
+
+      String output = new FormatAdapter().formatSequences(
+          format,
+          viewport.getSelectionAsNewSequence(),
+          omitHidden) ;
+
+
+
       if (output == null)
       {
         return false;
@@ -322,12 +394,20 @@ public class AlignFrame
   protected void outputText_actionPerformed(ActionEvent e)
   {
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
-    Desktop.addInternalFrame(cap,
-                             "Alignment output - " + e.getActionCommand(), 600,
-                             500);
-    cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
-                                              viewport.getAlignment().
-                                              getSequences()));
+
+
+    String [] omitHidden = null;
+
+    if(viewport.hasHiddenColumns)
+    {
+      System.out.println("PROMPT USER HERE");
+      omitHidden = viewport.getSelectionAsString();
+    }
+
+    cap.setText(new FormatAdapter().formatSequences(
+        e.getActionCommand(),
+        viewport.getSelectionAsNewSequence(),
+        omitHidden));
   }
 
   /**
@@ -533,14 +613,14 @@ public class AlignFrame
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
 
-        if (!sg.sequences.contains(seq))
+        if (!sg.getSequences(false).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
 
-        if (sg.sequences.contains(temp))
+        if (sg.getSequences(false).contains(temp))
         {
           continue;
         }
@@ -555,14 +635,14 @@ public class AlignFrame
       {
         SequenceI seq = viewport.alignment.getSequenceAt(i);
 
-        if (!sg.sequences.contains(seq))
+        if (!sg.getSequences(false).contains(seq))
         {
           continue;
         }
 
         SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
 
-        if (sg.sequences.contains(temp))
+        if (sg.getSequences(false).contains(temp))
         {
           continue;
         }
@@ -589,83 +669,32 @@ public class AlignFrame
       return;
     }
 
-    SequenceGroup sg = viewport.getSelectionGroup();
+    SequenceI [] seqs = viewport.getSelectionAsNewSequence();
 
     Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
 
-    Hashtable orderedSeqs = new Hashtable();
-    SequenceI[] seqs = new SequenceI[sg.getSize()];
-
-    for (int i = 0; i < sg.getSize(); i++)
-    {
-      SequenceI seq = sg.getSequenceAt(i);
-      int index = viewport.alignment.findIndex(seq);
-      orderedSeqs.put(index + "", seq);
-    }
+    FastaFile ff = new FastaFile();
+    ff.addJVSuffix( viewport.showJVSuffix );
 
-    int index = 0, startRes, endRes;
-    char ch;
+    c.setContents(new StringSelection(ff.print(seqs)), Desktop.instance);
 
-    for (int i = 0; i < sg.getSize(); i++)
+    Vector hiddenColumns = null;
+    if(viewport.hasHiddenColumns && viewport.getSelectionGroup()!=null)
     {
-      SequenceI seq = null;
-
-      while (seq == null)
+      hiddenColumns =new Vector();
+      int hiddenOffset = viewport.getSelectionGroup().getStartRes();
+      for(int i=0; i<viewport.getColumnSelection().getHiddenColumns().size(); i++)
       {
-        if (orderedSeqs.containsKey(index + ""))
-        {
-          seq = (SequenceI) orderedSeqs.get(index + "");
-          index++;
+        int[] region = (int[])
+            viewport.getColumnSelection().getHiddenColumns().elementAt(i);
 
-          break;
-        }
-        else
-        {
-          index++;
-        }
-      }
-
-      //FIND START RES
-      //Returns residue following index if gap
-      startRes = seq.findPosition(sg.getStartRes());
-
-      //FIND END RES
-      //Need to find the residue preceeding index if gap
-      endRes = 0;
-
-      for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++)
-      {
-        ch = seq.getCharAt(j);
-        if (!jalview.util.Comparison.isGap( (ch)))
-        {
-          endRes++;
-        }
-      }
-
-      if (endRes > 0)
-      {
-        endRes += seq.getStart() - 1;
-      }
-
-      seqs[i] = new Sequence(seq.getName(),
-                             seq.getSequence(sg.getStartRes(), sg.getEndRes() + 1),
-                             startRes,
-                             endRes);
-      seqs[i].setDescription(seq.getDescription());
-      seqs[i].setDBRef(seq.getDBRef());
-      seqs[i].setSequenceFeatures(seq.getSequenceFeatures());
-      seqs[i].setDatasetSequence(seq.getDatasetSequence());
-      if(seq.getAnnotation()!=null)
-      {
-        for(int a=0; a<seq.getAnnotation().length; a++)
-          seqs[i].addAlignmentAnnotation(seq.getAnnotation()[a]);
+        hiddenColumns.addElement(new int[]{region[0]-hiddenOffset,
+                          region[1]-hiddenOffset});
       }
     }
-
-    FastaFile ff = new FastaFile();
-    ff.addJVSuffix( viewport.showJVSuffix );
-    c.setContents(new StringSelection( ff.print(seqs)), Desktop.instance);
-    Desktop.jalviewClipboard = new Object[]{seqs,  viewport.alignment.getDataset()};
+    Desktop.jalviewClipboard = new Object[]{ seqs,
+        viewport.alignment.getDataset(),
+        hiddenColumns};
   }
 
   /**
@@ -789,6 +818,18 @@ public class AlignFrame
        AlignFrame af = new AlignFrame(alignment);
        String newtitle = new String("Copied sequences");
 
+       if(Desktop.jalviewClipboard[2]!=null)
+         {
+           Vector hc = (Vector)Desktop.jalviewClipboard[2];
+           for(int i=0; i<hc.size(); i++)
+           {
+             int [] region = (int[]) hc.elementAt(i);
+             for(int j=region[0]; j<region[1]+1; j++)
+               af.viewport.getColumnSelection().addElement(j);
+             af.viewport.getColumnSelection().hideColumns(region[0], af.viewport);
+           }
+         }
+
 
        //>>>This is a fix for the moment, until a better solution is found!!<<<
        af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
@@ -880,7 +921,7 @@ public class AlignFrame
                                    HistoryItem.HIDE));
 
 
-    for (int i = 0; i < sg.sequences.size(); i++)
+    for (int i = 0; i < sg.getSize(false); i++)
     {
       SequenceI seq = sg.getSequenceAt(i);
       int index = viewport.getAlignment().findIndex(seq);
@@ -888,7 +929,7 @@ public class AlignFrame
       seq.deleteChars(sg.getStartRes(), sg.getEndRes() + 1);
 
       // If the cut affects all sequences, remove highlighted columns
-      if (sg.sequences.size() == viewport.alignment.getHeight())
+      if (sg.getSize(false) == viewport.alignment.getHeight())
       {
         viewport.getColumnSelection().removeElements(sg.getStartRes(),
             sg.getEndRes() + 1);
@@ -973,6 +1014,7 @@ public class AlignFrame
     viewport.setSelectionGroup(null);
     alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
     alignPanel.idPanel.idCanvas.searchResults = null;
+    alignPanel.repaint();
     PaintRefresher.Refresh(null, viewport.alignment);
   }
 
@@ -1125,10 +1167,10 @@ public class AlignFrame
     int end = viewport.alignment.getWidth();
 
     if (viewport.getSelectionGroup() != null
-        && viewport.getSelectionGroup().sequences != null
-        && viewport.getSelectionGroup().sequences.size() > 0)
+        && viewport.getSelectionGroup().getSequences(true) != null
+        && viewport.getSelectionGroup().getSize(true) > 0)
     {
-      seqs = viewport.getSelectionGroup().sequences;
+      seqs = viewport.getSelectionGroup().getSequences(true);
       start = viewport.getSelectionGroup().getStartRes();
       end = viewport.getSelectionGroup().getEndRes()+1;
     }
@@ -1240,7 +1282,8 @@ public class AlignFrame
       SequenceGroup sg = (SequenceGroup)viewport.alignment.getGroups().elementAt(s);
       if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)
       {
-        ((ClustalxColourScheme)sg.cs).resetClustalX(sg.sequences, sg.getWidth());
+        ((ClustalxColourScheme)sg.cs).resetClustalX(
+            sg.getSequences(true), sg.getWidth());
       }
       sg.recalcConservation();
     }
@@ -1326,12 +1369,11 @@ public class AlignFrame
    */
   public void wrapMenuItem_actionPerformed(ActionEvent e)
   {
-    viewport.setWrapAlignment(wrapMenuItem.isSelected());
-    alignPanel.setWrapAlignment(wrapMenuItem.isSelected());
     scaleAbove.setVisible(wrapMenuItem.isSelected());
     scaleLeft.setVisible(wrapMenuItem.isSelected());
     scaleRight.setVisible(wrapMenuItem.isSelected());
-    alignPanel.repaint();
+    viewport.setWrapAlignment(wrapMenuItem.isSelected());
+    alignPanel.setWrapAlignment(wrapMenuItem.isSelected());
   }
 
   /**
@@ -1400,19 +1442,16 @@ public class AlignFrame
     alignPanel.repaint();
   }
 
-  public void fetchSeqFeatures_actionPerformed(ActionEvent e)
-  {
-      new DasSequenceFeatureFetcher(viewport.
-                                    alignment,
-                                    alignPanel);
-      viewport.setShowSequenceFeatures(true);
-      showSeqFeatures.setSelected(true);
-  }
-
 
+  FeatureSettings featureSettings;
   public void featureSettings_actionPerformed(ActionEvent e)
   {
-    new FeatureSettings(viewport, alignPanel);
+    if(featureSettings !=null )
+    {
+      featureSettings.close();
+      featureSettings = null;
+    }
+    featureSettings = new FeatureSettings(this);
   }
 
   /**
@@ -1595,7 +1634,7 @@ public class AlignFrame
    *
    * @param cs DOCUMENT ME!
    */
-  void changeColour(ColourSchemeI cs)
+  public void changeColour(ColourSchemeI cs)
   {
     int threshold = 0;
 
@@ -1659,7 +1698,8 @@ public class AlignFrame
 
         if (cs instanceof ClustalxColourScheme)
         {
-          sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth());
+          sg.cs = new ClustalxColourScheme(
+              sg.getSequences(true), sg.getWidth());
         }
         else if (cs instanceof UserColourScheme)
         {
@@ -1683,9 +1723,10 @@ public class AlignFrame
          sg.cs.setThreshold(threshold,
                 viewport.getIgnoreGapsConsensus());
 
-          sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-              sg.getWidth()));
-        }
+         sg.cs.setConsensus(AAFrequency.calculate(
+             sg.getSequences(true), 0,
+             sg.getWidth()));
+       }
         else
           sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
 
@@ -1694,7 +1735,7 @@ public class AlignFrame
         {
           Conservation c = new Conservation("Group",
                                             ResidueProperties.propHash, 3,
-                                            sg.sequences, 0,
+                                            sg.getSequences(true), 0,
                                             viewport.alignment.getWidth() - 1);
           c.calculate();
           c.verdict(false, viewport.ConsPercGaps);
@@ -1933,13 +1974,10 @@ public class AlignFrame
    */
   public void removeRedundancyMenuItem_actionPerformed(ActionEvent e)
   {
-    RedundancyPanel sp = new RedundancyPanel(alignPanel, this);
-    JInternalFrame frame = new JInternalFrame();
-    frame.setContentPane(sp);
-    Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,
-                             100, false);
+    new RedundancyPanel(alignPanel, this);
   }
 
+
   /**
    * DOCUMENT ME!
    *
@@ -1948,7 +1986,7 @@ public class AlignFrame
   public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)
   {
     if ( (viewport.getSelectionGroup() == null) ||
-        (viewport.getSelectionGroup().getSize() < 2))
+        (viewport.getSelectionGroup().getSize(false) < 2))
     {
       JOptionPane.showInternalMessageDialog(this,
                                             "You must select at least 2 sequences.",
@@ -1971,8 +2009,8 @@ public class AlignFrame
   public void PCAMenuItem_actionPerformed(ActionEvent e)
   {
     if ( ( (viewport.getSelectionGroup() != null) &&
-          (viewport.getSelectionGroup().getSize() < 4) &&
-          (viewport.getSelectionGroup().getSize() > 0)) ||
+          (viewport.getSelectionGroup().getSize(false) < 4) &&
+          (viewport.getSelectionGroup().getSize(false) > 0)) ||
         (viewport.getAlignment().getHeight() < 4))
     {
       JOptionPane.showInternalMessageDialog(this,
@@ -2050,15 +2088,15 @@ public class AlignFrame
     TreePanel tp;
 
     if ( (viewport.getSelectionGroup() != null) &&
-        (viewport.getSelectionGroup().getSize() > 3))
+        (viewport.getSelectionGroup().getSize(false) > 3))
     {
       int s = 0;
       SequenceGroup sg = viewport.getSelectionGroup();
 
       /* Decide if the selection is a column region */
-      while (s < sg.sequences.size())
+      while (s < sg.getSize(false))
       {
-        if ( ( (SequenceI) sg.sequences.elementAt(s++)).getLength() <
+        if ( ( (SequenceI) sg.getSequences(false).elementAt(s++)).getLength() <
             sg.getEndRes())
         {
           JOptionPane.showMessageDialog(Desktop.desktop,
@@ -2073,9 +2111,7 @@ public class AlignFrame
       }
 
       title = title + " on region";
-      tp = new TreePanel(viewport,
-                         viewport.getSelectionGroup().sequences, type, pwType,
-                         sg.getStartRes(), sg.getEndRes());
+      tp = new TreePanel(viewport, type, pwType);
     }
     else
     {
@@ -2092,10 +2128,7 @@ public class AlignFrame
         return;
       }
 
-      tp = new TreePanel(viewport,
-                         viewport.getAlignment().getSequences(), type, pwType,
-                         0,
-                         viewport.alignment.getWidth());
+      tp = new TreePanel(viewport, type, pwType);
     }
 
     addTreeMenuItem(tp, title);
@@ -2189,12 +2222,12 @@ public class AlignFrame
     SequenceI[] msa = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
-        (viewport.getSelectionGroup().getSize() > 1))
+        (viewport.getSelectionGroup().getSize(false) > 1))
     {
       // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!
       SequenceGroup seqs = viewport.getSelectionGroup();
       int sz;
-      msa = new SequenceI[sz = seqs.getSize()];
+      msa = new SequenceI[sz = seqs.getSize(false)];
 
       for (int i = 0; i < sz; i++)
       {
@@ -2230,19 +2263,19 @@ public class AlignFrame
     SequenceI[] msa = null;
 
     if ( (viewport.getSelectionGroup() != null) &&
-        (viewport.getSelectionGroup().getSize() > 0))
+        (viewport.getSelectionGroup().getSize(false) > 0))
     {
       // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!
       SequenceGroup seqs = viewport.getSelectionGroup();
 
-      if ( (seqs.getSize() == 1) || !viewport.alignment.isAligned())
+      if ( (seqs.getSize(false) == 1) || !viewport.alignment.isAligned())
       {
         seq = (SequenceI) seqs.getSequenceAt(0);
       }
       else
       {
         int sz;
-        msa = new SequenceI[sz = seqs.getSize()];
+        msa = new SequenceI[sz = seqs.getSize(false)];
 
         for (int i = 0; i < sz; i++)
         {
@@ -2346,9 +2379,9 @@ public class AlignFrame
       if (nf.getTree() != null)
       {
         tp = new TreePanel(viewport,
-                           viewport.getAlignment().getSequences(), nf,
                            "FromFile",
-                           title);
+                           title,
+                           nf);
 
         tp.setSize(w,h);
 
@@ -2638,9 +2671,10 @@ public boolean parseFeaturesFile(String file, String type)
 {
     boolean featuresFile = false;
     try{
-      featuresFile = new FeaturesFile(file, type).parse(viewport.alignment,
+      featuresFile = new FeaturesFile(file, type).parse(viewport.alignment.getDataset(),
                                          alignPanel.seqPanel.seqCanvas.
-                                         getFeatureRenderer().featureColours);
+                                         getFeatureRenderer().featureColours,
+                                         false);
     }
     catch(Exception ex)
     {