/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
-*/\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
\r
package jalview.appletgui;\r
\r
import java.awt.*;\r
-import jalview.datamodel.*;\r
-import jalview.analysis.*;\r
\r
+import jalview.analysis.*;\r
+import jalview.datamodel.*;\r
\r
-public class SeqCanvas extends Panel\r
+public class SeqCanvas\r
+ extends Panel\r
{\r
- FeatureRenderer fr;\r
- SequenceRenderer sr;\r
- Image img;\r
- Graphics gg;\r
- int imgWidth;\r
- int imgHeight;\r
-\r
- AlignViewport av;\r
+ FeatureRenderer fr;\r
+ SequenceRenderer sr;\r
+ Image img;\r
+ Graphics gg;\r
+ int imgWidth;\r
+ int imgHeight;\r
\r
- boolean showScores = false;\r
- boolean displaySearch = false;\r
- int [] searchResults = null;\r
+ AlignViewport av;\r
\r
- int chunkHeight;\r
- int chunkWidth;\r
+ boolean showScores = false;\r
+ boolean displaySearch = false;\r
+ int[] searchResults = null;\r
\r
- boolean fastPaint = false;\r
+ int chunkHeight;\r
+ int chunkWidth;\r
\r
+ boolean fastPaint = false;\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);\r
+ public SeqCanvas(AlignViewport av)\r
+ {\r
+ this.av = av;\r
+ fr = new FeatureRenderer(av);\r
+ sr = new SequenceRenderer(av);\r
+ PaintRefresher.Register(this);\r
\r
- }\r
+ }\r
\r
- void drawNorthScale(Graphics g, int startx, int endx,int ypos) {\r
+ void drawNorthScale(Graphics g, int startx, int endx, int ypos)\r
+ {\r
int scalestartx = startx - startx % 10 + 10;\r
\r
g.setColor(Color.black);\r
void drawWestScale(Graphics g, int startx, int endx, int ypos)\r
{\r
FontMetrics fm = getFontMetrics(av.getFont());\r
- ypos+= av.charHeight;\r
- // EAST SCALE\r
+ ypos += av.charHeight;\r
+ // EAST SCALE\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
SequenceI seq = av.alignment.getSequenceAt(i);\r
value = av.alignment.getSequenceAt(i).findPosition(index);\r
break;\r
}\r
- if(value!=-1)\r
+ if (value != -1)\r
{\r
- int x = LABEL_WEST - fm.stringWidth(value+"");\r
- g.drawString(value + "", x, ypos + i*av.charHeight - av.charHeight/5);\r
+ int x = LABEL_WEST - fm.stringWidth(value + "");\r
+ g.drawString(value + "", x,\r
+ ypos + i * av.charHeight - av.charHeight / 5);\r
}\r
}\r
}\r
\r
void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
-{\r
- ypos+= av.charHeight;\r
- // EAST SCALE\r
- for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- SequenceI seq = av.alignment.getSequenceAt(i);\r
- int index = endx;\r
- int value = -1;\r
- while (index > startx)\r
+ ypos += av.charHeight;\r
+ // EAST SCALE\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ SequenceI seq = av.alignment.getSequenceAt(i);\r
+ int index = endx;\r
+ int value = -1;\r
+ while (index > startx)\r
{\r
- index--;\r
- continue;\r
- }\r
+ if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ {\r
+ index--;\r
+ continue;\r
+ }\r
\r
- value = av.alignment.getSequenceAt(i).findPosition(index);\r
- break;\r
+ value = av.alignment.getSequenceAt(i).findPosition(index);\r
+ break;\r
+ }\r
+ if (value != -1)\r
+ {\r
+ g.drawString(value + "", 0,\r
+ ypos + i * av.charHeight - av.charHeight / 5);\r
+ }\r
}\r
- if(value!=-1)\r
- g.drawString(value + "", 0, ypos + i*av.charHeight - av.charHeight/5);\r
- }\r
-\r
-}\r
-\r
\r
+ }\r
\r
-public void fastPaint(int horizontal, int vertical)\r
-{\r
- if (horizontal == 0 && vertical == 0 || gg==null)\r
+ public void fastPaint(int horizontal, int vertical)\r
+ {\r
+ if (horizontal == 0 && vertical == 0 || gg == null)\r
+ {\r
return;\r
+ }\r
\r
gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,\r
-vertical * av.charHeight);\r
sr = er - horizontal;\r
}\r
else if (horizontal < 0)\r
+ {\r
er = sr - horizontal;\r
+ }\r
\r
else if (vertical > 0) // scroll down\r
{\r
ss = es - vertical;\r
- if(ss<av.startSeq) // ie scrolling too fast, more than a page at a time\r
+ if (ss < av.startSeq) // ie scrolling too fast, more than a page at a time\r
+ {\r
ss = av.startSeq;\r
+ }\r
else\r
+ {\r
transY = imgHeight - vertical * av.charHeight;\r
+ }\r
}\r
else if (vertical < 0)\r
{\r
es = ss - vertical;\r
- if(es > av.endSeq)\r
+ if (es > av.endSeq)\r
+ {\r
es = av.endSeq;\r
+ }\r
}\r
\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
+ gg.fillRect(0, 0, (er - sr + 1) * av.charWidth, (es - ss) * av.charHeight);\r
drawPanel(gg, sr, er, ss, es, sr, ss, 0);\r
gg.translate( -transX, -transY);\r
\r
fastPaint = true;\r
repaint();\r
\r
-}\r
+ }\r
\r
-/**\r
- * Definitions of startx and endx (hopefully):\r
- * SMJS This is what I'm working towards!\r
- * startx is the first residue (starting at 0) to display.\r
- * endx is the last residue to display (starting at 0).\r
- * starty is the first sequence to display (starting at 0).\r
- * endy is the last sequence to display (starting at 0).\r
- * NOTE 1: The av limits are set in setFont in this class and\r
- * in the adjustment listener in SeqPanel when the scrollbars move.\r
- */\r
+ /**\r
+ * Definitions of startx and endx (hopefully):\r
+ * SMJS This is what I'm working towards!\r
+ * startx is the first residue (starting at 0) to display.\r
+ * endx is the last residue to display (starting at 0).\r
+ * starty is the first sequence to display (starting at 0).\r
+ * endy is the last sequence to display (starting at 0).\r
+ * NOTE 1: The av limits are set in setFont in this class and\r
+ * in the adjustment listener in SeqPanel when the scrollbars move.\r
+ */\r
public void update(Graphics g)\r
{\r
paint(g);\r
}\r
\r
// this draws the whole of the alignment\r
- imgWidth = this.getSize().width;\r
- imgHeight = this.getSize().height;\r
+ imgWidth = this.getSize().width;\r
+ imgHeight = this.getSize().height;\r
\r
- imgWidth -= imgWidth%av.charWidth;\r
- imgHeight-= imgHeight%av.charHeight;\r
+ imgWidth -= imgWidth % av.charWidth;\r
+ imgHeight -= imgHeight % av.charHeight;\r
\r
- if(imgWidth<1 || imgHeight<1)\r
- return;\r
+ if (imgWidth < 1 || imgHeight < 1)\r
+ {\r
+ return;\r
+ }\r
\r
- if(img==null || imgWidth!=img.getWidth(this) || imgHeight!=img.getHeight(this))\r
- {\r
- img = createImage(imgWidth, imgHeight);\r
- gg = img.getGraphics();\r
- gg.setFont(av.getFont());\r
- }\r
+ if (img == null || imgWidth != img.getWidth(this) ||\r
+ imgHeight != img.getHeight(this))\r
+ {\r
+ img = createImage(imgWidth, imgHeight);\r
+ gg = img.getGraphics();\r
+ gg.setFont(av.getFont());\r
+ }\r
\r
- gg.setColor(Color.white);\r
- gg.fillRect(0,0,imgWidth,imgHeight);\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
+ chunkWidth = getWrappedCanvasWidth(getSize().width);\r
+ chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
\r
av.setChunkHeight(chunkHeight);\r
av.setChunkWidth(chunkWidth);\r
\r
-\r
if (av.getWrapAlignment())\r
+ {\r
drawWrappedPanel(gg, getSize().width, getSize().height, av.startRes);\r
+ }\r
else\r
- drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0);\r
+ {\r
+ drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes,\r
+ av.startSeq, 0);\r
+ }\r
\r
g.drawImage(img, 0, 0, this);\r
\r
LABEL_EAST = 0;\r
LABEL_WEST = 0;\r
\r
- if(av.scaleRightWrapped)\r
- LABEL_EAST = fm.stringWidth( av.alignment.getWidth()+"000" );\r
+ if (av.scaleRightWrapped)\r
+ {\r
+ LABEL_EAST = fm.stringWidth(av.alignment.getWidth() + "000");\r
+ }\r
\r
- if(av.scaleLeftWrapped)\r
- LABEL_WEST = fm.stringWidth( av.alignment.getWidth()+"" );\r
+ if (av.scaleLeftWrapped)\r
+ {\r
+ LABEL_WEST = fm.stringWidth(av.alignment.getWidth() + "");\r
+ }\r
\r
- return (cwidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
+ return (cwidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
}\r
\r
- public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)\r
+ public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight,\r
+ int startRes)\r
{\r
- AlignmentI al = av.getAlignment();\r
+ AlignmentI al = av.getAlignment();\r
\r
- FontMetrics fm = getFontMetrics(av.getFont());\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
\r
- int LABEL_EAST = 0;\r
- if(av.scaleRightWrapped)\r
- LABEL_EAST = fm.stringWidth( al.getWidth()+"000" );\r
- int LABEL_WEST = 0;\r
- if(av.scaleLeftWrapped)\r
- LABEL_WEST = fm.stringWidth(al.getWidth()+"0");\r
+ int LABEL_EAST = 0;\r
+ if (av.scaleRightWrapped)\r
+ {\r
+ LABEL_EAST = fm.stringWidth(al.getWidth() + "000");\r
+ }\r
+ int LABEL_WEST = 0;\r
+ if (av.scaleLeftWrapped)\r
+ {\r
+ LABEL_WEST = fm.stringWidth(al.getWidth() + "0");\r
+ }\r
\r
+ int cWidth = (canvasWidth - LABEL_EAST - LABEL_WEST) / av.charWidth;\r
+ int cHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
\r
- int cWidth = (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
- int cHeight = (av.getAlignment().getHeight() + 2)*av.charHeight;\r
+ av.endRes = av.startRes + cWidth;\r
\r
- av.endRes = av.startRes + cWidth;\r
+ int endx = startRes + cWidth - 1;\r
+ int ypos = 2 * av.charHeight;\r
\r
- int endx = startRes+cWidth-1;\r
- int ypos = 2*av.charHeight;\r
+ while (ypos <= canvasHeight && startRes < av.alignment.getWidth())\r
+ {\r
+ g.setColor(Color.black);\r
\r
- while (ypos <= canvasHeight && startRes<av.alignment.getWidth() )\r
+ if (av.scaleLeftWrapped)\r
{\r
- g.setColor(Color.black);\r
+ drawWestScale(g, startRes, endx, ypos);\r
+ }\r
\r
- if(av.scaleLeftWrapped)\r
- drawWestScale(g, startRes, endx, ypos);\r
+ if (av.scaleRightWrapped)\r
+ {\r
+ g.translate(canvasWidth - LABEL_EAST + av.charWidth, 0);\r
+ drawEastScale(g, startRes, endx, ypos);\r
+ g.translate( - (canvasWidth - LABEL_EAST + av.charWidth), 0);\r
+ }\r
\r
- if(av.scaleRightWrapped)\r
- {\r
- g.translate(canvasWidth - LABEL_EAST +av.charWidth, 0);\r
- drawEastScale(g, startRes, endx, ypos);\r
- g.translate( - (canvasWidth - LABEL_EAST+av.charWidth), 0);\r
- }\r
+ g.translate(LABEL_WEST, 0);\r
+ if (av.scaleAboveWrapped)\r
+ {\r
+ drawNorthScale(g, startRes, endx, ypos);\r
+ }\r
\r
- g.translate(LABEL_WEST,0);\r
- if(av.scaleAboveWrapped)\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
- g.setClip(0, 0, cWidth*av.charWidth, canvasHeight);\r
- else\r
- g.setClip(0,\r
- (int)clip.getBounds().y,\r
- cWidth*av.charWidth,\r
- (int)clip.getBounds().height\r
- );\r
-\r
- drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
- g.setClip(clip);\r
- g.translate(-LABEL_WEST,0);\r
-\r
- ypos += cHeight;\r
- startRes += cWidth;\r
- endx = startRes + cWidth - 1;\r
-\r
- if (endx > al.getWidth())\r
- endx = al.getWidth();\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
- }\r
+ drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
+ g.setClip(clip);\r
+ g.translate( -LABEL_WEST, 0);\r
\r
+ ypos += cHeight;\r
+ startRes += cWidth;\r
+ endx = startRes + cWidth - 1;\r
\r
- synchronized public void drawPanel(Graphics g,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {\r
+ if (endx > al.getWidth())\r
+ {\r
+ endx = al.getWidth();\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
+ {\r
\r
g.setFont(av.getFont());\r
sr.renderGaps(av.renderGaps);\r
\r
/// First draw the sequences\r
/////////////////////////////\r
- for (int i = y1 ; i < y2 ;i++)\r
+ for (int i = y1; i < y2; 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 + AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
- av.charWidth,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
- AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
- av.charWidth, av.charHeight);\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
+ AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
+ av.charWidth, 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
+ AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
+ av.charWidth, av.charHeight);\r
+ }\r
}\r
//\r
/////////////////////////////////////\r
}\r
\r
if (group != null)\r
+ {\r
do\r
{\r
int oldY = -1;\r
int i = 0;\r
boolean inGroup = false;\r
- int top=-1, bottom =-1;\r
+ int top = -1, bottom = -1;\r
for (i = y1; i < y2; i++)\r
{\r
sx = (group.getStartRes() - startx) * av.charWidth;\r
sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
- ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth -1;\r
+ ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth - 1;\r
\r
if (sx < getSize().width\r
&& ex > 0\r
&& group.sequences.contains(av.alignment.getSequenceAt(i)))\r
{\r
- if (bottom == -1 && (i==av.alignment.getHeight()-1 ||\r
- !group.sequences.contains(av.alignment.getSequenceAt(i + 1))))\r
- bottom = sy + av.charHeight ;\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
\r
if (!inGroup)\r
{\r
- if (top == -1 && i==0 ||\r
+ if (top == -1 && i == 0 ||\r
!group.sequences.contains(av.alignment.getSequenceAt(i - 1)))\r
+ {\r
top = sy;\r
-\r
+ }\r
\r
oldY = sy;\r
inGroup = true;\r
if (group == av.getSelectionGroup())\r
{\r
- g.setColor(new Color(255,0,0));\r
+ g.setColor(new Color(255, 0, 0));\r
}\r
else\r
{\r
- g.setColor(group.getOutlineColour());\r
+ g.setColor(group.getOutlineColour());\r
}\r
}\r
}\r
{\r
if (inGroup)\r
{\r
- g.drawLine(sx, oldY, sx, sy );\r
- g.drawLine(sx+ex, oldY, sx+ex, sy );\r
+ g.drawLine(sx, oldY, sx, sy);\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
+ top = -1;\r
}\r
if (bottom != -1)\r
{\r
bottom = -1;\r
}\r
\r
-\r
inGroup = false;\r
}\r
}\r
if (inGroup)\r
{\r
\r
- if(top!=-1)\r
+ if (top != -1)\r
{\r
g.drawLine(sx, top, sx + ex, top);\r
- top =-1;\r
+ top = -1;\r
}\r
- if(bottom!=-1)\r
- {\r
- g.drawLine(sx, bottom-1, sx + ex, bottom-1);\r
- bottom = -1;\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
+ bottom = -1;\r
\r
- }\r
+ }\r
sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
- g.drawLine(sx, oldY, sx, sy );\r
- g.drawLine(sx+ex, oldY, sx+ex, sy );\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
\r
group = (SequenceGroup) groups.elementAt(groupIndex);\r
\r
}\r
while (groupIndex < groups.size());\r
-\r
+ }\r
\r
/// Highlight search Results once all sequences have been drawn\r
//////////////////////////////////////////////////////////\r
- if(displaySearch)\r
+ if (displaySearch)\r
{\r
- for(int r=0; r<searchResults.length; r+=3)\r
+ for (int r = 0; r < searchResults.length; r += 3)\r
{\r
int searchSeq = searchResults[r];\r
\r
{\r
SequenceI seq = av.getAlignment().getSequenceAt(searchSeq);\r
\r
- int searchStart = seq.findIndex( searchResults[r+1] )-1;\r
- int searchEnd = seq.findIndex( searchResults[r+2] )-1;\r
+ int searchStart = seq.findIndex(searchResults[r + 1]) - 1;\r
+ int searchEnd = seq.findIndex(searchResults[r + 2]) - 1;\r
\r
SequenceRenderer ssr = (SequenceRenderer) sr;\r
- if(searchStart<x1)\r
+ if (searchStart < x1)\r
+ {\r
searchStart = x1;\r
- if(searchEnd > x2)\r
+ }\r
+ if (searchEnd > x2)\r
+ {\r
searchEnd = x2;\r
+ }\r
\r
ssr.drawHighlightedText(seq,\r
searchStart,\r
searchEnd,\r
(searchStart - startx) * av.charWidth,\r
offset +\r
- AlignmentUtil.getPixelHeight(starty, searchSeq,\r
+ AlignmentUtil.getPixelHeight(starty,\r
+ searchSeq,\r
av.charHeight),\r
av.charWidth,\r
av.charHeight);\r
\r
}\r
\r
-\r
-\r
- public void highlightSearchResults(int [] results)\r
+ public void highlightSearchResults(int[] results)\r
{\r
// results are in the order sequence, startRes, endRes\r
- if(results==null)\r
+ if (results == null)\r
+ {\r
displaySearch = false;\r
+ }\r
else\r
+ {\r
displaySearch = true;\r
+ }\r
\r
searchResults = results;\r
\r
repaint();\r
}\r
\r
-\r
}\r
git://source.jalview.org / jalview.git / blobdiff