X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=d7a034c74f13e82d6bf79e8bf6631a6588e44124;hb=ebb52a433edbbdbd31ab82cbb1c59fc116a72b1d;hp=b693f988d5fc9693764bb9936d087f57e1089d99;hpb=7ee3b5a7f099858cdde2318c719121b39d9e466e;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index b693f98..d7a034c 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -19,6 +19,8 @@ public class IdCanvas extends JPanel
   int imgHeight=0;
   boolean fastPaint = false;
 
+  java.util.ArrayList searchResults;
+
   public IdCanvas(AlignViewport av)
   {
     setLayout(new BorderLayout());
@@ -29,8 +31,13 @@ public class IdCanvas extends JPanel
   public void drawIdString(Graphics2D gg,SequenceI s,int i, int starty, int ypos) {
       int charHeight = av.getCharHeight();
 
-
-      if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(s)) {
+      if(searchResults!=null && searchResults.contains(s))
+      {
+        gg.setColor(Color.black);
+        gg.fillRect(0,AlignmentUtil.getPixelHeight(starty,i,charHeight)+ ypos,getWidth(),charHeight);
+        gg.setColor(Color.white);
+      }
+      else if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(s)) {
 	  gg.setColor(Color.lightGray);
 	  gg.fillRect(0,AlignmentUtil.getPixelHeight(starty,i,charHeight)+ ypos,getWidth(),charHeight);
 	  gg.setColor(Color.white);
@@ -56,16 +63,23 @@ public class IdCanvas extends JPanel
     gg.copyArea( 0,0, getWidth(), imgHeight, 0, -vertical*av.charHeight );
 
     int ss=av.startSeq, es=av.endSeq, transY = 0;
-     if(vertical>0)    // scroll down
+    if (vertical > 0) // scroll down
      {
-       transY = imgHeight - vertical*av.charHeight;
        ss = es - vertical;
+       if(ss<av.startSeq) // ie scrolling too fast, more than a page at a time
+         ss = av.startSeq;
+       else
+         transY = imgHeight - vertical * av.charHeight;
      }
-     else if(vertical<0)
+     else if (vertical < 0)
      {
-       es = ss-vertical;
+       es = ss - vertical;
+       if(es > av.endSeq)
+         es = av.endSeq;
      }
 
+
+
         gg.translate(0, transY);
 
         drawIds(ss, es);
@@ -84,8 +98,8 @@ public class IdCanvas extends JPanel
 
     if (fastPaint)
     {
-      g.drawImage(image, 0, 0, this);
       fastPaint = false;
+      g.drawImage(image, 0, 0, this);
       return;
     }
 
@@ -109,18 +123,16 @@ public class IdCanvas extends JPanel
 
   void drawIds(int starty, int endy)
   {
-
     Color currentColor     = Color.white;
     Color currentTextColor = Color.black;
 
-
     if (av.getWrapAlignment())
     {
 
           int rowSize =  av.getEndRes() - av.getStartRes();
           // Draw the rest of the panels
 
-          for(int ypos=2*av.charHeight, row=av.getEndRes();
+          for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;
               ypos <= getHeight() && row<av.alignment.getWidth();
               ypos += av.chunkHeight, row+=rowSize )
           {
@@ -140,10 +152,15 @@ public class IdCanvas extends JPanel
       {
         // Selected sequence colours
 
-        if (av.getSelectionGroup()!= null
+        if(searchResults!=null && searchResults.contains(av.alignment.getSequenceAt(i)))
+        {
+          gg.setColor(Color.black);
+          currentColor = Color.black;
+          currentTextColor = Color.white;
+      }
+      else if (av.getSelectionGroup()!= null
             && av.getSelectionGroup().sequences.contains(av.alignment.getSequenceAt(i)))
         {
-       //   if(av.alignment.findGroup(al.getSequenceAt(i)).getEndRes()==
           currentColor = Color.lightGray;
           currentTextColor = Color.black;
         }
@@ -175,4 +192,10 @@ public class IdCanvas extends JPanel
     }
 
   }
+
+  public void setHighlighted(java.util.ArrayList found)
+  {
+    searchResults = found;
+    repaint();
+  }
 }