/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
\r
AlignViewport av;\r
\r
- boolean displaySearch = false;\r
- int[] searchResults = null;\r
-\r
- int chunkHeight;\r
- int chunkWidth;\r
+ SearchResults searchResults = null;\r
\r
boolean fastPaint = false;\r
\r
- boolean isOverview = false;\r
+ int cursorX = 0;\r
+ int cursorY = 0;\r
\r
public SeqCanvas(AlignViewport av)\r
{\r
this.av = av;\r
fr = new FeatureRenderer(av);\r
sr = new SequenceRenderer(av);\r
- PaintRefresher.Register(this, av.alignment);\r
+ PaintRefresher.Register(this, av.getSequenceSetId());\r
+ }\r
+\r
+ public AlignViewport getViewport()\r
+ {\r
+ return av;\r
+ }\r
\r
+ public FeatureRenderer getFeatureRenderer()\r
+ {\r
+ return fr;\r
+ }\r
+\r
+ public SequenceRenderer getSequenceRenderer()\r
+ {\r
+ return sr;\r
}\r
\r
void drawNorthScale(Graphics g, int startx, int endx, int ypos)\r
// NORTH SCALE\r
for (int i = scalestartx; i < endx; i += 10)\r
{\r
- String string = String.valueOf(i);\r
- g.drawString(string, (i - startx - 1) * av.charWidth,\r
- ypos - av.charHeight / 2);\r
+ int value = i;\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ value = av.getColumnSelection().adjustForHiddenColumns(value);\r
+ }\r
\r
- g.drawLine( (i - startx - 1) * av.charWidth + av.charWidth / 2,\r
- ypos + 2 - av.charHeight / 2,\r
- (i - startx - 1) * av.charWidth + av.charWidth / 2, ypos - 2);\r
+ g.drawString(String.valueOf(value), (i - startx - 1) * av.charWidth,\r
+ ypos - (av.charHeight / 2));\r
\r
+ g.drawLine( ( (i - startx - 1) * av.charWidth) + (av.charWidth / 2),\r
+ (ypos + 2) - (av.charHeight / 2),\r
+ ( (i - startx - 1) * av.charWidth) + (av.charWidth / 2), ypos -\r
+ 2);\r
}\r
}\r
\r
{\r
FontMetrics fm = getFontMetrics(av.getFont());\r
ypos += av.charHeight;\r
- // EAST SCALE\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ startx = av.getColumnSelection().adjustForHiddenColumns(startx);\r
+ endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
+ }\r
+\r
+ int maxwidth = av.alignment.getWidth();\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
+ }\r
+\r
+ // WEST SCALE\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
SequenceI seq = av.alignment.getSequenceAt(i);\r
int index = startx;\r
int value = -1;\r
+\r
while (index < endx)\r
{\r
if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
{\r
index++;\r
+\r
continue;\r
}\r
\r
value = av.alignment.getSequenceAt(i).findPosition(index);\r
+\r
break;\r
}\r
+\r
if (value != -1)\r
{\r
- int x = LABEL_WEST - fm.stringWidth(String.valueOf(value))-av.charWidth/2;\r
+ int x = LABEL_WEST - fm.stringWidth(String.valueOf(value)) -\r
+ av.charWidth / 2;\r
g.drawString(value + "", x,\r
- ypos + i * av.charHeight - av.charHeight / 5);\r
+ (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
}\r
}\r
}\r
void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
{\r
ypos += av.charHeight;\r
+\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
+ }\r
+\r
+ SequenceI seq;\r
// EAST SCALE\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- SequenceI seq = av.alignment.getSequenceAt(i);\r
+ seq = av.alignment.getSequenceAt(i);\r
int index = endx;\r
int value = -1;\r
+\r
while (index > startx)\r
{\r
if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
{\r
index--;\r
+\r
continue;\r
}\r
\r
- value = av.alignment.getSequenceAt(i).findPosition(index);\r
+ value = seq.findPosition(index);\r
+\r
break;\r
}\r
+\r
if (value != -1)\r
{\r
- g.drawString(value + "", av.charWidth/2,\r
- ypos + i * av.charHeight - av.charHeight / 5);\r
+ g.drawString(String.valueOf(value), 0,\r
+ (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
}\r
}\r
-\r
}\r
\r
- public void fastPaint(int horizontal, int vertical)\r
+ int lastsr = 0;\r
+ void fastPaint(int horizontal, int vertical)\r
{\r
- if (gg == null)\r
+ if (fastPaint || gg == null)\r
{\r
return;\r
}\r
\r
- gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,\r
+ // Its possible on certain browsers that the call to fastpaint\r
+ // is faster than it can paint, so this check here catches\r
+ // this possibility\r
+ if (lastsr + horizontal != av.startRes)\r
+ {\r
+ horizontal = av.startRes - lastsr;\r
+ }\r
+\r
+ lastsr = av.startRes;\r
+\r
+ fastPaint = true;\r
+ gg.copyArea(horizontal * av.charWidth,\r
+ vertical * av.charHeight,\r
+ imgWidth - horizontal * av.charWidth,\r
+ imgHeight - vertical * av.charHeight,\r
+ -horizontal * av.charWidth,\r
-vertical * av.charHeight);\r
\r
int sr = av.startRes, er = av.endRes, ss = av.startSeq, es = av.endSeq,\r
transX = 0, transY = 0;\r
+\r
if (horizontal > 0) // scrollbar pulled right, image to the left\r
{\r
transX = (er - sr - horizontal) * av.charWidth;\r
\r
gg.translate(transX, transY);\r
\r
- gg.setColor(Color.white);\r
- gg.fillRect(0, 0, (er - sr + 1) * av.charWidth, (es - ss) * av.charHeight);\r
- drawPanel(gg, sr, er, ss, es, sr, ss, 0);\r
+ drawPanel(gg, sr, er, ss, es, 0);\r
gg.translate( -transX, -transY);\r
\r
- fastPaint = true;\r
repaint();\r
\r
}\r
\r
public void paint(Graphics g)\r
{\r
- sr.renderGaps(av.renderGaps);\r
+\r
+ if (img != null && (fastPaint\r
+ || (getSize().width != g.getClipBounds().width)\r
+ || (getSize().height != g.getClipBounds().height)))\r
+ {\r
+ g.drawImage(img, 0, 0, this);\r
+ fastPaint = false;\r
+ return;\r
+ }\r
\r
if (fastPaint)\r
{\r
gg.setColor(Color.white);\r
gg.fillRect(0, 0, imgWidth, imgHeight);\r
\r
- chunkWidth = getWrappedCanvasWidth(getSize().width);\r
- chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
-\r
- av.setChunkHeight(chunkHeight);\r
- av.setChunkWidth(chunkWidth);\r
-\r
if (av.getWrapAlignment())\r
{\r
drawWrappedPanel(gg, imgWidth, imgHeight, av.startRes);\r
}\r
else\r
{\r
- drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes,\r
- av.startSeq, 0);\r
+ drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, 0);\r
}\r
\r
g.drawImage(img, 0, 0, this);\r
int LABEL_WEST, LABEL_EAST;\r
public int getWrappedCanvasWidth(int cwidth)\r
{\r
- FontMetrics fm = getFontMetrics(av.getFont());\r
+ cwidth -= cwidth % av.charWidth;\r
\r
- LABEL_EAST = 0;\r
- LABEL_WEST = 0;\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
\r
- if (av.scaleRightWrapped)\r
- {\r
- LABEL_EAST = fm.stringWidth(getMask()+"0");\r
- }\r
+ LABEL_EAST = 0;\r
+ LABEL_WEST = 0;\r
\r
- if (av.scaleLeftWrapped)\r
- {\r
- LABEL_WEST = fm.stringWidth(getMask());\r
- }\r
+ if (av.scaleRightWrapped)\r
+ {\r
+ LABEL_EAST = fm.stringWidth(getMask());\r
+ }\r
\r
- return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
- }\r
+ if (av.scaleLeftWrapped)\r
+ {\r
+ LABEL_WEST = fm.stringWidth(getMask());\r
+ }\r
\r
+ return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
+ }\r
\r
/**\r
* Generates a string of zeroes.\r
String getMask()\r
{\r
String mask = "0";\r
- for (int i = av.alignment.getWidth(); i > 0; i /= 10)\r
+ int maxWidth = 0;\r
+ int tmp;\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
+ {\r
+ tmp = av.alignment.getSequenceAt(i).getEnd();\r
+ if (tmp > maxWidth)\r
+ {\r
+ maxWidth = tmp;\r
+ }\r
+ }\r
+\r
+ for (int i = maxWidth; i > 0; i /= 10)\r
{\r
mask += "0";\r
}\r
return mask;\r
- }\r
+ }\r
\r
public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight,\r
int startRes)\r
\r
if (av.scaleRightWrapped)\r
{\r
- LABEL_EAST = fm.stringWidth(getMask()+"0");\r
+ LABEL_EAST = fm.stringWidth(getMask());\r
}\r
\r
- int LABEL_WEST = 0;\r
-\r
if (av.scaleLeftWrapped)\r
{\r
- LABEL_WEST = fm.stringWidth(getMask());\r
+ LABEL_WEST = fm.stringWidth(getMask());\r
+ }\r
+\r
+ int hgap = av.charHeight;\r
+ if (av.scaleAboveWrapped)\r
+ {\r
+ hgap += av.charHeight;\r
}\r
\r
int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
- int cHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
+ int cHeight = av.getAlignment().getHeight() * av.charHeight;\r
+\r
+ av.setWrappedWidth(cWidth);\r
\r
av.endRes = av.startRes + cWidth;\r
\r
- int endx = startRes + cWidth - 1;\r
- int ypos = 2 * av.charHeight;\r
+ int endx;\r
+ int ypos = hgap;\r
+\r
+ int maxwidth = av.alignment.getWidth() - 1;\r
\r
- while (ypos <= canvasHeight && startRes < av.alignment.getWidth())\r
+ if (av.hasHiddenColumns)\r
{\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
+ }\r
+\r
+ while ( (ypos <= canvasHeight) && (startRes < maxwidth))\r
+ {\r
+ endx = startRes + cWidth - 1;\r
+\r
+ if (endx > maxwidth)\r
+ {\r
+ endx = maxwidth;\r
+ }\r
+\r
g.setColor(Color.black);\r
\r
if (av.scaleLeftWrapped)\r
}\r
\r
g.translate(LABEL_WEST, 0);\r
+\r
if (av.scaleAboveWrapped)\r
{\r
drawNorthScale(g, startRes, endx, ypos);\r
}\r
+ if (av.hasHiddenColumns && av.showHiddenMarkers)\r
+ {\r
+ g.setColor(Color.blue);\r
+ int res;\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
+ i++)\r
+ {\r
+ res = av.getColumnSelection().findHiddenRegionPosition(i) -\r
+ startRes;\r
+\r
+ if (res < 0 || res > endx - startRes)\r
+ {\r
+ continue;\r
+ }\r
\r
+ gg.fillPolygon(new int[]\r
+ {res * av.charWidth - av.charHeight / 4,\r
+ res * av.charWidth + av.charHeight / 4,\r
+ res * av.charWidth},\r
+ new int[]\r
+ {\r
+ ypos - (av.charHeight / 2),\r
+ ypos - (av.charHeight / 2),\r
+ ypos - (av.charHeight / 2) + 8\r
+ }, 3);\r
\r
- if(g.getClip()==null)\r
- g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
+ }\r
+ }\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
+ if (g.getClip() == null)\r
+ {\r
+ g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);\r
+ }\r
+\r
+ drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);\r
g.setClip(null);\r
+\r
+ if (av.showAnnotation)\r
+ {\r
+ g.translate(0, cHeight + ypos + 4);\r
+ if (annotations == null)\r
+ {\r
+ annotations = new AnnotationPanel(av);\r
+ }\r
+\r
+ annotations.drawComponent(g, startRes, endx + 1);\r
+ g.translate(0, -cHeight - ypos - 4);\r
+ }\r
g.translate( -LABEL_WEST, 0);\r
\r
- ypos += cHeight;\r
+ ypos += cHeight + getAnnotationHeight() + hgap;\r
+\r
startRes += cWidth;\r
- endx = startRes + cWidth - 1;\r
+ }\r
+\r
+ }\r
+\r
+ AnnotationPanel annotations;\r
+ int getAnnotationHeight()\r
+ {\r
+ if (!av.showAnnotation)\r
+ {\r
+ return 0;\r
+ }\r
+\r
+ if (annotations == null)\r
+ {\r
+ annotations = new AnnotationPanel(av);\r
+ }\r
+\r
+ return annotations.adjustPanelHeight();\r
+ }\r
\r
- if (endx > al.getWidth())\r
+ void drawPanel(Graphics g1, int startRes, int endRes,\r
+ int startSeq, int endSeq, int offset)\r
+ {\r
+ if (!av.hasHiddenColumns)\r
+ {\r
+ draw(g1, startRes, endRes, startSeq, endSeq, offset);\r
+ }\r
+ else\r
+ {\r
+ java.util.Vector regions = av.getColumnSelection().getHiddenColumns();\r
+\r
+ int screenY = 0;\r
+ int blockStart = startRes;\r
+ int blockEnd = endRes;\r
+\r
+ for (int i = 0; i < regions.size(); i++)\r
{\r
- endx = al.getWidth();\r
+ int[] region = (int[]) regions.elementAt(i);\r
+ int hideStart = region[0];\r
+ int hideEnd = region[1];\r
+\r
+ if (hideStart <= blockStart)\r
+ {\r
+ blockStart += (hideEnd - hideStart) + 1;\r
+ continue;\r
+ }\r
+\r
+ blockEnd = hideStart - 1;\r
+\r
+ g1.translate(screenY * av.charWidth, 0);\r
+\r
+ draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
+\r
+ if (av.getShowHiddenMarkers())\r
+ {\r
+ g1.setColor(Color.blue);\r
+ g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+ 0 + offset,\r
+ (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+ (endSeq - startSeq) * av.charHeight + offset);\r
+ }\r
+\r
+ g1.translate( -screenY * av.charWidth, 0);\r
+ screenY += blockEnd - blockStart + 1;\r
+ blockStart = hideEnd + 1;\r
+ }\r
+\r
+ if (screenY <= (endRes - startRes))\r
+ {\r
+ blockEnd = blockStart + (endRes - startRes) - screenY;\r
+ g1.translate(screenY * av.charWidth, 0);\r
+ draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
+\r
+ g1.translate( -screenY * av.charWidth, 0);\r
}\r
}\r
\r
}\r
\r
- synchronized public void drawPanel(Graphics g, int x1, int x2, int y1, int y2,\r
- int startx, int starty, int offset)\r
+ //int startRes, int endRes, int startSeq, int endSeq, int x, int y,\r
+ // int x1, int x2, int y1, int y2, int startx, int starty,\r
+ void draw(Graphics g,\r
+ int startRes, int endRes,\r
+ int startSeq, int endSeq,\r
+ int offset)\r
{\r
-\r
g.setFont(av.getFont());\r
- sr.renderGaps(av.renderGaps);\r
+ sr.prepare(g, av.renderGaps);\r
\r
SequenceI nextSeq;\r
\r
/// First draw the sequences\r
/////////////////////////////\r
- for (int i = y1; i < y2; i++)\r
+ for (int i = startSeq; i < endSeq; i++)\r
{\r
nextSeq = av.alignment.getSequenceAt(i);\r
\r
- sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,\r
- (x1 - startx) * av.charWidth,\r
- offset +\r
- (i-starty)*av.charHeight,\r
- av.charWidth, av.charHeight);\r
+ if (nextSeq == null)\r
+ {\r
+ continue;\r
+ }\r
+\r
+ sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),\r
+ startRes, endRes,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
\r
if (av.showSequenceFeatures)\r
{\r
- fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,\r
- (x1 - startx) * av.charWidth,\r
- offset +\r
- (i-starty)*av.charHeight,\r
- av.charWidth, av.charHeight);\r
+ fr.drawSequence(g, nextSeq, startRes, endRes,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
+ }\r
+\r
+ /// Highlight search Results once all sequences have been drawn\r
+ //////////////////////////////////////////////////////////\r
+ if (searchResults != null)\r
+ {\r
+ int[] visibleResults = searchResults.getResults(nextSeq, startRes,\r
+ endRes);\r
+ if (visibleResults != null)\r
+ {\r
+ for (int r = 0; r < visibleResults.length; r += 2)\r
+ {\r
+ sr.drawHighlightedText(nextSeq, visibleResults[r],\r
+ visibleResults[r + 1],\r
+ (visibleResults[r] - startRes) *\r
+ av.charWidth,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
+ }\r
+ }\r
+ }\r
+\r
+ if (av.cursorMode && cursorY == i\r
+ && cursorX >= startRes && cursorX <= endRes)\r
+ {\r
+ sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
}\r
}\r
+\r
+ if (av.getSelectionGroup() != null || av.alignment.getGroups().size() > 0)\r
+ {\r
+ drawGroupsBoundaries(g, startRes, endRes, startSeq, endSeq, offset);\r
+ }\r
+\r
+ }\r
+\r
+ void drawGroupsBoundaries(Graphics g,\r
+ int startRes, int endRes,\r
+ int startSeq, int endSeq,\r
+ int offset)\r
+ {\r
//\r
/////////////////////////////////////\r
-\r
// Now outline any areas if necessary\r
/////////////////////////////////////\r
SequenceGroup group = av.getSelectionGroup();\r
- java.util.Vector groups = av.alignment.getGroups();\r
\r
- int sx = -1, sy = -1, ex = -1;\r
+ int sx = -1;\r
+ int sy = -1;\r
+ int ex = -1;\r
int groupIndex = -1;\r
- if (group == null && groups.size() > 0)\r
+\r
+ if ( (group == null) && (av.alignment.getGroups().size() > 0))\r
{\r
- group = (SequenceGroup) groups.elementAt(0);\r
+ group = (SequenceGroup) av.alignment.getGroups().elementAt(0);\r
groupIndex = 0;\r
}\r
\r
- if (group != null && !isOverview)\r
+ if (group != null)\r
{\r
do\r
{\r
- int oldY = -1;\r
- int i = 0;\r
- boolean inGroup = false;\r
- int top = -1;\r
- int bottom = -1;\r
+ int oldY = -1;\r
+ int i = 0;\r
+ boolean inGroup = false;\r
+ int top = -1;\r
+ int bottom = -1;\r
+ int alHeight = av.alignment.getHeight() - 1;\r
+\r
+ for (i = startSeq; i < endSeq; i++)\r
+ {\r
+ sx = (group.getStartRes() - startRes) * av.charWidth;\r
+ sy = offset + ( (i - startSeq) * av.charHeight);\r
+ ex = ( ( (group.getEndRes() + 1) - group.getStartRes()) *\r
+ av.charWidth) -\r
+ 1;\r
\r
- for (i = y1; i < y2; i++)\r
+ if (sx + ex < 0 || sx > imgWidth)\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
+ continue;\r
+ }\r
\r
- if(sx+ex<0 || sx>imgWidth)\r
+ if ( (sx <= (endRes - startRes) * av.charWidth) &&\r
+ group.getSequences(null).\r
+ contains(av.alignment.getSequenceAt(i)))\r
+ {\r
+ if ( (bottom == -1) &&\r
+ (i >= alHeight ||\r
+ !group.getSequences(null).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.getSequences(null).contains(\r
+ av.alignment.getSequenceAt(i - 1)))\r
{\r
- continue;\r
+ top = sy;\r
}\r
\r
- if ( (sx <= (x2-x1)*av.charWidth) &&\r
- group.sequences.contains(av.alignment.getSequenceAt(\r
- i)))\r
+ oldY = sy;\r
+ inGroup = true;\r
+\r
+ if (group == av.getSelectionGroup())\r
{\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
+ g.setColor(Color.red);\r
}\r
else\r
{\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
+ g.setColor(group.getOutlineColour());\r
}\r
+ }\r
}\r
-\r
- if (inGroup)\r
+ else\r
{\r
- sy = offset + ( (i - starty) * av.charHeight);\r
- if (sx >= 0 && sx < imgWidth)\r
- g.drawLine(sx, oldY, sx, sy);\r
+ if (inGroup)\r
+ {\r
+ if (sx >= 0 && sx < imgWidth)\r
+ {\r
+ g.drawLine(sx, oldY, sx, sy);\r
+ }\r
\r
- if (sx + ex < imgWidth)\r
- g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+ if (sx + ex < imgWidth)\r
+ {\r
+ g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+ }\r
\r
- if (sx < 0)\r
- {\r
- ex += sx;\r
- sx = 0;\r
- }\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
\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
+ if (sx + ex > imgWidth)\r
+ {\r
+ ex = imgWidth;\r
+ }\r
\r
- if (top != -1)\r
- {\r
- g.drawLine(sx, top, sx + ex, top);\r
- top = -1;\r
- }\r
+ else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
+ {\r
+ ex = (endRes - startRes + 1) * av.charWidth;\r
+ }\r
\r
- if (bottom != -1)\r
- {\r
- g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
- bottom = -1;\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
- groupIndex++;\r
-\r
- if (groupIndex >= groups.size())\r
+ if (inGroup)\r
+ {\r
+ sy = offset + ( (i - startSeq) * av.charHeight);\r
+ if (sx >= 0 && sx < imgWidth)\r
{\r
- break;\r
+ g.drawLine(sx, oldY, sx, sy);\r
}\r
\r
- group = (SequenceGroup) groups.elementAt(groupIndex);\r
- }\r
- while (groupIndex < groups.size());\r
- }\r
-\r
- /// Highlight search Results once all sequences have been drawn\r
- //////////////////////////////////////////////////////////\r
- if (displaySearch)\r
- {\r
- for (int r = 0; r < searchResults.length; r += 3)\r
- {\r
- int searchSeq = searchResults[r];\r
+ if (sx + ex < imgWidth)\r
+ {\r
+ g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+ }\r
\r
- if (searchSeq >= y1 && searchSeq < y2)\r
- {\r
- SequenceI seq = av.getAlignment().getSequenceAt(searchSeq);\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
\r
- int searchStart = seq.findIndex(searchResults[r + 1]) - 1;\r
- int searchEnd = seq.findIndex(searchResults[r + 2]) - 1;\r
+ if (sx + ex > imgWidth)\r
+ {\r
+ ex = imgWidth;\r
+ }\r
+ else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
+ {\r
+ ex = (endRes - startRes + 1) * av.charWidth;\r
+ }\r
\r
- SequenceRenderer ssr = (SequenceRenderer) sr;\r
- if (searchStart < x1)\r
+ if (top != -1)\r
{\r
- searchStart = x1;\r
+ g.drawLine(sx, top, sx + ex, top);\r
+ top = -1;\r
}\r
- if (searchEnd > x2)\r
+\r
+ if (bottom != -1)\r
{\r
- searchEnd = x2;\r
+ g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
+ bottom = -1;\r
}\r
\r
- ssr.drawHighlightedText(seq,\r
- searchStart,\r
- searchEnd,\r
- (searchStart - startx) * av.charWidth,\r
- offset +\r
- (searchSeq-starty)*av.charHeight,\r
- av.charWidth,\r
- av.charHeight);\r
+ inGroup = false;\r
}\r
+\r
+ groupIndex++;\r
+\r
+ if (groupIndex >= av.alignment.getGroups().size())\r
+ {\r
+ break;\r
+ }\r
+\r
+ group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);\r
}\r
- }\r
+ while (groupIndex < av.alignment.getGroups().size());\r
\r
+ }\r
}\r
\r
- public void highlightSearchResults(int[] results)\r
+ public void highlightSearchResults(SearchResults results)\r
{\r
- // results are in the order sequence, startRes, endRes\r
- if (results == null)\r
- {\r
- displaySearch = false;\r
- }\r
- else\r
- {\r
- displaySearch = true;\r
- }\r
-\r
searchResults = results;\r
\r
repaint();\r
git://source.jalview.org / jalview.git / blobdiff