\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
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
}\r
\r
\r
+\r
+\r
SequenceGroup sg = av.getSelectionGroup();\r
\r
if (sg != null)\r
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