X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=420e369d62a8f754a8d698b49e099ee7fc47540d;hb=ac07859006686a2c62bcf57b24742eb610bc46f0;hp=28744946978ca71223ed91857f35dfe65a220274;hpb=c59fb56cb143b05c5643a71f5b39996ac1cd2fef;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 2874494..420e369 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -23,7 +23,15 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
   static Color HELIX_COLOUR = Color.red.darker();
   static Color SHEET_COLOUR = Color.green.darker().darker();
 
-  BufferedImage bi;
+
+  BufferedImage image;
+  Graphics2D gg;
+  FontMetrics fm;
+  int imgWidth=0;
+
+  boolean fastPaint = false;
+
+  public static int GRAPH_HEIGHT = 40;
 
 
 
@@ -64,7 +72,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
         aa[i].height += 16;
 
       if (aa[i].isGraph)
-        aa[i].height += 50;
+        aa[i].height += GRAPH_HEIGHT;
 
       if(aa[i].height==0)
         aa[i].height = 20;
@@ -303,7 +311,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
     }
 
     int res = evt.getX() / av.getCharWidth() + av.getStartRes();
-    if(row>-1 && aa[row].annotations[res]!=null)
+    if(row>-1 && res<aa[row].annotations.length && aa[row].annotations[res]!=null)
       this.setToolTipText(aa[row].annotations[res].description);
 
   }
@@ -312,29 +320,76 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 
   public void paintComponent(Graphics g)
   {
-    if(bi==null
-       || bi.getWidth()!=ap.annotationPanel.getWidth()
-       || bi.getHeight()!=ap.annotationPanel.getHeight())
+    g.setColor(Color.white);
+    g.fillRect(0,0,getWidth(), getHeight());
+
+    if(fastPaint)
     {
-      bi = new BufferedImage(ap.annotationPanel.getWidth(),
-                           ap.annotationPanel.getHeight(),
-                           BufferedImage.TYPE_INT_RGB);
+      g.drawImage(image, 0, 0, this);
+      fastPaint = false;
+      return;
     }
 
-    drawComponent( (Graphics2D)bi.getGraphics() );
-    g.drawImage( bi, 0, 0, this);
+    imgWidth = (av.endRes-av.startRes+1) *av.charWidth;
+
+    image = new BufferedImage(imgWidth,
+                                ap.annotationPanel.getHeight(),
+                                BufferedImage.TYPE_INT_RGB);
+      gg = (Graphics2D) image.getGraphics();
+      gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                          RenderingHints.VALUE_ANTIALIAS_ON);
+      fm = gg.getFontMetrics();
+      gg.setFont(av.getFont());
+
+    drawComponent( gg, av.startRes, av.endRes+1);
+    g.drawImage( image, 0, 0, this);
+
   }
 
-  public void drawComponent(Graphics2D g)
+  public void fastPaint(int horizontal)
+{
+  if( horizontal == 0
+     || av.alignment.getAlignmentAnnotation()==null
+     || av.alignment.getAlignmentAnnotation().length<1
+    )
   {
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
-    FontMetrics fm = g.getFontMetrics();
-    g.setFont(av.getFont());
-    g.setColor(Color.white);
-    g.fillRect(0,0,getWidth(),getHeight());
+    repaint();
+    return;
+  }
 
+  gg.copyArea( 0,0, imgWidth, getHeight(), -horizontal*av.charWidth, 0 );
+  int sr=av.startRes, er=av.endRes+1, transX=0;
+
+  if(horizontal>0) // scrollbar pulled right, image to the left
+  {
+    transX =  (er-sr-horizontal)*av.charWidth;
+    sr = er - horizontal ;
+  }
+  else if(horizontal<0)
+  {
+    er = sr-horizontal;
+  }
+
+
+  gg.translate(transX, 0);
+
+  drawComponent(gg, sr, er);
+
+  gg.translate( -transX, 0 );
+
+  fastPaint = true;
+  repaint();
+}
+
+
+  public void drawComponent(Graphics2D g, int startRes, int endRes)
+  {
+    g.setColor(Color.white);
+    g.fillRect(0,0,(endRes-startRes) *av.charWidth, getHeight());
     if(av.alignment.getAlignmentAnnotation()==null || av.alignment.getAlignmentAnnotation().length<1)
     {
+      g.setColor(Color.white);
+      g.fillRect(0,0,getWidth(), getHeight());
       g.setColor(Color.black);
       g.drawString("Alignment has no annotations",20,15);
       return;
@@ -348,6 +403,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
     int iconOffset = av.charHeight/2;
     boolean validRes = false;
     //\u03B2 \u03B1
+
     for(int i=0; i<aa.length; i++)
     {
       AlignmentAnnotation row = aa[i];
@@ -366,11 +422,11 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
       else
         iconOffset = 0;
 
-      for(j=av.startRes; j<av.endRes+1; j++)
+      for(j=startRes; j<endRes; j++)
       {
         validRes = row.annotations[j]==null?false:true;
 
-       x = (j-av.getStartRes())*av.charWidth;
+       x = (j-startRes)*av.charWidth;
 
 
        if(activeRow==i)
@@ -383,7 +439,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
            {
              int v = Integer.parseInt(activeRes.get(n).toString()) ;
              if (v == j)
-               g.fillRect( (j-av.getStartRes()) * av.charWidth, y, av.charWidth, row.height);
+               g.fillRect( (j-startRes) * av.charWidth, y, av.charWidth, row.height);
            }
        }
 
@@ -447,7 +503,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
        if (validRes && row.isGraph)
        {
          g.setColor(new Color(0,0,180));
-         int height = (int)((row.annotations[j].value / row.graphMax)*50);
+         int height = (int)((row.annotations[j].value / row.graphMax)*GRAPH_HEIGHT);
 
          if(row.windowLength>1)
          {
@@ -461,10 +517,10 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
            }
 
            total/=row.windowLength;
-           height = (int)( (total / row.graphMax) *50);
+           height = (int)( (total / row.graphMax) *GRAPH_HEIGHT);
 
          }
-
+         g.setColor(row.annotations[j].colour);
          g.fillRect(x, y-height, av.charWidth, height );
        }
 
@@ -515,7 +571,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
     for(int j=0; j<aa.annotations.length; j++)
     {
       g.setColor(new Color(0, 0, 180));
-      int height = (int) ( (aa.annotations[j].value / aa.graphMax) * 50);
+      int height = (int) ( (aa.annotations[j].value / aa.graphMax) * GRAPH_HEIGHT );
       g.fillRect(x, y - height, av.charWidth, height);
       x+=av.charWidth;
     }