X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=28e40eb1ea7591de061b72b0b36bf6dca98c7357;hb=c42fcf7bf5cfcf51e67dd0f683edb9ab6683d157;hp=b85c7d205e1c7961dd258228ca6263b6d0bffa07;hpb=47a3f3d338d24f2a92d8249eede1ed0a6fd43d87;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index b85c7d2..28e40eb 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -53,6 +53,20 @@ public class APopupMenu CheckboxMenuItem showBoxes = new CheckboxMenuItem(); CheckboxMenuItem showText = new CheckboxMenuItem(); CheckboxMenuItem showColourText = new CheckboxMenuItem(); + Menu editMenu = new Menu("Edit"); + MenuItem copy = new MenuItem("Copy (Jalview Only)"); + MenuItem cut = new MenuItem("Cut (Jalview Only)"); + MenuItem toUpper = new MenuItem("To Upper Case"); + MenuItem toLower = new MenuItem("To Lower Case"); + MenuItem toggleCase = new MenuItem("Toggle Case"); + Menu outputmenu = new Menu(); + Menu seqMenu = new Menu(); + MenuItem pdb = new MenuItem(); + MenuItem hideSeqs = new MenuItem(); + MenuItem repGroup = new MenuItem(); + + Sequence seq; + MenuItem revealAll = new MenuItem(); public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links) { @@ -64,6 +78,7 @@ public class APopupMenu ////////////////////////////////////////////////////////// this.ap = apanel; + this.seq = seq; try { @@ -74,20 +89,34 @@ public class APopupMenu e.printStackTrace(); } + for (int i = 0; i < jalview.io.AppletFormatAdapter.formats.size()-1; i++) + { + MenuItem item = new MenuItem( (String) jalview.io.AppletFormatAdapter.formats. + elementAt( + i)); + item.addActionListener(this); + outputmenu.add(item); + } + SequenceGroup sg = ap.av.getSelectionGroup(); - if (sg != null) + + if (sg != null && sg.getSize(false)>0) { showText.setState(sg.getDisplayText()); showColourText.setState(sg.getColourText()); showBoxes.setState(sg.getDisplayBoxes()); - } + if (!ap.av.alignment.getGroups().contains(sg)) + { + groupMenu.remove(unGroupMenuItem); + } - if (!ap.av.alignment.getGroups().contains(sg)) + } + else { - groupMenu.remove(unGroupMenuItem); + remove(groupMenu); } - if (seq != null && links!=null) + if (links!=null) { Menu linkMenu = new Menu("Link"); MenuItem item; @@ -97,13 +126,22 @@ public class APopupMenu link = links.elementAt(i).toString(); final String target = link.substring(0, link.indexOf("|")); item = new MenuItem(target); - String id = seq.getName(); - if(id.indexOf("|")>-1) - id = id.substring(id.lastIndexOf("|")+1); - final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$")) - + id + - link.substring(link.indexOf("$SEQUENCE_ID$") + 13); + final String url; + + if (link.indexOf("$SEQUENCE_ID$") > -1) + { + String id = seq.getName(); + if (id.indexOf("|") > -1) + id = id.substring(id.lastIndexOf("|") + 1); + + url = link.substring(link.indexOf("|") + 1, + link.indexOf("$SEQUENCE_ID$")) + + id + + link.substring(link.indexOf("$SEQUENCE_ID$") + 13); + } + else + url = link.substring(link.lastIndexOf("|")+1); item.addActionListener(new java.awt.event.ActionListener() { @@ -114,21 +152,18 @@ public class APopupMenu }); linkMenu.add(item); } - add(linkMenu); - - item = new MenuItem("Show PDB Structure"); - item.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - addPDB(seq); - } - }); - - add(item); - - + seqMenu.add(linkMenu); + } + if(seq!=null) + { + seqMenu.setLabel(seq.getName()); + repGroup.setLabel("Represent Group with " + seq.getName()); } + else + remove(seqMenu); + + if(!ap.av.hasHiddenRows) + remove(revealAll); } public void itemStateChanged(ItemEvent evt) @@ -145,41 +180,112 @@ public class APopupMenu public void actionPerformed(ActionEvent evt) { - if(evt.getSource()==clustalColour) + Object source = evt.getSource(); + if(source==clustalColour) clustalColour_actionPerformed(); - else if(evt.getSource()==zappoColour) + else if(source==zappoColour) zappoColour_actionPerformed(); - else if(evt.getSource()==taylorColour) + else if(source==taylorColour) taylorColour_actionPerformed(); - else if(evt.getSource()==hydrophobicityColour) + else if(source==hydrophobicityColour) hydrophobicityColour_actionPerformed(); - else if(evt.getSource()==helixColour) + else if(source==helixColour) helixColour_actionPerformed(); - else if(evt.getSource()==strandColour) + else if(source==strandColour) strandColour_actionPerformed(); - else if(evt.getSource()==clustalColour) + else if(source==clustalColour) turnColour_actionPerformed(); - else if(evt.getSource()==buriedColour) + else if(source==buriedColour) buriedColour_actionPerformed(); - else if(evt.getSource()==nucleotideMenuItem) + else if(source==nucleotideMenuItem) nucleotideMenuItem_actionPerformed(); - else if(evt.getSource()==userDefinedColour) - userDefinedColour_actionPerformed(); - else if(evt.getSource()==PIDColour) - PIDColour_actionPerformed(); - else if(evt.getSource()==BLOSUM62Colour) + else if (source == userDefinedColour) + userDefinedColour_actionPerformed(); + else if (source == PIDColour) + PIDColour_actionPerformed(); + else if (source == BLOSUM62Colour) BLOSUM62Colour_actionPerformed(); - else if(evt.getSource()==noColourmenuItem) + else if (source == noColourmenuItem) noColourmenuItem_actionPerformed(); - else if(evt.getSource()==conservationMenuItem) - conservationMenuItem_itemStateChanged(); - else if(evt.getSource()==unGroupMenuItem) + else if (source == conservationMenuItem) + conservationMenuItem_itemStateChanged(); + else if (source == unGroupMenuItem) unGroupMenuItem_actionPerformed(); + else if(source == pdb) + addPDB(); + else if(source == hideSeqs) + hideSequences(false); + else if(source == repGroup) + hideSequences(true); + else if(source == revealAll) + { + ap.av.showAllHiddenSeqs(); + ap.repaint(); + } + + else if(source==copy) + ap.alignFrame.copy_actionPerformed(); + else if(source==cut) + ap.alignFrame.cut_actionPerformed(); + else if(source==toUpper || source==toLower || source==toggleCase) + { + SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg != null) + { + for (int g = 0; g < sg.getSize(true); g++) + { + if (source == toggleCase) + ((SequenceI) sg.getSequences(true).elementAt(g)) + .toggleCase(sg.getStartRes(), sg.getEndRes() + 1); + else + ((SequenceI) sg.getSequences(true).elementAt(g)) + .changeCase(source == toUpper, sg.getStartRes(), + sg.getEndRes() + 1); + } + ap.seqPanel.seqCanvas.repaint(); + } + } + else + outputText(evt); + + } + + void outputText(ActionEvent e) + { + CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame); + Vector vseqs = new Vector(); + + String [] selection = ap.av.getViewAsString(true); + SequenceI [] seqs = ap.av.getSelectionAsNewSequence(); + if (selection != null) + { + for (int i = 0; i < selection.length; i++) + { + Sequence seq = new Sequence( + seqs[i].getName(), + selection[i], + seqs[i].getStart(), seqs[i].getEnd()); + seq.setDescription(seqs[i].getDescription()); + vseqs.addElement( seq ); + } + } + + Frame frame = new Frame(); + frame.add(cap); + jalview.bin.JalviewLite.addFrame(frame, + "Selection output - " + e.getActionCommand(), + 600, 500); + + cap.setText(new jalview.io.AppletFormatAdapter().formatSequences( + e.getActionCommand(), + vseqs, + ap.av.showJVSuffix)); + } - void addPDB(Sequence seq) + void addPDB() { CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame); cap.setText("Paste your PDB file here."); @@ -193,7 +299,7 @@ public class APopupMenu throws Exception { groupMenu.setLabel("Group"); - groupMenu.setLabel("Define"); + groupMenu.setLabel("Selection"); unGroupMenuItem.setLabel("Remove Group"); unGroupMenuItem.addActionListener(this); @@ -211,11 +317,22 @@ public class APopupMenu showText.addItemListener(this); showColourText.setLabel("Colour Text"); showColourText.addItemListener(this); + outputmenu.setLabel("Output to Textbox..."); + seqMenu.setLabel("Sequence"); + pdb.setLabel("View PDB Structure"); + hideSeqs.setLabel("Hide Sequences"); + repGroup.setLabel("Represent Group with"); + revealAll.setLabel("Reveal All"); add(groupMenu); + this.add(seqMenu); + this.add(hideSeqs); + this.add(revealAll); + groupMenu.add(editMenu); + groupMenu.add(outputmenu); + groupMenu.addSeparator(); groupMenu.add(unGroupMenuItem); groupMenu.add(colourMenu); - groupMenu.addSeparator(); groupMenu.add(showBoxes); groupMenu.add(showText); groupMenu.add(showColourText); @@ -265,6 +382,23 @@ public class APopupMenu BLOSUM62Colour.addActionListener(this); conservationMenuItem.setLabel("Conservation"); + editMenu.add(copy); + copy.addActionListener(this); + editMenu.add(cut); + cut.addActionListener(this); + editMenu.add(toUpper); + toUpper.addActionListener(this); + editMenu.add(toLower); + toLower.addActionListener(this); + editMenu.add(toggleCase); + seqMenu.add(pdb); + seqMenu.add(repGroup); + toggleCase.addActionListener(this); + pdb.addActionListener(this); + hideSeqs.addActionListener(this); + repGroup.addActionListener(this); + revealAll.addActionListener(this); + } void refresh() @@ -277,7 +411,7 @@ public class APopupMenu protected void clustalColour_actionPerformed() { SequenceGroup sg = getGroup(); - sg.cs = new ClustalxColourScheme(sg.sequences, ap.av.alignment.getWidth()); + sg.cs = new ClustalxColourScheme(sg.getSequences(true), ap.av.alignment.getWidth()); refresh(); } @@ -337,7 +471,7 @@ public class APopupMenu if (abovePIDColour.getState()) { - sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, ap.av.alignment.getWidth())); int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup().getName()); @@ -365,7 +499,7 @@ public class APopupMenu { SequenceGroup sg = getGroup(); sg.cs = new PIDColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, ap.av.alignment.getWidth())); refresh(); } @@ -376,7 +510,7 @@ public class APopupMenu sg.cs = new Blosum62ColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, ap.av.alignment.getWidth())); refresh(); @@ -399,7 +533,7 @@ public class APopupMenu Conservation c = new Conservation("Group", ResidueProperties.propHash, 3, - sg.sequences, 0, + sg.getSequences(true), 0, ap.av.alignment.getWidth()); c.calculate(); @@ -456,4 +590,33 @@ public class APopupMenu refresh(); } + void hideSequences(boolean representGroup) + { + SequenceGroup sg = ap.av.getSelectionGroup(); + if(sg==null || sg.getSize(false)<1) + { + ap.av.hideSequence(seq); + return; + } + + int index = 0; + while(index < sg.getSize(false)) + { + if(representGroup && sg.getSequenceAt(index)!=seq) + { + seq.addHiddenSequence(sg.getSequenceAt(index)); + ap.av.hideSequence(sg.getSequenceAt(index)); + } + else if(!representGroup) + { + ap.av.hideSequence(sg.getSequenceAt(index)); + } + index ++; + } + + ap.av.setSelectionGroup(null); + ap.repaint(); + refresh(); + } + }