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-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[jalview.git]
/
src
/
jalview
/
appletgui
/
SequenceRenderer.java
diff --git
a/src/jalview/appletgui/SequenceRenderer.java
b/src/jalview/appletgui/SequenceRenderer.java
index
e55f2a5
..
eab6e39
100755
(executable)
--- a/
src/jalview/appletgui/SequenceRenderer.java
+++ b/
src/jalview/appletgui/SequenceRenderer.java
@@
-85,8
+85,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
// TODO replace 8 or so code duplications with calls to this method
// (refactored as needed)
return resColourFinder.getResidueColour(av.getShowBoxes(),
// TODO replace 8 or so code duplications with calls to this method
// (refactored as needed)
return resColourFinder.getResidueColour(av.getShowBoxes(),
- av.getResidueShading(),
- allGroups, seq, position, finder);
+ av.getResidueShading(), allGroups, seq, position, finder);
}
public Color findSequenceColour(SequenceI seq, int i)
}
public Color findSequenceColour(SequenceI seq, int i)
@@
-137,8
+136,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
if (currentSequenceGroup.getDisplayBoxes())
{
resBoxColour = resColourFinder.getBoxColour(
if (currentSequenceGroup.getDisplayBoxes())
{
resBoxColour = resColourFinder.getBoxColour(
- currentSequenceGroup.getGroupColourScheme(), seq,
- i);
+ currentSequenceGroup.getGroupColourScheme(), seq, i);
}
}
else if (av.getShowBoxes())
}
}
else if (av.getShowBoxes())
@@
-325,8
+323,8
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
return sequenceChar;
}
return sequenceChar;
}
- public void drawHighlightedText(SequenceI seq, int start, int end,
- int x1, int y1)
+ public void drawHighlightedText(SequenceI seq, int start, int end, int x1,
+ int y1)
{
int avCharWidth = av.getCharWidth(), avCharHeight = av.getCharHeight();
int pady = avCharHeight / 5;
{
int avCharWidth = av.getCharWidth(), avCharHeight = av.getCharHeight();
int pady = avCharHeight / 5;