public int width;\r
public int lastid;\r
\r
+ SequenceGroup selectedSequenceGroup;\r
\r
public IdPanel(AlignViewport av, AlignmentPanel parent)\r
{\r
public void mouseMoved(MouseEvent e) {}\r
\r
public void selectSeqs(int start, int end) {\r
- if (end < start) {\r
+ if (end < start)\r
+ {\r
int tmp = start;\r
start = end;\r
end = tmp;\r
for (int i = start; i <= end; i++)\r
{\r
SequenceI pickedSeq = av.getAlignment().getSequenceAt(i);\r
-\r
if (av.getSelection().contains(pickedSeq))\r
+ {\r
av.getSelection().removeElement(pickedSeq);\r
- else\r
+ selectedSequenceGroup.deleteSequence(pickedSeq);\r
+ }\r
+ else\r
+ {\r
av.getSelection().addElement(pickedSeq);\r
+ if(selectedSequenceGroup==null)\r
+ {\r
+ selectedSequenceGroup = new SequenceGroup();\r
+ av.setRubberbandGroup( selectedSequenceGroup );\r
+ // av.alignment.addGroup( selectedSequenceGroup );\r
+ selectedSequenceGroup.setStartRes(0);\r
+ selectedSequenceGroup.setEndRes( pickedSeq.getSequence().length());\r
+ }\r
+\r
+ selectedSequenceGroup.addSequence( pickedSeq );\r
+ }\r
\r
}\r
\r
+ alignPanel.seqPanel.seqCanvas.paintFlag=true;\r
+ alignPanel.repaint();\r
repaint();\r
\r
}\r
\r
public void mouseDragged(MouseEvent e) {\r
int y = e.getY();\r
+ if(av.getWrapAlignment())\r
+ y-=2*av.charHeight;\r
int seq = av.getIndex(y);\r
\r
-\r
-\r
-\r
if (seq < lastid)\r
selectSeqs(lastid - 1, seq);\r
else if (seq > lastid)\r
{\r
if (e.getClickCount() == 2)\r
{\r
- int seq = av.getIndex(e.getY());\r
+ int y = e.getY();\r
+ if(av.getWrapAlignment())\r
+ y-=2*av.charHeight;\r
+\r
+ int seq = av.getIndex(y);\r
String id = av.getAlignment().getSequenceAt(seq).getName();\r
\r
try{\r
return;\r
\r
int y = e.getY();\r
+ if(av.getWrapAlignment())\r
+ y-=2*av.charHeight;\r
+\r
int seq = av.getIndex(y);\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
+ pop.show(this, e.getX(), y);\r
+ return;\r
+ }\r
+\r
+\r
+\r
+ if(av.getRubberbandGroup()!=null && (av.getRubberbandGroup().getSize() == av.getSelection().size()))\r
+ selectedSequenceGroup = av.getRubberbandGroup();\r
+\r
+ if (selectedSequenceGroup == null)\r
+ {\r
+ selectedSequenceGroup = new SequenceGroup();\r
+ av.setRubberbandGroup(selectedSequenceGroup);\r
+ }\r
+\r
+ selectedSequenceGroup.setStartRes(0);\r
+ selectedSequenceGroup.setEndRes(av.getAlignment().getWidth() - 1);\r
+\r
+ if (seq != -1)\r
+ selectSeqs(seq, seq);\r
+\r
+ lastid = seq;\r
+\r
\r
- if( javax.swing.SwingUtilities.isRightMouseButton(e))\r
- {\r
- String id = av.getAlignment().getSequenceAt(seq).getName();\r
- String s = (String)JOptionPane.showInternalInputDialog(\r
- this,\r
- "Edit sequence name",\r
- "Edit sequence name",\r
- JOptionPane.PLAIN_MESSAGE,\r
- null,\r
- null,\r
- id);\r
-\r
- if(s!=null)\r
- {\r
- av.getAlignment().getSequenceAt(seq).setName(s);\r
- alignPanel.RefreshPanels();\r
- }\r
-\r
- }\r
- else\r
- {\r
- if (seq != -1)\r
- selectSeqs(seq,seq);\r
-\r
- lastid = seq;\r
- }\r
return;\r
}\r
\r
{\r
lastid = -1;\r
PaintRefresher.Refresh(this);\r
+ selectedSequenceGroup = null;\r
}\r
}\r