X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=01ba119b3839554be04078e851fc228284838910;hb=24efbd38f2c3dceaf6d3e305eef41ba0b0c9ebdc;hp=dc80d1bff69aa8023eee8f847f8c04a85d915589;hpb=577f505f54fe343e89f581461e780ea8308c20ec;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index dc80d1b..01ba119 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -61,6 +61,8 @@ public class ScalePanel extends JPanel
 
       sg.setStartRes(res);
       sg.setEndRes(res);
+
+      ap.annotationPanel.addEditableColumn(res);
     }
     av.setSelectionGroup(sg);
     ap.RefreshPanels();
@@ -102,6 +104,7 @@ public class ScalePanel extends JPanel
       else if (res < sg.getStartRes())
         sg.setStartRes(res);
 
+       ap.annotationPanel.addEditableColumn(res);
       ap.RefreshPanels();
     }
   }
@@ -112,8 +115,10 @@ public class ScalePanel extends JPanel
   }
 
 // scalewidth will normally be screenwidth,
-  public void drawScale(Graphics gg, int startx, int endx, int scaleWidth)
+  public void drawScale(Graphics g, int startx, int endx, int scaleWidth)
   {
+    Graphics2D gg = (Graphics2D)g;
+    gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
     int charWidth  = av.getCharWidth();
 
     gg.setFont(av.getFont());
@@ -134,14 +139,15 @@ public class ScalePanel extends JPanel
     int   digits  = (int)(Math.log(roughtick)/Math.log(10));
     int   num     = (int)(roughtick/Math.pow(10,digits));
 
-    if (Math.abs(10-num) < 3)
+    if (roughtick>5)
         num = 10;
-    else if (Math.abs(5-num) >= 2)
+    else
         num = 5;
+
   //   else
   //  num = 2;
 
-    //System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
+  //  System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
 
     int space = (int)(num * Math.pow(10,digits));
 
@@ -149,7 +155,10 @@ public class ScalePanel extends JPanel
 
     gg.setColor(Color.black);
 
-    int scalestartx = startx - startx%space + space;
+
+    int scalestartx = 0;
+    if(space>0)
+      scalestartx = startx - startx%space + space;
 
 
     //Fill the selected columns