X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=9b593093b7e4176cf2e2caa427c09245a3cba84d;hb=1a6fbadeec90e7524075ed6e37bbe4b7bba97a94;hp=de421ed2eb14ff44b12042f87edc8771fa1f9fbb;hpb=4532dfefeac026198bfea1b9dbe84186e870bfc8;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index de421ed..9b59309 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -16,8 +16,6 @@ public class SeqCanvas extends JPanel AlignViewport av; - public boolean paintFlag = false; - boolean showScores = false; boolean displaySearch = false; int [] searchResults = null; @@ -25,6 +23,8 @@ public class SeqCanvas extends JPanel int chunkHeight; int chunkWidth; + boolean fastPaint = false; + public SeqCanvas(AlignViewport av) { @@ -35,72 +35,127 @@ public class SeqCanvas extends JPanel } - public void drawScale(Graphics g, int startx, int endx,int ypos) { - int scalestartx = startx - startx%10 + 10; + void drawNorthScale(Graphics g, int startx, int endx,int ypos) { + int scalestartx = startx - startx % 10 + 10; - g.setColor(Color.black); + g.setColor(Color.black); - for (int i=scalestartx;i < endx;i+= 10) - { - String string = String.valueOf(i); - g.drawString(string,(i-startx-1)*av.charWidth,ypos - av.charHeight/2); - - g.drawLine( (i-startx-1)*av.charWidth +av.charWidth/2, ypos+2 - av.charHeight/2, - (i-startx-1)*av.charWidth +av.charWidth/2, ypos-2 ); + // NORTH SCALE + for (int i = scalestartx; i < endx; i += 10) + { + String string = String.valueOf(i); + g.drawString(string, (i - startx - 1) * av.charWidth, + ypos - av.charHeight / 2); - } + g.drawLine( (i - startx - 1) * av.charWidth + av.charWidth / 2, + ypos + 2 - av.charHeight / 2, + (i - startx - 1) * av.charWidth + av.charWidth / 2, ypos - 2); + } } + void drawWestScale(Graphics g, int startx, int endx, int ypos) + { + FontMetrics fm = getFontMetrics(av.getFont()); + ypos+= av.charHeight; + // EAST SCALE + for (int i = 0; i < av.alignment.getHeight(); i++) + { + SequenceI seq = av.alignment.getSequenceAt(i); + int index = startx; + int value = -1; + while (index < endx) + { + if (jalview.util.Comparison.isGap(seq.getCharAt(index))) + { + index++; + continue; + } + + value = av.alignment.getSequenceAt(i).findPosition(index); + break; + } + if(value!=-1) + { + int x = fm.stringWidth("000") - fm.stringWidth(value+""); + g.drawString(value + "", x, ypos + i*av.charHeight - av.charHeight/5); + } + } + } -public void fastPaint(int horizontal, int vertical) + void drawEastScale(Graphics g, int startx, int endx, int ypos) { - if(horizontal==0 && vertical==0) - { - return; - } + ypos+= av.charHeight; + // EAST SCALE + for (int i = 0; i < av.alignment.getHeight(); i++) + { + SequenceI seq = av.alignment.getSequenceAt(i); + int index = endx; + int value = -1; + while (index > startx) + { + if (jalview.util.Comparison.isGap(seq.getCharAt(index))) + { + index--; + continue; + } + + value = av.alignment.getSequenceAt(i).findPosition(index); + break; + } + if(value!=-1) + g.drawString(value + "", 0, ypos + i*av.charHeight - av.charHeight/5); + } +} - if (img==null || paintFlag) - { - repaint(); - return; - } - gg.copyArea( 0,0, imgWidth, imgHeight, -horizontal*av.charWidth, -vertical*av.charHeight ); - int sr=av.startRes, er=av.endRes+1, ss = av.startSeq, es = av.endSeq, transX=0, transY = 0; - if(horizontal>0) // scrollbar pulled right, image to the left - { - transX = (er-sr-horizontal)*av.charWidth; - sr = er - horizontal ; - } - else if(horizontal<0) - { - er = sr-horizontal; - } +public void fastPaint(int horizontal, int vertical) +{ + if (horizontal == 0 && vertical == 0 || gg==null) + return; + gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth, + -vertical * av.charHeight); - if(vertical>0) // scroll down - { - transY = imgHeight - vertical*av.charHeight; - ss = es - vertical; - } - else if(vertical<0) - { + int sr = av.startRes, er = av.endRes + 1, ss = av.startSeq, es = av.endSeq, + transX = 0, transY = 0; + if (horizontal > 0) // scrollbar pulled right, image to the left + { + transX = (er - sr - horizontal) * av.charWidth; + sr = er - horizontal; + } + else if (horizontal < 0) + er = sr - horizontal; - es = ss-vertical; + else if (vertical > 0) // scroll down + { + ss = es - vertical; + if(ss av.endSeq) + es = av.endSeq; + } - } gg.translate(transX, transY); - drawPanel(gg, sr,er,ss,es,sr,ss,0); + gg.setColor(Color.white); + gg.fillRect(0,0, (er-sr)*av.charWidth, (es-ss)*av.charHeight); + drawPanel(gg, sr, er, ss, es, sr, ss, 0); + gg.translate( -transX, -transY); - gg.translate( -transX, -transY ); - getGraphics().drawImage(img,0,0,this); + fastPaint = true; + repaint(); } @@ -117,10 +172,21 @@ public void fastPaint(int horizontal, int vertical) public void paintComponent(Graphics g) { - // this draws the whole of the alignment + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); + + if (fastPaint) + { + g.drawImage(img, 0, 0, this); + fastPaint = false; + return; + } + // this draws the whole of the alignment imgWidth = getWidth(); imgHeight = getHeight(); + if(imgWidth==0 || imgHeight==0) + return; imgWidth -= imgWidth%av.charWidth; imgHeight-= imgHeight%av.charHeight; @@ -129,50 +195,88 @@ public void fastPaint(int horizontal, int vertical) gg = (Graphics2D)img.getGraphics(); gg.setFont(av.getFont()); gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); - gg.setClip(0,0,imgWidth, imgHeight); - paintFlag = false; + gg.setColor(Color.white); + gg.fillRect(0,0,imgWidth,imgHeight); - chunkWidth = getWidth()/av.charWidth; + chunkWidth = getWrappedCanvasWidth( getWidth() ); chunkHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; av.setChunkHeight(chunkHeight); av.setChunkWidth(chunkWidth); - g.setColor(Color.WHITE); - g.fillRect(0,0,getWidth(), getHeight()); if (av.getWrapAlignment()) drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes); else drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, av.startRes, av.startSeq, 0); + g.drawImage(img, 0, 0, this); + + } + + public int getWrappedCanvasWidth(int cwidth) + { + FontMetrics fm = getFontMetrics(av.getFont()); - g.drawImage(img,0,0,this); + int LABEL_EAST = 0; + if(av.scaleRightWrapped) + LABEL_EAST = fm.stringWidth( av.alignment.getWidth()+"000" ); + int LABEL_WEST = 0; + if(av.scaleLeftWrapped) + LABEL_WEST = fm.stringWidth( av.alignment.getWidth()+"0" ); + return (cwidth - LABEL_EAST -LABEL_WEST)/av.charWidth; } public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes) { - AlignmentI da = av.getAlignment(); + AlignmentI al = av.getAlignment(); + + FontMetrics fm = getFontMetrics(av.getFont()); + + int LABEL_EAST = 0; + if(av.scaleRightWrapped) + LABEL_EAST = fm.stringWidth( al.getWidth()+"000" ); + int LABEL_WEST = 0; + if(av.scaleLeftWrapped) + LABEL_WEST = fm.stringWidth( al.getWidth()+"0" ); - int cWidth = canvasWidth/av.charWidth; + int cWidth = (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth; int cHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; int endx = startRes+cWidth-1; - int ypos = 2*av.charHeight; + int ypos = 2*av.charHeight; + while (ypos <= canvasHeight) { - drawScale(g, startRes, endx, ypos); - drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos); + g.setColor(Color.black); + + if(av.scaleLeftWrapped) + drawWestScale(g, startRes, endx, ypos); + + if(av.scaleRightWrapped) + { + g.translate(canvasWidth - LABEL_EAST +av.charWidth, 0); + drawEastScale(g, startRes, endx, ypos); + g.translate( - (canvasWidth - LABEL_EAST+av.charWidth), 0); + } + + + g.translate(LABEL_WEST,0); + if(av.scaleAboveWrapped) + drawNorthScale(g, startRes, endx, ypos); + + drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos); + g.translate(-LABEL_WEST,0); ypos += cHeight; startRes += cWidth; endx = startRes + cWidth - 1; - if (endx > da.getWidth()) - endx = da.getWidth(); + if (endx > al.getWidth()) + endx = al.getWidth(); } } @@ -180,8 +284,7 @@ public void fastPaint(int horizontal, int vertical) public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) { - - Graphics2D g = (Graphics2D)g1; + Graphics2D g = (Graphics2D)g1; g.setFont(av.getFont()); RendererI sr = av.getRenderer(); @@ -217,7 +320,7 @@ public void fastPaint(int horizontal, int vertical) ///////////////////////////// for (int i = y1 ; i < y2 ;i++) { - nextSeq = av.getAlignment().getSequenceAt(i); + nextSeq = av.alignment.getSequenceAt(i); sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2, (x1 - startx) * av.charWidth, @@ -255,23 +358,42 @@ public void fastPaint(int horizontal, int vertical) int oldY = -1; int i = 0; boolean inGroup = false; + int top=-1, bottom =-1; for (i = y1; i < y2; i++) { sx = (group.getStartRes() - startx) * av.charWidth; sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight); - ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth; + ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth -1; + + if (av.getWrapAlignment()) + { + if (sx < 0) + sx = 0; + + if (ex > getWidth()) + ex = getWrappedCanvasWidth(getWidth()) * av.charWidth; + } - if (group.sequences.contains(av.alignment.getSequenceAt(i)) - && sx < getWidth() - && ex > 0) + if (sx < getWidth() + && ex > 0 + && group.sequences.contains(av.alignment.getSequenceAt(i))) { + if (bottom == -1 && + !group.sequences.contains(av.alignment.getSequenceAt(i + 1))) + bottom = sy + av.charHeight ; + if (!inGroup) { + if (top == -1 && i==0 || + !group.sequences.contains(av.alignment.getSequenceAt(i - 1))) + top = sy; + + oldY = sy; inGroup = true; if (group == av.getSelectionGroup()) { - // g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,2f,2f}, 0f )); + g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 3f, new float[]{5f,3f}, 0f )); g.setColor(Color.RED); } else @@ -285,18 +407,45 @@ public void fastPaint(int horizontal, int vertical) { if (inGroup) { - g.drawRect(sx, oldY, ex, (sy - oldY)); + g.drawLine(sx, oldY, sx, sy ); + g.drawLine(sx+ex, oldY, sx+ex, sy ); + + if (top != -1) + { + g.drawLine(sx, top, sx + ex, top); + top =-1; + } + if (bottom != -1) + { + g.drawLine(sx, bottom, sx + ex, bottom); + bottom = -1; + } + + inGroup = false; } } } + if (inGroup) { + + if(top!=-1) + { + g.drawLine(sx, top, sx + ex, top); + top =-1; + } + if(bottom!=-1) + { + g.drawLine(sx, bottom-1, sx + ex, bottom-1); + bottom = -1; + + } sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight); - g.drawRect(sx, oldY, ex, (sy - oldY)); + g.drawLine(sx, oldY, sx, sy ); + g.drawLine(sx+ex, oldY, sx+ex, sy ); inGroup = false; } - groupIndex++; if (groupIndex >= groups.size()) break; @@ -320,6 +469,10 @@ public void fastPaint(int horizontal, int vertical) if (searchSeq >= y1 && searchSeq < y2) { SequenceRenderer ssr = (SequenceRenderer) sr; + if(searchStart x2) + searchEnd = x2; ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq), searchStart, searchEnd, @@ -336,9 +489,6 @@ public void fastPaint(int horizontal, int vertical) } - public int getChunkWidth() { - return chunkWidth; - } public void highlightSearchResults(int [] results) { @@ -350,7 +500,6 @@ public void fastPaint(int horizontal, int vertical) searchResults = results; - paintFlag = true; repaint(); }