/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
MenuItem revealAll = new MenuItem();
+ MenuItem revealSeq = new MenuItem();
+ /**
+ * index of sequence to be revealed
+ */
+ int revealSeq_index=-1;
Menu menu1 = new Menu();
public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links)
if (sg != null && sg.getSize() > 0)
{
- editGroupName.setLabel(sg.getName());
+ editGroupName.setLabel("Name: "+sg.getName());
showText.setState(sg.getDisplayText());
showColourText.setState(sg.getColourText());
showBoxes.setState(sg.getDisplayBoxes());
remove(groupMenu);
}
- if (links != null && links.size() > 0)
+ if (seq!=null && links != null && links.size() > 0)
{
Menu linkMenu = new Menu("Link");
String link;
final String target = urlLink.getTarget(); // link.substring(0,
// link.indexOf("|"));
final String label = urlLink.getLabel();
- if (urlLink.isDynamic())
+ if (seq!=null && urlLink.isDynamic())
{
// collect matching db-refs
if (!ap.av.hasHiddenRows)
{
remove(revealAll);
+ remove(revealSeq);
+ } else {
+ final int index = ap.av.alignment.findIndex(seq);
+
+ if (ap.av.adjustForHiddenSeqs(index)
+ - ap.av.adjustForHiddenSeqs(index - 1) > 1)
+ {
+ revealSeq_index=index;
+ } else {
+ remove(revealSeq);
+ }
}
}
{
hideSequences(true);
}
+ else if (source == revealSeq)
+ {
+ ap.av.showSequence(revealSeq_index);
+ }
else if (source == revealAll)
{
ap.av.showAllHiddenSeqs();
cap.setPDBImport(seq);
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame, "Paste PDB file ", 400, 300);
+ jalview.bin.JalviewLite.addFrame(frame, "Paste PDB file for sequence "+seq.getName(), 400, 300);
}
}
hideSeqs.setLabel("Hide Sequences");
repGroup.setLabel("Represent Group with");
revealAll.setLabel("Reveal All");
+ revealSeq.setLabel("Reveal Sequences");
menu1.setLabel("Group");
add(groupMenu);
this.add(seqMenu);
this.add(hideSeqs);
+ this.add(revealSeq);
this.add(revealAll);
groupMenu.add(editGroupName);
groupMenu.add(editMenu);
toLower.addActionListener(this);
editMenu.add(toggleCase);
seqMenu.add(sequenceName);
- seqMenu.add(pdb);
+ if (!ap.av.applet.useXtrnalSviewer)
+ {
+ seqMenu.add(pdb);
+ }
seqMenu.add(repGroup);
menu1.add(unGroupMenuItem);
menu1.add(colourMenu);
hideSeqs.addActionListener(this);
repGroup.addActionListener(this);
revealAll.addActionListener(this);
+ revealSeq.addActionListener(this);
}
void refresh()
}
ap.av.hideSequence(hseqs);
+ ap.av.sendSelection();
}
}