X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=0cfa537c0271e975b0936ea6a465a13295d2c1a0;hb=9fff97021c2c637e426f6971d54dcf3fd4191985;hp=83e4407fbca307d2581b415efbd3964633bf9d8b;hpb=f2cd37c3b51d78aa72b04a85e083d73e9365d9a0;p=jalview.git

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 83e4407..0cfa537 100755
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -1,12 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 package jalview.appletgui;
 
-import jalview.datamodel.*;
-import jalview.analysis.*;
-import jalview.schemes.*;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.Vector;
+
+import jalview.analysis.*;
+import jalview.datamodel.*;
+import jalview.schemes.*;
 
-public class APopupMenu extends java.awt.PopupMenu
+public class APopupMenu
+    extends java.awt.PopupMenu
 {
   Menu groupMenu = new Menu();
   protected MenuItem clustalColour = new MenuItem();
@@ -24,15 +46,15 @@ public class APopupMenu extends java.awt.PopupMenu
   MenuItem noColourmenuItem = new MenuItem();
   protected CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem();
 
-
   AlignmentPanel ap;
-  Menu sequenceMenu = new Menu();
-  MenuItem sequenceName = new MenuItem();
-  Sequence sequence;
   MenuItem unGroupMenuItem = new MenuItem();
   MenuItem nucleotideMenuItem = new MenuItem();
+  Menu colourMenu = new Menu();
+  CheckboxMenuItem showBoxes = new CheckboxMenuItem();
+  CheckboxMenuItem showText = new CheckboxMenuItem();
+  CheckboxMenuItem showColourText = new CheckboxMenuItem();
 
-  public APopupMenu(AlignmentPanel ap, Sequence seq)
+  public APopupMenu(AlignmentPanel ap, Sequence seq, Vector links)
   {
     ///////////////////////////////////////////////////////////
     // If this is activated from the sequence panel, the user may want to
@@ -42,31 +64,62 @@ public class APopupMenu extends java.awt.PopupMenu
     //////////////////////////////////////////////////////////
 
     this.ap = ap;
-    sequence = seq;
 
     try
-    {     jbInit();   }
-    catch(Exception e)
-    {    e.printStackTrace();    }
-
+    {
+      jbInit();
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
 
     SequenceGroup sg = ap.av.getSelectionGroup();
+    if (sg != null)
+    {
+      showText.setState(sg.getDisplayText());
+      showColourText.setState(sg.getColourText());
+      showBoxes.setState(sg.getDisplayBoxes());
+    }
 
-    if( !ap.av.alignment.getGroups().contains(sg))
-        groupMenu.remove(unGroupMenuItem);
-
-    if(seq==null)
-       remove(sequenceMenu);
-
+    if (!ap.av.alignment.getGroups().contains(sg))
+    {
+      groupMenu.remove(unGroupMenuItem);
+    }
 
+    if (seq != null && links!=null)
+    {
+      Menu linkMenu = new Menu("Link");
+      MenuItem item;
+      String link;
+      for(int i=0; i<links.size(); i++)
+      {
+        link = links.elementAt(i).toString();
+        final String target = link.substring(0, link.indexOf("|"));
+        item = new MenuItem(target);
+        final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))
+               + seq.getName() +
+               link.substring(link.indexOf("$SEQUENCE_ID$") + 13);
+
+           item.addActionListener(new java.awt.event.ActionListener()
+           {
+               public void actionPerformed(ActionEvent e)
+               {
+                  jalview.bin.JalviewLite.showURL(url, target);
+               }
+           });
+          linkMenu.add(item);
+      }
+      add(linkMenu);
+    }
   }
-  private void jbInit() throws Exception
+
+  private void jbInit()
+      throws Exception
   {
     groupMenu.setLabel("Group");
     groupMenu.setLabel("Define");
 
-    sequenceMenu.setLabel("Sequence");
-    sequenceName.setLabel("Edit name");
     unGroupMenuItem.setLabel("Remove Group");
     unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
@@ -76,7 +129,6 @@ public class APopupMenu extends java.awt.PopupMenu
       }
     });
 
-
     nucleotideMenuItem.setLabel("Nucleotide");
     nucleotideMenuItem.addActionListener(new ActionListener()
     {
@@ -85,31 +137,71 @@ public class APopupMenu extends java.awt.PopupMenu
         nucleotideMenuItem_actionPerformed(e);
       }
     });
+    conservationMenuItem.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        conservationMenuItem_itemStateChanged(itemEvent);
+      }
+    });
+    abovePIDColour.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        abovePIDColour_itemStateChanged(itemEvent);
+      }
+    });
+    colourMenu.setLabel("Group Colour");
+    showBoxes.setLabel("Boxes");
+    showBoxes.setState(true);
+    showBoxes.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        showBoxes_itemStateChanged(itemEvent);
+      }
+    });
+
+    showText.setLabel("Text");
+    showText.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        showText_itemStateChanged(itemEvent);
+      }
+    });
+    showColourText.setLabel("Colour Text");
+    showColourText.addItemListener(new ItemListener()
+    {
+      public void itemStateChanged(ItemEvent itemEvent)
+      {
+        showColourText_itemStateChanged(itemEvent);
+      }
+    });
 
     add(groupMenu);
-    this.add(sequenceMenu);
     groupMenu.add(unGroupMenuItem);
-    groupMenu.add(noColourmenuItem);
-    groupMenu.add(clustalColour);
-    groupMenu.add(BLOSUM62Colour);
-    groupMenu.add(PIDColour);
-
-    groupMenu.add(zappoColour);
-    groupMenu.add(taylorColour);
-    groupMenu.add(hydrophobicityColour);
-    groupMenu.add(helixColour);
-    groupMenu.add(strandColour);
-    groupMenu.add(turnColour);
-    groupMenu.add(buriedColour);
-    groupMenu.add(nucleotideMenuItem);
-
-    groupMenu.add(userDefinedColour);
-
+    groupMenu.add(colourMenu);
     groupMenu.addSeparator();
-    groupMenu.add(abovePIDColour);
-    groupMenu.add(conservationMenuItem);
-
-    sequenceMenu.add(sequenceName);
+    groupMenu.add(showBoxes);
+    groupMenu.add(showText);
+    groupMenu.add(showColourText);
+    colourMenu.add(noColourmenuItem);
+    colourMenu.add(clustalColour);
+    colourMenu.add(BLOSUM62Colour);
+    colourMenu.add(PIDColour);
+    colourMenu.add(zappoColour);
+    colourMenu.add(taylorColour);
+    colourMenu.add(hydrophobicityColour);
+    colourMenu.add(helixColour);
+    colourMenu.add(strandColour);
+    colourMenu.add(turnColour);
+    colourMenu.add(buriedColour);
+    colourMenu.add(nucleotideMenuItem);
+    colourMenu.add(userDefinedColour);
+    colourMenu.addSeparator();
+    colourMenu.add(abovePIDColour);
+    colourMenu.add(conservationMenuItem);
 
     noColourmenuItem.setLabel("None");
     noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
@@ -185,13 +277,7 @@ public class APopupMenu extends java.awt.PopupMenu
       }
     });
     abovePIDColour.setLabel("Above % Identity");
-    abovePIDColour.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        abovePIDColour_actionPerformed(e);
-      }
-    });
+
     userDefinedColour.setLabel("User Defined");
     userDefinedColour.addActionListener(new java.awt.event.ActionListener()
     {
@@ -217,25 +303,21 @@ public class APopupMenu extends java.awt.PopupMenu
       }
     });
     conservationMenuItem.setLabel("Conservation");
-   conservationMenuItem.addActionListener(new java.awt.event.ActionListener()
-   {
-     public void actionPerformed(ActionEvent e)
-     {
-       conservationMenuItem_actionPerformed(e);
-     }
-   });
-
-
 
   }
 
   void refresh()
   {
     SequenceGroup sg = getGroup();
-    SuperGroup superG = ap.av.alignment.getSuperGroup( sg );
-    if( superG !=null)
-      superG.setSuperGroupProperties( sg );
+    if(sg!=null)
+    {
+      SuperGroup superG = ap.av.alignment.getSuperGroup(sg);
 
+      if (superG != null)
+      {
+        superG.setSuperGroupProperties(sg);
+      }
+        }
     ap.seqPanel.seqCanvas.repaint();
   }
 
@@ -258,7 +340,6 @@ public class APopupMenu extends java.awt.PopupMenu
     refresh();
   }
 
-
   protected void hydrophobicityColour_actionPerformed(ActionEvent e)
   {
     getGroup().cs = new HydrophobicColourScheme();
@@ -295,29 +376,31 @@ public class APopupMenu extends java.awt.PopupMenu
     refresh();
   }
 
-
-
-  protected void abovePIDColour_actionPerformed(ActionEvent e)
+  protected void abovePIDColour_itemStateChanged(ItemEvent ie)
   {
     SequenceGroup sg = getGroup();
     if (abovePIDColour.getState())
     {
       sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
                                                ap.av.alignment.getWidth()));
-      int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup().getName());
+      int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,
+          getGroup().getName());
       if (sg.cs instanceof ResidueColourScheme)
-        ( (ResidueColourScheme)sg. cs).setThreshold(threshold);
+      {
+        ( (ResidueColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
+      }
       else if (sg.cs instanceof ScoreColourScheme)
-        ( (ScoreColourScheme) sg.cs).setThreshold(threshold);
+      {
+        ( (ScoreColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());
+      }
 
       SliderPanel.showPIDSlider();
 
-
     }
     else // remove PIDColouring
     {
       ResidueColourScheme rcs = (ResidueColourScheme) sg.cs;
-      rcs.setThreshold(0);
+      rcs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
       sg.cs = rcs;
     }
 
@@ -325,15 +408,18 @@ public class APopupMenu extends java.awt.PopupMenu
 
   }
 
-
   protected void userDefinedColour_actionPerformed(ActionEvent e)
   {
-    UserDefinedColours chooser = new UserDefinedColours( ap, getGroup());
+    new UserDefinedColours(ap, getGroup());
   }
 
   protected void PIDColour_actionPerformed(ActionEvent e)
   {
-
+    SequenceGroup sg = getGroup();
+    sg.cs = new PIDColourScheme();
+    sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
+                                             ap.av.alignment.getWidth()));
+    refresh();
   }
 
   protected void BLOSUM62Colour_actionPerformed(ActionEvent e)
@@ -343,34 +429,32 @@ public class APopupMenu extends java.awt.PopupMenu
     sg.cs = new Blosum62ColourScheme();
 
     sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-                                               ap.av.alignment.getWidth()));
+                                             ap.av.alignment.getWidth()));
 
     refresh();
   }
 
-
   protected void noColourmenuItem_actionPerformed(ActionEvent e)
   {
     getGroup().cs = null;
     refresh();
   }
 
-  protected  void conservationMenuItem_actionPerformed(ActionEvent e)
+  protected void conservationMenuItem_itemStateChanged(ItemEvent ie)
   {
     SequenceGroup sg = getGroup();
 
-    if(conservationMenuItem.getState())
+    if (conservationMenuItem.getState())
     {
 
-        Conservation c = new Conservation("Group",
-                                          ResidueProperties.propHash, 3,
-                                          sg.sequences, 0,
-                                          ap.av.alignment.getWidth());
-
-        c.calculate();
-        c.verdict(false, ap.av.ConsPercGaps);
-        ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);
+      Conservation c = new Conservation("Group",
+                                        ResidueProperties.propHash, 3,
+                                        sg.sequences, 0,
+                                        ap.av.alignment.getWidth());
 
+      c.calculate();
+      c.verdict(false, ap.av.ConsPercGaps);
+      ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);
 
       sg.cs = ccs;
 
@@ -379,32 +463,31 @@ public class APopupMenu extends java.awt.PopupMenu
     }
     else // remove ConservationColouring
     {
-        ConservationColourScheme ccs = (ConservationColourScheme)sg.cs;
-        sg.cs = ccs.cs;
+      ConservationColourScheme ccs = (ConservationColourScheme) sg.cs;
+      sg.cs = ccs.cs;
     }
 
-     refresh();
+    refresh();
   }
 
-
   protected void analyze_actionPerformed(ActionEvent e)
   {
-     CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
-     Frame frame = new Frame();
-     frame.add(cap);
-     jalview.bin.JalviewLite.addFrame(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.elementAt(i);
-       sb.append(  tmp.getSequence(sg.getStartRes(), sg.getEndRes()+1));
-       sb.append("\n");
-     }
-
-     sb.append("Something amazing will happen soon");
-     cap.setText( sb.toString() );
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
+    Frame frame = new Frame();
+    frame.add(cap);
+    jalview.bin.JalviewLite.addFrame(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.elementAt(i);
+      sb.append(tmp.getSequence(sg.getStartRes(), sg.getEndRes() + 1));
+      sb.append("\n");
+    }
+
+    sb.append("Something amazing will happen soon");
+    cap.setText(sb.toString());
 
   }
 
@@ -413,18 +496,36 @@ public class APopupMenu extends java.awt.PopupMenu
     SequenceGroup sg = ap.av.getSelectionGroup();
 
     // this method won't add a new group if it already exists
-    ap.av.alignment.addGroup(sg);
+    if(sg!=null)
+      ap.av.alignment.addGroup(sg);
 
     return sg;
   }
 
   void unGroupMenuItem_actionPerformed(ActionEvent e)
   {
-     SequenceGroup sg = ap.av.getSelectionGroup();
-     ap.av.alignment.deleteGroup(sg);
-     ap.av.setSelectionGroup(null);
-     ap.repaint();
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    ap.av.alignment.deleteGroup(sg);
+    ap.av.setSelectionGroup(null);
+    ap.repaint();
   }
 
+  public void showColourText_itemStateChanged(ItemEvent itemEvent)
+  {
+    getGroup().setColourText(showColourText.getState());
+    refresh();
+  }
+
+  public void showText_itemStateChanged(ItemEvent itemEvent)
+  {
+    getGroup().setDisplayText(showText.getState());
+    refresh();
+  }
+
+  public void showBoxes_itemStateChanged(ItemEvent itemEvent)
+  {
+    getGroup().setDisplayBoxes(showBoxes.getState());
+    refresh();
+  }
 
 }