X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=6dc2acd6cfd6feebf664646b59a8fc65afc8c830;hb=7a33703b08606394844a7cc796ca1ffe83e3d2d1;hp=00b4e954f52b9a614f6eec87a7ae011260ca57a3;hpb=a11e13d8fffacf8115a4d83e4254bf94a87d6600;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 00b4e95..6dc2acd 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -2,27 +2,19 @@ package jalview.gui; import java.awt.*; import javax.swing.*; -import java.awt.event.*; import jalview.datamodel.*; -import jalview.schemes.*; import jalview.analysis.*; public class SeqCanvas extends JPanel { - ColourSchemeI globalColorScheme = null; + FeatureRenderer fr; Image img; - Graphics gg; + Graphics2D gg; int imgWidth; int imgHeight; AlignViewport av; - int pady = 2; - int oldstartx; - int oldstarty; - int oldendx; - int oldendy; - public boolean paintFlag = false; boolean showScores = false; boolean displaySearch = false; @@ -31,275 +23,263 @@ public class SeqCanvas extends JPanel int chunkHeight; int chunkWidth; + boolean fastPaint = false; + public SeqCanvas(AlignViewport av) { this.av = av; + fr = new FeatureRenderer(av); setLayout(new BorderLayout()); + PaintRefresher.Register(this); } - public void drawScale(int startx, int endx,int charWidth, int charHeight,int ypos) { - int scalestartx = startx - startx%10 + 10; - - gg.setColor(Color.black); - - for (int i=scalestartx;i < endx;i+= 10) { - String string = String.valueOf(i); - gg.drawString(string,(int)((i-startx-1)*charWidth),ypos+15 - charHeight*(2)); - } - } + void drawNorthScale(Graphics g, int startx, int endx,int ypos) { + int scalestartx = startx - startx % 10 + 10; + g.setColor(Color.black); -/** - * Definitions of startx and endx (hopefully): - * SMJS This is what I'm working towards! - * startx is the first residue (starting at 0) to display. - * endx is the last residue to display (starting at 0). - * starty is the first sequence to display (starting at 0). - * endy is the last sequence to display (starting at 0). - * NOTE 1: The av limits are set in setFont in this class and - * in the adjustment listener in SeqPanel when the scrollbars move. - */ + // 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); - public void paintComponent(Graphics g) { + 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); - AlignmentI da = av.getAlignment(); + } + } - if (img == null || - imgWidth != getWidth() || - imgHeight != getHeight() - || paintFlag) + 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; + } - imgWidth = (getWidth() > 0 ? getWidth() : 1); - imgHeight = (getHeight() > 0 ? getHeight() : 1); - - img = createImage(imgWidth,imgHeight); - gg = img.getGraphics(); + 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); + } + } + } - gg.setFont(av.getFont()); + void drawEastScale(Graphics g, int startx, int endx, int ypos) +{ + 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; + } - oldstartx = -1; - oldendx = -1; - oldstarty = -1; - oldendy = -1; - paintFlag = false; + value = av.alignment.getSequenceAt(i).findPosition(index); + break; } + if(value!=-1) + g.drawString(value + "", 0, ypos + i*av.charHeight - av.charHeight/5); + } - int startx = av.getStartRes(); - int starty = av.getStartSeq(); +} - int endx = av.getEndRes(); - int endy = av.getEndSeq(); - int charWidth = av.getCharWidth(); - int charHeight = av.getCharHeight(); - chunkWidth = getWidth()/charWidth; - chunkHeight = (da.getHeight() + 2)*charHeight; - av.setChunkHeight(chunkHeight); - av.setChunkWidth(chunkWidth); - int offy = av.getStartSeq(); +public void fastPaint(int horizontal, int vertical) +{ + if (horizontal == 0 && vertical == 0 || gg==null) + return; - if (oldendx == -1) { - fillBackground(gg,Color.WHITE,0,0,imgWidth,imgHeight); + gg.copyArea(0, 0, imgWidth, imgHeight, -horizontal * av.charWidth, + -vertical * av.charHeight); - if (av.getWrapAlignment()) { - startx = (int)(offy/chunkWidth)*chunkWidth; - endx = startx + chunkWidth; - starty = offy%chunkHeight; - endy = starty + da.getHeight(); + 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; - int ypos = 0; - int rowstart = starty; + else if (vertical > 0) // scroll down + { + transY = imgHeight - vertical * av.charHeight; + ss = es - vertical; + } + else if (vertical < 0) + es = ss - vertical; - if (starty == 0) { - ypos = 2*charHeight; - } else if (starty == 1) { - starty = 0; - ypos = charHeight; - } + gg.translate(transX, transY); - if (endy > da.getHeight()) { - endy = da.getHeight(); - } + 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); - if (endx > da.getWidth()) { - endx = da.getWidth(); - } + fastPaint = true; + repaint(); - if (rowstart < 2) { - drawScale(startx,endx,charWidth,charHeight,ypos); - } +} - drawPanel(gg,startx,endx,starty,endy,startx,starty,ypos); +/** + * Definitions of startx and endx (hopefully): + * SMJS This is what I'm working towards! + * startx is the first residue (starting at 0) to display. + * endx is the last residue to display (starting at 0). + * starty is the first sequence to display (starting at 0). + * endy is the last sequence to display (starting at 0). + * NOTE 1: The av limits are set in setFont in this class and + * in the adjustment listener in SeqPanel when the scrollbars move. + */ - if (rowstart == 0) { - ypos = ypos + chunkHeight; - } else if (rowstart == 1) { - ypos = ypos + chunkHeight; - } else { - ypos = ypos + chunkHeight - rowstart*charHeight; - } + public void paintComponent(Graphics g) + { + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); - startx += chunkWidth; - endx = startx + chunkWidth; - starty = 0; + if (fastPaint) + { + g.drawImage(img, 0, 0, this); + fastPaint = false; + return; + } - if (endx > da.getWidth()) { - endx = da.getWidth(); - } - // Draw the rest of the panels + // this draws the whole of the alignment + imgWidth = getWidth(); + imgHeight = getHeight(); + if(imgWidth==0 || imgHeight==0) + return; - while (ypos <= getHeight()) { - drawScale(startx,endx,charWidth,charHeight,ypos); - drawPanel(gg,startx,endx,0,da.getHeight(),startx,starty,ypos); + imgWidth -= imgWidth%av.charWidth; + imgHeight-= imgHeight%av.charHeight; - ypos += chunkHeight; - startx += chunkWidth; - endx = startx + chunkWidth; + img = createImage(imgWidth,imgHeight); + gg = (Graphics2D)img.getGraphics(); + gg.setFont(av.getFont()); + gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); - if (endy > da.getHeight()) { - endy = da.getHeight(); - } + gg.setColor(Color.white); + gg.fillRect(0,0,imgWidth,imgHeight); - if (endx > da.getWidth()) { - endx = da.getWidth(); - } + chunkWidth = getWrappedCanvasWidth( getWidth() ); + chunkHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; - } - } - else - { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); + av.setChunkHeight(chunkHeight); + av.setChunkWidth(chunkWidth); - oldstartx = startx; - oldendx = endx; - oldstarty = starty; - oldendy = endy; - } - } + 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); - else if (oldstartx < startx) - { - // This is dragging horizontal scrollbar to the right + g.drawImage(img, 0, 0, this); - int delx = (startx - oldstartx) * charWidth; - int delx2 = (oldendx - startx + 1) * charWidth; + } - gg.copyArea(delx,0,delx2,AlignmentUtil.getPixelHeight(starty,endy,charHeight),-delx,0); + public int getWrappedCanvasWidth(int cwidth) + { + FontMetrics fm = getFontMetrics(av.getFont()); - if (startx > oldendx) - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - else - drawPanel(gg,oldendx+1,endx,starty,endy,startx,starty,0); + 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; + } - oldstartx = startx; - oldendx = endx; + public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes) + { + AlignmentI al = av.getAlignment(); - } else if (oldstartx > startx) - { - // Horizontal scrollbar pulled to the left + FontMetrics fm = getFontMetrics(av.getFont()); - int delx = (oldstartx - startx) * charWidth; - int delx2 = (endx - oldstartx +1) * charWidth; + 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" ); - gg.copyArea(0,0,delx2,AlignmentUtil.getPixelHeight(starty,endy,charHeight),delx,0); + int cWidth = (canvasWidth - LABEL_EAST -LABEL_WEST)/av.charWidth; + int cHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; - if (oldstartx > endx) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,oldstartx-1,starty,endy,startx,starty,0); - } + int endx = startRes+cWidth-1; + int ypos = 2*av.charHeight; - oldstartx = startx; - oldendx = endx; - } else if (oldstarty < starty) { - // Vertical scrollbar down - int dely = AlignmentUtil.getPixelHeight(oldstarty,starty,charHeight); - int dely2 = AlignmentUtil.getPixelHeight(starty,oldendy,charHeight); + while (ypos <= canvasHeight && endx oldendy) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,endx,oldendy,endy,startx,starty,0); - } + if(av.scaleRightWrapped) + { + g.translate(canvasWidth - LABEL_EAST +av.charWidth, 0); + drawEastScale(g, startRes, endx, ypos); + g.translate( - (canvasWidth - LABEL_EAST+av.charWidth), 0); + } - oldstarty = starty; - oldendy = endy; - } else if (oldstarty > starty) { + g.translate(LABEL_WEST,0); + if(av.scaleAboveWrapped) + drawNorthScale(g, startRes, endx, ypos); - // Vertical scrollbar up - int dely = AlignmentUtil.getPixelHeight(endy,oldendy,charHeight); - int dely2 = AlignmentUtil.getPixelHeight(oldstarty,endy,charHeight); + drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos); + g.translate(-LABEL_WEST,0); - gg.copyArea(0,0,(endx-startx+1)*charWidth,dely2,0,dely); + ypos += cHeight; + startRes += cWidth; + endx = startRes + cWidth - 1; - if (oldstarty > endy) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,endx,starty,oldstarty,startx,starty,0); + if (endx > al.getWidth()) + endx = al.getWidth(); } - oldstarty = starty; - oldendy = endy; - } - - if ((oldendy -oldstarty) > (getWidth() / av.getCharWidth())) { - System.out.println("LIMITS ERROR LIMITS ERROR"); - System.out.println("Corrds " + (oldendy-oldstarty) + " " + (getWidth()/av.getCharWidth()) + " " + getWidth() + " " + av.getCharWidth()); - } - - - // gg.setColor(Color.red); - // gg.drawRect( groupX, groupY, groupendX-groupX, groupendY-groupY ); - // gg.drawRect( groupX+1, groupY+1, groupendX-groupX-2, groupendY-groupY-2 ); - - - g.drawImage(img,0,0,this); - } + public void drawPanel(Graphics g1,int x1,int x2, int y1, int y2,int startx, int starty,int offset) { - - public void drawPanel(Graphics g,int x1,int x2, int y1, int y2,int startx, int starty,int offset) { - -/* - Startx and starty appear to be the same as x1, y1, unless you find different - x1 x2 - y1************************************************** - * * - * * - * * - * * - **************************************************y2 - -/* - System.out.println("drawPanel called with g = " + g); - System.out.println(" x1 = " + x1); - System.out.println(" x2 = " + x2); - System.out.println(" y1 = " + y1); - System.out.println(" y2 = " + y2); - System.out.println(" startx = " + startx); - System.out.println(" starty = " + starty); -*/ - + Graphics2D g = (Graphics2D)g1; g.setFont(av.getFont()); - int charWidth = av.getCharWidth(); - int charHeight = av.getCharHeight(); RendererI sr = av.getRenderer(); - /*Vector pid = av.getConsensus(false); Vector tmpseq = new Vector(); for (int i = 0; i < av.getAlignment().getHeight(); i++) @@ -316,68 +296,167 @@ public class SeqCanvas extends JPanel */ - if (y2 > starty && y1 < av.getEndSeq()) + /* if (y2 > starty && y1 < av.getEndSeq()) { fillBackground(g, - Color.WHITE, + Color.red, (x1-startx)*charWidth, offset + AlignmentUtil.getPixelHeight(starty,y1,av.getCharHeight()), (x2-x1+1)*charWidth, offset + AlignmentUtil.getPixelHeight(y1,y2,av.getCharHeight())); - } + }*/ SequenceI nextSeq; - SequenceGroup group=null; - boolean newGroup=false; - int sx, sy, ex, ey; - int oldStartX=0,oldEndX=0,oldY=0; + + /// First draw the sequences + ///////////////////////////// for (int i = y1 ; i < y2 ;i++) { - nextSeq = av.getAlignment().getSequenceAt(i); - if(group==null || group!=av.alignment.findGroup( nextSeq )) - newGroup = true; - else - newGroup = false; - - group = av.alignment.findGroup( nextSeq ); + nextSeq = av.alignment.getSequenceAt(i); - sr.drawSequence(g, nextSeq, group,x1,x2, - (x1 - startx) * charWidth, - offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()), - charWidth,charHeight,null, i); + sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2, + (x1 - startx) * av.charWidth, + offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight), + av.charWidth,av.charHeight,null, i); - - if( group!=null ) + if(av.showSequenceFeatures) { + fr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ), x1, x2, + (x1 - startx) * av.charWidth, + offset + + AlignmentUtil.getPixelHeight(starty, i, av.charHeight), + av.charWidth, av.charHeight, null, i); + } + } + // + ///////////////////////////////////// - g.setColor(Color.GREEN); - - sx = (group.getStartRes()-startx)*charWidth; - sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()); - ex = (group.getEndRes()+1-startx)*charWidth; - ey = offset + AlignmentUtil.getPixelHeight(starty, i+1, av.getCharHeight()); + // Now outline any areas if necessary + ///////////////////////////////////// + SequenceGroup group = av.getSelectionGroup(); + java.util.Vector groups = av.alignment.getGroups(); + int sx = -1, sy = -1, ex = -1; + int groupIndex = -1; + if (group == null && groups.size() > 0) + { + group = (SequenceGroup) groups.elementAt(0); + groupIndex = 0; + } - if (newGroup) + if (group != null) + do + { + int oldY = -1; + int i = 0; + boolean inGroup = false; + int top=-1, bottom =-1; + for (i = y1; i < y2; i++) { - g.drawLine(oldStartX, oldY, oldEndX, oldY); // Horizontal, bottom of old box - g.drawLine(sx, sy, ex, sy); // Horizontal, top of new box + sx = (group.getStartRes() - startx) * av.charWidth; + sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight); + ex = (group.getEndRes() + 1 - group.getStartRes()) * av.charWidth; + + if (av.getWrapAlignment()) + { + if (sx < 0) + sx = 0; + + if (ex > getWidth()) + { + if (av.getWrapAlignment()) + ex = getWrappedCanvasWidth(getWidth()) * av.charWidth; + + } + } + else if(ex>getWidth()) + ex -= av.charWidth; + + + 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,3f}, 0f )); + g.setColor(Color.RED); + } + else + { + g.setStroke(new BasicStroke()); + g.setColor(group.getOutlineColour()); + } + } + } + else + { + if (inGroup) + { + 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; + } + } } - g.drawLine(sx, sy, sx, ey ); // vertical line, left hand side - g.drawLine( ex,sy,ex,ey); // vertical line, right hand side - if (i == y2 - 1)// last line of alignment, seal the box - g.drawLine(sx, ey, ex, ey); // Horizontal, bottom of old box + if (inGroup) + { - oldStartX = sx; - oldEndX = ex; - oldY = ey; + 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.drawLine(sx, oldY, sx, sy ); + g.drawLine(sx+ex, oldY, sx+ex, sy ); + inGroup = false; + } + groupIndex++; + if (groupIndex >= groups.size()) + break; - } + group = (SequenceGroup) groups.elementAt(groupIndex); + + } + while (groupIndex < groups.size()); - } /// Highlight search Results once all sequences have been drawn + ////////////////////////////////////////////////////////// if(displaySearch) { for(int r=0; r= y1 && searchSeq <= y2) + if (searchSeq >= y1 && searchSeq < y2) { SequenceRenderer ssr = (SequenceRenderer) sr; - ssr.drawHighlightedText(g, av.getAlignment().getSequenceAt(searchSeq), + if(searchStart x2) + searchEnd = x2; + ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq), searchStart, searchEnd, - (searchStart - startx) * charWidth, + (searchStart - startx) * av.charWidth, offset + AlignmentUtil.getPixelHeight(starty, searchSeq, - charHeight), - charWidth, - charHeight); + av.charHeight), + av.charWidth, + av.charHeight); } } } - - - - /*bg.drawImage(image,0,0,null); - int size=width*height; - int pixel, b, x,y; - if(value!=0 ) - { - if(painted!=null) - { - for(int i=0; i