Draw hidden column marker correctly

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 8623872..b4ef770 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -600,10 +600,11 @@ public class SeqCanvas extends JComponent
           if(av.getShowHiddenMarkers())\r
           {\r
             g1.setColor(Color.blue);\r
+\r
             g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                        startSeq + offset,\r
+                        0+offset,\r
                         (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                        startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
+                        (endSeq - startSeq) * av.charHeight + offset);\r
           }\r
 \r
           g1.translate( -screenY * av.charWidth, 0);\r
@@ -698,6 +699,7 @@ public class SeqCanvas extends JComponent
         int sy = -1;\r
         int ex = -1;\r
         int groupIndex = -1;\r
+        int visWidth = (endRes - startRes +1) * av.charWidth;\r
 \r
         if ((group == null) && (av.alignment.getGroups().size() > 0))\r
         {\r
@@ -705,6 +707,7 @@ public class SeqCanvas extends JComponent
             groupIndex = 0;\r
         }\r
 \r
+\r
         if (group != null)\r
         {\r
             do\r
@@ -722,7 +725,7 @@ public class SeqCanvas extends JComponent
                     ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -\r
                         1;\r
 \r
-                    if(sx+ex<0 || sx>imgWidth)\r
+                    if(sx+ex<0 || sx>visWidth)\r
                     {\r
                       continue;\r
                     }\r
@@ -769,10 +772,10 @@ public class SeqCanvas extends JComponent
                     {\r
                       if (inGroup)\r
                       {\r
-                        if (sx >= 0 && sx < imgWidth)\r
+                        if (sx >= 0 && sx < visWidth)\r
                           g.drawLine(sx, oldY, sx, sy);\r
 \r
-                        if (sx + ex < imgWidth)\r
+                        if (sx + ex < visWidth)\r
                           g.drawLine(sx + ex, oldY, sx + ex, sy);\r
 \r
                         if (sx < 0)\r
@@ -781,8 +784,8 @@ public class SeqCanvas extends JComponent
                           sx = 0;\r
                         }\r
 \r
-                        if (sx + ex > imgWidth)\r
-                          ex = imgWidth;\r
+                        if (sx + ex > visWidth)\r
+                          ex = visWidth;\r
 \r
                         else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
                           ex = (endRes - startRes + 1) * av.charWidth;\r
@@ -807,10 +810,10 @@ public class SeqCanvas extends JComponent
                 if (inGroup)\r
                 {\r
                   sy = offset + ( (i - startSeq) * av.charHeight);\r
-                  if (sx >= 0 && sx < imgWidth)\r
+                  if (sx >= 0 && sx < visWidth)\r
                     g.drawLine(sx, oldY, sx, sy);\r
 \r
-                  if (sx + ex < imgWidth)\r
+                  if (sx + ex < visWidth)\r
                     g.drawLine(sx + ex, oldY, sx + ex, sy);\r
 \r
                   if (sx < 0)\r
@@ -819,8 +822,8 @@ public class SeqCanvas extends JComponent
                     sx = 0;\r
                   }\r
 \r
-                  if (sx + ex > imgWidth)\r
-                    ex = imgWidth;\r
+                  if (sx + ex > visWidth)\r
+                    ex = visWidth;\r
                   else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
                     ex = (endRes - startRes + 1) * av.charWidth;\r
 \r
@@ -841,6 +844,8 @@ public class SeqCanvas extends JComponent
 \r
                 groupIndex++;\r
 \r
+                g.setStroke(new BasicStroke());\r
+\r
                 if (groupIndex >= av.alignment.getGroups().size())\r
                 {\r
                     break;\r
@@ -848,7 +853,7 @@ public class SeqCanvas extends JComponent
 \r
                 group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);\r
 \r
-                g.setStroke(new BasicStroke());\r
+\r
             }\r
             while (groupIndex < av.alignment.getGroups().size());\r
 \r