New implementation for holding search results

[jalview.git] / src / jalview / appletgui / SeqCanvas.java

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index 8d95574..618ec8a 100755 (executable)
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -35,8 +35,7 @@ public class SeqCanvas
 \r
   AlignViewport av;\r
 \r
-  boolean displaySearch = false;\r
-  int[] searchResults = null;\r
+  SearchResults searchResults = null;\r
 \r
   int chunkHeight;\r
   int chunkWidth;\r
@@ -454,6 +453,21 @@ public class SeqCanvas
                       (i - starty) * av.charHeight,\r
                       av.charWidth, av.charHeight);\r
     }\r
+    /// Highlight search Results once all sequences have been drawn\r
+   //////////////////////////////////////////////////////////\r
+   if (searchResults != null)\r
+   {\r
+     int[] visibleResults = searchResults.getResults(nextSeq, x1, x2);\r
+     if (visibleResults != null)\r
+       for (int r = 0; r < visibleResults.length; r += 2)\r
+       {\r
+         sr.drawHighlightedText(nextSeq, visibleResults[r],\r
+                                visibleResults[r + 1],\r
+                                (visibleResults[r] - startx) * av.charWidth,\r
+                                offset + ( (i - starty) * av.charHeight),\r
+                                av.charWidth, av.charHeight);\r
+       }\r
+   }\r
   }\r
 \r
     /////////////////////////////////////\r
@@ -613,58 +627,10 @@ public class SeqCanvas
         }\r
         while (groupIndex < groups.size());\r
     }\r
-\r
-    /// Highlight search Results once all sequences have been drawn\r
-    //////////////////////////////////////////////////////////\r
-    if (displaySearch)\r
-    {\r
-      for (int r = 0; r < searchResults.length; r += 3)\r
-      {\r
-        int searchSeq = searchResults[r];\r
-\r
-        if (searchSeq >= y1 && searchSeq < y2)\r
-        {\r
-          SequenceI seq = av.getAlignment().getSequenceAt(searchSeq);\r
-\r
-          int searchStart = seq.findIndex(searchResults[r + 1]) - 1;\r
-          int searchEnd = seq.findIndex(searchResults[r + 2]) - 1;\r
-\r
-          SequenceRenderer ssr = (SequenceRenderer) sr;\r
-          if (searchStart < x1)\r
-          {\r
-            searchStart = x1;\r
-          }\r
-          if (searchEnd > x2)\r
-          {\r
-            searchEnd = x2;\r
-          }\r
-\r
-          ssr.drawHighlightedText(seq,\r
-                                  searchStart,\r
-                                  searchEnd,\r
-                                  (searchStart - startx) * av.charWidth,\r
-                                  offset +\r
-                                  (searchSeq-starty)*av.charHeight,\r
-                                  av.charWidth,\r
-                                  av.charHeight);\r
-        }\r
-      }\r
-    }\r
-\r
   }\r
 \r
-  public void highlightSearchResults(int[] results)\r
+  public void highlightSearchResults(SearchResults results)\r
   {\r
-    // results are in the order sequence, startRes, endRes\r
-    if (results == null)\r
-    {\r
-      displaySearch = false;\r
-    }\r
-    else\r
-    {\r
-      displaySearch = true;\r
-    }\r
-\r
     searchResults = results;\r
 \r
     repaint();\r