vamsasDemo new branch

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

diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java
index 6bf4d40..b961b2c 100755 (executable)
--- a/src/jalview/gui/SequenceRenderer.java
+++ b/src/jalview/gui/SequenceRenderer.java
@@ -116,10 +116,10 @@ public class SequenceRenderer
 \r
         graphics = g;\r
 \r
-        drawBoxes(seq, start, end, x1, y1, width, height);\r
+        drawBoxes(seq, start, end, x1, y1, (int) width, height);\r
 \r
         fm = g.getFontMetrics();\r
-        drawText(seq, start, end, x1, y1,  width, height);\r
+        drawText(seq, start, end, x1, y1, (int) width, height);\r
     }\r
 \r
     /**\r
@@ -168,7 +168,14 @@ public class SequenceRenderer
             {\r
                 if (tempColour != null)\r
                 {\r
-                    graphics.fillRect(x1 + (width * (curStart - start)), y1,\r
+                  int xxx = x1 + (int) (av.charWidth * (curStart - start));\r
+                  if (width != av.charWidth)\r
+                  {\r
+                    xxx = x1 + (int) (av.charWidth * (curStart - start)) / 3;\r
+                  }\r
+\r
+\r
+                    graphics.fillRect(xxx, y1,\r
                         curWidth, height);\r
                 }\r
 \r
@@ -186,7 +193,14 @@ public class SequenceRenderer
             i++;\r
         }\r
 \r
-        graphics.fillRect(x1 + (width * (curStart - start)), y1, curWidth,\r
+        int xxx = x1 + (int) (av.charWidth * (curStart - start));\r
+        if (width != av.charWidth)\r
+        {\r
+          xxx = x1 + (int) (av.charWidth * (curStart - start)) / 3;\r
+        }\r
+\r
+\r
+        graphics.fillRect(xxx, y1, curWidth,\r
             height);\r
     }\r
 \r
@@ -208,6 +222,7 @@ public class SequenceRenderer
         int charOffset = 0;\r
         char s;\r
 \r
+\r
         // Need to find the sequence position here.\r
         String sequence = seq.getSequence();\r
 \r
@@ -261,8 +276,14 @@ public class SequenceRenderer
             }\r
 \r
             charOffset = (width - fm.charWidth(s)) / 2;\r
-            graphics.drawString(String.valueOf(s),\r
-                charOffset + x1 + (int)(width * (i - start)), (y1 + height) - pady);\r
+\r
+            int xxx = charOffset + x1 + (int)(av.charWidth * (i - start));\r
+            if(width != av.charWidth)\r
+            {\r
+              xxx = charOffset + x1 + (int)(av.charWidth * (i - start))/3;\r
+            }\r
+\r
+            graphics.drawString(String.valueOf(s),xxx, (y1 + height) - pady);\r
         }\r
     }\r
 \r