X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=fcf8e92444f854ed9d8539227cb411a1bf724116;hb=a73f21e87de8310ecd2477f8d29c1967d90bded5;hp=3e8af1774586b0af7b2b76d3ca189b2339bb2820;hpb=22be3f466cd70cb03d5eae619ede8589ae69716a;p=jalview.git

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 3e8af17..fcf8e92 100755
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -12,12 +12,12 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
   protected IdCanvas       idCanvas;
   protected AlignViewport  av;
   protected AlignmentPanel alignPanel;
+  ScrollThread scrollThread = null;
 
-  protected int            offy;
-  public    int            width;
-  public    int            lastid;
-
-  SequenceGroup selectedSequenceGroup;
+  int            offy;
+  int            width;
+  int lastid = -1;
+  boolean mouseDragging = false;
 
   public IdPanel(AlignViewport av, AlignmentPanel parent)
   {
@@ -32,59 +32,25 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
 
   public void mouseMoved(MouseEvent e) {}
 
-  public void selectSeqs(int start, int end) {
-     if (end < start)
-     {
-       int tmp = start;
-       start = end;
-       end   = tmp;
-     }
-
-     for (int i = start; i <= end; i++)
-     {
-       SequenceI pickedSeq = av.getAlignment().getSequenceAt(i);
-       if (av.getSelection().contains(pickedSeq))
-       {
-         av.getSelection().removeElement(pickedSeq);
-         selectedSequenceGroup.deleteSequence(pickedSeq);
-       }
-       else
-       {
-         av.getSelection().addElement(pickedSeq);
-         if(selectedSequenceGroup==null)
-         {
-           selectedSequenceGroup = new SequenceGroup();
-           av.setRubberbandGroup( selectedSequenceGroup );
-          // av.alignment.addGroup( selectedSequenceGroup );
-           selectedSequenceGroup.setStartRes(0);
-           selectedSequenceGroup.setEndRes( pickedSeq.getSequence().length());
-         }
-
-         selectedSequenceGroup.addSequence( pickedSeq );
-       }
-
-     }
-
-     alignPanel.seqPanel.seqCanvas.paintFlag=true;
-     alignPanel.repaint();
-     repaint();
-
-   }
 
   public void mouseDragged(MouseEvent e) {
+    mouseDragging = true;
+
     int y = e.getY();
     if(av.getWrapAlignment())
       y-=2*av.charHeight;
     int seq = av.getIndex(y);
 
+    if(seq<0)
+      return;
+
     if (seq < lastid)
       selectSeqs(lastid - 1, seq);
     else if (seq > lastid)
       selectSeqs(lastid + 1, seq);
 
     lastid = seq;
-
-    return;
+    alignPanel.repaint();
   }
 
   public void mouseClicked(MouseEvent e)
@@ -106,8 +72,28 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
     }
 
   }
-  public void mouseEntered(MouseEvent e) { }
-  public void mouseExited (MouseEvent e) { }
+  public void mouseEntered(MouseEvent e)
+  {
+    if(scrollThread!=null)
+      scrollThread.running = false;
+  }
+
+  public void mouseExited (MouseEvent e)
+  {
+    if(av.getWrapAlignment())
+      return;
+
+    if(mouseDragging && e.getY()<0 && av.getStartSeq()>0)
+    {
+      scrollThread = new ScrollThread(true);
+    }
+
+    if(mouseDragging && e.getY()>=getHeight() && av.alignment.getHeight()>av.getEndSeq())
+    {
+      scrollThread = new ScrollThread(false);
+    }
+  }
+
 
   public void mousePressed(MouseEvent e) {
     if (e.getClickCount() == 2)
@@ -118,6 +104,8 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
       y-=2*av.charHeight;
 
     int seq = av.getIndex(y);
+    if (seq == -1)
+      return;
 
     if (javax.swing.SwingUtilities.isRightMouseButton(e))
     {
@@ -127,33 +115,129 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
       return;
     }
 
+    if(!e.isControlDown() && !e.isShiftDown() && av.alignment.findGroup( av.alignment.getSequenceAt(seq))!=null)
+    {
 
+      SequenceGroup selection = new SequenceGroup();
+      SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(seq));
+      selection.setStartRes(0);
+      selection.setEndRes(av.alignment.getWidth()-1);
+      for (int i =0; i< sg.getSize(); i++)
+        selection.addSequence(sg.getSequenceAt(i));
 
-    if(av.getRubberbandGroup()!=null && (av.getRubberbandGroup().getSize() == av.getSelection().size()))
-          selectedSequenceGroup = av.getRubberbandGroup();
-
-    if (selectedSequenceGroup == null)
-    {
-      selectedSequenceGroup = new SequenceGroup();
-      av.setRubberbandGroup(selectedSequenceGroup);
+      av.setSelectionGroup(selection);
+      return;
     }
 
-    selectedSequenceGroup.setStartRes(0);
-    selectedSequenceGroup.setEndRes(av.getAlignment().getWidth() - 1);
+    if(av.getSelectionGroup()==null || ( !e.isControlDown() && av.getSelectionGroup()!=null))
+      av.setSelectionGroup(new SequenceGroup());
 
-    if (seq != -1)
-      selectSeqs(seq, seq);
+    av.getSelectionGroup().setStartRes(0);
+    av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);
 
-    lastid = seq;
+    if(e.isShiftDown() && lastid!=-1)
+      selectSeqs(lastid, seq);
+    else
+      selectSeq(seq);
 
+    alignPanel.repaint();
+  }
 
-    return;
+  void selectSeq(int seq)
+  {
+    lastid = seq;
+    SequenceI pickedSeq = av.getAlignment().getSequenceAt(seq);
+    av.getSelectionGroup().addOrRemove(pickedSeq);
   }
 
+  void selectSeqs(int start, int end) {
+
+    lastid = start;
+    if (end < start)
+     {
+       int tmp = start;
+       start = end;
+       end   = tmp;
+       lastid = end;
+     }
+
+     for (int i = start; i <= end; i++)
+        av.getSelectionGroup().addSequence(av.getAlignment().getSequenceAt(i));
+
+   }
+
+
   public void mouseReleased(MouseEvent e)
   {
-    lastid = -1;
+    if(scrollThread!=null)
+      scrollThread.running = false;
+
+    mouseDragging = false;
     PaintRefresher.Refresh(this);
-    selectedSequenceGroup = null;
   }
+
+  public void highlightSearchResults( java.util.ArrayList found )
+  {
+    idCanvas.setHighlighted( found );
+
+    if(found == null)
+      return;
+
+    int index = av.alignment.findIndex( (SequenceI)found.get(0));
+
+    // do we need to scroll the panel?
+    if(av.getStartSeq()>index || av.getEndSeq()<index)
+        alignPanel.setScrollValues( av.getStartRes(), index);
+  }
+
+  // this class allows scrolling off the bottom of the visible alignment
+  class ScrollThread
+      extends Thread
+  {
+    boolean running = false;
+    boolean up = true;
+    public ScrollThread(boolean up)
+    {
+      this.up = up;
+      start();
+    }
+
+    public void stopScrolling()
+    {
+      running = false;
+    }
+
+    public void run()
+    {
+      running = true;
+      while (running)
+      {
+        if(alignPanel.scrollUp(up))
+        {
+          // scroll was ok, so add new sequence to selection
+          int seq = av.getStartSeq();
+          if(!up)
+            seq = av.getEndSeq();
+
+          if (seq < lastid)
+            selectSeqs(lastid - 1, seq);
+          else if (seq > lastid)
+            selectSeqs(lastid + 1, seq);
+
+          lastid = seq;
+        }
+        else
+          running = false;
+
+        alignPanel.repaint();
+        try
+        {
+          Thread.sleep(100);
+        }
+        catch (Exception ex)
+        {}
+      }
+    }
+}
+
 }