X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=0d4e3e1203f641356ff28e07ddb8117d17040993;hb=4756b29312ca78d0975248c65e50157399e6ce39;hp=28e40eb1ea7591de061b72b0b36bf6dca98c7357;hpb=5cd5b6e7864fe435ceb3f5c2f339a436ea0aac93;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 28e40eb..0d4e3e1 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 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 @@ -26,11 +26,13 @@ import java.util.Vector; import jalview.analysis.*; import jalview.datamodel.*; import jalview.schemes.*; +import jalview.commands.ChangeCaseCommand; public class APopupMenu extends java.awt.PopupMenu implements ActionListener, ItemListener { Menu groupMenu = new Menu(); + MenuItem editGroupName = new MenuItem(); protected MenuItem clustalColour = new MenuItem(); protected MenuItem zappoColour = new MenuItem(); protected MenuItem taylorColour = new MenuItem(); @@ -64,9 +66,11 @@ public class APopupMenu MenuItem pdb = new MenuItem(); MenuItem hideSeqs = new MenuItem(); MenuItem repGroup = new MenuItem(); + MenuItem sequenceName = new MenuItem("Edit Name/Description"); Sequence seq; MenuItem revealAll = new MenuItem(); + Menu menu1 = new Menu(); public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links) { @@ -89,19 +93,19 @@ public class APopupMenu e.printStackTrace(); } - for (int i = 0; i < jalview.io.AppletFormatAdapter.formats.size()-1; i++) + for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; i++) { - MenuItem item = new MenuItem( (String) jalview.io.AppletFormatAdapter.formats. - elementAt( - i)); + MenuItem item = new MenuItem( jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i] ); + item.addActionListener(this); outputmenu.add(item); } SequenceGroup sg = ap.av.getSelectionGroup(); - if (sg != null && sg.getSize(false)>0) + if (sg != null && sg.getSize()>0) { + editGroupName.setLabel(sg.getName()); showText.setState(sg.getDisplayText()); showColourText.setState(sg.getColourText()); showBoxes.setState(sg.getDisplayBoxes()); @@ -113,6 +117,7 @@ public class APopupMenu } else { + remove(hideSeqs); remove(groupMenu); } @@ -152,7 +157,10 @@ public class APopupMenu }); linkMenu.add(item); } - seqMenu.add(linkMenu); + if(seq!=null) + seqMenu.add(linkMenu); + else + add(linkMenu); } if(seq!=null) { @@ -193,7 +201,7 @@ public class APopupMenu helixColour_actionPerformed(); else if(source==strandColour) strandColour_actionPerformed(); - else if(source==clustalColour) + else if(source==turnColour) turnColour_actionPerformed(); else if(source==buriedColour) buriedColour_actionPerformed(); @@ -213,6 +221,8 @@ public class APopupMenu else if (source == unGroupMenuItem) unGroupMenuItem_actionPerformed(); + else if(source == sequenceName) + editName(); else if(source == pdb) addPDB(); else if(source == hideSeqs) @@ -222,30 +232,101 @@ public class APopupMenu else if(source == revealAll) { ap.av.showAllHiddenSeqs(); - ap.repaint(); } + else if(source==editGroupName) + { + EditNameDialog dialog = new EditNameDialog( + getGroup().getName(), + getGroup().getDescription(), + " Group Name", + "Group Description", + ap, + "Edit Group Name / Description"); + + if (dialog.accept) + { + + getGroup().setName(dialog.getName().replace(' ', '_')); + getGroup().setDescription(dialog.getDescription()); + } + + } 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) + SequenceGroup sg = ap.av.getSelectionGroup(); + Vector regions = new Vector(); + if (sg != null) + { + int start = sg.getStartRes(); + int end = sg.getEndRes() + 1; + + do { - for (int g = 0; g < sg.getSize(true); g++) + if (ap.av.hasHiddenColumns) + { + if(start==0) + start = ap.av.colSel.adjustForHiddenColumns(start); + + end = ap.av.colSel.getHiddenBoundaryRight(start); + if (start == end) + end = sg.getEndRes() + 1; + if (end > sg.getEndRes()) + end = sg.getEndRes() + 1; + } + + regions.addElement(new int[] + {start, end}); + + if (ap.av.hasHiddenColumns) { - 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); + start = ap.av.colSel.adjustForHiddenColumns(end); + start = ap.av.colSel.getHiddenBoundaryLeft(start) + 1; } - ap.seqPanel.seqCanvas.repaint(); } + while (end < sg.getEndRes()); + + int[][] startEnd = new int[regions.size()][2]; + for (int i = 0; i < regions.size(); i++) + { + startEnd[i] = (int[]) regions.elementAt(i); + } + + + String description; + int caseChange; + + if(source==toggleCase) + { + description = "Toggle Case"; + caseChange = ChangeCaseCommand.TOGGLE_CASE; + } + else if(source==toUpper) + { + description = "To Upper Case"; + caseChange = ChangeCaseCommand.TO_UPPER; + } + else + { + description = "To Lower Case"; + caseChange = ChangeCaseCommand.TO_LOWER; + } + + ChangeCaseCommand caseCommand = new ChangeCaseCommand( + description, sg.getSequencesAsArray(ap.av.hiddenRepSequences), startEnd, caseChange + ); + + ap.alignFrame.addHistoryItem(caseCommand); + + + ap.av.firePropertyChange("alignment", null, + ap.av.getAlignment().getSequences()); + + } } else outputText(evt); @@ -254,23 +335,7 @@ public class APopupMenu 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 ); - } - } + CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame); Frame frame = new Frame(); frame.add(cap); @@ -280,11 +345,29 @@ public class APopupMenu cap.setText(new jalview.io.AppletFormatAdapter().formatSequences( e.getActionCommand(), - vseqs, + new Alignment( ap.av.getSelectionAsNewSequence() ), ap.av.showJVSuffix)); } + void editName() + { + EditNameDialog dialog = new EditNameDialog( + seq.getName(), + seq.getDescription(), + " Sequence Name ", + "Sequence Description ", + ap, + "Edit Sequence Name / Description"); + + if (dialog.accept) + { + seq.setName(dialog.getName()); + seq.setDescription(dialog.getDescription()); + ap.repaint(); + } + } + void addPDB() { CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame); @@ -301,6 +384,7 @@ public class APopupMenu groupMenu.setLabel("Group"); groupMenu.setLabel("Selection"); + editGroupName.addActionListener(this); unGroupMenuItem.setLabel("Remove Group"); unGroupMenuItem.addActionListener(this); @@ -312,6 +396,7 @@ public class APopupMenu showBoxes.setLabel("Boxes"); showBoxes.setState(true); showBoxes.addItemListener(this); + sequenceName.addActionListener(this); showText.setLabel("Text"); showText.addItemListener(this); @@ -323,19 +408,15 @@ public class APopupMenu hideSeqs.setLabel("Hide Sequences"); repGroup.setLabel("Represent Group with"); revealAll.setLabel("Reveal All"); - + menu1.setLabel("Group"); add(groupMenu); this.add(seqMenu); this.add(hideSeqs); this.add(revealAll); + groupMenu.add(editGroupName); groupMenu.add(editMenu); groupMenu.add(outputmenu); - groupMenu.addSeparator(); - groupMenu.add(unGroupMenuItem); - groupMenu.add(colourMenu); - groupMenu.add(showBoxes); - groupMenu.add(showText); - groupMenu.add(showColourText); + groupMenu.add(menu1); colourMenu.add(noColourmenuItem); colourMenu.add(clustalColour); colourMenu.add(BLOSUM62Colour); @@ -391,14 +472,19 @@ public class APopupMenu editMenu.add(toLower); toLower.addActionListener(this); editMenu.add(toggleCase); + seqMenu.add(sequenceName); seqMenu.add(pdb); seqMenu.add(repGroup); + menu1.add(unGroupMenuItem); + menu1.add(colourMenu); + menu1.add(showBoxes); + menu1.add(showText); + menu1.add(showColourText); toggleCase.addActionListener(this); pdb.addActionListener(this); hideSeqs.addActionListener(this); repGroup.addActionListener(this); revealAll.addActionListener(this); - } void refresh() @@ -411,7 +497,8 @@ public class APopupMenu protected void clustalColour_actionPerformed() { SequenceGroup sg = getGroup(); - sg.cs = new ClustalxColourScheme(sg.getSequences(true), ap.av.alignment.getWidth()); + sg.cs = new ClustalxColourScheme(sg.getSequences(ap.av.hiddenRepSequences), + ap.av.alignment.getWidth()); refresh(); } @@ -471,7 +558,7 @@ public class APopupMenu if (abovePIDColour.getState()) { - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av.hiddenRepSequences), 0, ap.av.alignment.getWidth())); int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup().getName()); @@ -499,7 +586,7 @@ public class APopupMenu { SequenceGroup sg = getGroup(); sg.cs = new PIDColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av.hiddenRepSequences), 0, ap.av.alignment.getWidth())); refresh(); } @@ -510,7 +597,7 @@ public class APopupMenu sg.cs = new Blosum62ColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, + sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av.hiddenRepSequences), 0, ap.av.alignment.getWidth())); refresh(); @@ -533,7 +620,7 @@ public class APopupMenu Conservation c = new Conservation("Group", ResidueProperties.propHash, 3, - sg.getSequences(true), 0, + sg.getSequences(ap.av.hiddenRepSequences), 0, ap.av.alignment.getWidth()); c.calculate(); @@ -593,30 +680,33 @@ public class APopupMenu void hideSequences(boolean representGroup) { SequenceGroup sg = ap.av.getSelectionGroup(); - if(sg==null || sg.getSize(false)<1) + if(sg==null || sg.getSize()<1) { - ap.av.hideSequence(seq); + ap.av.hideSequence(new SequenceI[]{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.av.setSelectionGroup(null); - ap.repaint(); - refresh(); + if (representGroup) + { + ap.av.hideRepSequences(seq, sg); + + return; + } + + int gsize = sg.getSize(); + SequenceI[] hseqs; + + hseqs = new SequenceI[gsize]; + + int index = 0; + for (int i = 0; i < gsize; i++) + { + hseqs[index++] = sg.getSequenceAt(i); + } + + ap.av.hideSequence(hseqs); } }