X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=f3e753226f2b5a9073703a25e5132bc8b6b04c01;hb=9be2898dd1635c87539a90de321975f043d005f3;hp=ef11e2dd849e5831a61bb3005bfaf801a27b1002;hpb=e21877065e4f51b0d74af7e6627a62835a7121f2;p=jalview.git

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index ef11e2d..f3e7532 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -1,23 +1,23 @@
 package jalview.gui;
 
 import java.awt.*;
+import java.awt.image.*;
 import javax.swing.*;
 import jalview.datamodel.*;
 import jalview.analysis.*;
 
 
-public class SeqCanvas extends JPanel
+public class SeqCanvas extends JComponent
 {
      FeatureRenderer fr;
-    Image             img;
+     SequenceRenderer sr;
+    BufferedImage             img;
     Graphics2D          gg;
     int               imgWidth;
     int               imgHeight;
 
     AlignViewport     av;
 
-    public boolean paintFlag = false;
-
     boolean showScores = false;
     boolean displaySearch = false;
     int [] searchResults = null;
@@ -25,49 +25,106 @@ public class SeqCanvas extends JPanel
     int chunkHeight;
     int chunkWidth;
 
+    boolean fastPaint = false;
+
 
     public SeqCanvas(AlignViewport av)
     {
 	this.av         = av;
        fr = new FeatureRenderer(av);
+       sr = new SequenceRenderer(av);
        setLayout(new BorderLayout());
        PaintRefresher.Register(this);
 
     }
 
-  public void drawScale(Graphics g, int startx, int endx,int ypos) {
-      int scalestartx = startx - startx%10 + 10;
+  void drawNorthScale(Graphics g, int startx, int endx,int ypos) {
+    int scalestartx = startx - startx % 10 + 10;
+
+    g.setColor(Color.black);
 
-      g.setColor(Color.black);
+    // NORTH SCALE
+    for (int i = scalestartx; i < endx; i += 10)
+    {
+      String string = String.valueOf(i);
+      g.drawString(string, (i - startx - 1) * av.charWidth,
+                   ypos - av.charHeight / 2);
+
+      g.drawLine( (i - startx - 1) * av.charWidth + av.charWidth / 2,
+                 ypos + 2 - av.charHeight / 2,
+                 (i - startx - 1) * av.charWidth + av.charWidth / 2, ypos - 2);
 
-      for (int i=scalestartx;i < endx;i+= 10)
+    }
+  }
+
+  void drawWestScale(Graphics g, int startx, int endx, int ypos)
+  {
+    FontMetrics fm = getFontMetrics(av.getFont());
+    ypos+= av.charHeight;
+      // EAST SCALE
+    for (int i = 0; i < av.alignment.getHeight(); i++)
+    {
+      SequenceI seq = av.alignment.getSequenceAt(i);
+      int index = startx;
+      int value = -1;
+      while (index < endx)
       {
-          String string = String.valueOf(i);
-          g.drawString(string,(i-startx-1)*av.charWidth,ypos - av.charHeight/2);
+        if (jalview.util.Comparison.isGap(seq.getCharAt(index)))
+        {
+          index++;
+          continue;
+        }
 
-          g.drawLine( (i-startx-1)*av.charWidth +av.charWidth/2, ypos+2 - av.charHeight/2,
-                    (i-startx-1)*av.charWidth +av.charWidth/2, ypos-2 );
+        value = av.alignment.getSequenceAt(i).findPosition(index);
+        break;
+      }
+      if(value!=-1)
+      {
+        int x = LABEL_WEST - fm.stringWidth(value+"");
+        g.drawString(value + "", x,  ypos +  i*av.charHeight - av.charHeight/5);
+      }
+    }
+  }
 
+  void drawEastScale(Graphics g, int startx, int endx, int ypos)
+{
+    ypos+= av.charHeight;
+    // EAST SCALE
+  for (int i = 0; i < av.alignment.getHeight(); i++)
+  {
+    SequenceI seq = av.alignment.getSequenceAt(i);
+    int index = endx;
+    int value = -1;
+    while (index > startx)
+    {
+      if (jalview.util.Comparison.isGap(seq.getCharAt(index)))
+      {
+        index--;
+        continue;
       }
 
+      value = av.alignment.getSequenceAt(i).findPosition(index);
+      break;
+    }
+    if(value!=-1)
+       g.drawString(value + "", 0,  ypos +  i*av.charHeight - av.charHeight/5);
   }
 
+}
+
+
+
+
 
 public void fastPaint(int horizontal, int vertical)
 {
-    if (horizontal == 0 && vertical == 0)
+    if (horizontal == 0 && vertical == 0 || gg==null)
       return;
 
-    if (img == null || paintFlag)
-    {
-      repaint();
-      return;
-    }
-
     gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,
                 -vertical * av.charHeight);
 
-    int sr = av.startRes, er = av.endRes + 1, ss = av.startSeq, es = av.endSeq,
+    int sr = av.startRes, er = av.endRes, ss = av.startSeq, es = av.endSeq,
         transX = 0, transY = 0;
     if (horizontal > 0) // scrollbar pulled right, image to the left
     {
@@ -79,18 +136,29 @@ public void fastPaint(int horizontal, int vertical)
 
     else if (vertical > 0) // scroll down
     {
-      transY = imgHeight - vertical * av.charHeight;
       ss = es - vertical;
+      if(ss<av.startSeq) // ie scrolling too fast, more than a page at a time
+        ss = av.startSeq;
+      else
+        transY = imgHeight - vertical * av.charHeight;
     }
     else if (vertical < 0)
+    {
       es = ss - vertical;
+      if(es > av.endSeq)
+        es = av.endSeq;
+    }
+
 
     gg.translate(transX, transY);
 
+    gg.setColor(Color.white);
+    gg.fillRect(0,0, (er-sr+1)*av.charWidth, (es-ss)*av.charHeight);
     drawPanel(gg, sr, er, ss, es, sr, ss, 0);
-
     gg.translate( -transX, -transY);
-    getGraphics().drawImage(img, 0, 0, this);
+
+    fastPaint = true;
+    repaint();
 
 }
 
@@ -105,25 +173,36 @@ public void fastPaint(int horizontal, int vertical)
  * in the adjustment listener in SeqPanel when the scrollbars move.
  */
 
-  public void paintComponent(Graphics g)
+  public void paint(Graphics g)
   {
+    g.setColor(Color.white);
+    g.fillRect(0, 0, getWidth(), getHeight());
+
+    if (fastPaint)
+    {
+      g.drawImage(img, 0, 0, this);
+      fastPaint = false;
+      return;
+    }
+
     // this draws the whole of the alignment
       imgWidth  = getWidth();
       imgHeight = getHeight();
+      if(imgWidth==0 || imgHeight==0)
+        return;
 
       imgWidth -= imgWidth%av.charWidth;
       imgHeight-= imgHeight%av.charHeight;
 
-      img = createImage(imgWidth,imgHeight);
+      img = new BufferedImage(imgWidth,imgHeight,BufferedImage.TYPE_INT_RGB);
       gg  = (Graphics2D)img.getGraphics();
       gg.setFont(av.getFont());
       gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
-      paintFlag = false;
 
       gg.setColor(Color.white);
       gg.fillRect(0,0,imgWidth,imgHeight);
 
-    chunkWidth  =   getWidth()/av.charWidth;
+    chunkWidth  =   getWrappedCanvasWidth( getWidth() );
     chunkHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
     av.setChunkHeight(chunkHeight);
@@ -135,70 +214,99 @@ public void fastPaint(int horizontal, int vertical)
     else
       drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0);
 
-    g.setColor(Color.white);
-    g.fillRect(0,0,getWidth(),getHeight());
-    g.drawImage(img,0,0,this);
+    g.drawImage(img, 0, 0, this);
 
   }
 
+  int LABEL_WEST, LABEL_EAST;
+  public int getWrappedCanvasWidth(int cwidth)
+  {
+    FontMetrics fm = getFontMetrics(av.getFont());
+
+    LABEL_EAST = 0;
+    LABEL_WEST = 0;
+
+    if(av.scaleRightWrapped)
+      LABEL_EAST = fm.stringWidth( av.alignment.getWidth()+"000" );
+
+    if(av.scaleLeftWrapped)
+      LABEL_WEST = fm.stringWidth( av.alignment.getWidth()+"" );
+
+    return  (cwidth - LABEL_EAST -LABEL_WEST)/av.charWidth;
+  }
+
   public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)
   {
-      AlignmentI da = av.getAlignment();
+      AlignmentI al = av.getAlignment();
+
+      FontMetrics fm = getFontMetrics(av.getFont());
+
+      int LABEL_EAST = 0;
+      if(av.scaleRightWrapped)
+        LABEL_EAST = fm.stringWidth( al.getWidth()+"000" );
+      int LABEL_WEST = 0;
+      if(av.scaleLeftWrapped)
+        LABEL_WEST = fm.stringWidth(al.getWidth()+"0");
+
 
-      int cWidth  =   canvasWidth/av.charWidth;
+      int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;
       int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
       int  endx   = startRes+cWidth-1;
-      int ypos  = 2*av.charHeight;
+      int  ypos  = 2*av.charHeight;
 
-      while (ypos <= canvasHeight)
+      while (ypos <= canvasHeight && startRes<av.alignment.getWidth() )
       {
-        drawScale(g, startRes, endx, ypos);
-        drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos);
+        g.setColor(Color.black);
+
+        if(av.scaleLeftWrapped)
+          drawWestScale(g, startRes, endx, ypos);
+
+        if(av.scaleRightWrapped)
+        {
+          g.translate(canvasWidth - LABEL_EAST +av.charWidth, 0);
+          drawEastScale(g, startRes, endx, ypos);
+          g.translate( - (canvasWidth - LABEL_EAST+av.charWidth), 0);
+        }
+
+        g.translate(LABEL_WEST,0);
+        if(av.scaleAboveWrapped)
+          drawNorthScale(g, startRes, endx, ypos);
+
+
+        // When printing we have an extra clipped region,
+        // the Printable page which we need to account for here
+        Shape clip = g.getClip();
+        if(clip==null)
+          g.setClip(0, 0, cWidth*av.charWidth, canvasHeight);
+        else
+          g.setClip(0,
+                    (int)clip.getBounds().getY(),
+                    cWidth*av.charWidth,
+                    (int)clip.getBounds().getHeight()
+                    );
+
+        drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);
+        g.setClip(clip);
+        g.translate(-LABEL_WEST,0);
 
         ypos += cHeight;
         startRes += cWidth;
         endx = startRes + cWidth - 1;
 
-        if (endx > da.getWidth())
-          endx = da.getWidth();
+        if (endx > al.getWidth())
+          endx = al.getWidth();
       }
 
   }
 
 
-  public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {
+  synchronized public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {
 
-
-   Graphics2D g = (Graphics2D)g1;
+    Graphics2D g = (Graphics2D)g1;
     g.setFont(av.getFont());
-    RendererI sr = av.getRenderer();
-
-    /*Vector    pid    = av.getConsensus(false);
-    Vector tmpseq = new Vector();
-    for (int i = 0; i < av.getAlignment().getHeight(); i++)
-	if (!av.getSelection().contains(av.getAlignment().getSequenceAt(i)))
-	    tmpseq.addElement(av.getAlignment().getSequenceAt(i));
+    sr.renderGaps(av.renderGaps);
 
-    if (sr instanceof SequenceRenderer)
-	pid    = AAFrequency.calculate(tmpseq,x1,x2);
-
-    else if (sr instanceof GraphRenderer)
-	pid = AAFrequency.calculatePID(av.getAlignment().getSequenceAt(0),
-				       av.getAlignment().getSequences(),
-				       av.getPIDWindow(),x1,x2);
-
-*/
-
-   /* if (y2 > starty && y1 < av.getEndSeq())
-    {
-       fillBackground(g,
-                   Color.red,
-                   (x1-startx)*charWidth,
-                   offset + AlignmentUtil.getPixelHeight(starty,y1,av.getCharHeight()),
-                   (x2-x1+1)*charWidth,
-                   offset + AlignmentUtil.getPixelHeight(y1,y2,av.getCharHeight()));
-    }*/
 
     SequenceI nextSeq;
 
@@ -206,12 +314,12 @@ public void fastPaint(int horizontal, int vertical)
     /////////////////////////////
     for (int i = y1 ; i < y2 ;i++)
     {
-     nextSeq = av.getAlignment().getSequenceAt(i);
+     nextSeq = av.alignment.getSequenceAt(i);
 
      sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2,
                  (x1 - startx) * av.charWidth,
                  offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
-                 av.charWidth,av.charHeight,null, i);
+                 av.charWidth,av.charHeight);
 
      if(av.showSequenceFeatures)
      {
@@ -219,7 +327,7 @@ public void fastPaint(int horizontal, int vertical)
                        (x1 - startx) * av.charWidth,
                        offset +
                        AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
-                       av.charWidth, av.charHeight, null, i);
+                       av.charWidth, av.charHeight);
      }
     }
     //
@@ -244,23 +352,33 @@ public void fastPaint(int horizontal, int vertical)
         int oldY = -1;
         int i = 0;
         boolean inGroup = false;
+        int top=-1, bottom =-1;
         for (i = y1; i < y2; i++)
         {
           sx = (group.getStartRes() - startx) * av.charWidth;
           sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);
-          ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth;
+          ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth -1;
 
-          if (group.sequences.contains(av.alignment.getSequenceAt(i))
-              && sx < getWidth()
-              && ex > 0)
+          if (sx < getWidth()
+              && ex > 0
+              && group.sequences.contains(av.alignment.getSequenceAt(i)))
           {
+            if (bottom == -1 &&
+                !group.sequences.contains(av.alignment.getSequenceAt(i + 1)))
+              bottom = sy + av.charHeight ;
+
             if (!inGroup)
             {
+              if (top == -1 && i==0 ||
+                  !group.sequences.contains(av.alignment.getSequenceAt(i - 1)))
+                top = sy;
+
+
               oldY = sy;
               inGroup = true;
               if (group == av.getSelectionGroup())
               {
-            //    g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,2f,2f}, 0f ));
+                g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,3f}, 0f ));
                 g.setColor(Color.RED);
               }
               else
@@ -274,18 +392,45 @@ public void fastPaint(int horizontal, int vertical)
           {
             if (inGroup)
             {
-              g.drawRect(sx, oldY, ex, (sy - oldY));
+              g.drawLine(sx, oldY, sx, sy );
+              g.drawLine(sx+ex, oldY, sx+ex, sy );
+
+              if (top != -1)
+              {
+                g.drawLine(sx, top, sx + ex, top);
+                top =-1;
+              }
+              if (bottom != -1)
+              {
+                g.drawLine(sx, bottom, sx + ex, bottom);
+                bottom = -1;
+              }
+
+
               inGroup = false;
             }
           }
         }
+
         if (inGroup)
         {
+
+          if(top!=-1)
+          {
+            g.drawLine(sx, top, sx + ex, top);
+            top =-1;
+          }
+          if(bottom!=-1)
+           {
+             g.drawLine(sx, bottom-1, sx + ex, bottom-1);
+             bottom = -1;
+
+           }
           sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);
-          g.drawRect(sx, oldY, ex, (sy - oldY));
+          g.drawLine(sx, oldY, sx, sy );
+          g.drawLine(sx+ex, oldY, sx+ex, sy );
           inGroup = false;
         }
-
         groupIndex++;
         if (groupIndex >= groups.size())
           break;
@@ -309,6 +454,10 @@ public void fastPaint(int horizontal, int vertical)
         if (searchSeq >= y1 && searchSeq < y2)
         {
           SequenceRenderer ssr = (SequenceRenderer) sr;
+          if(searchStart<x1)
+            searchStart = x1;
+          if(searchEnd > x2)
+            searchEnd = x2;
           ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),
                                   searchStart,
                                   searchEnd,
@@ -325,9 +474,6 @@ public void fastPaint(int horizontal, int vertical)
   }
 
 
-  public int getChunkWidth() {
-    return chunkWidth;
-  }
 
   public void highlightSearchResults(int [] results)
   {
@@ -339,7 +485,6 @@ public void fastPaint(int horizontal, int vertical)
 
     searchResults = results;
 
-    paintFlag = true;
     repaint();
   }