From: amwaterhouse Date: Wed, 15 Dec 2004 17:18:39 +0000 (+0000) Subject: All colours added, also sequence menu added X-Git-Tag: Release_2_0~813 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=714aae012ecf6cb27e602eaafdb6458b885dc80c;p=jalview.git All colours added, also sequence menu added --- diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 458a6be..62d69d0 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -9,7 +9,6 @@ import java.awt.event.*; public class PopupMenu extends JPopupMenu { - JMenuItem residueMenu = new JMenuItem(); JMenu groupMenu = new JMenu(); JMenuItem copyGroup = new JMenuItem(); JMenuItem moveGroup = new JMenuItem(); @@ -31,17 +30,28 @@ public class PopupMenu extends JPopupMenu protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem(); - protected JMenuItem conservationColourIncMenuItem = new JMenuItem(); protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem(); - AlignViewport av; - SeqPanel seqPanel; + AlignmentPanel ap; + JMenu sequenceMenu = new JMenu(); + JMenuItem sequenceName = new JMenuItem(); + JMenu residueMenu = new JMenu(); + JMenuItem annotateResidue = new JMenuItem(); - public PopupMenu(AlignViewport av, SeqPanel sp) + SequenceI sequence; + + public PopupMenu(AlignmentPanel ap, SequenceI seq) { - this.av = av; - seqPanel = sp; + /////////////////////////////////////////////////////////// + // If this is activated from the sequence panel, the user may want to + // edit or annotate a particular residue. Therefore display the residue menu + // + // If from the IDPanel, we must display the sequence menu + ////////////////////////////////////////////////////////// + + this.ap = ap; + sequence = seq; ButtonGroup colours = new ButtonGroup(); colours.add(noColourmenuItem); @@ -59,20 +69,25 @@ public class PopupMenu extends JPopupMenu colours.add(BLOSUM62Colour); try - { - jbInit(); - } + { jbInit(); } catch(Exception e) + { e.printStackTrace(); } + + SequenceGroup sg = ap.av.getRubberbandGroup(); + if(sg!=null) + groupName.setText( sg.getName() ); + + if(seq!=null) { - e.printStackTrace(); + residueMenu.setVisible(false); + sequenceName.setText( sequence.getName() ); } + else + sequenceMenu.setVisible(false); - SequenceGroup sg = av.getRubberbandGroup(); - groupName.setText( sg.getName() ); } private void jbInit() throws Exception { - residueMenu.setText("Residue"); groupMenu.setText("Group"); copyGroup.setText("Copy region to new Alignment"); copyGroup.addActionListener(new java.awt.event.ActionListener() @@ -123,8 +138,21 @@ public class PopupMenu extends JPopupMenu groupAnnotation_actionPerformed(e); } }); + sequenceMenu.setText("Sequence"); + sequenceName.setText("sequenceName"); + sequenceName.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + sequenceName_actionPerformed(e); + } + }); + residueMenu.setText("Residue"); + annotateResidue.setText("annotate residue???"); + PIDColour.setFocusPainted(false); add(groupMenu); - add(residueMenu); + this.add(sequenceMenu); + this.add(residueMenu); groupMenu.add(defineMenu); groupMenu.addSeparator(); groupMenu.add(copyGroup); @@ -145,13 +173,14 @@ public class PopupMenu extends JPopupMenu defineMenu.add(turnColour); defineMenu.add(buriedColour); defineMenu.add(userDefinedColour); - defineMenu.addSeparator(); - defineMenu.add(conservationMenuItem); - defineMenu.add(conservationColourIncMenuItem); - defineMenu.addSeparator(); - defineMenu.add(abovePIDColour); defineMenu.add(PIDColour); defineMenu.add(BLOSUM62Colour); + defineMenu.addSeparator(); + defineMenu.add(abovePIDColour); + defineMenu.add(conservationMenuItem); + + sequenceMenu.add(sequenceName); + residueMenu.add(annotateResidue); noColourmenuItem.setText("None"); noColourmenuItem.setSelected(true); @@ -163,7 +192,6 @@ public class PopupMenu extends JPopupMenu } }); - clustalColour.setEnabled(false); clustalColour.setSelected(false); clustalColour.setText("Clustalx colours"); clustalColour.addActionListener(new java.awt.event.ActionListener() @@ -229,7 +257,6 @@ public class PopupMenu extends JPopupMenu buriedColour_actionPerformed(e); } }); - abovePIDColour.setEnabled(false); abovePIDColour.setText("Above PID threshold only"); abovePIDColour.addActionListener(new java.awt.event.ActionListener() { @@ -246,8 +273,7 @@ public class PopupMenu extends JPopupMenu userDefinedColour_actionPerformed(e); } }); - PIDColour.setEnabled(false); - PIDColour.setText("By PID"); + PIDColour.setText("Percentage Identity"); PIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -255,7 +281,7 @@ public class PopupMenu extends JPopupMenu PIDColour_actionPerformed(e); } }); - BLOSUM62Colour.setText("By BLOSUM62 score"); + BLOSUM62Colour.setText("BLOSUM62 score"); BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -272,28 +298,20 @@ public class PopupMenu extends JPopupMenu } }); - conservationColourIncMenuItem.setEnabled(false); - conservationColourIncMenuItem.setText("Conservation Colour Increment"); - conservationColourIncMenuItem.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - conservationColourIncMenuItem_actionPerformed(e); - } - }); } void refresh() { - seqPanel.seqCanvas.paintFlag=true; - seqPanel.repaint(); + ap.seqPanel.seqCanvas.paintFlag=true; + ap.seqPanel.repaint(); } protected void clustalColour_actionPerformed(ActionEvent e) { - + getGroup().cs = new ClustalxColourScheme(); + refresh(); } protected void zappoColour_actionPerformed(ActionEvent e) @@ -340,10 +358,6 @@ public class PopupMenu extends JPopupMenu } - protected void conservationColourIncMenuItem_actionPerformed(ActionEvent e) - { - -} /* public void conservationColourIncMenuItem_actionPerformed(ActionEvent e) { @@ -358,6 +372,11 @@ frame.setMaximizable(false); protected void abovePIDColour_actionPerformed(ActionEvent e) { + SliderPanel sp = new SliderPanel(ap, 70, false, getGroup().cs ); + JInternalFrame frame = new JInternalFrame(); + frame.setContentPane(sp); + Desktop.addInternalFrame(frame, "Percentage Identity Threshold", 400,90); + frame.setMaximizable(false); } @@ -365,7 +384,7 @@ frame.setMaximizable(false); protected void userDefinedColour_actionPerformed(ActionEvent e) { JInternalFrame frame = new JInternalFrame(); - UserDefinedColours chooser = new UserDefinedColours( frame, seqPanel.parent, getGroup()); + UserDefinedColours chooser = new UserDefinedColours( frame, ap, getGroup()); frame.setContentPane(chooser); Desktop.addInternalFrame(frame,"User defined colours", 450,540 ); frame.setResizable(false); @@ -381,7 +400,7 @@ frame.setMaximizable(false); protected void BLOSUM62Colour_actionPerformed(ActionEvent e) { - getGroup().cs = new Blosum62ColourScheme(av); + getGroup().cs = new Blosum62ColourScheme(ap.av); refresh(); } @@ -424,44 +443,10 @@ frame.setMaximizable(false); sg.setName(reply); groupName.setText(reply); } - /* public void deleteSelectedMenuItem_actionPerformed(ActionEvent e) - { - addHistoryItem("delete selection"); - - for (int i=0;i < viewport.getSelection().size(); i++) - viewport.getAlignment().deleteSequence(viewport.getSelection().sequenceAt(i)); - - viewport.getSelection().clear(); - viewport.resetSeqLimits(alignPanel.seqPanel.seqCanvas.getHeight()); - alignPanel.RefreshPanels(); - } - - public void moveSelectedMenuItem_actionPerformed(ActionEvent e) - { - copySelectedMenuItem_actionPerformed(null); - deleteSelectedMenuItem_actionPerformed(null); - alignPanel.repaint(); - } - - public void copySelectedMenuItem_actionPerformed(ActionEvent e) - { - if(viewport.getSelection().size()==0) - return; - SequenceI[] s = new Sequence[viewport.getSelection().size()]; - for (int i=0; i < viewport.getSelection().size(); i++) { - s[i] = new Sequence(viewport.getSelection().sequenceAt(i)); - } - AlignFrame af = new AlignFrame(new Alignment(s)); - int newHeight = s.length * af.viewport.getCharHeight() + 200; - if(newHeight>500) - newHeight=500; - Desktop.addInternalFrame(af, "Copied sequences", 700,newHeight); - } -*/ protected void copyGroup_actionPerformed(ActionEvent e) { - SequenceGroup sg = av.getRubberbandGroup(); + SequenceGroup sg = ap.av.getRubberbandGroup(); SequenceI[] s = new Sequence[sg.sequences.size()]; for (int i=0; i < sg.sequences.size(); i++) @@ -474,22 +459,43 @@ frame.setMaximizable(false); if (newHeight > 500) newHeight = 500; Desktop.addInternalFrame(af, "Copied sequences", 700, newHeight); - } + } protected void moveGroup_actionPerformed(ActionEvent e) { + SequenceGroup sg = ap.av.getRubberbandGroup(); + + SequenceI[] s = new Sequence[sg.sequences.size()]; + + for (int i=0; i < sg.sequences.size(); i++) + s[i] = new Sequence( sg.getSequenceAt(i)); + + AlignFrame af = new AlignFrame(new Alignment(s)); + int newHeight = s.length * af.viewport.getCharHeight() + 200; + if(newHeight>500) + newHeight=500; + Desktop.addInternalFrame(af, "Copied sequences", 700,newHeight); + + + for (int i=0; i < sg.sequences.size(); i++) + ap.av.alignment.deleteSequence(sg.getSequenceAt(i)); + + + ap.av.resetSeqLimits(ap.seqPanel.seqCanvas.getHeight()); + ap.RefreshPanels(); + } protected void deleteSequences_actionPerformed(ActionEvent e) { - SequenceGroup sg = av.getRubberbandGroup(); + SequenceGroup sg = ap.av.getRubberbandGroup(); for (int i=0;i < sg.sequences.size(); i++) - av.getAlignment().deleteSequence(sg.getSequenceAt(i)); + ap.av.getAlignment().deleteSequence(sg.getSequenceAt(i)); - av.alignment.deleteGroup(sg); - av.resetSeqLimits(seqPanel.seqCanvas.getHeight()); - seqPanel.parent.RefreshPanels(); + ap.av.alignment.deleteGroup(sg); + ap.av.resetSeqLimits(ap.seqPanel.seqCanvas.getHeight()); + ap.seqPanel.parent.RefreshPanels(); } @@ -517,10 +523,30 @@ frame.setMaximizable(false); SequenceGroup getGroup() { - SequenceGroup sg = av.getRubberbandGroup(); + SequenceGroup sg = ap.av.getRubberbandGroup(); // this method won't add a new group if it already exists - av.alignment.addGroup(sg); + ap.av.alignment.addGroup(sg); return sg; } + + void sequenceName_actionPerformed(ActionEvent e) + { + String id = sequence.getName(); + String s = (String)JOptionPane.showInternalInputDialog( + ap, + "Edit sequence name", + "Edit sequence name", + JOptionPane.PLAIN_MESSAGE, + null, + null, + id); + + if(s!=null) + { + sequence.setName(s); + ap.RefreshPanels(); + } + + } }