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
fix for arrayoutofbounds bug when secondary structure element extends whole width...
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationPanel.java
diff --git
a/src/jalview/appletgui/AnnotationPanel.java
b/src/jalview/appletgui/AnnotationPanel.java
index
ec5fbd8
..
909ce78
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationPanel.java
+++ b/
src/jalview/appletgui/AnnotationPanel.java
@@
-555,7
+555,7
@@
public class AnnotationPanel
int lastSSX;
int iconOffset = av.charHeight / 2;
boolean validRes = false;
int lastSSX;
int iconOffset = av.charHeight / 2;
boolean validRes = false;
-
+ boolean validEnd = false;
boolean[] graphGroupDrawn = new boolean[aa.length];
//\u03B2 \u03B1
boolean[] graphGroupDrawn = new boolean[aa.length];
//\u03B2 \u03B1
@@
-765,6
+765,9
@@
public class AnnotationPanel
if (column >= row.annotations.length)
{
column = row.annotations.length - 1;
if (column >= row.annotations.length)
{
column = row.annotations.length - 1;
+ validEnd = false;
+ } else {
+ validEnd = true;
}
// x ++;
}
// x ++;
@@
-812,7
+815,7
@@
public class AnnotationPanel
case 'E':
g.setColor(SHEET_COLOUR);
case 'E':
g.setColor(SHEET_COLOUR);
- if (row.annotations[endRes] == null
+ if (!validEnd || row.annotations[endRes] == null
|| row.annotations[endRes].secondaryStructure != 'E')
{
g.fillRect(lastSSX, y + 4 + iconOffset,
|| row.annotations[endRes].secondaryStructure != 'E')
{
g.fillRect(lastSSX, y + 4 + iconOffset,