git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/JAL-1738_JAL-345_selectionfromhighlight' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
SeqCanvas.java
diff --git
a/src/jalview/gui/SeqCanvas.java
b/src/jalview/gui/SeqCanvas.java
index
760ece0
..
d015292
100755
(executable)
--- a/
src/jalview/gui/SeqCanvas.java
+++ b/
src/jalview/gui/SeqCanvas.java
@@
-21,7
+21,7
@@
package jalview.gui;
import jalview.datamodel.AlignmentI;
package jalview.gui;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.SearchResults;
+import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.renderer.ScaleRenderer;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.renderer.ScaleRenderer;
@@
-62,8
+62,6
@@
public class SeqCanvas extends JComponent
AlignViewport av;
AlignViewport av;
- SearchResults searchResults = null;
-
boolean fastPaint = false;
int LABEL_WEST;
boolean fastPaint = false;
int LABEL_WEST;
@@
-740,10
+738,10
@@
public class SeqCanvas extends JComponent
// / Highlight search Results once all sequences have been drawn
// ////////////////////////////////////////////////////////
// / Highlight search Results once all sequences have been drawn
// ////////////////////////////////////////////////////////
- if (searchResults != null)
+ if (av.hasSearchResults())
{
{
- int[] visibleResults = searchResults.getResults(nextSeq, startRes,
- endRes);
+ int[] visibleResults = av.getSearchResults().getResults(nextSeq,
+ startRes, endRes);
if (visibleResults != null)
{
for (int r = 0; r < visibleResults.length; r += 2)
if (visibleResults != null)
{
for (int r = 0; r < visibleResults.length; r += 2)
@@
-965,11
+963,11
@@
public class SeqCanvas extends JComponent
* @param results
* DOCUMENT ME!
*/
* @param results
* DOCUMENT ME!
*/
- public void highlightSearchResults(SearchResults results)
+ public void highlightSearchResults(SearchResultsI results)
{
img = null;
{
img = null;
- searchResults = results;
+ av.setSearchResults(results);
repaint();
}
repaint();
}