DAS sources added

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 8f32d8c..9add747 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -167,6 +167,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 \r
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
         if(av.hasHiddenColumns)\r
           res = av.getColumnSelection().adjustForHiddenColumns(res);\r
 \r
@@ -206,6 +211,12 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         if(av.hasHiddenColumns)\r
           res = av.getColumnSelection().adjustForHiddenColumns(res);\r
 \r
+\r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
         if (res < min)\r
         {\r
             min = res;\r
@@ -217,6 +228,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         }\r
 \r
 \r
+\r
+\r
         SequenceGroup sg = av.getSelectionGroup();\r
 \r
         if (sg != null)\r
@@ -353,16 +366,27 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             scalestartx += 5;\r
         }\r
 \r
+        String string;\r
+        int maxX=0;\r
+\r
         for (int i = scalestartx; i < endx; i += 5)\r
         {\r
             if ((i % 10) == 0)\r
             {\r
-                gg.drawString(String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i)),\r
-                    (i - startx - 1) * av.charWidth, y);\r
-                gg.drawLine((int) (((i - startx - 1) * av.charWidth) +\r
-                    (av.charWidth / 2)), y + 2,\r
-                    (int) (((i - startx - 1) * av.charWidth) +\r
-                    (av.charWidth / 2)), y + (fm.getDescent() * 2));\r
+                string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i));\r
+                if ( (i - startx - 1) * av.charWidth > maxX)\r
+                {\r
+                  gg.drawString(string,\r
+                                (i - startx - 1) * av.charWidth, y);\r
+                  maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);\r
+                }\r
+\r
+                gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +\r
+                                    (av.charWidth / 2)), y + 2,\r
+                            (int) ( ( (i - startx - 1) * av.charWidth) +\r
+                                   (av.charWidth / 2)),\r
+                            y + (fm.getDescent() * 2));\r
+\r
             }\r
             else\r
             {\r