X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FSeqCanvas.java;h=ddc32e8dc47eba62aaec5295b5f56715f26d4dc1;hb=8359bd8f5bae0bfc1a63ba114b7a4d67fbb62efe;hp=f0c27a314b7cdf07de89ead61a0b444393e829e0;hpb=3c17b49e571fc1274009671435ac47f51efab112;p=jalview.git

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index f0c27a3..ddc32e8 100755
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -21,7 +21,6 @@ package jalview.appletgui;
 
 import java.awt.*;
 
-import jalview.analysis.*;
 import jalview.datamodel.*;
 
 public class SeqCanvas
@@ -44,6 +43,8 @@ public class SeqCanvas
 
   boolean fastPaint = false;
 
+  boolean isOverview = false;
+
   public SeqCanvas(AlignViewport av)
   {
     this.av = av;
@@ -53,6 +54,11 @@ public class SeqCanvas
 
   }
 
+  public FeatureRenderer getFeatureRenderer()
+  {
+    return fr;
+  }
+
   void drawNorthScale(Graphics g, int startx, int endx, int ypos)
   {
     int scalestartx = startx - startx % 10 + 10;
@@ -134,13 +140,17 @@ public class SeqCanvas
 
   public void fastPaint(int horizontal, int vertical)
   {
-    if (horizontal == 0 && vertical == 0 || gg == null)
+    if (gg == null)
     {
       return;
     }
 
-    gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,
-                -vertical * av.charHeight);
+    gg.copyArea(horizontal * av.charWidth,
+                vertical * av.charHeight,
+                imgWidth,
+                imgHeight,
+                -horizontal * av.charWidth,
+                    -vertical * av.charHeight);
 
     int sr = av.startRes, er = av.endRes, ss = av.startSeq, es = av.endSeq,
         transX = 0, transY = 0;
@@ -204,6 +214,8 @@ public class SeqCanvas
 
   public void paint(Graphics g)
   {
+    sr.renderGaps(av.renderGaps);
+
     if (fastPaint)
     {
       g.drawImage(img, 0, 0, this);
@@ -228,17 +240,16 @@ public class SeqCanvas
     {
       img = createImage(imgWidth, imgHeight);
       gg = img.getGraphics();
+      if(!jalview.bin.JalviewLite.AWT1)
+      {
+        MyGraphics.AntiAlias(gg);
+      }
       gg.setFont(av.getFont());
     }
 
     gg.setColor(Color.white);
     gg.fillRect(0, 0, imgWidth, imgHeight);
 
-    chunkWidth = getWrappedCanvasWidth(getSize().width);
-    chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;
-
-    av.setChunkHeight(chunkHeight);
-    av.setChunkWidth(chunkWidth);
 
     if (av.getWrapAlignment())
     {
@@ -297,6 +308,8 @@ public class SeqCanvas
 
     FontMetrics fm = getFontMetrics(av.getFont());
 
+    int LABEL_EAST = 0;
+
     if (av.scaleRightWrapped)
     {
         LABEL_EAST = fm.stringWidth(getMask()+"0");
@@ -309,57 +322,96 @@ public class SeqCanvas
         LABEL_WEST = fm.stringWidth(getMask());
     }
 
+    int hgap = av.charHeight;
+    if(av.scaleAboveWrapped)
+      hgap += av.charHeight;
+
     int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;
-    int cHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;
+    int cHeight = av.getAlignment().getHeight() * av.charHeight;
+
+    av.setWrappedWidth(cWidth);
 
     av.endRes = av.startRes + cWidth;
 
-    int endx = startRes + cWidth - 1;
-    int ypos = 2 * av.charHeight;
 
-    while (ypos <= canvasHeight && startRes < av.alignment.getWidth())
+    int endx = (startRes + cWidth) - 1;
+    int ypos = hgap;
+
+
+    while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))
     {
-      g.setColor(Color.black);
+        g.setColor(Color.black);
 
-      if (av.scaleLeftWrapped)
-      {
-        drawWestScale(g, startRes, endx, ypos);
-      }
+        if (av.scaleLeftWrapped)
+        {
+            drawWestScale(g, startRes, endx, ypos);
+        }
 
-      if (av.scaleRightWrapped)
-      {
-        g.translate(canvasWidth - LABEL_EAST, 0);
-        drawEastScale(g, startRes, endx, ypos);
-        g.translate( - (canvasWidth - LABEL_EAST), 0);
-      }
+        if (av.scaleRightWrapped)
+        {
+            g.translate(canvasWidth - LABEL_EAST, 0);
+            drawEastScale(g, startRes, endx, ypos);
+            g.translate(-(canvasWidth - LABEL_EAST), 0);
+        }
 
-      g.translate(LABEL_WEST, 0);
-      if (av.scaleAboveWrapped)
-      {
-        drawNorthScale(g, startRes, endx, ypos);
-      }
+        g.translate(LABEL_WEST, 0);
 
+        if (av.scaleAboveWrapped)
+        {
+            drawNorthScale(g, startRes, endx, ypos);
+        }
 
-     if(g.getClip()==null)
-       g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);
 
+        if (av.vconsensus!=null && av.alignment.getWidth() >= av.vconsensus.size())
+        {
+          endx = av.vconsensus.size() - 2;
+        }
 
-      drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);
-      g.setClip(null);
-      g.translate( -LABEL_WEST, 0);
 
-      ypos += cHeight;
-      startRes += cWidth;
-      endx = startRes + cWidth - 1;
+        if(g.getClip()==null)
+          g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);
 
-      if (endx > al.getWidth())
-      {
-        endx = al.getWidth();
-      }
-    }
+        drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);
+         g.setClip(null);
+
+
+        if(av.showAnnotation)
+        {
+          g.translate(0, cHeight + ypos+4);
+          if(annotations==null)
+            annotations = new AnnotationPanel(av);
+
+          annotations.drawComponent( g, startRes, endx + 1);
+          g.translate(0, -cHeight - ypos-4);
+        }
+        g.translate(-LABEL_WEST, 0);
+
+        ypos += cHeight+getAnnotationHeight()+hgap;
+
+
+        startRes += cWidth;
+        endx = (startRes + cWidth) - 1;
+
+        if (endx > al.getWidth())
+        {
+            endx = al.getWidth();
+        }
+        }
 
   }
 
+  AnnotationPanel annotations;
+  int getAnnotationHeight()
+  {
+    if(!av.showAnnotation)
+      return 0;
+
+    if(annotations==null)
+      annotations = new AnnotationPanel(av);
+
+    return annotations.adjustPanelHeight();
+    }
+
   synchronized public void drawPanel(Graphics g, int x1, int x2, int y1, int y2,
                                      int startx, int starty, int offset)
   {
@@ -368,29 +420,28 @@ public class SeqCanvas
     sr.renderGaps(av.renderGaps);
 
     SequenceI nextSeq;
-
     /// First draw the sequences
-    /////////////////////////////
-    for (int i = y1; i < y2; i++)
-    {
-      nextSeq = av.alignment.getSequenceAt(i);
+  /////////////////////////////
+  for (int i = y1; i < y2; i++)
+  {
+    nextSeq = av.alignment.getSequenceAt(i);
+
+    sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
+                    (x1 - startx) * av.charWidth,
+                    offset +
+                    (i - starty) * av.charHeight,
+                    av.charWidth, av.charHeight);
 
-      sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
+    if (av.showSequenceFeatures)
+    {
+      fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
                       (x1 - startx) * av.charWidth,
                       offset +
-                      (i-starty)*av.charHeight,
+                      (i - starty) * av.charHeight,
                       av.charWidth, av.charHeight);
-
-      if (av.showSequenceFeatures)
-      {
-        fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,
-                        (x1 - startx) * av.charWidth,
-                        offset +
-                        (i-starty)*av.charHeight,
-                        av.charWidth, av.charHeight);
-      }
     }
-    //
+  }
+
     /////////////////////////////////////
 
     // Now outline any areas if necessary
@@ -405,104 +456,146 @@ public class SeqCanvas
       group = (SequenceGroup) groups.elementAt(0);
       groupIndex = 0;
     }
-
-    if (group != null)
+    if (group != null && !isOverview)
     {
-      do
-      {
-        int oldY = -1;
-        int i = 0;
-        boolean inGroup = false;
-        int top = -1, bottom = -1;
-        for (i = y1; i < y2; i++)
+        do
         {
-          sx = (group.getStartRes() - startx) * av.charWidth;
-          sy = offset + (i-starty)*av.charHeight;
-          ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth - 1;
+            int oldY = -1;
+            int i = 0;
+            boolean inGroup = false;
+            int top = -1;
+            int bottom = -1;
 
-          if (sx < getSize().width
-              && ex > 0
-              && group.sequences.contains(av.alignment.getSequenceAt(i)))
-          {
-            if (bottom == -1 && (i == av.alignment.getHeight() - 1 ||
-                                 !group.sequences.contains(av.alignment.
-                getSequenceAt(i + 1))))
+            for (i = y1; i < y2; i++)
             {
-              bottom = sy + av.charHeight;
+                sx = (group.getStartRes() - startx) * av.charWidth;
+                sy = offset + ((i - starty) * av.charHeight);
+                ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -
+                    1;
+
+                if(sx+ex<0 || sx>imgWidth)
+                {
+                  continue;
+                }
+
+                if ( (sx <= (x2-x1)*av.charWidth) &&
+                        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.setColor(Color.red);
+                        }
+                        else
+                        {
+                            g.setColor(group.getOutlineColour());
+                        }
+                    }
+                }
+                else
+                {
+                  if (inGroup)
+                  {
+                    if (sx >= 0 && sx < imgWidth)
+                      g.drawLine(sx, oldY, sx, sy);
+
+                    if (sx + ex < imgWidth)
+                      g.drawLine(sx + ex, oldY, sx + ex, sy);
+
+                    if (sx < 0)
+                    {
+                      ex += sx;
+                      sx = 0;
+                    }
+
+                    if (sx + ex > imgWidth)
+                      ex = imgWidth;
+
+                    else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)
+                      ex = (x2 - x1 + 1) * av.charWidth;
+
+                    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 (inGroup)
             {
-              if (top == -1 && i == 0 ||
-                  !group.sequences.contains(av.alignment.getSequenceAt(i - 1)))
-              {
-                top = sy;
-              }
+              sy = offset + ( (i - starty) * av.charHeight);
+              if (sx >= 0 && sx < imgWidth)
+                g.drawLine(sx, oldY, sx, sy);
 
-              oldY = sy;
-              inGroup = true;
-              if (group == av.getSelectionGroup())
-              {
-                g.setColor(new Color(255, 0, 0));
-              }
-              else
+              if (sx + ex < imgWidth)
+                g.drawLine(sx + ex, oldY, sx + ex, sy);
+
+              if (sx < 0)
               {
-                g.setColor(group.getOutlineColour());
+                ex += sx;
+                sx = 0;
               }
-            }
-          }
-          else
-          {
-            if (inGroup)
-            {
-              g.drawLine(sx, oldY, sx, sy);
-              g.drawLine(sx + ex, oldY, sx + ex, sy);
+
+              if (sx + ex > imgWidth)
+                ex = imgWidth;
+              else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)
+                ex = (x2 - x1 + 1) * av.charWidth;
 
               if (top != -1)
               {
                 g.drawLine(sx, top, sx + ex, top);
                 top = -1;
               }
+
               if (bottom != -1)
               {
-                g.drawLine(sx, bottom, sx + ex, bottom);
+                g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);
                 bottom = -1;
               }
 
-              inGroup = false;
+                inGroup = false;
             }
-          }
-        }
 
-        if (inGroup)
-        {
+            groupIndex++;
 
-          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;
+            if (groupIndex >= groups.size())
+            {
+                break;
+            }
 
-          }
-          sy = offset + (i-starty)*av.charHeight;
-          g.drawLine(sx, oldY, sx, sy);
-          g.drawLine(sx + ex, oldY, sx + ex, sy);
-          inGroup = false;
+            group = (SequenceGroup) groups.elementAt(groupIndex);
         }
-        groupIndex++;
-        if (groupIndex >= groups.size())
-        {
-          break;
-        }
-
-        group = (SequenceGroup) groups.elementAt(groupIndex);
-
-      }
-      while (groupIndex < groups.size());
+        while (groupIndex < groups.size());
     }
 
     /// Highlight search Results once all sequences have been drawn