X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=caf93fcc67ee3f85285492215e3fe9b29bd52d72;hb=bed54fafd288a7cf39f15262522b0f2503883479;hp=8fcca782189c29145ee9fe9f2277cf9e320957da;hpb=353236b63bd005adee3fb297984228e26bc9d66c;p=jalview.git

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 8fcca78..caf93fc 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -2,23 +2,20 @@ package jalview.gui;
 
 import java.awt.*;
 import javax.swing.*;
-import java.awt.event.*;
 import jalview.datamodel.*;
-import jalview.schemes.*;
 import jalview.analysis.*;
 
 
 public class SeqCanvas extends JPanel
 {
+     FeatureRenderer fr;
     Image             img;
-    Graphics          gg;
+    Graphics2D          gg;
     int               imgWidth;
     int               imgHeight;
 
     AlignViewport     av;
 
-    public boolean paintFlag = false;
-
     boolean showScores = false;
     boolean displaySearch = false;
     int [] searchResults = null;
@@ -26,26 +23,73 @@ public class SeqCanvas extends JPanel
     int chunkHeight;
     int chunkWidth;
 
+    boolean fastPaint = false;
+
 
     public SeqCanvas(AlignViewport av)
     {
 	this.av         = av;
+       fr = new FeatureRenderer(av);
        setLayout(new BorderLayout());
+       PaintRefresher.Register(this);
 
     }
 
-  public void drawScale(int startx, int endx,int charWidth, int charHeight,int ypos) {
+  public void drawScale(Graphics g, int startx, int endx,int ypos) {
       int scalestartx = startx - startx%10 + 10;
 
-      gg.setColor(Color.black);
+      g.setColor(Color.black);
+
+      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) {
-	  String string = String.valueOf(i);
-	  gg.drawString(string,(int)((i-startx-1)*charWidth),ypos+15 - charHeight*(2));
       }
+
   }
 
 
+public void fastPaint(int horizontal, int vertical)
+{
+    if (horizontal == 0 && vertical == 0)
+      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,
+        transX = 0, transY = 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;
+
+    else if (vertical > 0) // scroll down
+    {
+      transY = imgHeight - vertical * av.charHeight;
+      ss = es - vertical;
+    }
+    else if (vertical < 0)
+      es = ss - vertical;
+
+    gg.translate(transX, transY);
+
+
+    drawPanel(gg, sr, er, ss, es, sr, ss, 0);
+    gg.translate( -transX, -transY);
+
+    fastPaint = true;
+    repaint();
+
+}
+
 /**
  * Definitions of startx and endx (hopefully):
  * SMJS This is what I'm working towards!
@@ -57,127 +101,79 @@ public class SeqCanvas extends JPanel
  * in the adjustment listener in SeqPanel when the scrollbars move.
  */
 
-  public void paintComponent(Graphics g) {
-
-    AlignmentI da = av.getAlignment();
+  public void paintComponent(Graphics g)
+  {
+    g.setColor(Color.white);
+    g.fillRect(0, 0, getWidth(), getHeight());
 
-    if (img == null ||
-        imgWidth  !=  getWidth()  ||
-        imgHeight !=  getHeight()
-        || paintFlag)
+    if (fastPaint)
     {
+      g.drawImage(img, 0, 0, this);
+      fastPaint = false;
+      return;
+    }
 
+    // this draws the whole of the alignment
       imgWidth  = getWidth();
       imgHeight = getHeight();
 
-      img = createImage(imgWidth,imgHeight);
-      gg  = img.getGraphics();
+      imgWidth -= imgWidth%av.charWidth;
+      imgHeight-= imgHeight%av.charHeight;
 
+      img = createImage(imgWidth,imgHeight);
+      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;
-    chunkHeight =  (da.getHeight() + 2)*av.charHeight;
+    chunkHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
     av.setChunkHeight(chunkHeight);
     av.setChunkWidth(chunkWidth);
 
 
+    if (av.getWrapAlignment())
+      drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);
+    else
+      drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0);
 
-    fillBackground(gg,Color.WHITE,0,0,imgWidth,imgHeight);
-
-    /* if (av.getWrapAlignment()) {
-        int offy = av.getStartSeq();
-	  startx = (int)(offy/chunkWidth)*chunkWidth;
-	  endx   = startx + chunkWidth;
-	  starty = offy%chunkHeight;
-	  endy   = starty + da.getHeight();
-
-	  int ypos     = 0;
-	  int rowstart = starty;
-
-	  if (starty == 0) {
-	      ypos = 2*charHeight;
-	  } else if (starty == 1) {
-	      starty = 0;
-	      ypos = charHeight;
-	  }
-
-	  if (endy > da.getHeight()) {
-	      endy = da.getHeight();
-	  }
-
-	  if (endx > da.getWidth()) {
-	      endx = da.getWidth();
-	  }
-
-	  if (rowstart < 2) {
-	      drawScale(startx,endx,charWidth,charHeight,ypos);
-	  }
-
-	  drawPanel(gg,startx,endx,starty,endy,startx,starty,ypos);
-
-	  if (rowstart == 0) {
-	      ypos = ypos + chunkHeight;
-	  } else if (rowstart == 1) {
-	      ypos = ypos + chunkHeight;
-	  } else {
-	      ypos   = ypos + chunkHeight - rowstart*charHeight;
-	  }
-
-	  startx += chunkWidth;
-	  endx   = startx + chunkWidth;
-	  starty = 0;
-
-	  if (endx > da.getWidth()) {
-	      endx = da.getWidth();
-	  }
-	  // Draw the rest of the panels
+    g.drawImage(img, 0, 0, this);
 
-	  while (ypos <= getHeight()) {
-	      drawScale(startx,endx,charWidth,charHeight,ypos);
-	      drawPanel(gg,startx,endx,0,da.getHeight(),startx,starty,ypos);
+  }
 
-	      ypos   += chunkHeight;
-	      startx += chunkWidth;
-	      endx   = startx + chunkWidth;
+  public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)
+  {
+      AlignmentI da = av.getAlignment();
 
-	      if (endy > da.getHeight()) {
-		  endy = da.getHeight();
-	      }
+      int cWidth  =   canvasWidth/av.charWidth;
+      int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
-	      if (endx > da.getWidth()) {
-		  endx = da.getWidth();
-	      }
+      int  endx   = startRes+cWidth-1;
+      int ypos  = 2*av.charHeight;
 
-	  }
-      }
-      else*/
+      while (ypos <= canvasHeight)
       {
-	  drawPanel(gg,av.startRes,av.endRes,av.startSeq,av.endSeq,av.startRes,av.startSeq,0);
-      }
+        drawScale(g, startRes, endx, ypos);
+        drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos);
 
+        ypos += cHeight;
+        startRes += cWidth;
+        endx = startRes + cWidth - 1;
 
-  /*  if ((oldendy -oldstarty) > (getWidth() / av.getCharWidth())) {
-      System.out.println("LIMITS ERROR LIMITS ERROR");
-      System.out.println("Corrds " + (oldendy-oldstarty) + " " + (getWidth()/av.getCharWidth()) + " " + getWidth() + " " + av.getCharWidth());
-    }*/
-
-    g.drawImage(img,0,0,this);
+        if (endx > da.getWidth())
+          endx = da.getWidth();
+      }
 
   }
 
 
+  public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {
 
-
-  public void drawPanel(Graphics g,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {
-
-
+   Graphics2D g = (Graphics2D)g1;
     g.setFont(av.getFont());
-    int            charWidth  = av.getCharWidth();
-    int            charHeight = av.getCharHeight();
     RendererI sr = av.getRenderer();
 
     /*Vector    pid    = av.getConsensus(false);
@@ -196,7 +192,7 @@ public class SeqCanvas extends JPanel
 
 */
 
-    if (y2 > starty && y1 < av.getEndSeq())
+   /* if (y2 > starty && y1 < av.getEndSeq())
     {
        fillBackground(g,
                    Color.red,
@@ -204,94 +200,145 @@ public class SeqCanvas extends JPanel
                    offset + AlignmentUtil.getPixelHeight(starty,y1,av.getCharHeight()),
                    (x2-x1+1)*charWidth,
                    offset + AlignmentUtil.getPixelHeight(y1,y2,av.getCharHeight()));
-    }
+    }*/
 
     SequenceI nextSeq;
-    SequenceGroup group=null;
-    boolean newGroup=false;
-    int sx=-1, sy=-1, ex=-1, ey=-1;
-    int oldStartX=0,oldEndX=0,oldY=0;
+
+    /// First draw the sequences
+    /////////////////////////////
     for (int i = y1 ; i < y2 ;i++)
     {
-     nextSeq = av.getAlignment().getSequenceAt(i);
-     if(group==null || group!=av.alignment.findGroup( nextSeq ))
-        newGroup = true;
-     else
-        newGroup = false;
-
-    group = av.alignment.findGroup( nextSeq );
-
-    sr.drawSequence(g, nextSeq, group,x1,x2,
-                 (x1 - startx) * charWidth,
-                 offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()),
-                 charWidth,charHeight,null, 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);
 
-     if( group!=null )
+     if(av.showSequenceFeatures)
      {
+       fr.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);
+     }
+    }
+    //
+    /////////////////////////////////////
 
-        g.setColor(Color.lightGray);
-
-        sx = (group.getStartRes()-startx)*charWidth;
-        sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight());
-        ex = (group.getEndRes()+1-startx)*charWidth;
-        ey = offset + AlignmentUtil.getPixelHeight(starty, i+1, av.getCharHeight());
+    // Now outline any areas if necessary
+    /////////////////////////////////////
+    SequenceGroup group = av.getSelectionGroup();
+    java.util.Vector groups = av.alignment.getGroups();
 
+    int sx = -1, sy = -1, ex = -1;
+    int groupIndex = -1;
+    if (group == null && groups.size() > 0)
+    {
+      group = (SequenceGroup) groups.elementAt(0);
+      groupIndex = 0;
+    }
 
-        if (newGroup)
+    if (group != null)
+      do
+      {
+        int oldY = -1;
+        int i = 0;
+        boolean inGroup = false;
+        int top=-1, bottom =-1;
+        for (i = y1; i < y2; i++)
         {
-          g.drawLine(oldStartX, oldY, oldEndX, oldY); // Horizontal, bottom of old box
-          g.drawLine(sx, sy, ex, sy); // Horizontal, top of new box
+          sx = (group.getStartRes() - startx) * av.charWidth;
+          sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);
+          ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth;
+
+
+          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,3f}, 0f ));
+                g.setColor(Color.RED);
+              }
+              else
+              {
+                g.setStroke(new BasicStroke());
+                g.setColor(group.getOutlineColour());
+              }
+            }
+          }
+          else
+          {
+            if (inGroup)
+            {
+              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;
+            }
+          }
         }
 
-        g.drawLine(sx, sy, sx, ey ); // vertical line, left hand side
-        g.drawLine( ex,sy,ex,ey);    // vertical line, right hand side
-        if (i == y2 - 1)// last line of alignment, seal the box
-          g.drawLine(sx, ey, ex, ey); // Horizontal, bottom of old box
-
-        oldStartX = sx;
-        oldEndX = ex;
-        oldY = ey;
+        if (inGroup)
+        {
 
-     }
-     else if(sx>-1)
-     {
-       g.setColor(Color.lightGray);
-       g.drawLine(sx, ey, ex, ey); // Horizontal, bottom of old box
-     }
+          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.drawLine(sx, oldY, sx, sy );
+          g.drawLine(sx+ex, oldY, sx+ex, sy );
+          inGroup = false;
+        }
+        groupIndex++;
+        if (groupIndex >= groups.size())
+          break;
 
-     group = av.getRubberbandGroup();
-     if( group !=null &&  group.sequences.contains(nextSeq) )
-     {
-         g.setColor(Color.red);
-
-         sx = (group.getStartRes() - startx) * charWidth;
-         sy = offset +
-             AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight());
-         ex = (group.getEndRes() + 1 - startx) * charWidth;
-         ey = offset +
-             AlignmentUtil.getPixelHeight(starty, i + 1, av.getCharHeight());
-
-         if (newGroup)
-         {
-           g.drawLine(oldStartX, oldY, oldEndX, oldY); // Horizontal, bottom of old box
-           g.drawLine(sx, sy, ex, sy); // Horizontal, top of new box
-         }
-
-         g.drawLine(sx, sy, sx, ey); // vertical line, left hand side
-         g.drawLine(ex, sy, ex, ey); // vertical line, right hand side
-         if (i == y2 - 1) // last line of alignment, seal the box
-           g.drawLine(sx, ey, ex, ey); // Horizontal, bottom of old box
-
-      //   oldStartX = sx;
-        // oldEndX = ex;
-        // oldY = ey;
+        group = (SequenceGroup) groups.elementAt(groupIndex);
 
-     }
+      }
+      while (groupIndex < groups.size());
 
-    }
 
     /// Highlight search Results once all sequences have been drawn
+    //////////////////////////////////////////////////////////
     if(displaySearch)
     {
       for(int r=0; r<searchResults.length; r+=3)
@@ -300,28 +347,24 @@ public class SeqCanvas extends JPanel
         int searchStart = searchResults[r+1];
         int searchEnd = searchResults[r+2];
 
-        if (searchSeq >= y1 && searchSeq <= y2)
+        if (searchSeq >= y1 && searchSeq < y2)
         {
           SequenceRenderer ssr = (SequenceRenderer) sr;
-          ssr.drawHighlightedText(g, av.getAlignment().getSequenceAt(searchSeq),
+          ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),
                                   searchStart,
                                   searchEnd,
-                                  (searchStart - startx) * charWidth,
+                                  (searchStart - startx) * av.charWidth,
                                   offset +
                                   AlignmentUtil.getPixelHeight(starty, searchSeq,
-              charHeight),
-                                  charWidth,
-                                  charHeight);
+              av.charHeight),
+                                  av.charWidth,
+                                  av.charHeight);
         }
       }
     }
 
   }
 
-  public void fillBackground(Graphics g,Color c, int x1,int y1,int width,int height) {
-    g.setColor(c);
-    g.fillRect(x1,y1,width,height);
-  }
 
   public int getChunkWidth() {
     return chunkWidth;
@@ -337,7 +380,6 @@ public class SeqCanvas extends JPanel
 
     searchResults = results;
 
-    paintFlag = true;
     repaint();
   }