X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqCanvas.java;h=5d6bb07a3ad12d7bfe6265f8ece56bf061eef70d;hb=d38a8b5baa757886792e4a3c5cb0b3877b25a256;hp=22849f132195b0c8987166ad836975f491c4dab1;hpb=f38aa05c9798d0dd2ddc70833001c55a3fd5b612;p=jalview.git diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java index 22849f1..5d6bb07 100755 --- a/src/jalview/appletgui/SeqCanvas.java +++ b/src/jalview/appletgui/SeqCanvas.java @@ -21,7 +21,7 @@ package jalview.appletgui; import jalview.datamodel.AlignmentI; -import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.renderer.ScaleRenderer; @@ -50,8 +50,6 @@ public class SeqCanvas extends Panel AlignViewport av; - SearchResults searchResults = null; - boolean fastPaint = false; int cursorX = 0; @@ -113,8 +111,7 @@ public class SeqCanvas extends Panel } g.drawLine((mpos * avcharWidth) + (avcharWidth / 2), (ypos + 2) - (avcharHeight / 2), (mpos * avcharWidth) - + (avcharWidth / 2), - ypos - 2); + + (avcharWidth / 2), ypos - 2); } } } @@ -633,9 +630,10 @@ public class SeqCanvas extends Panel // / Highlight search Results once all sequences have been drawn // //////////////////////////////////////////////////////// - if (searchResults != null) + if (av.hasSearchResults()) { - int[] visibleResults = searchResults.getResults(nextSeq, startRes, + int[] visibleResults = av.getSearchResults().getResults(nextSeq, + startRes, endRes); if (visibleResults != null) { @@ -844,10 +842,9 @@ public class SeqCanvas extends Panel } } - public void highlightSearchResults(SearchResults results) + public void highlightSearchResults(SearchResultsI results) { - searchResults = results; - + av.setSearchResults(results); repaint(); }