X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=3b37b62972d4179c2b193036e3835cac41928e04;hb=4663ab6ec8142df859d031bff618d78809e22082;hp=d98e2aa4a061ab6f5ea2ebb027e12973fba5608b;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index d98e2aa..3b37b62 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -20,19 +20,43 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.analysis.*; -import jalview.commands.*; -import jalview.datamodel.*; -import jalview.schemes.*; -import jalview.util.MessageManager; -import jalview.util.UrlLink; +import jalview.analysis.AAFrequency; +import jalview.analysis.Conservation; +import jalview.commands.ChangeCaseCommand; +import jalview.commands.EditCommand; +import jalview.commands.EditCommand.Action; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; import jalview.io.AppletFormatAdapter; import jalview.io.SequenceAnnotationReport; +import jalview.schemes.Blosum62ColourScheme; +import jalview.schemes.BuriedColourScheme; +import jalview.schemes.ClustalxColourScheme; +import jalview.schemes.HelixColourScheme; +import jalview.schemes.HydrophobicColourScheme; +import jalview.schemes.NucleotideColourScheme; +import jalview.schemes.PIDColourScheme; +import jalview.schemes.ResidueProperties; +import jalview.schemes.StrandColourScheme; +import jalview.schemes.TaylorColourScheme; +import jalview.schemes.TurnColourScheme; +import jalview.schemes.ZappoColourScheme; +import jalview.util.MessageManager; +import jalview.util.UrlLink; + +import java.awt.CheckboxMenuItem; +import java.awt.Frame; +import java.awt.Menu; +import java.awt.MenuItem; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.Vector; public class APopupMenu extends java.awt.PopupMenu implements ActionListener, ItemListener @@ -128,6 +152,8 @@ public class APopupMenu extends java.awt.PopupMenu implements MenuItem selSeqDetails = new MenuItem( MessageManager.getString("label.sequence_details") + "..."); + MenuItem makeReferenceSeq = new MenuItem(); + Sequence seq; MenuItem revealAll = new MenuItem(); @@ -323,6 +349,17 @@ public class APopupMenu extends java.awt.PopupMenu implements if (seq != null) { seqMenu.setLabel(seq.getName()); + if (seq == ap.av.getAlignment().getSeqrep()) + { + makeReferenceSeq.setLabel(MessageManager + .getString("action.unmark_as_reference"));// Unmark + // representative"); + } + else + { + makeReferenceSeq.setLabel(MessageManager + .getString("action.set_as_reference")); // ); + } repGroup.setLabel(MessageManager.formatMessage( "label.represent_group_with", new String[] { seq.getName() })); @@ -491,6 +528,10 @@ public class APopupMenu extends java.awt.PopupMenu implements { editName(); } + else if (source == makeReferenceSeq) + { + makeReferenceSeq_actionPerformed(); + } else if (source == sequenceDetails) { showSequenceDetails(); @@ -549,7 +590,9 @@ public class APopupMenu extends java.awt.PopupMenu implements if (sg != null) { if (seq == null) + { seq = (Sequence) sg.getSequenceAt(0); + } EditNameDialog dialog = new EditNameDialog(seq.getSequenceAsString( sg.getStartRes(), sg.getEndRes() + 1), null, @@ -559,8 +602,8 @@ public class APopupMenu extends java.awt.PopupMenu implements if (dialog.accept) { - EditCommand editCommand = new EditCommand("Edit Sequences", - EditCommand.REPLACE, dialog.getName().replace(' ', + EditCommand editCommand = new EditCommand(MessageManager.getString("label.edit_sequences"), + Action.REPLACE, dialog.getName().replace(' ', ap.av.getGapCharacter()), sg.getSequencesAsArray(ap.av.getHiddenRepSequences()), sg.getStartRes(), sg.getEndRes() + 1, @@ -647,7 +690,7 @@ public class APopupMenu extends java.awt.PopupMenu implements features, true, ap)) { ap.alignFrame.sequenceFeatures.setState(true); - ap.av.showSequenceFeatures(true); + ap.av.setShowSequenceFeatures(true);; ap.highlightSearchResults(null); } } @@ -672,9 +715,7 @@ public class APopupMenu extends java.awt.PopupMenu implements // TODO consider using getSequenceSelection instead here cap.setText(new jalview.io.AppletFormatAdapter().formatSequences( - e.getActionCommand(), - new Alignment(ap.av.getSelectionAsNewSequence()), - ap.av.showJVSuffix)); + e.getActionCommand(), ap.av.getShowJVSuffix(), ap.av, true)); } @@ -707,7 +748,7 @@ public class APopupMenu extends java.awt.PopupMenu implements true, true, false, - (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.minmax + (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.getMinMax() : null); contents.append("

"); } @@ -743,11 +784,15 @@ public class APopupMenu extends java.awt.PopupMenu implements PDBEntry entry = (PDBEntry) seq.getPDBId().firstElement(); if (ap.av.applet.jmolAvailable) + { new jalview.appletgui.AppletJmol(entry, new Sequence[] { seq }, null, ap, AppletFormatAdapter.URL); + } else + { new MCview.AppletPDBViewer(entry, new Sequence[] { seq }, null, ap, AppletFormatAdapter.URL); + } } else @@ -837,34 +882,34 @@ public class APopupMenu extends java.awt.PopupMenu implements colourMenu.add(abovePIDColour); colourMenu.add(conservationMenuItem); - noColourmenuItem.setLabel("None"); + noColourmenuItem.setLabel(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(this); - clustalColour.setLabel("Clustalx colours"); + clustalColour.setLabel(MessageManager.getString("label.clustalx_colours")); clustalColour.addActionListener(this); - zappoColour.setLabel("Zappo"); + zappoColour.setLabel(MessageManager.getString("label.zappo")); zappoColour.addActionListener(this); - taylorColour.setLabel("Taylor"); + taylorColour.setLabel(MessageManager.getString("label.taylor")); taylorColour.addActionListener(this); - hydrophobicityColour.setLabel("Hydrophobicity"); + hydrophobicityColour.setLabel(MessageManager.getString("label.hydrophobicity")); hydrophobicityColour.addActionListener(this); - helixColour.setLabel("Helix propensity"); + helixColour.setLabel(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(this); - strandColour.setLabel("Strand propensity"); + strandColour.setLabel(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(this); - turnColour.setLabel("Turn propensity"); + turnColour.setLabel(MessageManager.getString("label.turn_propensity")); turnColour.addActionListener(this); - buriedColour.setLabel("Buried Index"); + buriedColour.setLabel(MessageManager.getString("label.buried_index")); buriedColour.addActionListener(this); - abovePIDColour.setLabel("Above % Identity"); + abovePIDColour.setLabel(MessageManager.getString("label.above_identity_percentage")); - userDefinedColour.setLabel("User Defined"); + userDefinedColour.setLabel(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(this); - PIDColour.setLabel("Percentage Identity"); + PIDColour.setLabel(MessageManager.getString("action.percentage_identity")); PIDColour.addActionListener(this); BLOSUM62Colour.setLabel("BLOSUM62"); BLOSUM62Colour.addActionListener(this); - conservationMenuItem.setLabel("Conservation"); + conservationMenuItem.setLabel(MessageManager.getString("label.conservation")); editMenu.add(copy); copy.addActionListener(this); @@ -880,6 +925,7 @@ public class APopupMenu extends java.awt.PopupMenu implements toLower.addActionListener(this); editMenu.add(toggleCase); seqMenu.add(sequenceName); + seqMenu.add(makeReferenceSeq); // seqMenu.add(sequenceDetails); if (!ap.av.applet.useXtrnalSviewer) @@ -899,6 +945,7 @@ public class APopupMenu extends java.awt.PopupMenu implements repGroup.addActionListener(this); revealAll.addActionListener(this); revealSeq.addActionListener(this); + makeReferenceSeq.addActionListener(this); } void refresh() @@ -976,7 +1023,7 @@ public class APopupMenu extends java.awt.PopupMenu implements int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup() .getName()); - sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus()); + sg.cs.setThreshold(threshold, ap.av.isIgnoreGapsConsensus()); SliderPanel.showPIDSlider(); @@ -984,7 +1031,7 @@ public class APopupMenu extends java.awt.PopupMenu implements else // remove PIDColouring { - sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); + sg.cs.setThreshold(0, ap.av.isIgnoreGapsConsensus()); } refresh(); @@ -1088,6 +1135,28 @@ public class APopupMenu extends java.awt.PopupMenu implements getGroup().setDisplayText(showText.getState()); refresh(); } + public void makeReferenceSeq_actionPerformed() + { + if (!ap.av.getAlignment().hasSeqrep()) + { + // initialise the display flags so the user sees something happen + ap.av.setDisplayReferenceSeq(true); + ap.av.setColourByReferenceSeq(true); + ap.av.getAlignment().setSeqrep(seq); + } + else + { + if (ap.av.getAlignment().getSeqrep() == seq) + { + ap.av.getAlignment().setSeqrep(null); + } + else + { + ap.av.getAlignment().setSeqrep(seq); + } + } + refresh(); + } public void showNonconserved_itemStateChanged() {