git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6cfc81d
)
Show scores
author
amwaterhouse
<Andrew Waterhouse>
Wed, 25 Apr 2007 14:07:29 +0000
(14:07 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Wed, 25 Apr 2007 14:07:29 +0000
(14:07 +0000)
src/jalview/gui/AnnotationLabels.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AnnotationLabels.java
b/src/jalview/gui/AnnotationLabels.java
index
ccbebd5
..
0ea7730
100755
(executable)
--- a/
src/jalview/gui/AnnotationLabels.java
+++ b/
src/jalview/gui/AnnotationLabels.java
@@
-206,7
+206,7
@@
public class AnnotationLabels
ap,
new AlignmentAnnotation[]
{aa[selectedRow]},
ap,
new AlignmentAnnotation[]
{aa[selectedRow]},
- null
+ null, null
);
}
else if (evt.getActionCommand().equals(COPYCONS_SEQ))
);
}
else if (evt.getActionCommand().equals(COPYCONS_SEQ))
@@
-367,17
+367,31
@@
public class AnnotationLabels
getSelectedRow(evt.getY() - scrollOffset);
getSelectedRow(evt.getY() - scrollOffset);
+
if (selectedRow > -1
&& ap.av.alignment.getAlignmentAnnotation().length > selectedRow)
{
if (selectedRow > -1
&& ap.av.alignment.getAlignmentAnnotation().length > selectedRow)
{
- String desc = ap.av.alignment.
- getAlignmentAnnotation()[selectedRow].description;
+ AlignmentAnnotation aa = ap.av.alignment.
+ getAlignmentAnnotation()[selectedRow];
+
+ StringBuffer desc = new StringBuffer("<html>");
- if (desc != null && !desc.equals("New description"))
+ if (aa.description != null && !aa.description.equals("New description"))
{
{
- setToolTipText(ap.av.alignment.
- getAlignmentAnnotation()[selectedRow].description);
+ desc.append(aa.description+"<br>");
}
}
+ if(!Float.isNaN(aa.score))
+ {
+ desc.append("Score: "+aa.score);
+ }
+
+ if(desc.length()!=6)
+ {
+ desc.append("</html>");
+ this.setToolTipText(desc.toString());
+ }
+ else
+ this.setToolTipText(null);
}
}
}
}
@@
-629,7
+643,13
@@
public class AnnotationLabels
}
else
{
}
else
{
+ if(aa[i].belowAlignment)
+ g.setColor(Color.ORANGE);
+ else
+ g.setColor(Color.red);
+
g.drawString(aa[i].label, x, y +offset);
g.drawString(aa[i].label, x, y +offset);
+
}
}
}
}
}
}