\r
AlignViewport av;\r
\r
- public boolean paintFlag = false;\r
-\r
boolean showScores = false;\r
boolean displaySearch = false;\r
int [] searchResults = null;\r
int chunkHeight;\r
int chunkWidth;\r
\r
+ boolean fastPaint = false;\r
+\r
\r
public SeqCanvas(AlignViewport av)\r
{\r
\r
}\r
\r
- public void drawScale(Graphics g, int startx, int endx,int ypos) {\r
- int scalestartx = startx - startx%10 + 10;\r
+ void drawNorthScale(Graphics g, int startx, int endx,int ypos) {\r
+ int scalestartx = startx - startx % 10 + 10;\r
\r
- g.setColor(Color.black);\r
+ g.setColor(Color.black);\r
\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,ypos - av.charHeight/2);\r
-\r
- g.drawLine( (i-startx-1)*av.charWidth +av.charWidth/2, ypos+2 - av.charHeight/2,\r
- (i-startx-1)*av.charWidth +av.charWidth/2, ypos-2 );\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
\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
\r
+ }\r
}\r
\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
+ 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
+ while (index < endx)\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
+ }\r
+ if(value!=-1)\r
+ {\r
+ int x = fm.stringWidth("000") - fm.stringWidth(value+"");\r
+ g.drawString(value + "", x, ypos + i*av.charHeight - av.charHeight/5);\r
+ }\r
+ }\r
+ }\r
\r
-public void fastPaint(int horizontal, int vertical)\r
+ void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
{\r
- if(horizontal==0 && vertical==0)\r
- {\r
- return;\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
+ {\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
+ }\r
+ if(value!=-1)\r
+ g.drawString(value + "", 0, ypos + i*av.charHeight - av.charHeight/5);\r
+ }\r
\r
+}\r
\r
- if (img==null || paintFlag)\r
- {\r
- repaint();\r
- return;\r
- }\r
\r
- gg.copyArea( 0,0, imgWidth, imgHeight, -horizontal*av.charWidth, -vertical*av.charHeight );\r
\r
- int sr=av.startRes, er=av.endRes+1, ss = av.startSeq, es = av.endSeq, transX=0, transY = 0;\r
- if(horizontal>0) // scrollbar pulled right, image to the left\r
- {\r
- transX = (er-sr-horizontal)*av.charWidth;\r
- sr = er - horizontal ;\r
- }\r
- else if(horizontal<0)\r
- {\r
- er = sr-horizontal;\r
- }\r
\r
\r
+public void fastPaint(int horizontal, int vertical)\r
+{\r
+ if (horizontal == 0 && vertical == 0 || gg==null)\r
+ return;\r
\r
+ gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth,\r
+ -vertical * av.charHeight);\r
\r
- if(vertical>0) // scroll down\r
- {\r
- transY = imgHeight - vertical*av.charHeight;\r
- ss = es - vertical;\r
- }\r
- else if(vertical<0)\r
- {\r
+ int sr = av.startRes, er = av.endRes + 1, ss = av.startSeq, es = av.endSeq,\r
+ transX = 0, transY = 0;\r
+ if (horizontal > 0) // scrollbar pulled right, image to the left\r
+ {\r
+ transX = (er - sr - horizontal) * av.charWidth;\r
+ sr = er - horizontal;\r
+ }\r
+ else if (horizontal < 0)\r
+ er = sr - horizontal;\r
\r
- es = ss-vertical;\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
+ ss = av.startSeq;\r
+ else\r
+ transY = imgHeight - vertical * av.charHeight;\r
+ }\r
+ else if (vertical < 0)\r
+ {\r
+ es = ss - vertical;\r
+ if(es > av.endSeq)\r
+ es = av.endSeq;\r
+ }\r
\r
- }\r
\r
gg.translate(transX, transY);\r
\r
- drawPanel(gg, sr,er,ss,es,sr,ss,0);\r
+ gg.setColor(Color.white);\r
+ gg.fillRect(0,0, (er-sr)*av.charWidth, (es-ss)*av.charHeight);\r
+ drawPanel(gg, sr, er, ss, es, sr, ss, 0);\r
+ gg.translate( -transX, -transY);\r
\r
- gg.translate( -transX, -transY );\r
- getGraphics().drawImage(img,0,0,this);\r
+ fastPaint = true;\r
+ repaint();\r
\r
}\r
\r
\r
public void paintComponent(Graphics g)\r
{\r
- // this draws the whole of the alignment\r
+ g.setColor(Color.white);\r
+ g.fillRect(0, 0, getWidth(), getHeight());\r
+\r
+ if (fastPaint)\r
+ {\r
+ g.drawImage(img, 0, 0, this);\r
+ fastPaint = false;\r
+ return;\r
+ }\r
\r
+ // this draws the whole of the alignment\r
imgWidth = getWidth();\r
imgHeight = getHeight();\r
+ if(imgWidth==0 || imgHeight==0)\r
+ return;\r
\r
imgWidth -= imgWidth%av.charWidth;\r
imgHeight-= imgHeight%av.charHeight;\r
gg = (Graphics2D)img.getGraphics();\r
gg.setFont(av.getFont());\r
gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);\r
- gg.setClip(0,0,imgWidth, imgHeight);\r
- paintFlag = false;\r
\r
+ gg.setColor(Color.white);\r
+ gg.fillRect(0,0,imgWidth,imgHeight);\r
\r
- chunkWidth = getWidth()/av.charWidth;\r
+ chunkWidth = getWrappedCanvasWidth( getWidth() );\r
chunkHeight = (av.getAlignment().getHeight() + 2)*av.charHeight;\r
\r
av.setChunkHeight(chunkHeight);\r
av.setChunkWidth(chunkWidth);\r
\r
- g.setColor(Color.WHITE);\r
- g.fillRect(0,0,getWidth(), getHeight());\r
\r
if (av.getWrapAlignment())\r
drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);\r
else\r
drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0);\r
\r
+ g.drawImage(img, 0, 0, this);\r
+\r
+ }\r
+\r
+ public int getWrappedCanvasWidth(int cwidth)\r
+ {\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
\r
- g.drawImage(img,0,0,this);\r
+ int LABEL_EAST = 0;\r
+ if(av.scaleRightWrapped)\r
+ LABEL_EAST = fm.stringWidth( av.alignment.getWidth()+"000" );\r
+ int LABEL_WEST = 0;\r
+ if(av.scaleLeftWrapped)\r
+ LABEL_WEST = fm.stringWidth( av.alignment.getWidth()+"0" );\r
\r
+ return (cwidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
}\r
\r
public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)\r
{\r
- AlignmentI da = av.getAlignment();\r
+ AlignmentI al = av.getAlignment();\r
+\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
\r
- int cWidth = canvasWidth/av.charWidth;\r
+ int cWidth = (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth;\r
int cHeight = (av.getAlignment().getHeight() + 2)*av.charHeight;\r
\r
int endx = startRes+cWidth-1;\r
- int ypos = 2*av.charHeight;\r
+ int ypos = 2*av.charHeight;\r
+\r
\r
while (ypos <= canvasHeight)\r
{\r
- drawScale(g, startRes, endx, ypos);\r
- drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos);\r
+ g.setColor(Color.black);\r
+\r
+ if(av.scaleLeftWrapped)\r
+ drawWestScale(g, startRes, endx, ypos);\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
+\r
+\r
+ g.translate(LABEL_WEST,0);\r
+ if(av.scaleAboveWrapped)\r
+ drawNorthScale(g, startRes, endx, ypos);\r
+\r
+ drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);\r
+ g.translate(-LABEL_WEST,0);\r
\r
ypos += cHeight;\r
startRes += cWidth;\r
endx = startRes + cWidth - 1;\r
\r
- if (endx > da.getWidth())\r
- endx = da.getWidth();\r
+ if (endx > al.getWidth())\r
+ endx = al.getWidth();\r
}\r
\r
}\r
\r
public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {\r
\r
-\r
- Graphics2D g = (Graphics2D)g1;\r
+ Graphics2D g = (Graphics2D)g1;\r
g.setFont(av.getFont());\r
RendererI sr = av.getRenderer();\r
\r
/////////////////////////////\r
for (int i = y1 ; i < y2 ;i++)\r
{\r
- nextSeq = av.getAlignment().getSequenceAt(i);\r
+ nextSeq = av.alignment.getSequenceAt(i);\r
\r
sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2,\r
(x1 - startx) * av.charWidth,\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 + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
- ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth;\r
+ ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth -1;\r
+\r
+ if (av.getWrapAlignment())\r
+ {\r
+ if (sx < 0)\r
+ sx = 0;\r
+\r
+ if (ex > getWidth())\r
+ ex = getWrappedCanvasWidth(getWidth()) * av.charWidth;\r
+ }\r
\r
- if (group.sequences.contains(av.alignment.getSequenceAt(i))\r
- && sx < getWidth()\r
- && ex > 0)\r
+ if (sx < getWidth()\r
+ && ex > 0\r
+ && group.sequences.contains(av.alignment.getSequenceAt(i)))\r
{\r
+ if (bottom == -1 &&\r
+ !group.sequences.contains(av.alignment.getSequenceAt(i + 1)))\r
+ bottom = sy + av.charHeight ;\r
+\r
if (!inGroup)\r
{\r
+ if (top == -1 && i==0 ||\r
+ !group.sequences.contains(av.alignment.getSequenceAt(i - 1)))\r
+ top = sy;\r
+\r
+\r
oldY = sy;\r
inGroup = true;\r
if (group == av.getSelectionGroup())\r
{\r
- // g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,2f,2f}, 0f ));\r
+ g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,3f}, 0f ));\r
g.setColor(Color.RED);\r
}\r
else\r
{\r
if (inGroup)\r
{\r
- g.drawRect(sx, oldY, ex, (sy - oldY));\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
+ }\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom, sx + ex, bottom);\r
+ bottom = -1;\r
+ }\r
+\r
+\r
inGroup = false;\r
}\r
}\r
}\r
+\r
if (inGroup)\r
{\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-1, sx + ex, bottom-1);\r
+ bottom = -1;\r
+\r
+ }\r
sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight);\r
- g.drawRect(sx, oldY, ex, (sy - oldY));\r
+ g.drawLine(sx, oldY, sx, sy );\r
+ g.drawLine(sx+ex, oldY, sx+ex, sy );\r
inGroup = false;\r
}\r
-\r
groupIndex++;\r
if (groupIndex >= groups.size())\r
break;\r
if (searchSeq >= y1 && searchSeq < y2)\r
{\r
SequenceRenderer ssr = (SequenceRenderer) sr;\r
+ if(searchStart<x1)\r
+ searchStart = x1;\r
+ if(searchEnd > x2)\r
+ searchEnd = x2;\r
ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),\r
searchStart,\r
searchEnd,\r
}\r
\r
\r
- public int getChunkWidth() {\r
- return chunkWidth;\r
- }\r
\r
public void highlightSearchResults(int [] results)\r
{\r
\r
searchResults = results;\r
\r
- paintFlag = true;\r
repaint();\r
}\r
\r
git://source.jalview.org / jalview.git / blobdiff