X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=07b9fec2f8484681853c01e945cc82c8f5af0e18;hb=627834dc46a79d74dec14c3d7a64a529f2337f6f;hp=26fc93c4a22b1fc8a1daa7d445e84807d12ecf91;hpb=9fff97021c2c637e426f6971d54dcf3fd4191985;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 26fc93c..07b9fec 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -24,7 +24,6 @@ import jalview.analysis.*;
 
 import jalview.datamodel.*;
 
-import jalview.io.*;
 
 import jalview.schemes.*;
 
@@ -63,7 +62,6 @@ public class PopupMenu extends JPopupMenu
     JMenuItem sequenceName = new JMenuItem();
     Sequence sequence;
     JMenuItem unGroupMenuItem = new JMenuItem();
-    JMenuItem pdbMenuItem = new JMenuItem();
     JMenuItem outline = new JMenuItem();
     JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem();
     JMenu colourMenu = new JMenu();
@@ -77,7 +75,7 @@ public class PopupMenu extends JPopupMenu
      * @param ap DOCUMENT ME!
      * @param seq DOCUMENT ME!
      */
-    public PopupMenu(AlignmentPanel ap, Sequence seq)
+    public PopupMenu(final AlignmentPanel ap, Sequence seq)
     {
         ///////////////////////////////////////////////////////////
         // If this is activated from the sequence panel, the user may want to
@@ -112,9 +110,27 @@ public class PopupMenu extends JPopupMenu
             e.printStackTrace();
         }
 
-        if ((seq == null) || (seq.getPDBId() == null))
+
+        if ((seq != null)
+            && seq.getDatasetSequence().getPDBId() != null)
         {
-            pdbMenuItem.setVisible(false);
+          java.util.Enumeration e = seq.getDatasetSequence().getPDBId().elements();
+          while(e.hasMoreElements())
+          {
+            final PDBEntry pdb = (PDBEntry)e.nextElement();
+
+            JMenuItem pdbMenuItem = new JMenuItem();
+            pdbMenuItem.setText("View PDB entry: "+pdb.getId());
+            pdbMenuItem.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                  new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas);
+                }
+            });
+            sequenceMenu.add(pdbMenuItem);
+          }
+
         }
 
         SequenceGroup sg = ap.av.getSelectionGroup();
@@ -172,7 +188,7 @@ public class PopupMenu extends JPopupMenu
                 noColourmenuItem.setSelected(true);
             }
 
-            if (sg.cs instanceof ConservationColourScheme)
+            if (sg.cs!=null && sg.cs.conservationApplied())
             {
                 conservationMenuItem.setSelected(true);
             }
@@ -206,9 +222,12 @@ public class PopupMenu extends JPopupMenu
             String link = links.elementAt(i).toString();
 
             item = new JMenuItem(link.substring(0, link.indexOf("|")));
+            String id = sequence.getName();
+            if(id.indexOf("|")>-1)
+              id = id.substring(id.lastIndexOf("|")+1);
 
             final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))
-                + sequence.getName() +
+                + id +
                 link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
 
 
@@ -261,14 +280,7 @@ public class PopupMenu extends JPopupMenu
                     unGroupMenuItem_actionPerformed(e);
                 }
             });
-        pdbMenuItem.setText("View PDB structure");
-        pdbMenuItem.addActionListener(new java.awt.event.ActionListener()
-            {
-                public void actionPerformed(ActionEvent e)
-                {
-                    pdbMenuItem_actionPerformed(e);
-                }
-            });
+
         outline.setText("Border colour");
         outline.addActionListener(new java.awt.event.ActionListener()
             {
@@ -325,7 +337,6 @@ public class PopupMenu extends JPopupMenu
         groupMenu.addSeparator();
         groupMenu.add(outline);
         sequenceMenu.add(sequenceName);
-        sequenceMenu.add(pdbMenuItem);
         colourMenu.add(noColourmenuItem);
         colourMenu.add(clustalColour);
         colourMenu.add(BLOSUM62Colour);
@@ -339,6 +350,28 @@ public class PopupMenu extends JPopupMenu
         colourMenu.add(buriedColour);
         colourMenu.add(nucleotideMenuItem);
         colourMenu.add(userDefinedColour);
+
+        if(jalview.gui.UserDefinedColours.getUserColourSchemes()!=null)
+        {
+          java.util.Enumeration userColours = jalview.gui.UserDefinedColours.
+              getUserColourSchemes().keys();
+
+          while (userColours.hasMoreElements())
+          {
+            JMenuItem item = new JMenuItem(userColours.
+                nextElement().toString());
+            item.addActionListener(new ActionListener()
+            {
+              public void actionPerformed(ActionEvent evt)
+              {
+                userDefinedColour_actionPerformed(evt);
+              }
+            });
+            colourMenu.add(item);
+          }
+        }
+
+
         colourMenu.addSeparator();
         colourMenu.add(abovePIDColour);
         colourMenu.add(conservationMenuItem);
@@ -423,7 +456,7 @@ public class PopupMenu extends JPopupMenu
                     abovePIDColour_actionPerformed(e);
                 }
             });
-        userDefinedColour.setText("User Defined");
+        userDefinedColour.setText("User Defined...");
         userDefinedColour.addActionListener(new java.awt.event.ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -472,6 +505,9 @@ public class PopupMenu extends JPopupMenu
             superG.setSuperGroupProperties(sg);
           }
         }
+        if (ap.overviewPanel != null)
+          ap.overviewPanel.updateOverviewImage();
+
         ap.seqPanel.repaint();
     }
 
@@ -584,6 +620,8 @@ public class PopupMenu extends JPopupMenu
     protected void abovePIDColour_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (abovePIDColour.isSelected())
         {
@@ -593,22 +631,13 @@ public class PopupMenu extends JPopupMenu
             int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
                     getGroup().getName());
 
-            if (sg.cs instanceof ResidueColourScheme)
-            {
-                ((ResidueColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
-            }
-            else if (sg.cs instanceof ScoreColourScheme)
-            {
-                ((ScoreColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
-            }
+           sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
 
             SliderPanel.showPIDSlider();
         }
         else // remove PIDColouring
         {
-            ResidueColourScheme rcs = (ResidueColourScheme) sg.cs;
-            rcs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
-            sg.cs = rcs;
+            sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
         }
 
         refresh();
@@ -621,9 +650,18 @@ public class PopupMenu extends JPopupMenu
      */
     protected void userDefinedColour_actionPerformed(ActionEvent e)
     {
-        new UserDefinedColours(ap, getGroup());
-    }
-
+       SequenceGroup sg = getGroup();
+
+       if (e.getActionCommand().equals("User Defined..."))
+         new UserDefinedColours(ap, sg);
+       else
+       {
+         UserColourScheme udc = (UserColourScheme) UserDefinedColours.
+             getUserColourSchemes().get(e.getActionCommand());
+
+         sg.cs = udc;
+       }
+     }
     /**
      * DOCUMENT ME!
      *
@@ -674,6 +712,8 @@ public class PopupMenu extends JPopupMenu
     protected void conservationMenuItem_actionPerformed(ActionEvent e)
     {
         SequenceGroup sg = getGroup();
+        if(sg.cs==null)
+          return;
 
         if (conservationMenuItem.isSelected())
         {
@@ -684,17 +724,14 @@ public class PopupMenu extends JPopupMenu
             c.calculate();
             c.verdict(false, ap.av.ConsPercGaps);
 
-            ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);
-
-            sg.cs = ccs;
+            sg.cs.setConservation(c);
 
-            SliderPanel.setConservationSlider(ap, ccs, sg.getName());
+            SliderPanel.setConservationSlider(ap, sg.cs, sg.getName());
             SliderPanel.showConservationSlider();
         }
         else // remove ConservationColouring
         {
-            ConservationColourScheme ccs = (ConservationColourScheme) sg.cs;
-            sg.cs = ccs.cs;
+            sg.cs.setConservation(null);
         }
 
         refresh();
@@ -786,6 +823,7 @@ public class PopupMenu extends JPopupMenu
             }
 
             s = s.replace(' ', '_');
+            sequence.getDatasetSequence().setName(s);
             sequence.setName(s);
             ap.repaint();
         }
@@ -804,37 +842,6 @@ public class PopupMenu extends JPopupMenu
         refresh();
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    void pdbMenuItem_actionPerformed(ActionEvent e)
-    {
-        if (sequence.getPDBId() == null)
-        {
-            return;
-        }
-
-        try
-        {
-            EBIFetchClient ebi = new EBIFetchClient();
-            String[] result = ebi.fetchData("pdb:" + sequence.getPDBId(), null,
-                    null);
-
-            PDBfile pdb = new PDBfile(result);
-
-            rotCanvas rc = new rotCanvas(pdb, sequence, ap.av);
-            JInternalFrame frame = new JInternalFrame();
-            frame.setContentPane(rc);
-            Desktop.addInternalFrame(frame,
-                sequence.getName() + " " + sequence.getPDBId(), 400, 400);
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
 
     /**
      * DOCUMENT ME!