\r
boolean fastPaint = false;\r
\r
+ boolean isOverview = false;\r
+\r
public SeqCanvas(AlignViewport av)\r
{\r
this.av = av;\r
\r
public void fastPaint(int horizontal, int vertical)\r
{\r
- if (horizontal == 0 && vertical == 0 || gg == null)\r
+ if (gg == null)\r
{\r
return;\r
}\r
\r
public void paint(Graphics g)\r
{\r
+ sr.renderGaps(av.renderGaps);\r
+\r
if (fastPaint)\r
{\r
g.drawImage(img, 0, 0, this);\r
groupIndex = 0;\r
}\r
\r
- if (group != null)\r
+ if (group != null && !isOverview)\r
{\r
do\r
{\r
- int oldY = -1;\r
- int i = 0;\r
- boolean inGroup = false;\r
- int top = -1, bottom = -1;\r
- for (i = y1; i < y2; i++)\r
- {\r
- sx = (group.getStartRes() - startx) * av.charWidth;\r
- sy = offset + (i-starty)*av.charHeight;\r
- ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth - 1;\r
+ int oldY = -1;\r
+ int i = 0;\r
+ boolean inGroup = false;\r
+ int top = -1;\r
+ int bottom = -1;\r
\r
- if (sx < getSize().width\r
- && ex > 0\r
- && group.sequences.contains(av.alignment.getSequenceAt(i)))\r
+ for (i = y1; i < y2; i++)\r
{\r
- if (bottom == -1 && (i == av.alignment.getHeight() - 1 ||\r
- !group.sequences.contains(av.alignment.\r
- getSequenceAt(i + 1))))\r
- {\r
- bottom = sy + av.charHeight;\r
- }\r
+ sx = (group.getStartRes() - startx) * av.charWidth;\r
+ sy = offset + ((i - starty) * av.charHeight);\r
+ ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -\r
+ 1;\r
\r
- if (!inGroup)\r
- {\r
- if (top == -1 && i == 0 ||\r
- !group.sequences.contains(av.alignment.getSequenceAt(i - 1)))\r
+ if(sx+ex<0 || sx>imgWidth)\r
{\r
- top = sy;\r
+ continue;\r
}\r
\r
- oldY = sy;\r
- inGroup = true;\r
- if (group == av.getSelectionGroup())\r
+ if ( (sx <= (x2-x1)*av.charWidth) &&\r
+ group.sequences.contains(av.alignment.getSequenceAt(\r
+ i)))\r
{\r
- g.setColor(new Color(255, 0, 0));\r
+ if ((bottom == -1) &&\r
+ !group.sequences.contains(\r
+ av.alignment.getSequenceAt(i + 1)))\r
+ {\r
+ bottom = sy + av.charHeight;\r
+ }\r
+\r
+ if (!inGroup)\r
+ {\r
+ if (((top == -1) && (i == 0)) ||\r
+ !group.sequences.contains(\r
+ av.alignment.getSequenceAt(i - 1)))\r
+ {\r
+ top = sy;\r
+ }\r
+\r
+ oldY = sy;\r
+ inGroup = true;\r
+\r
+ if (group == av.getSelectionGroup())\r
+ {\r
+ g.setColor(Color.red);\r
+ }\r
+ else\r
+ {\r
+ g.setColor(group.getOutlineColour());\r
+ }\r
+ }\r
}\r
else\r
{\r
- g.setColor(group.getOutlineColour());\r
+ if (inGroup)\r
+ {\r
+ if (sx >= 0 && sx < imgWidth)\r
+ g.drawLine(sx, oldY, sx, sy);\r
+\r
+ if (sx + ex < imgWidth)\r
+ g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
+\r
+ if (sx + ex > imgWidth)\r
+ ex = imgWidth;\r
+\r
+ else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)\r
+ ex = (x2 - x1 + 1) * av.charWidth;\r
+\r
+ if (top != -1)\r
+ {\r
+ g.drawLine(sx, top, sx + ex, top);\r
+ top = -1;\r
+ }\r
+\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom, sx + ex, bottom);\r
+ bottom = -1;\r
+ }\r
+\r
+ inGroup = false;\r
+ }\r
}\r
- }\r
}\r
- else\r
+\r
+ if (inGroup)\r
{\r
- if (inGroup)\r
- {\r
+ sy = offset + ( (i - starty) * av.charHeight);\r
+ if (sx >= 0 && sx < imgWidth)\r
g.drawLine(sx, oldY, sx, sy);\r
+\r
+ if (sx + ex < imgWidth)\r
g.drawLine(sx + ex, oldY, sx + ex, sy);\r
\r
- if (top != -1)\r
- {\r
- g.drawLine(sx, top, sx + ex, top);\r
- top = -1;\r
- }\r
- if (bottom != -1)\r
- {\r
- g.drawLine(sx, bottom, sx + ex, bottom);\r
- bottom = -1;\r
- }\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
\r
- inGroup = false;\r
+ if (sx + ex > imgWidth)\r
+ ex = imgWidth;\r
+ else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)\r
+ ex = (x2 - x1 + 1) * av.charWidth;\r
+\r
+ if (top != -1)\r
+ {\r
+ g.drawLine(sx, top, sx + ex, top);\r
+ top = -1;\r
}\r
- }\r
- }\r
\r
- if (inGroup)\r
- {\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
+ bottom = -1;\r
+ }\r
\r
- if (top != -1)\r
- {\r
- g.drawLine(sx, top, sx + ex, top);\r
- top = -1;\r
+ inGroup = false;\r
}\r
- if (bottom != -1)\r
- {\r
- g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
- bottom = -1;\r
\r
- }\r
- sy = offset + (i-starty)*av.charHeight;\r
- g.drawLine(sx, oldY, sx, sy);\r
- g.drawLine(sx + ex, oldY, sx + ex, sy);\r
- inGroup = false;\r
- }\r
- groupIndex++;\r
- if (groupIndex >= groups.size())\r
- {\r
- break;\r
- }\r
+ groupIndex++;\r
\r
- group = (SequenceGroup) groups.elementAt(groupIndex);\r
+ if (groupIndex >= groups.size())\r
+ {\r
+ break;\r
+ }\r
\r
+ group = (SequenceGroup) groups.elementAt(groupIndex);\r
}\r
while (groupIndex < groups.size());\r
}\r
git://source.jalview.org / jalview.git / blobdiff