final int seq = av.getIndex(y);\r
if(seq!=-1)\r
{\r
+ SequenceI sequence = av.alignment.getSequenceAt(seq);\r
StringBuffer tip = new StringBuffer("<html>");\r
- tip.append(av.alignment.getSequenceAt(seq).getDisplayId(true));\r
+ tip.append(sequence.getDisplayId(true));\r
if (av.alignment.getSequenceAt(seq).getDescription() != null)\r
{\r
tip.append("<table width=250 border=0><tr><td><i>");\r
tip.append(av.alignment.getSequenceAt(seq).getDescription());\r
- tip.append("</i></td></tr></table>");\r
- }\r
- tip.append("</html>");\r
- setToolTipText(tip.toString());\r
- }\r
\r
- if(av.hasHiddenRows)\r
- {\r
- if(av.adjustForHiddenSeqs(seq) -\r
- av.adjustForHiddenSeqs(seq-1)>1)\r
- {\r
- JPopupMenu pop = new JPopupMenu();\r
- JMenuItem item = new JMenuItem("Reveal");\r
- item.addActionListener(new ActionListener()\r
+ //ADD NON POSITIONAL SEQUENCE INFO\r
+ SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures();\r
+ if(features!=null)\r
{\r
- public void actionPerformed(ActionEvent e)\r
+ for(int i=0; i<features.length; i++)\r
{\r
- av.showSequence(seq);\r
- alignPanel.repaint();\r
- if(alignPanel.overviewPanel!=null)\r
- alignPanel.overviewPanel.updateOverviewImage();\r
+ if(features[i].begin == 0 && features[i].end ==0)\r
+ {\r
+ tip.append("<br>"+features[i].featureGroup\r
+ +" "+ features[i].getType()+" "+features[i].description);\r
+ }\r
}\r
- });\r
- pop.add(item);\r
- pop.show(this, e.getX(), e.getY());\r
+ }\r
+\r
+ tip.append("</i></td></tr></table>");\r
}\r
+ tip.append("</html>");\r
+ setToolTipText(tip.toString());\r
}\r
}\r
\r
if (javax.swing.SwingUtilities.isRightMouseButton(e))\r
{\r
jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel,\r
- (Sequence) av.getAlignment().getSequenceAt(seq));\r
+ (Sequence) av.getAlignment().getSequenceAt(seq),\r
+ Preferences.sequenceURLLinks);\r
pop.show(this, e.getX(), y);\r
\r
return;\r
}\r
\r
- if (!e.isControlDown() && !e.isShiftDown() &&\r
+ /* if (!e.isControlDown() && !e.isShiftDown() &&\r
(av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null))\r
{\r
+ System.out.println("no modifiers");\r
SequenceGroup selection = new SequenceGroup();\r
SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(\r
seq));\r
av.setSelectionGroup(selection);\r
\r
return;\r
- }\r
+ }*/\r
\r
if ((av.getSelectionGroup() == null) ||\r
- (!e.isControlDown() && (av.getSelectionGroup() != null)))\r
+ ((!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))\r
{\r
- av.setSelectionGroup(new SequenceGroup());\r
+ av.setSelectionGroup(new SequenceGroup());\r
+ av.getSelectionGroup().setStartRes(0);\r
+ av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
}\r
\r
- av.getSelectionGroup().setStartRes(0);\r
- av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
+\r
\r
if (e.isShiftDown() && (lastid != -1))\r
{\r
git://source.jalview.org / jalview.git / blobdiff