\r
import java.awt.*;\r
\r
-import jalview.analysis.*;\r
import jalview.datamodel.*;\r
\r
public class SeqCanvas\r
\r
AlignViewport av;\r
\r
- boolean showScores = false;\r
boolean displaySearch = false;\r
int[] searchResults = null;\r
\r
}\r
if (value != -1)\r
{\r
- int x = LABEL_WEST - fm.stringWidth(value + "");\r
+ int x = LABEL_WEST - fm.stringWidth(String.valueOf(value))-av.charWidth/2;\r
g.drawString(value + "", x,\r
ypos + i * av.charHeight - av.charHeight / 5);\r
}\r
}\r
if (value != -1)\r
{\r
- g.drawString(value + "", 0,\r
+ g.drawString(value + "", av.charWidth/2,\r
ypos + i * av.charHeight - av.charHeight / 5);\r
}\r
}\r
\r
if (av.getWrapAlignment())\r
{\r
- drawWrappedPanel(gg, getSize().width, getSize().height, av.startRes);\r
+ drawWrappedPanel(gg, imgWidth, imgHeight, av.startRes);\r
}\r
else\r
{\r
int LABEL_WEST, LABEL_EAST;\r
public int getWrappedCanvasWidth(int cwidth)\r
{\r
- FontMetrics fm = getFontMetrics(av.getFont());\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
\r
- LABEL_EAST = 0;\r
- LABEL_WEST = 0;\r
+ LABEL_EAST = 0;\r
+ LABEL_WEST = 0;\r
\r
- if (av.scaleRightWrapped)\r
- {\r
- LABEL_EAST = fm.stringWidth(av.alignment.getWidth() + "000");\r
- }\r
+ if (av.scaleRightWrapped)\r
+ {\r
+ LABEL_EAST = fm.stringWidth(getMask()+"0");\r
+ }\r
\r
- if (av.scaleLeftWrapped)\r
- {\r
- LABEL_WEST = fm.stringWidth(av.alignment.getWidth() + "");\r
- }\r
+ if (av.scaleLeftWrapped)\r
+ {\r
+ LABEL_WEST = fm.stringWidth(getMask());\r
+ }\r
\r
- return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
+ return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
}\r
\r
+\r
+ /**\r
+ * Generates a string of zeroes.\r
+ * @return String\r
+ */\r
+ String getMask()\r
+ {\r
+ String mask = "0";\r
+ for (int i = av.alignment.getWidth(); i > 0; i /= 10)\r
+ {\r
+ mask += "0";\r
+ }\r
+ return mask;\r
+ }\r
+\r
public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight,\r
int startRes)\r
{\r
\r
FontMetrics fm = getFontMetrics(av.getFont());\r
\r
- int LABEL_EAST = 0;\r
if (av.scaleRightWrapped)\r
{\r
- LABEL_EAST = fm.stringWidth(al.getWidth() + "000");\r
+ LABEL_EAST = fm.stringWidth(getMask()+"0");\r
}\r
+\r
int LABEL_WEST = 0;\r
+\r
if (av.scaleLeftWrapped)\r
{\r
- LABEL_WEST = fm.stringWidth(al.getWidth() + "0");\r
+ LABEL_WEST = fm.stringWidth(getMask());\r
}\r
\r
int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
\r
if (av.scaleRightWrapped)\r
{\r
- g.translate(canvasWidth - LABEL_EAST + av.charWidth, 0);\r
+ g.translate(canvasWidth - LABEL_EAST, 0);\r
drawEastScale(g, startRes, endx, ypos);\r
- g.translate( - (canvasWidth - LABEL_EAST + av.charWidth), 0);\r
+ g.translate( - (canvasWidth - LABEL_EAST), 0);\r
}\r
\r
g.translate(LABEL_WEST, 0);\r
drawNorthScale(g, startRes, endx, ypos);\r
}\r
\r
- // When printing we have an extra clipped region,\r
- // the Printable page which we need to account for here\r
- Shape clip = g.getClip();\r
- if (clip == null)\r
- {\r
- g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
- }\r
- else\r
- {\r
- g.setClip(0,\r
- (int) clip.getBounds().y,\r
- cWidth * av.charWidth,\r
- (int) clip.getBounds().height\r
- );\r
- }\r
\r
- drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
- g.setClip(clip);\r
+ if(g.getClip()==null)\r
+ g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
+\r
+ if (av.alignment.getWidth() >= av.vconsensus.size())\r
+ {\r
+ endx = av.vconsensus.size() - 2;\r
+ }\r
+ drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
+ g.setClip(null);\r
g.translate( -LABEL_WEST, 0);\r
\r
ypos += cHeight;\r