show sliders when first selecting conservation,PID

[jalview.git] / src / jalview / gui / AnnotationPanel.java

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 48f9c20..77f557b 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -312,7 +312,14 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 \r
     int res = evt.getX() / av.getCharWidth() + av.getStartRes();\r
     if(row>-1 && res<aa[row].annotations.length && aa[row].annotations[res]!=null)\r
+    {\r
       this.setToolTipText(aa[row].annotations[res].description);\r
+      StringBuffer text = new StringBuffer("Sequence position " + (res + 1) +\r
+                                           "  " +\r
+                                           aa[row].annotations[res].description);\r
+      ap.alignFrame.statusBar.setText(text.toString());\r
+    }\r
+\r
 \r
   }\r
   public void mouseClicked(MouseEvent evt) {}\r
@@ -336,21 +343,23 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
                                 ap.annotationPanel.getHeight(),\r
                                 BufferedImage.TYPE_INT_RGB);\r
       gg = (Graphics2D) image.getGraphics();\r
-      gg.setColor(Color.white);\r
-      gg.fillRect(0, 0, imgWidth, getHeight());\r
       gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
                           RenderingHints.VALUE_ANTIALIAS_ON);\r
-      fm = gg.getFontMetrics();\r
-      gg.setFont(av.getFont());\r
 \r
+      gg.setFont(av.getFont());\r
+      fm = gg.getFontMetrics();\r
 \r
     drawComponent( gg, av.startRes, av.endRes+1);\r
     g.drawImage( image, 0, 0, this);\r
+\r
   }\r
 \r
   public void fastPaint(int horizontal)\r
 {\r
-  if(image==null || horizontal ==0)\r
+  if( horizontal == 0\r
+     || av.alignment.getAlignmentAnnotation()==null\r
+     || av.alignment.getAlignmentAnnotation().length<1\r
+    )\r
   {\r
     repaint();\r
     return;\r
@@ -387,6 +396,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
     g.fillRect(0,0,(endRes-startRes) *av.charWidth, getHeight());\r
     if(av.alignment.getAlignmentAnnotation()==null || av.alignment.getAlignmentAnnotation().length<1)\r
     {\r
+      g.setColor(Color.white);\r
+      g.fillRect(0,0,getWidth(), getHeight());\r
       g.setColor(Color.black);\r
       g.drawString("Alignment has no annotations",20,15);\r
       return;\r
@@ -400,6 +411,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
     int iconOffset = av.charHeight/2;\r
     boolean validRes = false;\r
     //\u03B2 \u03B1\r
+\r
     for(int i=0; i<aa.length; i++)\r
     {\r
       AlignmentAnnotation row = aa[i];\r
@@ -443,9 +455,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 \r
        if(validRes && row.annotations[j].displayCharacter.length()>0)\r
        {\r
-         int charOffset = (av.charWidth -\r
-                            fm.charWidth(row.annotations[j].displayCharacter.\r
-                                         charAt(0))) / 2;\r
+         int charOffset = (av.charWidth - fm.charWidth(row.annotations[j].displayCharacter.charAt(0)))/2;\r
          g.setColor( row.annotations[j].colour);\r
           if(j==0)\r
           {\r
@@ -516,7 +526,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
            height = (int)( (total / row.graphMax) *GRAPH_HEIGHT);\r
 \r
          }\r
-\r
+         g.setColor(row.annotations[j].colour);\r
          g.fillRect(x, y-height, av.charWidth, height );\r
        }\r
 \r