From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 12 Dec 2005 10:45:39 +0000 (+0000)
Subject: Getmask is slightly wider
X-Git-Tag: Release_2_07~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5099540b9d747283036a752baa5ea246e8a5e855;p=jalview.git

Getmask is slightly wider
---

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index 5d02825..fe8122a 100755
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -290,7 +290,7 @@ public class SeqCanvas
 
       if (av.scaleRightWrapped)
       {
-          LABEL_EAST = fm.stringWidth(getMask()+"0");
+          LABEL_EAST = fm.stringWidth(getMask());
       }
 
       if (av.scaleLeftWrapped)
@@ -308,7 +308,7 @@ public class SeqCanvas
    */
   String getMask()
   {
-    String mask = "0";
+    String mask = "00";
     for (int i = av.alignment.getWidth(); i > 0; i /= 10)
     {
       mask += "0";
@@ -327,7 +327,7 @@ public class SeqCanvas
 
     if (av.scaleRightWrapped)
     {
-        LABEL_EAST = fm.stringWidth(getMask()+"0");
+        LABEL_EAST = fm.stringWidth(getMask());
     }
 
     int LABEL_WEST = 0;
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 42424d9..0fe3b86 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -191,7 +191,7 @@ public class SeqCanvas extends JComponent
 
             if (value != -1)
             {
-                g.drawString(String.valueOf(value), av.charWidth/2,
+                g.drawString(String.valueOf(value), 0,
                     (ypos + (i * av.charHeight)) - (av.charHeight / 5));
             }
         }
@@ -350,7 +350,7 @@ public class SeqCanvas extends JComponent
 
         if (av.scaleRightWrapped)
         {
-            LABEL_EAST = fm.stringWidth(getMask()+"0");
+            LABEL_EAST = fm.stringWidth(getMask());
         }
 
         if (av.scaleLeftWrapped)
@@ -368,7 +368,7 @@ public class SeqCanvas extends JComponent
      */
     String getMask()
     {
-      String mask = "0";
+      String mask = "00";
       for (int i = av.alignment.getWidth(); i > 0; i /= 10)
       {
         mask += "0";
@@ -396,7 +396,7 @@ public class SeqCanvas extends JComponent
 
         if (av.scaleRightWrapped)
         {
-            LABEL_EAST = fm.stringWidth(getMask()+"0");
+            LABEL_EAST = fm.stringWidth(getMask());
         }
 
         int LABEL_WEST = 0;