X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=f2d0b697cb8e050835c5ff8d862d53b94377bf25;hb=f85c8c88d6947b9f290409f1271429144df2c120;hp=9762258403bb4d2f6d08efd6937b499f150d52cb;hpb=ceb4fd3a8909862e45ac79b242ed112a15998d84;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9762258..f2d0b69 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -27,7 +27,6 @@ import java.awt.datatransfer.*;
 import java.awt.event.*;
 import java.awt.print.*;
 import javax.swing.*;
-import javax.swing.event.*;
 
 import jalview.analysis.*;
 import jalview.datamodel.*;
@@ -50,8 +49,11 @@ public class AlignFrame
 
   /** DOCUMENT ME!! */
   public static final int NEW_WINDOW_HEIGHT = 500;
-  final AlignmentPanel alignPanel;
-  final AlignViewport viewport;
+  AlignmentPanel alignPanel;
+  AlignViewport viewport;
+
+  Vector viewports = new Vector();
+  Vector alignPanels = new Vector();
 
   /** DOCUMENT ME!! */
   public String currentFileFormat = null;
@@ -67,10 +69,12 @@ public class AlignFrame
   public AlignFrame(AlignmentI al)
   {
     viewport = new AlignViewport(al);
+    viewports.add(viewport);
+
 
     if(viewport.vconsensus==null)
     {
-      //Out of memory caluclating consensus.
+      //Out of memory calculating consensus.
       BLOSUM62Colour.setEnabled(false);
       PIDColour.setEnabled(false);
       conservationMenuItem.setEnabled(false);
@@ -80,12 +84,7 @@ public class AlignFrame
     }
 
     alignPanel = new AlignmentPanel(this, viewport);
-    alignPanel.annotationPanel.adjustPanelHeight();
-    alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.
-        annotationPanel.getPreferredSize());
-    alignPanel.annotationScroller.setPreferredSize(alignPanel.annotationPanel.
-        getPreferredSize());
-    alignPanel.setAnnotationVisible(viewport.getShowAnnotation());
+    alignPanels.add(alignPanel);
 
     String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");
 
@@ -94,7 +93,24 @@ public class AlignFrame
     else if(sortby.equals("Pairwise Identity"))
       sortPairwiseMenuItem_actionPerformed(null);
 
-    getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);
+    tabbedPane.add(al.isNucleotide() ? "DNA":"Protein", alignPanel);
+
+    ///Dataset tab
+    /////////////////////////
+
+    if(al.getDataset()==null)
+    {
+      al.setDataset(null);
+    }
+
+    AlignViewport ds = new AlignViewport(al.getDataset());
+    ds.setDataset(true);
+    AlignmentPanel dap = new AlignmentPanel(this, ds);
+    tabbedPane.add("Dataset", dap);
+    viewports.add(ds);
+    alignPanels.add(dap);
+    /////////////////////////
+
 
     viewport.addPropertyChangeListener(new PropertyChangeListener()
     {
@@ -108,6 +124,7 @@ public class AlignFrame
    });
 
 
+	if(Desktop.desktop!=null)
     addServiceListeners();
   }
 
@@ -157,24 +174,28 @@ public class AlignFrame
     {
       BufferedReader in = new BufferedReader(new FileReader(file));
       SequenceI seq = null;
-      String line, text, token;
-      UserColourScheme ucs;
+      String line, type, desc, token;
+
       int index, start, end;
       StringTokenizer st;
-      SequenceGroup sg;
+      SequenceFeature sf;
+      FeatureRenderer fr = alignPanel.seqPanel.seqCanvas.getFeatureRenderer();
+      int lineNo = 0;
       while ( (line = in.readLine()) != null)
       {
+        lineNo++;
         st = new StringTokenizer(line, "\t");
-        if (st.countTokens() != 6)
+        if (st.countTokens() == 2)
         {
-          System.out.println("Groups file " + file +
-                             " is invalid. Read help file.");
-          System.exit(1);
+          type = st.nextToken();
+          UserColourScheme ucs = new UserColourScheme(st.nextToken());
+          fr.setColour(type, ucs.findColour("A"));
+          continue;
         }
 
         while (st.hasMoreElements())
         {
-          text = st.nextToken();
+          desc = st.nextToken();
           token = st.nextToken();
           if (!token.equals("ID_NOT_SPECIFIED"))
           {
@@ -189,19 +210,32 @@ public class AlignFrame
 
           start = Integer.parseInt(st.nextToken());
           end = Integer.parseInt(st.nextToken());
-          ucs = new UserColourScheme(st.nextToken());
 
           seq = viewport.alignment.getSequenceAt(index);
           start = seq.findIndex(start) - 1;
           end = seq.findIndex(end) - 1;
 
-          sg = new SequenceGroup(text, ucs, true, true, false, start, end);
-          sg.addSequence(seq, true);
+          type = st.nextToken();
+
+          sf = new SequenceFeature(type, desc, "", start, end);
+
+          seq.addSequenceFeature(sf);
+
+          System.out.println(sf.getType()+" "+sf.getBegin());
+
+         // sg = new SequenceGroup(text, ucs, true, true, false, start, end);
+         // sg.addSequence(seq, false);
+
+         // viewport.alignment.addGroup(sg);
 
-          viewport.alignment.addGroup(sg);
         }
       }
 
+      viewport.showSequenceFeatures = true;
+      ((Alignment)viewport.alignment).featuresAdded = true;
+
+      alignPanel.repaint();
+
     }
     catch (Exception ex)
     {
@@ -238,7 +272,18 @@ public class AlignFrame
 
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
-      currentFileFormat = chooser.getSelectedFormat();
+        currentFileFormat = chooser.getSelectedFormat();
+
+        if (currentFileFormat == null)
+        {
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                                "You must select a file format before saving!",
+                                                "File format not specified",
+                                                JOptionPane.WARNING_MESSAGE);
+          value = chooser.showSaveDialog(this);
+          return;
+        }
+
       jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT",
                                     currentFileFormat);
 
@@ -268,7 +313,7 @@ public class AlignFrame
     }
     else
     {
-      String output = FormatAdapter.formatSequences(format,
+      String output = new FormatAdapter().formatSequences(format,
           viewport.getAlignment().
           getSequences());
       if (output == null)
@@ -304,7 +349,7 @@ public class AlignFrame
     Desktop.addInternalFrame(cap,
                              "Alignment output - " + e.getActionCommand(), 600,
                              500);
-    cap.setText(FormatAdapter.formatSequences(e.getActionCommand(),
+    cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
                                               viewport.getAlignment().
                                               getSequences()));
   }
@@ -629,9 +674,7 @@ public class AlignFrame
                              endRes);
     }
 
-    System.out.println("BLOBL"+FastaFile.print(seqs));
-
-    c.setContents(new StringSelection(FastaFile.print(seqs)), null);
+    c.setContents(new StringSelection(new FastaFile().print(seqs)), null);
   }
 
   /**
@@ -674,14 +717,18 @@ public class AlignFrame
       }
 
       String str = (String) contents.getTransferData(DataFlavor.stringFlavor);
+      if(str.length()<1)
+        return;
 
       String format = IdentifyFile.Identify(str, "Paste");
-      SequenceI[] sequences = FormatAdapter.readFile(str, "Paste", format);
+      SequenceI[] sequences = new FormatAdapter().readFile(str, "Paste", format);
 
 
       if (newAlignment)
       {
-        AlignFrame af = new AlignFrame(new Alignment(sequences));
+        Alignment alignment = new Alignment(sequences);
+        alignment.setDataset( viewport.alignment.getDataset() );
+        AlignFrame af = new AlignFrame(alignment);
         String newtitle = new String("Copied sequences");
 
         if (title.startsWith("Copied sequences"))
@@ -1061,6 +1108,16 @@ public class AlignFrame
    if(alignPanel.overviewPanel!=null)
      alignPanel.overviewPanel.updateOverviewImage();
 
+  Provenance prov = viewport.alignment.getProvenance();
+  if(prov == null)
+   {
+     prov = new Provenance();
+     viewport.alignment.setProvenance(prov);
+   }
+
+   prov.addEntry("Me",
+       "Edited in Jalview", new java.util.Date(), "myID");
+
    alignPanel.repaint();
  }
 
@@ -1151,7 +1208,7 @@ public class AlignFrame
    */
   public void font_actionPerformed(ActionEvent e)
   {
-    FontChooser fc = new FontChooser(alignPanel);
+    new FontChooser(alignPanel);
   }
 
   /**
@@ -1271,12 +1328,13 @@ public class AlignFrame
     if (viewport.showSequenceFeatures &&
         ! ( (Alignment) viewport.alignment).featuresAdded)
     {
-      SequenceFeatureFetcher sft = new SequenceFeatureFetcher(viewport.
+      new SequenceFeatureFetcher(viewport.
           alignment,
           alignPanel);
-      ( (Alignment) viewport.alignment).featuresAdded = true;
     }
 
+    featureSettings.setEnabled(true);
+
     alignPanel.repaint();
   }
 
@@ -1287,14 +1345,6 @@ public class AlignFrame
    */
   public void annotationPanelMenuItem_actionPerformed(ActionEvent e)
   {
-    if (annotationPanelMenuItem.isSelected() &&
-        viewport.getWrapAlignment())
-    {
-      annotationPanelMenuItem.setSelected(false);
-
-      return;
-    }
-
     viewport.setShowAnnotation(annotationPanelMenuItem.isSelected());
     alignPanel.setAnnotationVisible(annotationPanelMenuItem.isSelected());
   }
@@ -1626,8 +1676,6 @@ public class AlignFrame
     conservationMenuItem.setSelected(false);
     viewport.setConservationSelected(false);
 
-    ColourSchemeI cs = viewport.getGlobalColourScheme();
-
     changeColour(viewport.getGlobalColourScheme());
 
     modifyPID_actionPerformed(null);
@@ -1838,11 +1886,7 @@ public class AlignFrame
       return;
     }
 
-      PCAPanel pcaPanel = new PCAPanel(viewport, null);
-      JInternalFrame frame = new JInternalFrame();
-      frame.setContentPane(pcaPanel);
-      Desktop.addInternalFrame(frame, "Principal component analysis",
-                               400, 400);
+     new PCAPanel(viewport);
   }
 
   /**
@@ -2245,11 +2289,11 @@ public class AlignFrame
    */
   public void BuildWebServiceMenu()
   {
-    if ( (Desktop.discoverer.services != null)
-        && (Desktop.discoverer.services.size() > 0))
+    if ( (Discoverer.services != null)
+        && (Discoverer.services.size() > 0))
     {
-      Vector msaws = (Vector) Desktop.discoverer.services.get("MsaWS");
-      Vector secstrpr = (Vector) Desktop.discoverer.services.get("SecStrPred");
+      Vector msaws = (Vector) Discoverer.services.get("MsaWS");
+      Vector secstrpr = (Vector) Discoverer.services.get("SecStrPred");
       Vector wsmenu = new Vector();
       if (msaws != null)
       {
@@ -2265,7 +2309,7 @@ public class AlignFrame
             public void actionPerformed(ActionEvent e)
             {
               SequenceI[] msa = gatherSequencesForAlignment();
-              MsaWSClient ct = new jalview.ws.MsaWSClient(sh, title, msa,
+              new jalview.ws.MsaWSClient(sh, title, msa,
                   false, true);
 
             }
@@ -2282,7 +2326,7 @@ public class AlignFrame
               public void actionPerformed(ActionEvent e)
               {
                 SequenceI[] msa = gatherSequencesForAlignment();
-                MsaWSClient ct = new jalview.ws.MsaWSClient(sh, title, msa,
+                new jalview.ws.MsaWSClient(sh, title, msa,
                     true, true);
 
               }
@@ -2311,8 +2355,7 @@ public class AlignFrame
               if (msa.length == 1)
               {
                 // Single Sequence prediction
-                jalview.ws.JPredClient ct = new jalview.ws.JPredClient(sh,
-                    title, msa[0]);
+                new jalview.ws.JPredClient(sh,title, msa[0]);
               }
               else
               {
@@ -2345,4 +2388,144 @@ public class AlignFrame
     // TODO: group services by location as well as function.
   }
 
+  public void vamsasStore_actionPerformed(ActionEvent e)
+  {
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+        getProperty("LAST_DIRECTORY"));
+
+    chooser.setFileView(new JalviewFileView());
+    chooser.setDialogTitle("Export to Vamsas file");
+    chooser.setToolTipText("Export");
+
+    int value = chooser.showSaveDialog(this);
+
+    if (value == JalviewFileChooser.APPROVE_OPTION)
+    {
+      jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
+      vs.store(chooser.getSelectedFile().getAbsolutePath()
+          );
+    }
+  }
+
+  public void featureSettings_actionPerformed(ActionEvent e)
+  {
+    new FeatureSettings(viewport, alignPanel);
+  }
+
+
+
+public void showTranslation_actionPerformed(ActionEvent e)
+{
+
+  if(!viewport.alignment.isNucleotide())
+    return;
+
+  viewport.showTranslation(showTranslation.isSelected());
+
+  if(!viewport.alignment.isNucleotide())
+    return;
+
+  int s, sSize = viewport.alignment.getHeight();
+  SequenceI [] newSeq = new SequenceI[sSize];
+
+  int res, resSize;
+  StringBuffer protein;
+  SequenceI seq;
+  for(s=0; s<sSize; s++)
+  {
+    protein = new StringBuffer();
+    seq = (SequenceI)viewport.alignment.getSequenceAt(s);
+    resSize = seq.getLength();
+    for(res = 0; res < resSize; res+=3)
+    {
+      String codon = seq.getSequence(res, res+3);
+      codon = codon.replace('U', 'T');
+      String aa = ResidueProperties.codonTranslate(codon);
+      if(aa==null)
+        protein.append(viewport.getGapCharacter());
+      else if(aa.equals("STOP"))
+        protein.append("X");
+      else
+        protein.append( aa );
+    }
+    newSeq[s] = new Sequence(seq.getName(), protein.toString());
+  }
+
+
+  AlignmentI al = new Alignment(newSeq);
+  al.setDataset(null);
+
+
+  ////////////////////////////////
+  // Copy annotations across
+  jalview.datamodel.AlignmentAnnotation[] annotations
+      = viewport.alignment.getAlignmentAnnotation();
+  int a, aSize;
+  for (int i = 0; i < annotations.length; i++)
+  {
+
+    if (annotations[i].label.equals("Quality") ||
+        annotations[i].label.equals("Conservation") ||
+        annotations[i].label.equals("Consensus"))
+    {
+      continue;
+    }
+
+
+    aSize = viewport.alignment.getWidth()/3;
+    jalview.datamodel.Annotation [] anots =
+        new jalview.datamodel.Annotation[aSize];
+
+    for(a=0; a<viewport.alignment.getWidth(); a++)
+    {
+     if( annotations[i].annotations[a]==null
+      || annotations[i].annotations[a]==null)
+       continue;
+
+      anots[a/3] = new Annotation(
+     annotations[i].annotations[a].displayCharacter,
+     annotations[i].annotations[a].description,
+     annotations[i].annotations[a].secondaryStructure,
+     annotations[i].annotations[a].value,
+     annotations[i].annotations[a].colour);
+    }
+
+    jalview.datamodel.AlignmentAnnotation aa
+          = new jalview.datamodel.AlignmentAnnotation(annotations[i].label,
+       annotations[i].description, anots );
+     al.addAnnotation(aa);
+  }
+
+
+   // Desktop.addInternalFrame(af, "Translation of "+this.getTitle(),
+    //                         NEW_WINDOW_WIDTH,
+     //                        NEW_WINDOW_HEIGHT);
+
+    AlignViewport newViewport = new AlignViewport(al);
+    AlignmentPanel ap = new AlignmentPanel(this, newViewport);
+    tabbedPane.add("Protein", ap);
+    viewports.add(newViewport);
+    alignPanels.add(ap);
+
+    ///Dataset tab
+  /////////////////////////
+
+    AlignViewport ds = new AlignViewport(al.getDataset());
+    ds.setDataset(true);
+    AlignmentPanel dap = new AlignmentPanel(this, ds);
+    tabbedPane.add("Dataset", dap);
+    viewports.add(ds);
+    alignPanels.add(dap);
+  /////////////////////////
+
+
+}
+
+public void tabSelected()
+{
+  int index = tabbedPane.getSelectedIndex();
+  viewport = (AlignViewport)viewports.elementAt(index);
+  alignPanel = (AlignmentPanel)alignPanels.elementAt(index);
+}
+
 }