X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=0fcb1c04de9ec18040434d08b9cb989a5472a555;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=fe1700b904f9ee46a3200f9a0bf6e6c10f568aec;hpb=1cc81e06ac2faa5ee4b8879e9fa019956e34259f;p=jalview.git
diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index fe1700b..0fcb1c0 100755
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -108,20 +108,22 @@ public class APopupMenu extends java.awt.PopupMenu implements
MenuItem sequenceFeature = new MenuItem("Create Sequence Feature");
MenuItem editSequence = new MenuItem("Edit Sequence");
-
+
MenuItem sequenceDetails = new MenuItem("Sequence Details ...");
MenuItem selSeqDetails = new MenuItem("Sequence Details ...");
-
+
Sequence seq;
MenuItem revealAll = new MenuItem();
MenuItem revealSeq = new MenuItem();
+
/**
* index of sequence to be revealed
*/
- int revealSeq_index=-1;
+ int revealSeq_index = -1;
+
Menu menu1 = new Menu();
public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links)
@@ -157,7 +159,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
if (sg != null && sg.getSize() > 0)
{
- editGroupName.setLabel("Name: "+sg.getName());
+ editGroupName.setLabel("Name: " + sg.getName());
showText.setState(sg.getDisplayText());
showColourText.setState(sg.getColourText());
showBoxes.setState(sg.getDisplayBoxes());
@@ -190,7 +192,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
final String target = urlLink.getTarget(); // link.substring(0,
// link.indexOf("|"));
final String label = urlLink.getLabel();
- if (seq!=null && urlLink.isDynamic())
+ if (seq != null && urlLink.isDynamic())
{
// collect matching db-refs
@@ -309,14 +311,18 @@ public class APopupMenu extends java.awt.PopupMenu implements
{
remove(revealAll);
remove(revealSeq);
- } else {
+ }
+ else
+ {
final int index = ap.av.getAlignment().findIndex(seq);
if (ap.av.adjustForHiddenSeqs(index)
- ap.av.adjustForHiddenSeqs(index - 1) > 1)
{
- revealSeq_index=index;
- } else {
+ revealSeq_index = index;
+ }
+ else
+ {
remove(revealSeq);
}
}
@@ -527,7 +533,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
EditCommand.REPLACE, dialog.getName().replace(' ',
ap.av.getGapCharacter()),
sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),
- sg.getStartRes(), sg.getEndRes() + 1, ap.av.getAlignment());
+ sg.getStartRes(), sg.getEndRes() + 1,
+ ap.av.getAlignment());
ap.alignFrame.addHistoryItem(editCommand);
@@ -542,8 +549,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
Vector regions = new Vector();
if (sg != null)
{
- int[][] startEnd = ap.av.getVisibleRegionBoundaries(sg.getStartRes(),
- sg.getEndRes() + 1);
+ int[][] startEnd = ap.av.getVisibleRegionBoundaries(
+ sg.getStartRes(), sg.getEndRes() + 1);
String description;
int caseChange;
@@ -565,8 +572,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
}
ChangeCaseCommand caseCommand = new ChangeCaseCommand(description,
- sg.getSequencesAsArray(ap.av.getHiddenRepSequences()), startEnd,
- caseChange);
+ sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),
+ startEnd, caseChange);
ap.alignFrame.addHistoryItem(caseCommand);
@@ -621,7 +628,6 @@ public class APopupMenu extends java.awt.PopupMenu implements
}
-
void outputText(ActionEvent e)
{
CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame);
@@ -630,7 +636,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
frame.add(cap);
jalview.bin.JalviewLite.addFrame(frame,
"Selection output - " + e.getActionCommand(), 600, 500);
- // JBPNote: getSelectionAsNewSequence behaviour has changed - this method now returns a full copy of sequence data
+ // JBPNote: getSelectionAsNewSequence behaviour has changed - this method
+ // now returns a full copy of sequence data
// TODO consider using getSequenceSelection instead here
cap.setText(new jalview.io.AppletFormatAdapter().formatSequences(
@@ -639,6 +646,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
ap.av.showJVSuffix));
}
+
protected void showSequenceSelectionDetails()
{
createSequenceDetailsReport(ap.av.getSequenceSelection());
@@ -646,32 +654,36 @@ public class APopupMenu extends java.awt.PopupMenu implements
protected void showSequenceDetails()
{
- createSequenceDetailsReport(new SequenceI[]{seq});
+ createSequenceDetailsReport(new SequenceI[]
+ { seq });
}
+
public void createSequenceDetailsReport(SequenceI[] sequences)
{
CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame);
-
+
StringBuffer contents = new StringBuffer();
- for (SequenceI seq:sequences)
+ for (SequenceI seq : sequences)
{
- contents.append("Annotation 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("
");
+ contents.append("Annotation 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("
");
}
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame,
- "Sequence Details for " + (sequences.length==1 ? sequences[0].getDisplayId(true) : "Selection")
- , 600, 500);
+ jalview.bin.JalviewLite.addFrame(frame, "Sequence Details for "
+ + (sequences.length == 1 ? sequences[0].getDisplayId(true)
+ : "Selection"), 600, 500);
cap.setText("" + contents.toString() + "");
}
@@ -711,7 +723,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
cap.setPDBImport(seq);
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame, "Paste PDB file for sequence "+seq.getName(), 400, 300);
+ jalview.bin.JalviewLite.addFrame(frame,
+ "Paste PDB file for sequence " + seq.getName(), 400, 300);
}
}
@@ -824,7 +837,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
editMenu.add(toggleCase);
seqMenu.add(sequenceName);
// seqMenu.add(sequenceDetails);
-
+
if (!ap.av.applet.useXtrnalSviewer)
{
seqMenu.add(pdb);
@@ -852,8 +865,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
protected void clustalColour_actionPerformed()
{
SequenceGroup sg = getGroup();
- sg.cs = new ClustalxColourScheme(
- sg,ap.av.getHiddenRepSequences());
+ sg.cs = new ClustalxColourScheme(sg, ap.av.getHiddenRepSequences());
refresh();
}
@@ -915,9 +927,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
if (abovePIDColour.getState())
{
- sg.cs.setConsensus(AAFrequency.calculate(
- sg.getSequences(ap.av.getHiddenRepSequences()), 0,
- ap.av.getAlignment().getWidth()));
+ sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
+ .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup()
.getName());
@@ -945,9 +956,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
{
SequenceGroup sg = getGroup();
sg.cs = new PIDColourScheme();
- sg.cs.setConsensus(AAFrequency.calculate(
- sg.getSequences(ap.av.getHiddenRepSequences()), 0,
- ap.av.getAlignment().getWidth()));
+ sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
+ .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
refresh();
}
@@ -957,9 +967,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
sg.cs = new Blosum62ColourScheme();
- sg.cs.setConsensus(AAFrequency.calculate(
- sg.getSequences(ap.av.getHiddenRepSequences()), 0,
- ap.av.getAlignment().getWidth()));
+ sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(ap.av
+ .getHiddenRepSequences()), 0, ap.av.getAlignment().getWidth()));
refresh();
}
@@ -982,10 +991,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
{
sg.cs.setConservation(Conservation.calculateConservation("Group",
- ResidueProperties.propHash, 3,
- sg.getSequences(ap.av.getHiddenRepSequences()), 0,
- ap.av.getAlignment().getWidth(),
- false, ap.av.getConsPercGaps(),false));
+ ResidueProperties.propHash, 3, sg.getSequences(ap.av
+ .getHiddenRepSequences()), 0, ap.av.getAlignment()
+ .getWidth(), false, ap.av.getConsPercGaps(), false));
SliderPanel.setConservationSlider(ap, sg.cs, sg.getName());
SliderPanel.showConservationSlider();
}