git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make sure annots are alignment width
[jalview.git] / src / jalview / gui / AnnotationLabels.java
diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index e7e3970..a0648c7 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -193,7 +193,7 @@ public class AnnotationLabels
     {
       for (int i = 0; i < aa.length; i++)
       {
-        if (!aa[i].visible)
+        if (!aa[i].visible && aa[i].annotations!=null)
         {
           dif += aa[i].height;
           aa[i].visible = true;
@@ -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("<html>");
+
+      if (aa.description != null && !aa.description.equals("New description"))
+      {
+        desc.append(aa.description+"<br>");
+      }
+      if(aa.hasScore())
+      {
+        desc.append("Score: "+aa.score);
+      }
 
-      if (desc != null && !desc.equals("New description"))
+      if(desc.length()!=6)
       {
-        setToolTipText(ap.av.alignment.
-                       getAlignmentAnnotation()[selectedRow].description);
+        desc.append("</html>");
+        this.setToolTipText(desc.toString());
       }
+      else
+        this.setToolTipText(null);
     }
 
   }