X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=66b29a0d3de78a9d120fd8878994f9f8de9c6c37;hb=0f31ab4d7d3c5fdf3af01f3f2f497962d9602725;hp=62d69d00aa38ecb2e5ec035bb4741478894afd08;hpb=714aae012ecf6cb27e602eaafdb6458b885dc80c;p=jalview.git diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 62d69d0..66b29a0 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -3,20 +3,16 @@ package jalview.gui; import jalview.datamodel.*; import jalview.analysis.*; import jalview.schemes.*; +import java.awt.*; import javax.swing.*; import java.awt.event.*; - +import jalview.io.*; +import MCview.*; public class PopupMenu extends JPopupMenu { JMenu groupMenu = new JMenu(); - JMenuItem copyGroup = new JMenuItem(); - JMenuItem moveGroup = new JMenuItem(); - JMenuItem deleteSequences = new JMenuItem(); - JMenuItem analyze = new JMenuItem(); - JMenu defineMenu = new JMenu(); JMenuItem groupName = new JMenuItem(); - JMenuItem groupAnnotation = new JMenuItem(); protected JRadioButtonMenuItem clustalColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem zappoColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem taylorColour = new JRadioButtonMenuItem(); @@ -25,7 +21,7 @@ public class PopupMenu extends JPopupMenu protected JRadioButtonMenuItem strandColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem(); - protected JRadioButtonMenuItem abovePIDColour = new JRadioButtonMenuItem(); + protected JCheckBoxMenuItem abovePIDColour = new JCheckBoxMenuItem(); protected JRadioButtonMenuItem userDefinedColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem PIDColour = new JRadioButtonMenuItem(); protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem(); @@ -36,12 +32,13 @@ public class PopupMenu extends JPopupMenu AlignmentPanel ap; JMenu sequenceMenu = new JMenu(); JMenuItem sequenceName = new JMenuItem(); - JMenu residueMenu = new JMenu(); - JMenuItem annotateResidue = new JMenuItem(); - - SequenceI sequence; + Sequence sequence; + JMenuItem unGroupMenuItem = new JMenuItem(); + JMenuItem pdbMenuItem = new JMenuItem(); + JMenuItem outline = new JMenuItem(); + JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem(); - public PopupMenu(AlignmentPanel ap, SequenceI seq) + public PopupMenu(AlignmentPanel ap, Sequence seq) { /////////////////////////////////////////////////////////// // If this is activated from the sequence panel, the user may want to @@ -73,117 +70,131 @@ public class PopupMenu extends JPopupMenu catch(Exception e) { e.printStackTrace(); } - SequenceGroup sg = ap.av.getRubberbandGroup(); + SequenceGroup sg = ap.av.getSelectionGroup(); if(sg!=null) - groupName.setText( sg.getName() ); - - if(seq!=null) { - residueMenu.setVisible(false); - sequenceName.setText( sequence.getName() ); + groupName.setText(sg.getName()); + if(sg.cs instanceof ZappoColourScheme) + zappoColour.setSelected(true); + else if(sg.cs instanceof TaylorColourScheme) + taylorColour.setSelected(true); + else if (sg.cs instanceof PIDColourScheme) + PIDColour.setSelected(true); + else if (sg.cs instanceof Blosum62ColourScheme) + BLOSUM62Colour.setSelected(true); + else if (sg.cs instanceof UserColourScheme) + userDefinedColour.setSelected(true); + else if (sg.cs instanceof HydrophobicColourScheme) + hydrophobicityColour.setSelected(true); + else if (sg.cs instanceof HelixColourScheme) + helixColour.setSelected(true); + else if (sg.cs instanceof StrandColourScheme) + strandColour.setSelected(true); + else if (sg.cs instanceof TurnColourScheme) + turnColour.setSelected(true); + else if (sg.cs instanceof BuriedColourScheme) + buriedColour.setSelected(true); + else if (sg.cs instanceof ClustalxColourScheme) + clustalColour.setSelected(true); + else + noColourmenuItem.setSelected(true); + + if (sg.cs instanceof ConservationColourScheme) + conservationMenuItem.setSelected(true); } - else - sequenceMenu.setVisible(false); + + if( !ap.av.alignment.getGroups().contains(sg)) + unGroupMenuItem.setVisible(false); + + if(seq==null) + sequenceMenu.setVisible(false); } private void jbInit() throws Exception { groupMenu.setText("Group"); - copyGroup.setText("Copy region to new Alignment"); - copyGroup.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - copyGroup_actionPerformed(e); - } - }); - moveGroup.setText("Move sequences to new Alignment"); - moveGroup.addActionListener(new java.awt.event.ActionListener() + groupMenu.setText("Define"); + groupName.setText("Name"); + groupName.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - moveGroup_actionPerformed(e); + groupName_actionPerformed(e); } }); - deleteSequences.setText("Delete sequences"); - deleteSequences.addActionListener(new java.awt.event.ActionListener() + sequenceMenu.setText("Sequence"); + sequenceName.setText("Edit name"); + sequenceName.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - deleteSequences_actionPerformed(e); + sequenceName_actionPerformed(e); } }); - analyze.setText("Analyze"); - analyze.addActionListener(new java.awt.event.ActionListener() + PIDColour.setFocusPainted(false); + unGroupMenuItem.setText("Remove Group"); + unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - analyze_actionPerformed(e); + unGroupMenuItem_actionPerformed(e); } }); - defineMenu.setText("Define"); - groupName.setText("Name"); - groupName.addActionListener(new java.awt.event.ActionListener() + pdbMenuItem.setText("View PDB structure"); + pdbMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - groupName_actionPerformed(e); + pdbMenuItem_actionPerformed(e); } }); - groupAnnotation.setText("Annotation"); - groupAnnotation.addActionListener(new java.awt.event.ActionListener() + outline.setText("Border colour"); + outline.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { - groupAnnotation_actionPerformed(e); + outline_actionPerformed(e); } }); - sequenceMenu.setText("Sequence"); - sequenceName.setText("sequenceName"); - sequenceName.addActionListener(new java.awt.event.ActionListener() + nucleotideMenuItem.setText("Nucleotide"); + nucleotideMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - sequenceName_actionPerformed(e); + nucleotideMenuItem_actionPerformed(e); } }); - residueMenu.setText("Residue"); - annotateResidue.setText("annotate residue???"); - PIDColour.setFocusPainted(false); add(groupMenu); - this.add(sequenceMenu); - this.add(residueMenu); - groupMenu.add(defineMenu); + add(sequenceMenu); + groupMenu.add(groupName); + groupMenu.addSeparator(); + groupMenu.add(unGroupMenuItem); groupMenu.addSeparator(); - groupMenu.add(copyGroup); - groupMenu.add(moveGroup); - groupMenu.add(deleteSequences); + groupMenu.add(outline); groupMenu.addSeparator(); - groupMenu.add(analyze); - defineMenu.add(groupName); - defineMenu.add(groupAnnotation); - defineMenu.addSeparator(); - defineMenu.add(noColourmenuItem); - defineMenu.add(clustalColour); - defineMenu.add(zappoColour); - defineMenu.add(taylorColour); - defineMenu.add(hydrophobicityColour); - defineMenu.add(helixColour); - defineMenu.add(strandColour); - defineMenu.add(turnColour); - defineMenu.add(buriedColour); - defineMenu.add(userDefinedColour); - defineMenu.add(PIDColour); - defineMenu.add(BLOSUM62Colour); - defineMenu.addSeparator(); - defineMenu.add(abovePIDColour); - defineMenu.add(conservationMenuItem); + 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); - sequenceMenu.add(sequenceName); - residueMenu.add(annotateResidue); + groupMenu.addSeparator(); + groupMenu.add(abovePIDColour); + groupMenu.add(conservationMenuItem); + sequenceMenu.add(sequenceName); + sequenceMenu.add(pdbMenuItem); noColourmenuItem.setText("None"); - noColourmenuItem.setSelected(true); noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -192,7 +203,6 @@ public class PopupMenu extends JPopupMenu } }); - clustalColour.setSelected(false); clustalColour.setText("Clustalx colours"); clustalColour.addActionListener(new java.awt.event.ActionListener() { @@ -201,7 +211,7 @@ public class PopupMenu extends JPopupMenu clustalColour_actionPerformed(e); } }); - zappoColour.setText("Zappo colour scheme"); + zappoColour.setText("Zappo"); zappoColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -209,7 +219,7 @@ public class PopupMenu extends JPopupMenu zappoColour_actionPerformed(e); } }); - taylorColour.setText("Taylor colour scheme"); + taylorColour.setText("Taylor"); taylorColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -217,7 +227,7 @@ public class PopupMenu extends JPopupMenu taylorColour_actionPerformed(e); } }); - hydrophobicityColour.setText("By hydrophobicity"); + hydrophobicityColour.setText("Hydrophobicity"); hydrophobicityColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -249,7 +259,7 @@ public class PopupMenu extends JPopupMenu turnColour_actionPerformed(e); } }); - buriedColour.setText("Buried index"); + buriedColour.setText("Buried Index"); buriedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -257,7 +267,7 @@ public class PopupMenu extends JPopupMenu buriedColour_actionPerformed(e); } }); - abovePIDColour.setText("Above PID threshold only"); + abovePIDColour.setText("Above % Identity"); abovePIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -265,7 +275,7 @@ public class PopupMenu extends JPopupMenu abovePIDColour_actionPerformed(e); } }); - userDefinedColour.setText("User defined colours"); + userDefinedColour.setText("User Defined"); userDefinedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -281,7 +291,7 @@ public class PopupMenu extends JPopupMenu PIDColour_actionPerformed(e); } }); - BLOSUM62Colour.setText("BLOSUM62 score"); + BLOSUM62Colour.setText("BLOSUM62"); BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -289,7 +299,7 @@ public class PopupMenu extends JPopupMenu BLOSUM62Colour_actionPerformed(e); } }); - conservationMenuItem.setText("By conservation"); + conservationMenuItem.setText("Conservation"); conservationMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -304,13 +314,18 @@ public class PopupMenu extends JPopupMenu void refresh() { - ap.seqPanel.seqCanvas.paintFlag=true; + SequenceGroup sg = getGroup(); + SuperGroup superG = ap.av.alignment.getSuperGroup( sg ); + if( superG !=null) + superG.setSuperGroupProperties( sg ); + ap.seqPanel.repaint(); } protected void clustalColour_actionPerformed(ActionEvent e) { - getGroup().cs = new ClustalxColourScheme(); + SequenceGroup sg = getGroup(); + sg.cs = new ClustalxColourScheme(sg.sequences, ap.av.alignment.getWidth()); refresh(); } @@ -357,40 +372,46 @@ public class PopupMenu extends JPopupMenu refresh(); } + public void nucleotideMenuItem_actionPerformed(ActionEvent e) + { + getGroup().cs = new NucleotideColourScheme(); + refresh(); + } -/* -public void conservationColourIncMenuItem_actionPerformed(ActionEvent e) -{ -ConservationIncrementPanel cip = new ConservationIncrementPanel(viewport, alignPanel); -JInternalFrame frame = new JInternalFrame(); -frame.setContentPane(cip); -Desktop.addInternalFrame(frame, "Conservation Colour Increment", 400,90); -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); + SequenceGroup sg = getGroup(); + if (abovePIDColour.isSelected()) + { + sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, + ap.av.alignment.getWidth())); + int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup().getName()); + if (sg.cs instanceof ResidueColourScheme) + ( (ResidueColourScheme)sg. cs).setThreshold(threshold); + else if (sg.cs instanceof ScoreColourScheme) + ( (ScoreColourScheme) sg.cs).setThreshold(threshold); + + SliderPanel.showPIDSlider(); + + + } + else // remove PIDColouring + { + ResidueColourScheme rcs = (ResidueColourScheme) sg.cs; + rcs.setThreshold(0); + sg.cs = rcs; + } + + refresh(); } protected void userDefinedColour_actionPerformed(ActionEvent e) { - JInternalFrame frame = new JInternalFrame(); - UserDefinedColours chooser = new UserDefinedColours( frame, ap, getGroup()); - frame.setContentPane(chooser); - Desktop.addInternalFrame(frame,"User defined colours", 450,540 ); - frame.setResizable(false); - frame.setIconifiable(false); - frame.setMaximizable(false); - + UserDefinedColours chooser = new UserDefinedColours( ap, getGroup()); } protected void PIDColour_actionPerformed(ActionEvent e) @@ -400,7 +421,13 @@ frame.setMaximizable(false); protected void BLOSUM62Colour_actionPerformed(ActionEvent e) { - getGroup().cs = new Blosum62ColourScheme(ap.av); + SequenceGroup sg = getGroup(); + + sg.cs = new Blosum62ColourScheme(); + + sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, + ap.av.alignment.getWidth())); + refresh(); } @@ -415,15 +442,29 @@ frame.setMaximizable(false); { SequenceGroup sg = getGroup(); - Conservation c = new Conservation("Group", - ResidueProperties.propHash, 3, sg.sequences, sg.getStartRes(), - sg.getEndRes() ); + if(conservationMenuItem.isSelected()) + { + + 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); - c.calculate(); - c.verdict(false, 100); - ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs); - sg.cs = ccs; + sg.cs = ccs; + + SliderPanel.setConservationSlider(ap, ccs, sg.getName()); + SliderPanel.showConservationSlider(); + } + else // remove ConservationColouring + { + ConservationColourScheme ccs = (ConservationColourScheme)sg.cs; + sg.cs = ccs.cs; + } refresh(); } @@ -444,60 +485,6 @@ frame.setMaximizable(false); groupName.setText(reply); } - protected void copyGroup_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)); - s[i].setSequence( s[i].getSequence(sg.getStartRes(), sg.getEndRes()+1) ); - } - 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 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 = ap.av.getRubberbandGroup(); - for (int i=0;i < sg.sequences.size(); i++) - ap.av.getAlignment().deleteSequence(sg.getSequenceAt(i)); - - ap.av.alignment.deleteGroup(sg); - ap.av.resetSeqLimits(ap.seqPanel.seqCanvas.getHeight()); - ap.seqPanel.parent.RefreshPanels(); - - } protected void analyze_actionPerformed(ActionEvent e) { @@ -523,10 +510,11 @@ frame.setMaximizable(false); SequenceGroup getGroup() { - SequenceGroup sg = ap.av.getRubberbandGroup(); + SequenceGroup sg = ap.av.getSelectionGroup(); // this method won't add a new group if it already exists ap.av.alignment.addGroup(sg); + return sg; } @@ -536,7 +524,7 @@ frame.setMaximizable(false); String s = (String)JOptionPane.showInternalInputDialog( ap, "Edit sequence name", - "Edit sequence name", + "Edit sequence name ("+sequence.getName()+")", JOptionPane.PLAIN_MESSAGE, null, null, @@ -545,8 +533,50 @@ frame.setMaximizable(false); if(s!=null) { sequence.setName(s); - ap.RefreshPanels(); + ap.repaint(); } } + + void unGroupMenuItem_actionPerformed(ActionEvent e) + { + SequenceGroup sg = ap.av.getSelectionGroup(); + ap.av.alignment.deleteGroup(sg); + ap.av.setSelectionGroup(null); + ap.repaint(); + } + + void pdbMenuItem_actionPerformed(ActionEvent e) + { + if(sequence.getPDBId()==null) + return; + + try + { + EBIFetchClient ebi = new EBIFetchClient(); + String[] result = ebi.fetchData("pdb:" + sequence.getPDBId(), null, null); + + System.out.println("Got "+ sequence.getPDBId() ); + 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(); + } + } + + protected void outline_actionPerformed(ActionEvent e) + { + SequenceGroup sg = getGroup(); + Color col = JColorChooser.showDialog(this, "Select Outline Colour", Color.BLUE); + if(col!=null) + sg.setOutlineColour(col); + ap.repaint(); + } + }