Wrapped, getWidth > vconsensus
authoramwaterhouse <Andrew Waterhouse>
Tue, 30 Aug 2005 14:11:11 +0000 (14:11 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 30 Aug 2005 14:11:11 +0000 (14:11 +0000)
src/jalview/appletgui/SeqCanvas.java
src/jalview/gui/SeqCanvas.java

index f0c27a3..8ffad08 100755 (executable)
@@ -21,7 +21,6 @@ package jalview.appletgui;
 \r
 import java.awt.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 \r
 public class SeqCanvas\r
@@ -343,8 +342,11 @@ public class SeqCanvas
      if(g.getClip()==null)\r
        g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
 \r
-\r
-      drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
+     if (av.alignment.getWidth() >= av.vconsensus.size())\r
+     {\r
+       endx = av.vconsensus.size() - 2;\r
+     }\r
+     drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
       g.setClip(null);\r
       g.translate( -LABEL_WEST, 0);\r
 \r
index afb5a36..b1b63b3 100755 (executable)
@@ -424,6 +424,11 @@ public class SeqCanvas extends JComponent
                     cWidth * av.charWidth, (int) clip.getBounds().getHeight());\r
             }\r
 \r
+            if(av.alignment.getWidth() >= av.vconsensus.size())\r
+            {\r
+              endx = av.vconsensus.size()-2;\r
+            }\r
+\r
             drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
             g.setClip(clip);\r
             g.translate(-LABEL_WEST, 0);\r