setgraphics black
[jalview.git] / src / jalview / gui / PopupMenu.java
index 62d69d0..8294469 100755 (executable)
@@ -3,20 +3,16 @@ package jalview.gui;
 import jalview.datamodel.*;\r
 import jalview.analysis.*;\r
 import jalview.schemes.*;\r
+import java.awt.*;\r
 import javax.swing.*;\r
 import java.awt.event.*;\r
-\r
+import jalview.io.*;\r
+import MCview.*;\r
 \r
 public class PopupMenu extends JPopupMenu\r
 {\r
   JMenu groupMenu = new JMenu();\r
-  JMenuItem copyGroup = new JMenuItem();\r
-  JMenuItem moveGroup = new JMenuItem();\r
-  JMenuItem deleteSequences = new JMenuItem();\r
-  JMenuItem analyze = new JMenuItem();\r
-  JMenu defineMenu = new JMenu();\r
   JMenuItem groupName = new JMenuItem();\r
-  JMenuItem groupAnnotation = new JMenuItem();\r
   protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem();\r
@@ -25,7 +21,7 @@ public class PopupMenu extends JPopupMenu
   protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem();\r
-  protected JRadioButtonMenuItem abovePIDColour = new JRadioButtonMenuItem();\r
+  protected JCheckBoxMenuItem abovePIDColour = new JCheckBoxMenuItem();\r
   protected JRadioButtonMenuItem userDefinedColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem();\r
   protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();\r
@@ -36,12 +32,17 @@ public class PopupMenu extends JPopupMenu
   AlignmentPanel ap;\r
   JMenu sequenceMenu = new JMenu();\r
   JMenuItem sequenceName = new JMenuItem();\r
-  JMenu residueMenu = new JMenu();\r
-  JMenuItem annotateResidue = new JMenuItem();\r
-\r
-  SequenceI sequence;\r
-\r
-  public PopupMenu(AlignmentPanel ap, SequenceI seq)\r
+  Sequence sequence;\r
+  JMenuItem unGroupMenuItem = new JMenuItem();\r
+  JMenuItem pdbMenuItem = new JMenuItem();\r
+  JMenuItem outline = new JMenuItem();\r
+  JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem();\r
+  JMenu colourMenu = new JMenu();\r
+  JCheckBoxMenuItem showBoxes = new JCheckBoxMenuItem();\r
+  JCheckBoxMenuItem showText = new JCheckBoxMenuItem();\r
+  JCheckBoxMenuItem showColourText = new JCheckBoxMenuItem();\r
+\r
+  public PopupMenu(AlignmentPanel ap, Sequence seq)\r
   {\r
     ///////////////////////////////////////////////////////////\r
     // If this is activated from the sequence panel, the user may want to\r
@@ -73,117 +74,164 @@ public class PopupMenu extends JPopupMenu
     catch(Exception e)\r
     {    e.printStackTrace();    }\r
 \r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
+    SequenceGroup sg = ap.av.getSelectionGroup();\r
     if(sg!=null)\r
-      groupName.setText( sg.getName() );\r
-\r
-    if(seq!=null)\r
     {\r
-      residueMenu.setVisible(false);\r
-      sequenceName.setText( sequence.getName() );\r
+      groupName.setText(sg.getName());\r
+      if(sg.cs instanceof ZappoColourScheme)\r
+        zappoColour.setSelected(true);\r
+      else if(sg.cs instanceof TaylorColourScheme)\r
+        taylorColour.setSelected(true);\r
+      else if (sg.cs instanceof PIDColourScheme)\r
+        PIDColour.setSelected(true);\r
+      else if (sg.cs instanceof Blosum62ColourScheme)\r
+        BLOSUM62Colour.setSelected(true);\r
+      else if (sg.cs instanceof UserColourScheme)\r
+        userDefinedColour.setSelected(true);\r
+      else if (sg.cs instanceof HydrophobicColourScheme)\r
+        hydrophobicityColour.setSelected(true);\r
+      else if (sg.cs instanceof HelixColourScheme)\r
+        helixColour.setSelected(true);\r
+      else if (sg.cs instanceof StrandColourScheme)\r
+        strandColour.setSelected(true);\r
+      else if (sg.cs instanceof TurnColourScheme)\r
+        turnColour.setSelected(true);\r
+      else if (sg.cs instanceof BuriedColourScheme)\r
+        buriedColour.setSelected(true);\r
+      else if (sg.cs instanceof ClustalxColourScheme)\r
+        clustalColour.setSelected(true);\r
+      else\r
+        noColourmenuItem.setSelected(true);\r
+\r
+      if (sg.cs instanceof ConservationColourScheme)\r
+        conservationMenuItem.setSelected(true);\r
+\r
+      showText.setSelected(sg.getDisplayText());\r
+      showColourText.setSelected(sg.getColourText());\r
+      showBoxes.setSelected(sg.getDisplayBoxes());\r
     }\r
+\r
+    if( !ap.av.alignment.getGroups().contains(sg))\r
+      unGroupMenuItem.setVisible(false);\r
     else\r
-      sequenceMenu.setVisible(false);\r
+      groupMenu.insertSeparator(3);\r
+\r
+    if(seq==null)\r
+       sequenceMenu.setVisible(false);\r
 \r
   }\r
   private void jbInit() throws Exception\r
   {\r
     groupMenu.setText("Group");\r
-    copyGroup.setText("Copy region to new Alignment");\r
-    copyGroup.addActionListener(new java.awt.event.ActionListener()\r
+    groupMenu.setText("Define");\r
+    groupName.setText("Name");\r
+    groupName.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        copyGroup_actionPerformed(e);\r
+        groupName_actionPerformed(e);\r
       }\r
     });\r
-    moveGroup.setText("Move sequences to new Alignment");\r
-    moveGroup.addActionListener(new java.awt.event.ActionListener()\r
+    sequenceMenu.setText("Sequence");\r
+    sequenceName.setText("Edit name");\r
+    sequenceName.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        moveGroup_actionPerformed(e);\r
+        sequenceName_actionPerformed(e);\r
       }\r
     });\r
-    deleteSequences.setText("Delete sequences");\r
-    deleteSequences.addActionListener(new java.awt.event.ActionListener()\r
+    PIDColour.setFocusPainted(false);\r
+    unGroupMenuItem.setText("Remove Group");\r
+    unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        deleteSequences_actionPerformed(e);\r
+        unGroupMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    analyze.setText("Analyze");\r
-    analyze.addActionListener(new java.awt.event.ActionListener()\r
+    pdbMenuItem.setText("View PDB structure");\r
+    pdbMenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        analyze_actionPerformed(e);\r
+        pdbMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    defineMenu.setText("Define");\r
-    groupName.setText("Name");\r
-    groupName.addActionListener(new java.awt.event.ActionListener()\r
+    outline.setText("Border colour");\r
+    outline.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        groupName_actionPerformed(e);\r
+        outline_actionPerformed(e);\r
       }\r
     });\r
-    groupAnnotation.setText("Annotation");\r
-    groupAnnotation.addActionListener(new java.awt.event.ActionListener()\r
+    nucleotideMenuItem.setText("Nucleotide");\r
+    nucleotideMenuItem.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        groupAnnotation_actionPerformed(e);\r
+        nucleotideMenuItem_actionPerformed(e);\r
       }\r
     });\r
-    sequenceMenu.setText("Sequence");\r
-    sequenceName.setText("sequenceName");\r
-    sequenceName.addActionListener(new java.awt.event.ActionListener()\r
+    colourMenu.setText("Group Colour");\r
+    showBoxes.setText("Boxes");\r
+    showBoxes.setState(true);\r
+    showBoxes.addActionListener(new ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
       {\r
-        sequenceName_actionPerformed(e);\r
+        showBoxes_actionPerformed(e);\r
+      }\r
+    });\r
+    showText.setText("Text");\r
+    showText.setState(true);\r
+    showText.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        showText_actionPerformed(e);\r
+      }\r
+    });\r
+    showColourText.setText("Colour Text");\r
+    showColourText.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        showColourText_actionPerformed(e);\r
       }\r
     });\r
-    residueMenu.setText("Residue");\r
-    annotateResidue.setText("annotate residue???");\r
-    PIDColour.setFocusPainted(false);\r
     add(groupMenu);\r
-    this.add(sequenceMenu);\r
-    this.add(residueMenu);\r
-    groupMenu.add(defineMenu);\r
+    add(sequenceMenu);\r
+    groupMenu.add(groupName);\r
     groupMenu.addSeparator();\r
-    groupMenu.add(copyGroup);\r
-    groupMenu.add(moveGroup);\r
-    groupMenu.add(deleteSequences);\r
+    groupMenu.add(unGroupMenuItem);\r
+    groupMenu.add(colourMenu);\r
     groupMenu.addSeparator();\r
-    groupMenu.add(analyze);\r
-    defineMenu.add(groupName);\r
-    defineMenu.add(groupAnnotation);\r
-    defineMenu.addSeparator();\r
-    defineMenu.add(noColourmenuItem);\r
-    defineMenu.add(clustalColour);\r
-    defineMenu.add(zappoColour);\r
-    defineMenu.add(taylorColour);\r
-    defineMenu.add(hydrophobicityColour);\r
-    defineMenu.add(helixColour);\r
-    defineMenu.add(strandColour);\r
-    defineMenu.add(turnColour);\r
-    defineMenu.add(buriedColour);\r
-    defineMenu.add(userDefinedColour);\r
-    defineMenu.add(PIDColour);\r
-    defineMenu.add(BLOSUM62Colour);\r
-    defineMenu.addSeparator();\r
-    defineMenu.add(abovePIDColour);\r
-    defineMenu.add(conservationMenuItem);\r
-\r
+    groupMenu.add(showBoxes);\r
+    groupMenu.add(showText);\r
+    groupMenu.add(showColourText);\r
+    groupMenu.addSeparator();\r
+    groupMenu.add(outline);\r
     sequenceMenu.add(sequenceName);\r
-    residueMenu.add(annotateResidue);\r
-\r
+    sequenceMenu.add(pdbMenuItem);\r
+    colourMenu.add(noColourmenuItem);\r
+    colourMenu.add(clustalColour);\r
+    colourMenu.add(BLOSUM62Colour);\r
+    colourMenu.add(PIDColour);\r
+    colourMenu.add(zappoColour);\r
+    colourMenu.add(taylorColour);\r
+    colourMenu.add(hydrophobicityColour);\r
+    colourMenu.add(helixColour);\r
+    colourMenu.add(strandColour);\r
+    colourMenu.add(turnColour);\r
+    colourMenu.add(buriedColour);\r
+    colourMenu.add(nucleotideMenuItem);\r
+    colourMenu.add(userDefinedColour);\r
+    colourMenu.addSeparator();\r
+    colourMenu.add(abovePIDColour);\r
+    colourMenu.add(conservationMenuItem);\r
     noColourmenuItem.setText("None");\r
-    noColourmenuItem.setSelected(true);\r
     noColourmenuItem.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -192,7 +240,6 @@ public class PopupMenu extends JPopupMenu
       }\r
     });\r
 \r
-    clustalColour.setSelected(false);\r
     clustalColour.setText("Clustalx colours");\r
     clustalColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
@@ -201,7 +248,7 @@ public class PopupMenu extends JPopupMenu
         clustalColour_actionPerformed(e);\r
       }\r
     });\r
-    zappoColour.setText("Zappo colour scheme");\r
+    zappoColour.setText("Zappo");\r
     zappoColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -209,7 +256,7 @@ public class PopupMenu extends JPopupMenu
         zappoColour_actionPerformed(e);\r
       }\r
     });\r
-    taylorColour.setText("Taylor colour scheme");\r
+    taylorColour.setText("Taylor");\r
     taylorColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -217,7 +264,7 @@ public class PopupMenu extends JPopupMenu
         taylorColour_actionPerformed(e);\r
       }\r
     });\r
-    hydrophobicityColour.setText("By hydrophobicity");\r
+    hydrophobicityColour.setText("Hydrophobicity");\r
     hydrophobicityColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -249,7 +296,7 @@ public class PopupMenu extends JPopupMenu
         turnColour_actionPerformed(e);\r
       }\r
     });\r
-    buriedColour.setText("Buried index");\r
+    buriedColour.setText("Buried Index");\r
     buriedColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -257,7 +304,7 @@ public class PopupMenu extends JPopupMenu
         buriedColour_actionPerformed(e);\r
       }\r
     });\r
-    abovePIDColour.setText("Above PID threshold only");\r
+    abovePIDColour.setText("Above % Identity");\r
     abovePIDColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -265,7 +312,7 @@ public class PopupMenu extends JPopupMenu
         abovePIDColour_actionPerformed(e);\r
       }\r
     });\r
-    userDefinedColour.setText("User defined colours");\r
+    userDefinedColour.setText("User Defined");\r
     userDefinedColour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -281,7 +328,7 @@ public class PopupMenu extends JPopupMenu
         PIDColour_actionPerformed(e);\r
       }\r
     });\r
-    BLOSUM62Colour.setText("BLOSUM62 score");\r
+    BLOSUM62Colour.setText("BLOSUM62");\r
     BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()\r
     {\r
       public void actionPerformed(ActionEvent e)\r
@@ -289,7 +336,7 @@ public class PopupMenu extends JPopupMenu
         BLOSUM62Colour_actionPerformed(e);\r
       }\r
     });\r
-    conservationMenuItem.setText("By conservation");\r
+    conservationMenuItem.setText("Conservation");\r
    conservationMenuItem.addActionListener(new java.awt.event.ActionListener()\r
    {\r
      public void actionPerformed(ActionEvent e)\r
@@ -304,13 +351,18 @@ public class PopupMenu extends JPopupMenu
 \r
   void refresh()\r
   {\r
-    ap.seqPanel.seqCanvas.paintFlag=true;\r
+    SequenceGroup sg = getGroup();\r
+    SuperGroup superG = ap.av.alignment.getSuperGroup( sg );\r
+    if( superG !=null)\r
+      superG.setSuperGroupProperties( sg );\r
+\r
     ap.seqPanel.repaint();\r
   }\r
 \r
   protected void clustalColour_actionPerformed(ActionEvent e)\r
   {\r
-    getGroup().cs = new ClustalxColourScheme();\r
+    SequenceGroup sg = getGroup();\r
+    sg.cs = new ClustalxColourScheme(sg.sequences, ap.av.alignment.getWidth());\r
     refresh();\r
   }\r
 \r
@@ -357,50 +409,66 @@ public class PopupMenu extends JPopupMenu
     refresh();\r
   }\r
 \r
+  public void nucleotideMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+    getGroup().cs = new NucleotideColourScheme();\r
+    refresh();\r
+  }\r
 \r
-/*\r
-public void conservationColourIncMenuItem_actionPerformed(ActionEvent e)\r
-{\r
-ConservationIncrementPanel cip = new ConservationIncrementPanel(viewport, alignPanel);\r
-JInternalFrame frame = new JInternalFrame();\r
-frame.setContentPane(cip);\r
-Desktop.addInternalFrame(frame, "Conservation Colour Increment", 400,90);\r
-frame.setMaximizable(false);\r
-\r
- }*/\r
 \r
 \r
   protected void abovePIDColour_actionPerformed(ActionEvent e)\r
   {\r
-    SliderPanel sp = new SliderPanel(ap, 70, false, getGroup().cs );\r
-    JInternalFrame frame = new JInternalFrame();\r
-    frame.setContentPane(sp);\r
-    Desktop.addInternalFrame(frame, "Percentage Identity Threshold", 400,90);\r
-    frame.setMaximizable(false);\r
+    SequenceGroup sg = getGroup();\r
+    if (abovePIDColour.isSelected())\r
+    {\r
+      sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,\r
+                                               ap.av.alignment.getWidth()));\r
+      int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup().getName());\r
+      if (sg.cs instanceof ResidueColourScheme)\r
+        ( (ResidueColourScheme)sg. cs).setThreshold(threshold);\r
+      else if (sg.cs instanceof ScoreColourScheme)\r
+        ( (ScoreColourScheme) sg.cs).setThreshold(threshold);\r
+\r
+      SliderPanel.showPIDSlider();\r
+\r
+\r
+    }\r
+    else // remove PIDColouring\r
+    {\r
+      ResidueColourScheme rcs = (ResidueColourScheme) sg.cs;\r
+      rcs.setThreshold(0);\r
+      sg.cs = rcs;\r
+    }\r
+\r
+    refresh();\r
 \r
   }\r
 \r
 \r
   protected void userDefinedColour_actionPerformed(ActionEvent e)\r
   {\r
-    JInternalFrame frame = new JInternalFrame();\r
-    UserDefinedColours chooser = new UserDefinedColours( frame, ap, getGroup());\r
-    frame.setContentPane(chooser);\r
-    Desktop.addInternalFrame(frame,"User defined colours", 450,540 );\r
-    frame.setResizable(false);\r
-    frame.setIconifiable(false);\r
-    frame.setMaximizable(false);\r
-\r
+    new UserDefinedColours( ap, getGroup());\r
   }\r
 \r
   protected void PIDColour_actionPerformed(ActionEvent e)\r
   {\r
-\r
+    SequenceGroup sg = getGroup();\r
+    sg.cs = new PIDColourScheme();\r
+    sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,\r
+                                               ap.av.alignment.getWidth()));\r
+    refresh();\r
   }\r
 \r
   protected void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
   {\r
-    getGroup().cs = new Blosum62ColourScheme(ap.av);\r
+    SequenceGroup sg = getGroup();\r
+\r
+    sg.cs = new Blosum62ColourScheme();\r
+\r
+    sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,\r
+                                               ap.av.alignment.getWidth()));\r
+\r
     refresh();\r
   }\r
 \r
@@ -415,24 +483,34 @@ frame.setMaximizable(false);
   {\r
     SequenceGroup sg = getGroup();\r
 \r
-    Conservation c = new Conservation("Group",\r
-                          ResidueProperties.propHash, 3, sg.sequences, sg.getStartRes(),\r
-                          sg.getEndRes() );\r
+    if(conservationMenuItem.isSelected())\r
+    {\r
 \r
-     c.calculate();\r
-     c.verdict(false, 100);\r
-     ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);\r
+        Conservation c = new Conservation("Group",\r
+                                          ResidueProperties.propHash, 3,\r
+                                          sg.sequences, 0,\r
+                                          ap.av.alignment.getWidth());\r
 \r
-     sg.cs = ccs;\r
+        c.calculate();\r
+        c.verdict(false, ap.av.ConsPercGaps);\r
+        ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);\r
 \r
-     refresh();\r
-  }\r
 \r
-  protected void groupAnnotation_actionPerformed(ActionEvent e)\r
-  {\r
+      sg.cs = ccs;\r
+\r
+      SliderPanel.setConservationSlider(ap, ccs, sg.getName());\r
+      SliderPanel.showConservationSlider();\r
+    }\r
+    else // remove ConservationColouring\r
+    {\r
+        ConservationColourScheme ccs = (ConservationColourScheme)sg.cs;\r
+        sg.cs = ccs.cs;\r
+    }\r
 \r
+     refresh();\r
   }\r
 \r
+\r
   protected void groupName_actionPerformed(ActionEvent e)\r
   {\r
     SequenceGroup sg = getGroup();\r
@@ -444,60 +522,6 @@ frame.setMaximizable(false);
     groupName.setText(reply);\r
   }\r
 \r
-  protected void copyGroup_actionPerformed(ActionEvent e)\r
-  {\r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
-\r
-    SequenceI[] s = new Sequence[sg.sequences.size()];\r
-     for (int i=0; i < sg.sequences.size(); i++)\r
-     {\r
-       s[i] = new Sequence( sg.getSequenceAt(i));\r
-       s[i].setSequence( s[i].getSequence(sg.getStartRes(), sg.getEndRes()+1) );\r
-     }\r
-     AlignFrame af = new AlignFrame(new Alignment(s));\r
-     int newHeight = s.length * af.viewport.getCharHeight() + 200;\r
-     if (newHeight > 500)\r
-       newHeight = 500;\r
-     Desktop.addInternalFrame(af, "Copied sequences", 700, newHeight);\r
-   }\r
-\r
-  protected  void moveGroup_actionPerformed(ActionEvent e)\r
-  {\r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
-\r
-    SequenceI[] s = new Sequence[sg.sequences.size()];\r
-\r
-     for (int i=0; i < sg.sequences.size(); i++)\r
-       s[i] = new Sequence( sg.getSequenceAt(i));\r
-\r
-     AlignFrame af = new AlignFrame(new Alignment(s));\r
-     int newHeight = s.length * af.viewport.getCharHeight() + 200;\r
-     if(newHeight>500)\r
-       newHeight=500;\r
-     Desktop.addInternalFrame(af, "Copied sequences", 700,newHeight);\r
-\r
-\r
-     for (int i=0; i < sg.sequences.size(); i++)\r
-       ap.av.alignment.deleteSequence(sg.getSequenceAt(i));\r
-\r
-\r
-     ap.av.resetSeqLimits(ap.seqPanel.seqCanvas.getHeight());\r
-     ap.RefreshPanels();\r
-\r
-\r
-  }\r
-\r
-  protected void deleteSequences_actionPerformed(ActionEvent e)\r
-  {\r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
-    for (int i=0;i < sg.sequences.size(); i++)\r
-            ap.av.getAlignment().deleteSequence(sg.getSequenceAt(i));\r
-\r
-    ap.av.alignment.deleteGroup(sg);\r
-    ap.av.resetSeqLimits(ap.seqPanel.seqCanvas.getHeight());\r
-    ap.seqPanel.parent.RefreshPanels();\r
-\r
-  }\r
 \r
   protected void analyze_actionPerformed(ActionEvent e)\r
   {\r
@@ -523,10 +547,11 @@ frame.setMaximizable(false);
 \r
   SequenceGroup getGroup()\r
   {\r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
+    SequenceGroup sg = ap.av.getSelectionGroup();\r
 \r
     // this method won't add a new group if it already exists\r
     ap.av.alignment.addGroup(sg);\r
+\r
     return sg;\r
   }\r
 \r
@@ -536,7 +561,7 @@ frame.setMaximizable(false);
     String s = (String)JOptionPane.showInternalInputDialog(\r
                 ap,\r
                 "Edit sequence name",\r
-                "Edit sequence name",\r
+                "Edit sequence name ("+sequence.getName()+")",\r
                 JOptionPane.PLAIN_MESSAGE,\r
                 null,\r
                 null,\r
@@ -545,8 +570,67 @@ frame.setMaximizable(false);
     if(s!=null)\r
     {\r
       sequence.setName(s);\r
-      ap.RefreshPanels();\r
+      ap.repaint();\r
     }\r
 \r
   }\r
+\r
+  void unGroupMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+     SequenceGroup sg = ap.av.getSelectionGroup();\r
+     ap.av.alignment.deleteGroup(sg);\r
+     ap.av.setSelectionGroup(null);\r
+     ap.repaint();\r
+  }\r
+\r
+  void pdbMenuItem_actionPerformed(ActionEvent e)\r
+  {\r
+    if(sequence.getPDBId()==null)\r
+      return;\r
+\r
+    try\r
+    {\r
+      EBIFetchClient ebi = new EBIFetchClient();\r
+      String[] result = ebi.fetchData("pdb:" + sequence.getPDBId(), null, null);\r
+\r
+      PDBfile pdb = new PDBfile(result);\r
+\r
+      rotCanvas rc = new rotCanvas(pdb, sequence, ap.av);\r
+      JInternalFrame frame = new JInternalFrame();\r
+      frame.setContentPane(rc);\r
+      Desktop.addInternalFrame(frame,sequence.getName()+" "+ sequence.getPDBId(), 400, 400);\r
+    }\r
+    catch (Exception ex)\r
+    {\r
+      ex.printStackTrace();\r
+    }\r
+  }\r
+\r
+  protected void outline_actionPerformed(ActionEvent e)\r
+  {\r
+    SequenceGroup sg = getGroup();\r
+    Color col = JColorChooser.showDialog(this, "Select Outline Colour", Color.BLUE);\r
+    if(col!=null)\r
+      sg.setOutlineColour(col);\r
+    ap.repaint();\r
+  }\r
+\r
+  public void showBoxes_actionPerformed(ActionEvent e)\r
+  {\r
+    getGroup().setDisplayBoxes(showBoxes.isSelected());\r
+    refresh();\r
+  }\r
+\r
+  public void showText_actionPerformed(ActionEvent e)\r
+  {\r
+    getGroup().setDisplayText(showText.isSelected());\r
+    refresh();\r
+  }\r
+\r
+  public void showColourText_actionPerformed(ActionEvent e)\r
+  {\r
+    getGroup().setColourText(showColourText.isSelected());\r
+    refresh();\r
+  }\r
+\r
 }\r