X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=1a367c5e58d494e8354f494db9ba1e9ad797ea25;hb=8f2bef6f91e7a6e47e41e78a82f45f7e406ef90a;hp=a98c1da213537b110f4117d25466a025c801704c;hpb=65b3877f9041a45bfbb7cbc1dd444a8cf87c9f3d;p=jalview.git
diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
old mode 100755
new mode 100644
index a98c1da..1a367c5
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1,13 +1,13 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -21,22 +21,23 @@ import java.util.*;
import java.awt.*;
import java.awt.event.*;
+
import javax.swing.*;
-import MCview.*;
import jalview.analysis.*;
import jalview.commands.*;
import jalview.datamodel.*;
import jalview.io.*;
import jalview.schemes.*;
import jalview.util.GroupUrlLink;
+import jalview.util.GroupUrlLink.UrlStringTooLongException;
import jalview.util.UrlLink;
/**
* DOCUMENT ME!
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.118 $
*/
public class PopupMenu extends JPopupMenu
{
@@ -68,6 +69,11 @@ public class PopupMenu extends JPopupMenu
protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();
+ protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
+
+ // protected JRadioButtonMenuItem covariationColour = new
+ // JRadioButtonMenuItem();
+
JRadioButtonMenuItem noColourmenuItem = new JRadioButtonMenuItem();
protected JCheckBoxMenuItem conservationMenuItem = new JCheckBoxMenuItem();
@@ -78,7 +84,11 @@ public class PopupMenu extends JPopupMenu
JMenuItem sequenceName = new JMenuItem();
- Sequence sequence;
+ JMenuItem sequenceDetails = new JMenuItem();
+
+ JMenuItem sequenceSelDetails = new JMenuItem();
+
+ SequenceI sequence;
JMenuItem unGroupMenuItem = new JMenuItem();
@@ -155,8 +165,8 @@ public class PopupMenu extends JPopupMenu
* @param links
* @param groupLinks
*/
- public PopupMenu(final AlignmentPanel ap, Sequence seq, Vector links,
- Vector groupLinks)
+ public PopupMenu(final AlignmentPanel ap, final SequenceI seq,
+ Vector links, Vector groupLinks)
{
// /////////////////////////////////////////////////////////
// If this is activated from the sequence panel, the user may want to
@@ -181,6 +191,8 @@ public class PopupMenu extends JPopupMenu
colours.add(userDefinedColour);
colours.add(PIDColour);
colours.add(BLOSUM62Colour);
+ colours.add(purinePyrimidineColour);
+ // colours.add(covariationColour);
for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
{
@@ -206,11 +218,11 @@ public class PopupMenu extends JPopupMenu
e.printStackTrace();
}
+ JMenuItem menuItem;
if (seq != null)
{
sequenceMenu.setText(sequence.getName());
- JMenuItem menuItem;
if (seq.getDatasetSequence().getPDBId() != null
&& seq.getDatasetSequence().getPDBId().size() > 0)
{
@@ -227,33 +239,13 @@ public class PopupMenu extends JPopupMenu
{
public void actionPerformed(ActionEvent e)
{
- Vector seqs = new Vector();
- for (int i = 0; i < ap.av.alignment.getHeight(); i++)
- {
- Vector pdbs = ap.av.alignment.getSequenceAt(i)
- .getDatasetSequence().getPDBId();
- if (pdbs == null)
- continue;
-
- for (int p = 0; p < pdbs.size(); p++)
- {
- PDBEntry p1 = (PDBEntry) pdbs.elementAt(p);
- if (p1.getId().equals(pdb.getId()))
- {
- if (!seqs.contains(ap.av.alignment.getSequenceAt(i)))
- seqs.addElement(ap.av.alignment.getSequenceAt(i));
-
- continue;
- }
- }
- }
-
- SequenceI[] seqs2 = new SequenceI[seqs.size()];
- seqs.toArray(seqs2);
-
- new AppJmol(pdb, seqs2, null, ap);
+ // TODO re JAL-860: optionally open dialog or provide a menu entry
+ // allowing user to open just one structure per sequence
+ new AppJmol(pdb, ap.av.collateForPDB(new PDBEntry[]
+ { pdb })[0], null, ap);
// new PDBViewer(pdb, seqs2, null, ap, AppletFormatAdapter.FILE);
}
+
});
viewStructureMenu.add(menuItem);
@@ -268,10 +260,68 @@ public class PopupMenu extends JPopupMenu
}
else
{
- structureMenu.remove(viewStructureMenu);
+ if (ap.av.getAlignment().isNucleotide() == false)
+ {
+ structureMenu.remove(viewStructureMenu);
+ }
// structureMenu.remove(colStructureMenu);
}
+ if (ap.av.getAlignment().isNucleotide() == true)
+ {
+ AlignmentAnnotation[] aa = ap.av.getAlignment()
+ .getAlignmentAnnotation();
+ for (int i = 0; i < aa.length; i++)
+ {
+ if (aa[i].getRNAStruc() != null)
+ {
+ final String rnastruc = aa[i].getRNAStruc();
+ final String structureLine = aa[i].label;
+ menuItem = new JMenuItem();
+ menuItem.setText("2D RNA " + structureLine);
+ menuItem.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ new AppVarna(structureLine, seq, seq.getSequenceAsString(),
+ rnastruc, seq.getName(), ap);
+ }
+ });
+ viewStructureMenu.add(menuItem);
+ }
+ }
+
+ // SequenceFeatures[] test = seq.getSequenceFeatures();
+
+ if (seq.getAnnotation() != null)
+ {
+ AlignmentAnnotation seqAnno[] = seq.getAnnotation();
+ for (int i = 0; i < seqAnno.length; i++)
+ {
+ if (seqAnno[i].getRNAStruc() != null)
+ {
+ final String rnastruc = seqAnno[i].getRNAStruc();
+
+ // TODO: make rnastrucF a bit more nice
+ menuItem = new JMenuItem();
+ menuItem.setText("2D RNA - " + seq.getName());
+ menuItem.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ // TODO: VARNA does'nt print gaps in the sequence
+ new AppVarna(seq.getName() + " structure", seq, seq
+ .getSequenceAsString(), rnastruc, seq.getName(),
+ ap);
+ }
+ });
+ viewStructureMenu.add(menuItem);
+ }
+ }
+ }
+
+ }
+
menuItem = new JMenuItem("Hide Sequences");
menuItem.addActionListener(new java.awt.event.ActionListener()
{
@@ -296,9 +346,9 @@ public class PopupMenu extends JPopupMenu
sequenceMenu.add(menuItem);
}
- if (ap.av.hasHiddenRows)
+ if (ap.av.hasHiddenRows())
{
- final int index = ap.av.alignment.findIndex(seq);
+ final int index = ap.av.getAlignment().findIndex(seq);
if (ap.av.adjustForHiddenSeqs(index)
- ap.av.adjustForHiddenSeqs(index - 1) > 1)
@@ -317,7 +367,12 @@ public class PopupMenu extends JPopupMenu
});
add(menuItem);
}
-
+ }
+ }
+ // for the case when no sequences are even visible
+ if (ap.av.hasHiddenRows())
+ {
+ {
menuItem = new JMenuItem("Reveal All");
menuItem.addActionListener(new ActionListener()
{
@@ -338,9 +393,10 @@ public class PopupMenu extends JPopupMenu
SequenceGroup sg = ap.av.getSelectionGroup();
- if (sg != null)
+ if (sg != null && sg.getSize() > 0)
{
- groupName.setText(sg.getName());
+ groupName.setText("Name: " + sg.getName());
+ groupName.setText("Edit name and description of current group.");
if (sg.cs instanceof ZappoColourScheme)
{
@@ -386,6 +442,14 @@ public class PopupMenu extends JPopupMenu
{
clustalColour.setSelected(true);
}
+ else if (sg.cs instanceof PurinePyrimidineColourScheme)
+ {
+ purinePyrimidineColour.setSelected(true);
+ }
+ /*
+ * else if (sg.cs instanceof CovariationColourScheme) {
+ * covariationColour.setSelected(true); }
+ */
else
{
noColourmenuItem.setSelected(true);
@@ -395,7 +459,7 @@ public class PopupMenu extends JPopupMenu
{
conservationMenuItem.setSelected(true);
}
- displayNonconserved.setSelected(sg.getShowunconserved());
+ displayNonconserved.setSelected(sg.getShowNonconserved());
showText.setSelected(sg.getDisplayText());
showColourText.setSelected(sg.getColourText());
showBoxes.setSelected(sg.getDisplayBoxes());
@@ -404,6 +468,51 @@ public class PopupMenu extends JPopupMenu
{
buildGroupURLMenu(sg, groupLinks);
}
+ // Add a 'show all structures' for the current selection
+ HashtableAnnotation for " + seq.getDisplayId(true)
+ + "
"); + new SequenceAnnotationReport(null) + .createSequenceAnnotationReport( + contents, + seq, + true, + true, + false, + (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.minmax + : null); + contents.append("
"); + } + cap.setText("" + contents.toString() + ""); + + Desktop.instance.addInternalFrame(cap, "Sequence Details for " + + (sequences.length == 1 ? sequences[0].getDisplayId(true) + : "Selection"), 500, 400); + + } + protected void showNonconserved_actionPerformed() { - getGroup().setShowunconserved(displayNonconserved.isSelected()); + getGroup().setShowNonconserved(displayNonconserved.isSelected()); refresh(); } @@ -1163,9 +1359,7 @@ public class PopupMenu extends JPopupMenu protected void clustalColour_actionPerformed() { SequenceGroup sg = getGroup(); - sg.cs = new ClustalxColourScheme(sg - .getSequences(ap.av.hiddenRepSequences), ap.av.alignment - .getWidth()); + sg.cs = new ClustalxColourScheme(sg, ap.av.getHiddenRepSequences()); refresh(); } @@ -1265,6 +1459,16 @@ public class PopupMenu extends JPopupMenu refresh(); } + protected void purinePyrimidineColour_actionPerformed() + { + getGroup().cs = new PurinePyrimidineColourScheme(); + refresh(); + } + + /* + * protected void covariationColour_actionPerformed() { getGroup().cs = new + * CovariationColourScheme(sequence.getAnnotation()[0]); refresh(); } + */ /** * DOCUMENT ME! * @@ -1281,9 +1485,9 @@ public class PopupMenu extends JPopupMenu if (abovePIDColour.isSelected()) { - sg.cs.setConsensus(AAFrequency.calculate(sg - .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg - .getEndRes() + 1)); + sg.cs.setConsensus(AAFrequency.calculate( + sg.getSequences(ap.av.getHiddenRepSequences()), + sg.getStartRes(), sg.getEndRes() + 1)); int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup() .getName()); @@ -1335,9 +1539,9 @@ public class PopupMenu extends JPopupMenu { SequenceGroup sg = getGroup(); sg.cs = new PIDColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg - .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg - .getEndRes() + 1)); + sg.cs.setConsensus(AAFrequency.calculate( + sg.getSequences(ap.av.getHiddenRepSequences()), + sg.getStartRes(), sg.getEndRes() + 1)); refresh(); } @@ -1353,9 +1557,9 @@ public class PopupMenu extends JPopupMenu sg.cs = new Blosum62ColourScheme(); - sg.cs.setConsensus(AAFrequency.calculate(sg - .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg - .getEndRes() + 1)); + sg.cs.setConsensus(AAFrequency.calculate( + sg.getSequences(ap.av.getHiddenRepSequences()), + sg.getStartRes(), sg.getEndRes() + 1)); refresh(); } @@ -1389,12 +1593,12 @@ public class PopupMenu extends JPopupMenu if (conservationMenuItem.isSelected()) { Conservation c = new Conservation("Group", - ResidueProperties.propHash, 3, sg - .getSequences(ap.av.hiddenRepSequences), sg - .getStartRes(), sg.getEndRes() + 1); + ResidueProperties.propHash, 3, sg.getSequences(ap.av + .getHiddenRepSequences()), sg.getStartRes(), + sg.getEndRes() + 1); c.calculate(); - c.verdict(false, ap.av.ConsPercGaps); + c.verdict(false, ap.av.getConsPercGaps()); sg.cs.setConservation(c); @@ -1418,8 +1622,8 @@ public class PopupMenu extends JPopupMenu return; } - AnnotationColourGradient acg = new AnnotationColourGradient(sequence - .getAnnotation()[0], null, + AnnotationColourGradient acg = new AnnotationColourGradient( + sequence.getAnnotation()[0], null, AnnotationColourGradient.NO_THRESHOLD); acg.predefinedColours = true; @@ -1438,9 +1642,10 @@ public class PopupMenu extends JPopupMenu { SequenceGroup sg = getGroup(); - EditNameDialog dialog = new EditNameDialog(sg.getName(), sg - .getDescription(), " Group Name ", "Group Description ", - "Edit Group Name/Description"); + EditNameDialog dialog = new EditNameDialog(sg.getName(), + sg.getDescription(), " Group Name ", + "Group Description ", "Edit Group Name/Description", + ap.alignFrame); if (!dialog.accept) { @@ -1463,7 +1668,7 @@ public class PopupMenu extends JPopupMenu // this method won't add a new group if it already exists if (sg != null) { - ap.av.alignment.addGroup(sg); + ap.av.getAlignment().addGroup(sg); } return sg; @@ -1477,9 +1682,10 @@ public class PopupMenu extends JPopupMenu */ void sequenceName_actionPerformed() { - EditNameDialog dialog = new EditNameDialog(sequence.getName(), sequence - .getDescription(), " Sequence Name ", - "Sequence Description ", "Edit Sequence Name/Description"); + EditNameDialog dialog = new EditNameDialog(sequence.getName(), + sequence.getDescription(), " Sequence Name ", + "Sequence Description ", "Edit Sequence Name/Description", + ap.alignFrame); if (!dialog.accept) { @@ -1516,7 +1722,7 @@ public class PopupMenu extends JPopupMenu void unGroupMenuItem_actionPerformed() { SequenceGroup sg = ap.av.getSelectionGroup(); - ap.av.alignment.deleteGroup(sg); + ap.av.getAlignment().deleteGroup(sg); ap.av.setSelectionGroup(null); refresh(); } @@ -1669,9 +1875,9 @@ public class PopupMenu extends JPopupMenu caseChange = ChangeCaseCommand.TO_LOWER; } - ChangeCaseCommand caseCommand = new ChangeCaseCommand(description, sg - .getSequencesAsArray(ap.av.hiddenRepSequences), startEnd, - caseChange); + ChangeCaseCommand caseCommand = new ChangeCaseCommand(description, + sg.getSequencesAsArray(ap.av.getHiddenRepSequences()), + startEnd, caseChange); ap.alignFrame.addHistoryItem(caseCommand); @@ -1685,8 +1891,8 @@ public class PopupMenu extends JPopupMenu { CutAndPasteTransfer cap = new CutAndPasteTransfer(); cap.setForInput(null); - Desktop.addInternalFrame(cap, "Alignment output - " - + e.getActionCommand(), 600, 500); + Desktop.addInternalFrame(cap, + "Alignment output - " + e.getActionCommand(), 600, 500); String[] omitHidden = null; @@ -1697,8 +1903,10 @@ public class PopupMenu extends JPopupMenu ColumnSelection csel = new ColumnSelection(ap.av.getColumnSelection()); omitHidden = ap.av.getViewAsString(true); Alignment oal = new Alignment(ap.av.getSequenceSelection()); - AlignmentAnnotation[] nala = ap.av.alignment.getAlignmentAnnotation(); - if (nala!=null) { + AlignmentAnnotation[] nala = ap.av.getAlignment() + .getAlignmentAnnotation(); + if (nala != null) + { for (int i = 0; i < nala.length; i++) { AlignmentAnnotation na = nala[i]; @@ -1715,47 +1923,19 @@ public class PopupMenu extends JPopupMenu jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser( jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Select a PDB file"); - chooser.setToolTipText("Load a PDB file"); + chooser.setDialogTitle("Select a PDB file for " + + sequence.getDisplayId(false)); + chooser.setToolTipText("Load a PDB file and associate it with sequence '" + + sequence.getDisplayId(false) + "'"); int value = chooser.showOpenDialog(null); if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION) { - PDBEntry entry = new PDBEntry(); String choice = chooser.getSelectedFile().getPath(); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice); - try - { - MCview.PDBfile pdbfile = new MCview.PDBfile(choice, - jalview.io.AppletFormatAdapter.FILE); - - if (pdbfile.id == null) - { - String reply = JOptionPane - .showInternalInputDialog( - Desktop.desktop, - "Couldn't find a PDB id in the file supplied." - + "Please enter an Id to identify this structure.", - "No PDB Id in File", JOptionPane.QUESTION_MESSAGE); - if (reply == null) - { - return; - } - - entry.setId(reply); - } - else - { - entry.setId(pdbfile.id); - } - } catch (java.io.IOException ex) - { - ex.printStackTrace(); - } - - entry.setFile(choice); - sequence.getDatasetSequence().addPDBId(entry); + new AssociatePdbFileWithSeq().associatePdbWithSeq(choice, + jalview.io.AppletFormatAdapter.FILE, sequence, true); } } @@ -1776,9 +1956,9 @@ public class PopupMenu extends JPopupMenu public void discoverPDB_actionPerformed() { - final SequenceI[] sequences = ((ap.av.selectionGroup == null) ? new Sequence[] + final SequenceI[] sequences = ((ap.av.getSelectionGroup() == null) ? new SequenceI[] { sequence } - : ap.av.selectionGroup.getSequencesInOrder(ap.av.alignment)); + : ap.av.getSequenceSelection()); Thread discpdb = new Thread(new Runnable() { public void run() @@ -1841,17 +2021,16 @@ public class PopupMenu extends JPopupMenu public void colourByStructure(String pdbid) { - Annotation[] anots = jalview.structure.StructureSelectionManager - .getStructureSelectionManager().colourSequenceFromStructure( - sequence, pdbid); + Annotation[] anots = ap.av.getStructureSelectionManager() + .colourSequenceFromStructure(sequence, pdbid); AlignmentAnnotation an = new AlignmentAnnotation("Structure", "Coloured by " + pdbid, anots); - ap.av.alignment.addAnnotation(an); + ap.av.getAlignment().addAnnotation(an); an.createSequenceMapping(sequence, 0, true); // an.adjustForAlignment(); - ap.av.alignment.setAnnotationIndex(an, 0); + ap.av.getAlignment().setAnnotationIndex(an, 0); ap.adjustAnnotationHeight(); @@ -1868,17 +2047,18 @@ public class PopupMenu extends JPopupMenu if (sequence == null) sequence = (Sequence) sg.getSequenceAt(0); - EditNameDialog dialog = new EditNameDialog(sequence - .getSequenceAsString(sg.getStartRes(), sg.getEndRes() + 1), - null, "Edit Sequence ", null, "Edit Sequence"); + EditNameDialog dialog = new EditNameDialog( + sequence.getSequenceAsString(sg.getStartRes(), + sg.getEndRes() + 1), null, "Edit Sequence ", null, + "Edit Sequence", ap.alignFrame); if (dialog.accept) { EditCommand editCommand = new EditCommand("Edit Sequences", EditCommand.REPLACE, dialog.getName().replace(' ', - ap.av.getGapCharacter()), sg - .getSequencesAsArray(ap.av.hiddenRepSequences), sg - .getStartRes(), sg.getEndRes() + 1, ap.av.alignment); + ap.av.getGapCharacter()), + sg.getSequencesAsArray(ap.av.getHiddenRepSequences()), + sg.getStartRes(), sg.getEndRes() + 1, ap.av.getAlignment()); ap.alignFrame.addHistoryItem(editCommand);