allow for final line of alignment

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 8d6e331..e49eb17 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -61,9 +61,11 @@ public class ScalePanel extends JPanel
 \r
       sg.setStartRes(res);\r
       sg.setEndRes(res);\r
+\r
+      ap.annotationPanel.addEditableColumn(res);\r
     }\r
-    av.setRubberbandGroup(sg);\r
-    ap.RefreshPanels();\r
+    av.setSelectionGroup(sg);\r
+    ap.repaint();\r
   }\r
 \r
   public void doMouseReleased(MouseEvent evt)\r
@@ -77,7 +79,7 @@ public class ScalePanel extends JPanel
    if (! av.getColumnSelection().contains(res))\r
      av.getColumnSelection().addElement(res);\r
 \r
-   SequenceGroup sg = av.getRubberbandGroup();\r
+   SequenceGroup sg = av.getSelectionGroup();\r
 \r
    if(res>sg.getStartRes())\r
      sg.setEndRes(res);\r
@@ -85,7 +87,7 @@ public class ScalePanel extends JPanel
      sg.setStartRes(res);\r
 \r
    stretchingGroup = false;\r
-   ap.RefreshPanels();\r
+   ap.repaint();\r
   }\r
 \r
   public void doMouseDragged(MouseEvent evt)\r
@@ -93,7 +95,7 @@ public class ScalePanel extends JPanel
     int x = evt.getX();\r
     int res = x/av.getCharWidth() + av.getStartRes();\r
 \r
-    SequenceGroup sg = av.getRubberbandGroup();\r
+    SequenceGroup sg = av.getSelectionGroup();\r
     if(sg!=null)\r
     {\r
       stretchingGroup = true;\r
@@ -102,7 +104,8 @@ public class ScalePanel extends JPanel
       else if (res < sg.getStartRes())\r
         sg.setStartRes(res);\r
 \r
-      ap.RefreshPanels();\r
+       ap.annotationPanel.addEditableColumn(res);\r
+      ap.repaint();\r
     }\r
   }\r
 \r
@@ -112,8 +115,10 @@ public class ScalePanel extends JPanel
   }\r
 \r
 // scalewidth will normally be screenwidth,\r
-  public void drawScale(Graphics gg, int startx, int endx, int scaleWidth)\r
+  public void drawScale(Graphics g, int startx, int endx, int scaleWidth)\r
   {\r
+    Graphics2D gg = (Graphics2D)g;\r
+    gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);\r
     int charWidth  = av.getCharWidth();\r
 \r
     gg.setFont(av.getFont());\r
@@ -134,14 +139,15 @@ public class ScalePanel extends JPanel
     int   digits  = (int)(Math.log(roughtick)/Math.log(10));\r
     int   num     = (int)(roughtick/Math.pow(10,digits));\r
 \r
-    if (Math.abs(10-num) < 3)\r
+    if (roughtick>5)\r
         num = 10;\r
-    else if (Math.abs(5-num) >= 2)\r
+    else\r
         num = 5;\r
+\r
   //   else\r
   //  num = 2;\r
 \r
-    //System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);\r
+  //  System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);\r
 \r
     int space = (int)(num * Math.pow(10,digits));\r
 \r
@@ -149,7 +155,10 @@ public class ScalePanel extends JPanel
 \r
     gg.setColor(Color.black);\r
 \r
-    int scalestartx = startx - startx%space + space;\r
+\r
+    int scalestartx = 0;\r
+    if(space>0)\r
+      scalestartx = startx - startx%space + space;\r
 \r
 \r
     //Fill the selected columns\r