From: amwaterhouse Date: Wed, 25 Apr 2007 14:07:29 +0000 (+0000) Subject: Show scores X-Git-Tag: Release_2_3~175 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2eae25971bb6fc582e1f5ad831b1ca228da2a495 Show scores --- diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index ccbebd5..0ea7730 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -206,7 +206,7 @@ public class AnnotationLabels ap, new AlignmentAnnotation[] {aa[selectedRow]}, - null + null, null ); } else if (evt.getActionCommand().equals(COPYCONS_SEQ)) @@ -367,17 +367,31 @@ public class AnnotationLabels getSelectedRow(evt.getY() - scrollOffset); + 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(""); - 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+"
"); } + if(!Float.isNaN(aa.score)) + { + desc.append("Score: "+aa.score); + } + + if(desc.length()!=6) + { + desc.append(""); + this.setToolTipText(desc.toString()); + } + else + this.setToolTipText(null); } } @@ -629,7 +643,13 @@ public class AnnotationLabels } else { + if(aa[i].belowAlignment) + g.setColor(Color.ORANGE); + else + g.setColor(Color.red); + g.drawString(aa[i].label, x, y +offset); + } } }