\r
import jalview.datamodel.*;\r
\r
-import jalview.io.*;\r
\r
import jalview.schemes.*;\r
\r
JMenuItem sequenceName = new JMenuItem();\r
Sequence sequence;\r
JMenuItem unGroupMenuItem = new JMenuItem();\r
- JMenuItem pdbMenuItem = new JMenuItem();\r
JMenuItem outline = new JMenuItem();\r
JRadioButtonMenuItem nucleotideMenuItem = new JRadioButtonMenuItem();\r
JMenu colourMenu = new JMenu();\r
* @param ap DOCUMENT ME!\r
* @param seq DOCUMENT ME!\r
*/\r
- public PopupMenu(AlignmentPanel ap, Sequence seq)\r
+ public PopupMenu(final AlignmentPanel ap, Sequence seq)\r
{\r
///////////////////////////////////////////////////////////\r
// If this is activated from the sequence panel, the user may want to\r
e.printStackTrace();\r
}\r
\r
- if ((seq == null) || (seq.getPDBId() == null))\r
+\r
+ if (seq != null)\r
{\r
- pdbMenuItem.setVisible(false);\r
+ JMenuItem menuItem;\r
+ if( seq.getDatasetSequence().getPDBId() != null)\r
+ {\r
+ java.util.Enumeration e = seq.getDatasetSequence().getPDBId().\r
+ elements();\r
+ while (e.hasMoreElements())\r
+ {\r
+ final PDBEntry pdb = (PDBEntry) e.nextElement();\r
+\r
+ menuItem = new JMenuItem();\r
+ menuItem.setText("View PDB entry: " + pdb.getId());\r
+ menuItem.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas);\r
+ }\r
+ });\r
+ sequenceMenu.add(menuItem);\r
+ }\r
+ }\r
+\r
+ /* menuItem = new JMenuItem("Hide Sequences");\r
+ menuItem.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ hideSequences(false);\r
+ }\r
+ });\r
+ sequenceMenu.add(menuItem);\r
+\r
+ if(ap.av.getSelectionGroup() !=null && ap.av.getSelectionGroup().getSize()>1)\r
+ {\r
+ menuItem = new JMenuItem("Represent Group with " + seq.getName());\r
+ menuItem.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ hideSequences(true);\r
+ }\r
+ });\r
+ sequenceMenu.add(menuItem);\r
+ }*/\r
+\r
+\r
}\r
\r
+\r
+\r
SequenceGroup sg = ap.av.getSelectionGroup();\r
\r
if (sg != null)\r
noColourmenuItem.setSelected(true);\r
}\r
\r
- if (sg.cs instanceof ConservationColourScheme)\r
+ if (sg.cs!=null && sg.cs.conservationApplied())\r
{\r
conservationMenuItem.setSelected(true);\r
}\r
String link = links.elementAt(i).toString();\r
\r
item = new JMenuItem(link.substring(0, link.indexOf("|")));\r
+ String id = sequence.getName();\r
+ if(id.indexOf("|")>-1)\r
+ id = id.substring(id.lastIndexOf("|")+1);\r
\r
final String url = link.substring(link.indexOf("|")+1, link.indexOf("$SEQUENCE_ID$"))\r
- + sequence.getName() +\r
+ + id +\r
link.substring(link.indexOf("$SEQUENCE_ID$") + 13);\r
\r
\r
}\r
}\r
\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
}\r
});\r
sequenceMenu.setText("Sequence");\r
- sequenceName.setText("Edit name");\r
+ sequenceName.setText("Edit Name/Description");\r
sequenceName.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
unGroupMenuItem_actionPerformed(e);\r
}\r
});\r
- pdbMenuItem.setText("View PDB structure");\r
- pdbMenuItem.addActionListener(new java.awt.event.ActionListener()\r
- {\r
- public void actionPerformed(ActionEvent e)\r
- {\r
- pdbMenuItem_actionPerformed(e);\r
- }\r
- });\r
+\r
outline.setText("Border colour");\r
outline.addActionListener(new java.awt.event.ActionListener()\r
{\r
groupMenu.addSeparator();\r
groupMenu.add(outline);\r
sequenceMenu.add(sequenceName);\r
- sequenceMenu.add(pdbMenuItem);\r
colourMenu.add(noColourmenuItem);\r
colourMenu.add(clustalColour);\r
colourMenu.add(BLOSUM62Colour);\r
*/\r
void refresh()\r
{\r
- SequenceGroup sg = getGroup();\r
- if(sg!=null)\r
- {\r
- SuperGroup superG = ap.av.alignment.getSuperGroup(sg);\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
\r
- if (superG != null)\r
- {\r
- superG.setSuperGroupProperties(sg);\r
- }\r
- }\r
ap.seqPanel.repaint();\r
}\r
\r
protected void abovePIDColour_actionPerformed(ActionEvent e)\r
{\r
SequenceGroup sg = getGroup();\r
+ if(sg.cs==null)\r
+ return;\r
\r
if (abovePIDColour.isSelected())\r
{\r
int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs,\r
getGroup().getName());\r
\r
- if (sg.cs instanceof ResidueColourScheme)\r
- {\r
- ((ResidueColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());\r
- }\r
- else if (sg.cs instanceof ScoreColourScheme)\r
- {\r
- ((ScoreColourScheme) sg.cs).setThreshold(threshold, ap.av.getIgnoreGapsConsensus());\r
- }\r
+ sg.cs.setThreshold(threshold, ap.av.getIgnoreGapsConsensus());\r
\r
SliderPanel.showPIDSlider();\r
}\r
else // remove PIDColouring\r
{\r
- ResidueColourScheme rcs = (ResidueColourScheme) sg.cs;\r
- rcs.setThreshold(0, ap.av.getIgnoreGapsConsensus());\r
- sg.cs = rcs;\r
+ sg.cs.setThreshold(0, ap.av.getIgnoreGapsConsensus());\r
}\r
\r
refresh();\r
protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
{\r
SequenceGroup sg = getGroup();\r
+ if(sg.cs==null)\r
+ return;\r
\r
if (conservationMenuItem.isSelected())\r
{\r
c.calculate();\r
c.verdict(false, ap.av.ConsPercGaps);\r
\r
- ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);\r
-\r
- sg.cs = ccs;\r
+ sg.cs.setConservation(c);\r
\r
- SliderPanel.setConservationSlider(ap, ccs, sg.getName());\r
+ SliderPanel.setConservationSlider(ap, sg.cs, sg.getName());\r
SliderPanel.showConservationSlider();\r
}\r
else // remove ConservationColouring\r
{\r
- ConservationColourScheme ccs = (ConservationColourScheme) sg.cs;\r
- sg.cs = ccs.cs;\r
+ sg.cs.setConservation(null);\r
}\r
\r
refresh();\r
*/\r
void sequenceName_actionPerformed(ActionEvent e)\r
{\r
- String id = sequence.getName();\r
- String s = (String) JOptionPane.showInternalInputDialog(ap,\r
- "Edit sequence name",\r
- "Edit sequence name (" + sequence.getName() + ")",\r
- JOptionPane.PLAIN_MESSAGE, null, null, id);\r
+ JLabel idlabel = new JLabel( " Sequence Name ");\r
+ JLabel desclabel = new JLabel("Sequence Description ");\r
+ idlabel.setFont(new Font("Courier", Font.PLAIN, 12));\r
+ desclabel.setFont(new Font("Courier", Font.PLAIN, 12));\r
+ JTextField id = new JTextField(sequence.getName(), 40);\r
+ JTextField description = new JTextField(sequence.getDescription(), 40);\r
+ JPanel panel = new JPanel(new BorderLayout());\r
+ JPanel panel2 = new JPanel(new BorderLayout());\r
+ panel2.add(idlabel, BorderLayout.WEST);\r
+ panel2.add(id, BorderLayout.CENTER);\r
+ panel.add(panel2, BorderLayout.NORTH);\r
+ panel2 = new JPanel(new BorderLayout());\r
+ panel2.add(desclabel, BorderLayout.WEST);\r
+ panel2.add(description, BorderLayout.CENTER);\r
+ panel.add(panel2, BorderLayout.SOUTH);\r
+\r
+\r
+ int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,\r
+ panel, "Edit Sequence Name/Description",\r
+ JOptionPane.OK_CANCEL_OPTION );\r
+\r
+\r
+ if (reply != JOptionPane.OK_OPTION )\r
+ {\r
+ return;\r
+ }\r
+\r
+ String s = id.getText();\r
\r
if (s != null)\r
{\r
}\r
\r
s = s.replace(' ', '_');\r
+ sequence.getDatasetSequence().setName(s);\r
sequence.setName(s);\r
ap.repaint();\r
}\r
+\r
+ sequence.getDatasetSequence().setDescription(description.getText());\r
+ sequence.setDescription(description.getText());\r
}\r
\r
/**\r
refresh();\r
}\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param e DOCUMENT ME!\r
- */\r
- void pdbMenuItem_actionPerformed(ActionEvent e)\r
- {\r
- if (sequence.getPDBId() == null)\r
- {\r
- return;\r
- }\r
-\r
- try\r
- {\r
- EBIFetchClient ebi = new EBIFetchClient();\r
- String[] result = ebi.fetchData("pdb:" + sequence.getPDBId(), null,\r
- null);\r
-\r
- PDBfile pdb = new PDBfile(result);\r
-\r
- rotCanvas rc = new rotCanvas(pdb, sequence, ap.av);\r
- JInternalFrame frame = new JInternalFrame();\r
- frame.setContentPane(rc);\r
- Desktop.addInternalFrame(frame,\r
- sequence.getName() + " " + sequence.getPDBId(), 400, 400);\r
- }\r
- catch (Exception ex)\r
- {\r
- ex.printStackTrace();\r
- }\r
- }\r
\r
/**\r
* DOCUMENT ME!\r
ex.printStackTrace();\r
}\r
}\r
+\r
+ void hideSequences(boolean representGroup)\r
+ {\r
+ SequenceGroup sg = ap.av.getSelectionGroup();\r
+ if(sg==null || sg.getSize()<1)\r
+ {\r
+ ap.av.hideSequence(sequence);\r
+ return;\r
+ }\r
+\r
+ int index = 0;\r
+ while(index < sg.sequences.size())\r
+ {\r
+ if(representGroup && sg.getSequenceAt(index)!=sequence)\r
+ {\r
+ sequence.addHiddenSequence(sg.getSequenceAt(index));\r
+ ap.av.hideSequence(sg.getSequenceAt(index));\r
+ }\r
+ else if(!representGroup)\r
+ {\r
+ ap.av.hideSequence(sg.getSequenceAt(index));\r
+ }\r
+ index ++;\r
+ }\r
+\r
+ ap.av.setSelectionGroup(null);\r
+ refresh();\r
+ }\r
+\r
}\r
git://source.jalview.org / jalview.git / blobdiff