From 7d94c626bdb25815aa9b29a462520fc36e87c6e5 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 6 May 2005 17:07:02 +0000
Subject: [PATCH] wrap align correction for last row

---
 src/jalview/appletgui/IdCanvas.java  |    2 +-
 src/jalview/appletgui/SeqCanvas.java |    2 ++
 src/jalview/gui/IdCanvas.java        |    2 +-
 src/jalview/gui/SeqCanvas.java       |    2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index cc042ed..80533f2 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -135,7 +135,7 @@ public class IdCanvas extends Panel
           int rowSize =  av.getEndRes() - av.getStartRes();
           // Draw the rest of the panels
 
-          for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;
+          for(int ypos=2*av.charHeight, row=av.startRes;
               ypos <= getSize().height && row<av.alignment.getWidth();
               ypos += av.chunkHeight, row+=rowSize )
           {
diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index 4305abe..679d48b 100755
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -250,6 +250,8 @@ public void fastPaint(int horizontal, int vertical)
       int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;
       int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
+      av.endRes = av.startRes + cWidth;
+
       int  endx   = startRes+cWidth-1;
       int  ypos  = 2*av.charHeight;
 
diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index d7a034c..048fb37 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -132,7 +132,7 @@ public class IdCanvas extends JPanel
           int rowSize =  av.getEndRes() - av.getStartRes();
           // Draw the rest of the panels
 
-          for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;
+          for(int ypos=2*av.charHeight, row=av.startRes;
               ypos <= getHeight() && row<av.alignment.getWidth();
               ypos += av.chunkHeight, row+=rowSize )
           {
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index f3e7532..1a8ae3d 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -252,6 +252,8 @@ public void fastPaint(int horizontal, int vertical)
       int cWidth  =   (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;
       int cHeight =  (av.getAlignment().getHeight() + 2)*av.charHeight;
 
+      av.endRes = av.startRes + cWidth;
+
       int  endx   = startRes+cWidth-1;
       int  ypos  = 2*av.charHeight;
 
-- 
1.7.10.2