protected IdCanvas idCanvas;\r
protected AlignViewport av;\r
protected AlignmentPanel alignPanel;\r
+ ScrollThread scrollThread = null;\r
\r
- protected int offy;\r
- public int width;\r
- public int lastid;\r
-\r
- SequenceGroup selectedSequenceGroup;\r
+ int offy;\r
+ int width;\r
+ int lastid = -1;\r
+ boolean mouseDragging = false;\r
\r
public IdPanel(AlignViewport av, AlignmentPanel parent)\r
{\r
\r
public void mouseMoved(MouseEvent e) {}\r
\r
- public void selectSeqs(int start, int end) {\r
- if (end < start)\r
- {\r
- int tmp = start;\r
- start = end;\r
- end = tmp;\r
- }\r
-\r
- for (int i = start; i <= end; i++)\r
- {\r
- SequenceI pickedSeq = av.getAlignment().getSequenceAt(i);\r
- if (av.getSelection().contains(pickedSeq))\r
- {\r
- av.getSelection().removeElement(pickedSeq);\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
+ mouseDragging = true;\r
+\r
int y = e.getY();\r
+ if(av.getWrapAlignment())\r
+ y-=2*av.charHeight;\r
int seq = av.getIndex(y);\r
\r
+ if(seq<0)\r
+ return;\r
+\r
if (seq < lastid)\r
selectSeqs(lastid - 1, seq);\r
else if (seq > lastid)\r
selectSeqs(lastid + 1, seq);\r
\r
lastid = seq;\r
-\r
- return;\r
+ alignPanel.repaint();\r
}\r
\r
public void mouseClicked(MouseEvent e)\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
}\r
\r
}\r
- public void mouseEntered(MouseEvent e) { }\r
- public void mouseExited (MouseEvent e) { }\r
+ public void mouseEntered(MouseEvent e)\r
+ {\r
+ if(scrollThread!=null)\r
+ scrollThread.running = false;\r
+ }\r
+\r
+ public void mouseExited (MouseEvent e)\r
+ {\r
+ if(av.getWrapAlignment())\r
+ return;\r
+\r
+ if(mouseDragging && e.getY()<0 && av.getStartSeq()>0)\r
+ {\r
+ scrollThread = new ScrollThread(true);\r
+ }\r
+\r
+ if(mouseDragging && e.getY()>=getHeight() && av.alignment.getHeight()>av.getEndSeq())\r
+ {\r
+ scrollThread = new ScrollThread(false);\r
+ }\r
+ }\r
+\r
\r
public void mousePressed(MouseEvent e) {\r
if (e.getClickCount() == 2)\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
+ if (seq == -1)\r
+ return;\r
\r
- selectedSequenceGroup = av.getRubberbandGroup();\r
- if (selectedSequenceGroup == null)\r
+ if (javax.swing.SwingUtilities.isRightMouseButton(e))\r
{\r
- selectedSequenceGroup = new SequenceGroup();\r
- av.setRubberbandGroup(selectedSequenceGroup);\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
- selectedSequenceGroup.setStartRes(0);\r
- selectedSequenceGroup.setEndRes(av.getAlignment().getWidth() - 1);\r
+ if(!e.isControlDown() && !e.isShiftDown() && av.alignment.findGroup( av.alignment.getSequenceAt(seq))!=null)\r
+ {\r
+\r
+ SequenceGroup selection = new SequenceGroup();\r
+ SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(seq));\r
+ selection.setStartRes(0);\r
+ selection.setEndRes(av.alignment.getWidth());\r
+ for (int i =0; i< sg.getSize(); i++)\r
+ selection.addSequence(sg.getSequenceAt(i));\r
\r
- if (seq != -1)\r
- selectSeqs(seq, seq);\r
+ av.setSelectionGroup(selection);\r
+ return;\r
+ }\r
\r
+ if(av.getSelectionGroup()==null || ( !e.isControlDown() && av.getSelectionGroup()!=null))\r
+ av.setSelectionGroup(new SequenceGroup());\r
+\r
+ av.getSelectionGroup().setStartRes(0);\r
+ av.getSelectionGroup().setEndRes(av.alignment.getWidth());\r
+\r
+ if(e.isShiftDown() && lastid!=-1)\r
+ selectSeqs(lastid, seq);\r
+ else\r
+ selectSeq(seq);\r
+\r
+ alignPanel.seqPanel.seqCanvas.paintFlag=true;\r
+ alignPanel.repaint();\r
+ repaint();\r
+ }\r
+\r
+ void selectSeq(int seq)\r
+ {\r
lastid = seq;\r
+ SequenceI pickedSeq = av.getAlignment().getSequenceAt(seq);\r
+ av.getSelectionGroup().addOrRemove(pickedSeq);\r
+ }\r
+\r
+ void selectSeqs(int start, int end) {\r
\r
- if( javax.swing.SwingUtilities.isRightMouseButton(e))\r
+ lastid = start;\r
+ if (end < start)\r
{\r
- jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, av.getAlignment().getSequenceAt(seq) );\r
- pop.show(this, e.getX(), y);\r
+ int tmp = start;\r
+ start = end;\r
+ end = tmp;\r
+ lastid = end;\r
}\r
\r
+ for (int i = start; i <= end; i++)\r
+ av.getSelectionGroup().addSequence(av.getAlignment().getSequenceAt(i));\r
+\r
+ }\r
\r
- return;\r
- }\r
\r
public void mouseReleased(MouseEvent e)\r
{\r
- lastid = -1;\r
+ if(scrollThread!=null)\r
+ scrollThread.running = false;\r
+\r
+ mouseDragging = false;\r
PaintRefresher.Refresh(this);\r
- selectedSequenceGroup = null;\r
}\r
+\r
+ // this class allows scrolling off the bottom of the visible alignment\r
+ class ScrollThread\r
+ extends Thread\r
+ {\r
+ boolean running = false;\r
+ boolean up = true;\r
+ public ScrollThread(boolean up)\r
+ {\r
+ this.up = up;\r
+ start();\r
+ }\r
+\r
+ public void stopScrolling()\r
+ {\r
+ running = false;\r
+ }\r
+\r
+ public void run()\r
+ {\r
+ running = true;\r
+ while (running)\r
+ {\r
+ if(alignPanel.scrollUp(up))\r
+ {\r
+ // scroll was ok, so add new sequence to selection\r
+ int seq = av.getStartSeq();\r
+ if(!up)\r
+ seq = av.getEndSeq();\r
+\r
+ if (seq < lastid)\r
+ selectSeqs(lastid - 1, seq);\r
+ else if (seq > lastid)\r
+ selectSeqs(lastid + 1, seq);\r
+\r
+ lastid = seq;\r
+ }\r
+ else\r
+ running = false;\r
+\r
+ alignPanel.repaint();\r
+ try\r
+ {\r
+ Thread.sleep(100);\r
+ }\r
+ catch (Exception ex)\r
+ {}\r
+ }\r
+ }\r
+}\r
+\r
}\r
git://source.jalview.org / jalview.git / blobdiff