X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=9ed81abb1cb5984c3603944798777a07342f4f66;hb=e9f4df7b610b6bbe64a1447641b8dffdfc3a78c6;hp=480b1959d49250a5db6c3130ba530e43a1fd7b64;hpb=c5aa740f1fff4c8caee4ccf0c0e0de517ca4dcb8;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 480b195..9ed81ab 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -21,11 +21,9 @@ package jalview.gui;
 import MCview.*;
 
 import jalview.analysis.*;
-
 import jalview.datamodel.*;
-
-
 import jalview.schemes.*;
+import jalview.commands.ChangeCaseCommand;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -33,6 +31,7 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import java.util.Vector;
+import jalview.io.FormatAdapter;
 
 
 /**
@@ -76,6 +75,14 @@ public class PopupMenu extends JPopupMenu
   JMenuItem upperCase = new JMenuItem();
   JMenuItem lowerCase = new JMenuItem();
   JMenuItem toggle = new JMenuItem();
+  JMenu pdbMenu = new JMenu();
+  JMenuItem pdbFromFile = new JMenuItem();
+  JMenuItem enterPDB = new JMenuItem();
+  JMenuItem discoverPDB = new JMenuItem();
+  JMenu outputMenu = new JMenu();
+  JMenuItem sequenceFeature = new JMenuItem();
+  JMenuItem textColour = new JMenuItem();
+  JMenu jMenu1 = new JMenu();
 
   /**
      * Creates a new PopupMenu object.
@@ -109,6 +116,22 @@ public class PopupMenu extends JPopupMenu
         colours.add(PIDColour);
         colours.add(BLOSUM62Colour);
 
+        for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
+        {
+          JMenuItem item = new JMenuItem( jalview.io.FormatAdapter.WRITEABLE_FORMATS[i] );
+
+          item.addActionListener(new java.awt.event.ActionListener()
+          {
+            public void actionPerformed(ActionEvent e)
+            {
+              outputText_actionPerformed(e);
+            }
+          });
+
+          outputMenu.add(item);
+        }
+
+
         try
         {
             jbInit();
@@ -121,11 +144,14 @@ public class PopupMenu extends JPopupMenu
 
         if (seq != null)
         {
+          sequenceMenu.setText(sequence.getName());
+
           JMenuItem menuItem;
           if( seq.getDatasetSequence().getPDBId() != null)
           {
             java.util.Enumeration e = seq.getDatasetSequence().getPDBId().
                 elements();
+
             while (e.hasMoreElements())
             {
               final PDBEntry pdb = (PDBEntry) e.nextElement();
@@ -143,7 +169,7 @@ public class PopupMenu extends JPopupMenu
             }
           }
 
-       /*   menuItem = new JMenuItem("Hide Sequences");
+          menuItem = new JMenuItem("Hide Sequences");
           menuItem.addActionListener(new java.awt.event.ActionListener()
               {
                 public void actionPerformed(ActionEvent e)
@@ -151,9 +177,10 @@ public class PopupMenu extends JPopupMenu
                   hideSequences(false);
                 }
               });
-          sequenceMenu.add(menuItem);
+          add(menuItem);
 
-          if(ap.av.getSelectionGroup() !=null && ap.av.getSelectionGroup().getSize()>1)
+          if(ap.av.getSelectionGroup() !=null
+             && ap.av.getSelectionGroup().getSize()>1)
           {
             menuItem = new JMenuItem("Represent Group with " + seq.getName());
             menuItem.addActionListener(new java.awt.event.ActionListener()
@@ -164,7 +191,41 @@ public class PopupMenu extends JPopupMenu
               }
             });
             sequenceMenu.add(menuItem);
-          }*/
+          }
+
+          if (ap.av.hasHiddenRows)
+          {
+            final int index = ap.av.alignment.findIndex(seq);
+
+            if (ap.av.adjustForHiddenSeqs(index) -
+                ap.av.adjustForHiddenSeqs(index - 1) > 1)
+            {
+              menuItem = new JMenuItem("Reveal Sequences");
+              menuItem.addActionListener(new ActionListener()
+              {
+                public void actionPerformed(ActionEvent e)
+                {
+                  ap.av.showSequence(index);
+                  if (ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
+                }
+              });
+              add(menuItem);
+            }
+
+            menuItem = new JMenuItem("Reveal All");
+            menuItem.addActionListener(new ActionListener()
+                {
+                  public void actionPerformed(ActionEvent e)
+                  {
+                    ap.av.showAllHiddenSeqs();
+                    if (ap.overviewPanel != null)
+                      ap.overviewPanel.updateOverviewImage();
+                    }
+                });
+
+            add(menuItem);
+          }
 
 
         }
@@ -245,14 +306,12 @@ public class PopupMenu extends JPopupMenu
         {
             unGroupMenuItem.setVisible(false);
         }
-        else
-        {
-            groupMenu.insertSeparator(3);
-        }
+
 
         if (seq == null)
         {
             sequenceMenu.setVisible(false);
+            pdbMenu.setVisible(false);
         }
 
         if(links != null && links.size()>0)
@@ -291,7 +350,10 @@ public class PopupMenu extends JPopupMenu
 
             linkMenu.add(item);
           }
-          add(linkMenu);
+          if(sequence!=null)
+            sequenceMenu.add(linkMenu);
+          else
+            add(linkMenu);
         }
     }
 
@@ -304,7 +366,7 @@ public class PopupMenu extends JPopupMenu
     private void jbInit() throws Exception
     {
         groupMenu.setText("Group");
-        groupMenu.setText("Group");
+        groupMenu.setText("Selection");
         groupName.setText("Name");
         groupName.addActionListener(new java.awt.event.ActionListener()
             {
@@ -389,7 +451,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        upperCase_actionPerformed(e);
+        changeCase(e);
       }
     });
     copy.setText("Copy");
@@ -405,7 +467,7 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        lowerCase_actionPerformed(e);
+        changeCase(e);
       }
     });
     toggle.setText("Toggle Case");
@@ -413,24 +475,63 @@ public class PopupMenu extends JPopupMenu
     {
       public void actionPerformed(ActionEvent e)
       {
-        toggle_actionPerformed(e);
+        changeCase(e);
+      }
+    });
+    pdbMenu.setText("Associate Structure with Sequence");
+    pdbFromFile.setText("From File");
+    pdbFromFile.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        pdbFromFile_actionPerformed(e);
       }
     });
+    enterPDB.setText("Enter PDB Id");
+    enterPDB.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        enterPDB_actionPerformed(e);
+      }
+    });
+    discoverPDB.setText("Discover PDB ids");
+    discoverPDB.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        discoverPDB_actionPerformed(e);
+      }
+    });
+    outputMenu.setText("Output to Textbox...");
+    sequenceFeature.setText("Create Sequence Feature");
+    sequenceFeature.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        sequenceFeature_actionPerformed(e);
+      }
+    });
+    textColour.setText("Text Colour");
+    textColour.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        textColour_actionPerformed(e);
+      }
+    });
+    jMenu1.setText("Group");
     add(groupMenu);
-        add(sequenceMenu);
-    this.add(editMenu);
-    groupMenu.add(groupName);
-        groupMenu.addSeparator();
-        groupMenu.add(unGroupMenuItem);
-        groupMenu.add(colourMenu);
-        groupMenu.addSeparator();
-        groupMenu.add(showBoxes);
-        groupMenu.add(showText);
-        groupMenu.add(showColourText);
-        groupMenu.addSeparator();
-        groupMenu.add(outline);
-        sequenceMenu.add(sequenceName);
-        colourMenu.add(noColourmenuItem);
+
+    add(sequenceMenu);
+    groupMenu.add(editMenu);
+    groupMenu.add(outputMenu);
+    groupMenu.add(sequenceFeature);
+    groupMenu.add(jMenu1);
+    sequenceMenu.add(sequenceName);
+    sequenceMenu.add(pdbMenu);
+    colourMenu.add(textColour);
+    colourMenu.add(noColourmenuItem);
         colourMenu.add(clustalColour);
         colourMenu.add(BLOSUM62Colour);
         colourMenu.add(PIDColour);
@@ -473,6 +574,16 @@ public class PopupMenu extends JPopupMenu
     editMenu.add(upperCase);
     editMenu.add(lowerCase);
     editMenu.add(toggle);
+    pdbMenu.add(pdbFromFile);
+    pdbMenu.add(enterPDB);
+    pdbMenu.add(discoverPDB);
+    jMenu1.add(groupName);
+    jMenu1.add(unGroupMenuItem);
+    jMenu1.add(colourMenu);
+    jMenu1.add(showBoxes);
+    jMenu1.add(showText);
+    jMenu1.add(showColourText);
+    jMenu1.add(outline);
     noColourmenuItem.setText("None");
         noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
             {
@@ -596,7 +707,7 @@ public class PopupMenu extends JPopupMenu
         if (ap.overviewPanel != null)
           ap.overviewPanel.updateOverviewImage();
 
-        ap.seqPanel.repaint();
+        PaintRefresher.Refresh(this, ap.av.getSequenceSetId());
     }
 
     /**
@@ -607,7 +718,7 @@ public class PopupMenu extends JPopupMenu
     protected void clustalColour_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
-        sg.cs = new ClustalxColourScheme(sg.sequences,
+        sg.cs = new ClustalxColourScheme(sg.getSequences(ap.av.hiddenRepSequences),
                 ap.av.alignment.getWidth());
         refresh();
     }
@@ -713,8 +824,9 @@ public class PopupMenu extends JPopupMenu
 
         if (abovePIDColour.isSelected())
         {
-            sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-                    ap.av.alignment.getWidth()));
+          sg.cs.setConsensus(AAFrequency.calculate(
+              sg.getSequences(ap.av.hiddenRepSequences), sg.getStartRes(),
+              sg.getEndRes() + 1));
 
             int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
                     getGroup().getName());
@@ -749,6 +861,7 @@ public class PopupMenu extends JPopupMenu
 
          sg.cs = udc;
        }
+       refresh();
      }
     /**
      * DOCUMENT ME!
@@ -759,8 +872,9 @@ public class PopupMenu extends JPopupMenu
     {
         SequenceGroup sg = getGroup();
         sg.cs = new PIDColourScheme();
-        sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-                ap.av.alignment.getWidth()));
+        sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av.hiddenRepSequences),
+                                                 sg.getStartRes(),
+                                                 sg.getEndRes() + 1));
         refresh();
     }
 
@@ -775,8 +889,9 @@ public class PopupMenu extends JPopupMenu
 
         sg.cs = new Blosum62ColourScheme();
 
-        sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-                ap.av.alignment.getWidth()));
+        sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av.hiddenRepSequences),
+                                                 sg.getStartRes(),
+                                                 sg.getEndRes() + 1));
 
         refresh();
     }
@@ -806,8 +921,10 @@ public class PopupMenu extends JPopupMenu
         if (conservationMenuItem.isSelected())
         {
             Conservation c = new Conservation("Group",
-                    ResidueProperties.propHash, 3, sg.sequences, 0,
-                    ap.av.alignment.getWidth());
+                    ResidueProperties.propHash, 3,
+                    sg.getSequences(ap.av.hiddenRepSequences),
+                    sg.getStartRes(),
+                    sg.getEndRes() + 1);
 
             c.calculate();
             c.verdict(false, ap.av.ConsPercGaps);
@@ -846,31 +963,6 @@ public class PopupMenu extends JPopupMenu
         groupName.setText(reply);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    protected void analyze_actionPerformed(ActionEvent e)
-    {
-        CutAndPasteTransfer cap = new CutAndPasteTransfer();
-        JInternalFrame frame = new JInternalFrame();
-        frame.setContentPane(cap);
-        Desktop.addInternalFrame(frame, "Analyze this - ", 400, 300);
-
-        SequenceGroup sg = getGroup();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < sg.sequences.size(); i++)
-        {
-            Sequence tmp = (Sequence) sg.sequences.get(i);
-            sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1));
-            sb.append("\n");
-        }
-
-        sb.append("Something amazing will happen soon");
-        cap.setText(sb.toString());
-    }
 
     /**
      * DOCUMENT ME!
@@ -934,13 +1026,15 @@ public class PopupMenu extends JPopupMenu
             }
 
             s = s.replace(' ', '_');
-            sequence.getDatasetSequence().setName(s);
             sequence.setName(s);
             ap.repaint();
         }
 
-        sequence.getDatasetSequence().setDescription(description.getText());
         sequence.setDescription(description.getText());
+
+        ap.av.firePropertyChange("alignment", null,
+                                  ap.av.getAlignment().getSequences());
+
     }
 
     /**
@@ -1032,27 +1126,31 @@ public class PopupMenu extends JPopupMenu
       SequenceGroup sg = ap.av.getSelectionGroup();
       if(sg==null || sg.getSize()<1)
       {
-        ap.av.hideSequence(sequence);
+        ap.av.hideSequence(new SequenceI[]{sequence});
         return;
       }
 
-        int index = 0;
-        while(index < sg.sequences.size())
-        {
-          if(representGroup && sg.getSequenceAt(index)!=sequence)
-          {
-            sequence.addHiddenSequence(sg.getSequenceAt(index));
-            ap.av.hideSequence(sg.getSequenceAt(index));
-          }
-          else if(!representGroup)
-          {
-            ap.av.hideSequence(sg.getSequenceAt(index));
-          }
-          index ++;
-        }
+      ap.av.setSelectionGroup(null);
 
-        ap.av.setSelectionGroup(null);
-        refresh();
+      if (representGroup)
+      {
+        ap.av.hideRepSequences(sequence, sg);
+
+        return;
+      }
+
+      int gsize = sg.getSize();
+      SequenceI[] hseqs;
+
+      hseqs = new SequenceI[gsize];
+
+      int index = 0;
+      for (int i = 0; i < gsize; i++)
+      {
+        hseqs[index++] = sg.getSequenceAt(i);
+      }
+
+      ap.av.hideSequence(hseqs);
     }
 
   public void copy_actionPerformed(ActionEvent e)
@@ -1065,44 +1163,203 @@ public class PopupMenu extends JPopupMenu
     ap.alignFrame.cut_actionPerformed(null);
   }
 
-  public void upperCase_actionPerformed(ActionEvent e)
+  void changeCase(ActionEvent e)
   {
+    Object source = e.getSource();
     SequenceGroup sg = ap.av.getSelectionGroup();
-    if(sg==null)
-      return;
+    Vector regions = new Vector();
+    if (sg != null)
+    {
+      int start = sg.getStartRes();
+      int end = sg.getEndRes() + 1;
+
+      do
+      {
+        if (ap.av.hasHiddenColumns)
+        {
+          if(start==0)
+            start = ap.av.colSel.adjustForHiddenColumns(start);
+
+          end = ap.av.colSel.getHiddenBoundaryRight(start);
+          if (start == end)
+            end = sg.getEndRes() + 1;
+          if (end > sg.getEndRes())
+            end = sg.getEndRes() + 1;
+        }
+
+        regions.addElement(new int[]
+                           {start, end});
+
+        if (ap.av.hasHiddenColumns)
+        {
+          start = ap.av.colSel.adjustForHiddenColumns(end);
+          start = ap.av.colSel.getHiddenBoundaryLeft(start) + 1;
+        }
+      }
+      while (end < sg.getEndRes());
 
-    for(int g=0; g<sg.getSize(); g++)
+      int[][] startEnd = new int[regions.size()][2];
+      for (int i = 0; i < regions.size(); i++)
+      {
+        startEnd[i] = (int[]) regions.elementAt(i);
+      }
+
+
+      String description;
+      int caseChange;
+
+      if(source==toggle)
+      {
+        description = "Toggle Case";
+        caseChange = ChangeCaseCommand.TOGGLE_CASE;
+      }
+      else if(source==upperCase)
+      {
+        description = "To Upper Case";
+        caseChange = ChangeCaseCommand.TO_UPPER;
+      }
+      else
+      {
+        description = "To Lower Case";
+        caseChange = ChangeCaseCommand.TO_LOWER;
+      }
+
+      ChangeCaseCommand caseCommand = new ChangeCaseCommand(
+          description, sg.getSequencesAsArray(ap.av.hiddenRepSequences),
+          startEnd, caseChange
+          );
+
+      ap.alignFrame.addHistoryItem(caseCommand);
+
+
+      ap.av.firePropertyChange("alignment", null,
+                                ap.av.getAlignment().getSequences());
+
+    }
+  }
+
+  public void outputText_actionPerformed(ActionEvent e)
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer();
+    cap.setForInput(null);
+    Desktop.addInternalFrame(cap,
+                             "Alignment output - " + e.getActionCommand(), 600,
+                             500);
+
+    String [] omitHidden = null;
+
+    if(ap.av.hasHiddenColumns)
     {
-      sg.getSequenceAt(g).changeCase(true, sg.getStartRes(), sg.getEndRes()+1);
+      System.out.println("PROMPT USER HERE");
+      omitHidden = ap.av.getViewAsString(true);
     }
-    ap.repaint();
+
+    cap.setText(new FormatAdapter().formatSequences(
+        e.getActionCommand(),
+        ap.av.getSelectionAsNewSequence(),
+        omitHidden));
   }
 
-  public void lowerCase_actionPerformed(ActionEvent e)
+
+  public void pdbFromFile_actionPerformed(ActionEvent e)
   {
-    SequenceGroup sg = ap.av.getSelectionGroup();
-    if(sg==null)
-      return;
+     jalview.io.JalviewFileChooser chooser
+         = new jalview.io.JalviewFileChooser(jalview.bin.Cache.
+         getProperty(
+             "LAST_DIRECTORY"));
+     chooser.setFileView(new jalview.io.JalviewFileView());
+     chooser.setDialogTitle("Select a PDB file");
+     chooser.setToolTipText("Load a PDB file");
+
+     int value = chooser.showOpenDialog(null);
+
+     if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
+     {
+       PDBEntry entry = new PDBEntry();
+       String choice = chooser.getSelectedFile().getPath();
+       jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
+       try
+       {
+         MCview.PDBfile pdbfile = new MCview.PDBfile(choice,
+                                       jalview.io.AppletFormatAdapter.FILE);
+
+         if (pdbfile.id == null)
+         {
+           String reply = JOptionPane.showInternalInputDialog(
+               Desktop.desktop,
+               "Couldn't find a PDB id in the file supplied."
+               + "Please enter an Id to identify this structure.",
+               "No PDB Id in File", JOptionPane.QUESTION_MESSAGE);
+           if (reply == null)
+             return;
+
+           entry.setId(reply);
+         }
+         else
+           entry.setId(pdbfile.id);
+       }
+       catch (java.io.IOException ex)
+       {
+         ex.printStackTrace();
+       }
+
+       entry.setFile(choice);
+       sequence.getDatasetSequence().addPDBId(entry);
+     }
+
+  }
+
+  public void enterPDB_actionPerformed(ActionEvent e)
+  {
+    String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
+        "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
 
-    for(int g=0; g<sg.getSize(); g++)
+    if (id != null && id.length() > 0)
     {
-      sg.getSequenceAt(g).changeCase(false, sg.getStartRes(), sg.getEndRes()+1);
+      PDBEntry entry = new PDBEntry();
+      entry.setId(id);
+      sequence.getDatasetSequence()
+          .addPDBId(entry);
     }
-    ap.repaint();
   }
 
-  public void toggle_actionPerformed(ActionEvent e)
+  public void discoverPDB_actionPerformed(ActionEvent e)
+  {
+    new jalview.io.DBRefFetcher(
+             ap.av.getAlignment(), ap.alignFrame).fetchDBRefs(false);
+  }
+
+  public void sequenceFeature_actionPerformed(ActionEvent e)
   {
     SequenceGroup sg = ap.av.getSelectionGroup();
-    if (sg == null)
+    if(sg==null)
       return;
 
-    for (int g = 0; g < sg.getSize(); g++)
+    int gSize= sg.getSize();
+    SequenceI [] seqs = new SequenceI[gSize];
+    SequenceFeature [] features = new SequenceFeature[gSize];
+
+    for (int i = 0; i < gSize; i++)
     {
-      sg.getSequenceAt(g).toggleCase(sg.getStartRes(), sg.getEndRes() + 1);
+      seqs[i] = sg.getSequenceAt(i).getDatasetSequence();
+      int start = sg.getSequenceAt(i).findPosition(sg.getStartRes());
+      int end = sg.findEndRes(sg.getSequenceAt(i));
+      features[i] = new SequenceFeature(null,null, null,start,end,"Jalview");
     }
 
-    ap.repaint();
+    if (ap.seqPanel.seqCanvas.getFeatureRenderer()
+        .createNewFeatures(seqs, features))
+    {
+      ap.alignFrame.showSeqFeatures.setSelected(true);
+      ap.av.setShowSequenceFeatures(true);
+      ap.highlightSearchResults(null);
+    }
   }
 
+  public void textColour_actionPerformed(ActionEvent e)
+  {
+    SequenceGroup sg = getGroup();
+    if (sg != null)
+      new TextColourChooser().chooseColour(ap, sg);
+  }
 }