X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=caf93fcc67ee3f85285492215e3fe9b29bd52d72;hb=bed54fafd288a7cf39f15262522b0f2503883479;hp=1339988e925ce4cbe2149e130bfcc6e4ff4f79a3;hpb=f59219438e94c6c782995d472b654fb2526cb293;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 1339988..caf93fc 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -2,57 +2,94 @@ package jalview.gui; import java.awt.*; import javax.swing.*; -import java.util.*; import jalview.datamodel.*; -import jalview.schemes.*; import jalview.analysis.*; public class SeqCanvas extends JPanel { + 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; + int [] searchResults = null; int chunkHeight; int chunkWidth; - Graphics debugG; - FeatureRenderer fr = new FeatureRenderer(); - BlockRenderer br = new BlockRenderer(); - CpGRenderer cgr = new CpGRenderer(); + boolean fastPaint = false; - ColourSchemeI cs = new ZappoColourScheme(); public SeqCanvas(AlignViewport av) { this.av = av; + fr = new FeatureRenderer(av); setLayout(new BorderLayout()); + PaintRefresher.Register(this); + } - public void drawScale(int startx, int endx,double charWidth, int charHeight,int ypos) { + public void drawScale(Graphics g, int startx, int endx,int ypos) { int scalestartx = startx - startx%10 + 10; - gg.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 ); - 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)); } + } +public void fastPaint(int horizontal, int vertical) +{ + if (horizontal == 0 && vertical == 0) + 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; + + else if (vertical > 0) // scroll down + { + transY = imgHeight - vertical * av.charHeight; + ss = es - vertical; + } + else if (vertical < 0) + es = ss - vertical; + + gg.translate(transX, transY); + + + drawPanel(gg, sr, er, ss, es, sr, ss, 0); + gg.translate( -transX, -transY); + + fastPaint = true; + repaint(); + +} + /** * Definitions of startx and endx (hopefully): * SMJS This is what I'm working towards! @@ -64,242 +101,87 @@ public class SeqCanvas extends JPanel * in the adjustment listener in SeqPanel when the scrollbars move. */ - public void paintComponent(Graphics g) { - debugG = g; + public void paintComponent(Graphics g) + { + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); - AlignmentI da = av.getAlignment(); + if (fastPaint) + { + g.drawImage(img, 0, 0, this); + fastPaint = false; + return; + } - if (img == null || - imgWidth != getWidth() || - imgHeight != getHeight() || - paintFlag == true) { + // this draws the whole of the alignment + imgWidth = getWidth(); + imgHeight = getHeight(); - imgWidth = (getWidth() > 0 ? getWidth() : 1); - imgHeight = (getHeight() > 0 ? getHeight() : 1); + imgWidth -= imgWidth%av.charWidth; + imgHeight-= imgHeight%av.charHeight; img = createImage(imgWidth,imgHeight); - gg = img.getGraphics(); - - // SMJS I added this in to update the AV when the size changes - // until I figure out how this should be done - setFont(av.getFont()); - + gg = (Graphics2D)img.getGraphics(); gg.setFont(av.getFont()); + gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); - paintFlag = false; - - oldstartx = -1; - oldendx = -1; - oldstarty = -1; - oldendy = -1; - } - - int startx = av.getStartRes(); - int starty = av.getStartSeq(); - - int endx = av.getEndRes(); - int endy = av.getEndSeq(); + gg.setColor(Color.white); + gg.fillRect(0,0,imgWidth,imgHeight); - double charWidth = av.getCharWidth(); - int charHeight = av.getCharHeight(); - - chunkWidth = (int)(getWidth()/charWidth); - chunkHeight = (da.getHeight() + 2)*charHeight; + chunkWidth = getWidth()/av.charWidth; + chunkHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; av.setChunkHeight(chunkHeight); av.setChunkWidth(chunkWidth); - int offy = av.getStartSeq(); - - if (oldendx == -1) { - fillBackground(gg,Color.WHITE,0,0,imgWidth,imgHeight); - - /* if (av.getWrapAlignment() == true) { - startx = (int)(offy/chunkWidth)*chunkWidth; - endx = startx + chunkWidth; - starty = offy%chunkHeight; - endy = starty + da.getHeight(); - - int ypos = 0; - int rowstart = starty; - - if (starty == 0) { - ypos = 2*charHeight; - } else if (starty == 1) { - starty = 0; - ypos = charHeight; - } - - if (endy > da.getHeight()) { - endy = da.getHeight(); - } - - if (endx > da.getWidth()) { - endx = da.getWidth(); - } - - if (rowstart < 2) { - drawScale(startx,endx,charWidth,charHeight,ypos); - } - - drawPanel(gg,startx,endx,starty,endy,startx,starty,ypos); - - if (rowstart == 0) { - ypos = ypos + chunkHeight; - } else if (rowstart == 1) { - ypos = ypos + chunkHeight; - } else { - ypos = ypos + chunkHeight - rowstart*charHeight; - } - - startx += chunkWidth; - endx = startx + chunkWidth; - starty = 0; - - if (endx > da.getWidth()) { - endx = da.getWidth(); - } - // Draw the rest of the panels - - while (ypos <= getHeight()) { - drawScale(startx,endx,charWidth,charHeight,ypos); - drawPanel(gg,startx,endx,0,da.getHeight(),startx,starty,ypos); - - ypos += chunkHeight; - startx += chunkWidth; - endx = startx + chunkWidth; - - if (endy > da.getHeight()) { - endy = da.getHeight(); - } - - if (endx > da.getWidth()) { - endx = da.getWidth(); - } - - } - } else*/ { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - - oldstartx = startx; - oldendx = endx; - oldstarty = starty; - oldendy = endy; - - } - } - - else if (oldstartx < startx) - { - // This is dragging horizontal scrollbar to the right - - int delx = (int)((startx - oldstartx) * charWidth); - int delx2 = (int)((oldendx - startx + 1) * charWidth); - - gg.copyArea(delx,0,delx2,AlignmentUtil.getPixelHeight(starty,endy,charHeight),-delx,0); - - if (startx > oldendx) - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - else - drawPanel(gg,oldendx+1,endx,starty,endy,startx,starty,0); - - - oldstartx = startx; - oldendx = endx; - - } else if (oldstartx > startx) - { - // Horizontal scrollbar pulled to the left - int delx = (int)((oldstartx - startx) * charWidth); - int delx2 = (int)((endx - oldstartx +1) * charWidth); + 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); - gg.copyArea(0,0,delx2,AlignmentUtil.getPixelHeight(starty,endy,charHeight),delx,0); + g.drawImage(img, 0, 0, this); - if (oldstartx > endx) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,oldstartx-1,starty,endy,startx,starty,0); - } - - 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); - - gg.copyArea(0,dely,(int)((endx-startx+1)*charWidth),dely2,0,-dely); + } - if (starty > oldendy) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,endx,oldendy,endy,startx,starty,0); - } + public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes) + { + AlignmentI da = av.getAlignment(); - oldstarty = starty; - oldendy = endy; + int cWidth = canvasWidth/av.charWidth; + int cHeight = (av.getAlignment().getHeight() + 2)*av.charHeight; - } else if (oldstarty > starty) { + int endx = startRes+cWidth-1; + int ypos = 2*av.charHeight; - // Vertical scrollbar up - int dely = AlignmentUtil.getPixelHeight(endy,oldendy,charHeight); - int dely2 = AlignmentUtil.getPixelHeight(oldstarty,endy,charHeight); + while (ypos <= canvasHeight) + { + drawScale(g, startRes, endx, ypos); + drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos); - gg.copyArea(0,0,(int)((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 > da.getWidth()) + endx = da.getWidth(); } - oldstarty = starty; - oldendy = endy; - } - - if ((oldendy -oldstarty) > (int)((getWidth() / av.getCharWidth()))) { - System.out.println("LIMITS ERROR LIMITS ERROR"); - System.out.println("Corrds " + (oldendy-oldstarty) + " " + (int)(getWidth()/av.getCharWidth()) + " " + getWidth() + " " + av.getCharWidth()); - } - - - 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) { - -/* - 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()); - double 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++) if (!av.getSelection().contains(av.getAlignment().getSequenceAt(i))) tmpseq.addElement(av.getAlignment().getSequenceAt(i)); - - if (sr instanceof SequenceRenderer) pid = AAFrequency.calculate(tmpseq,x1,x2); @@ -310,51 +192,196 @@ public class SeqCanvas extends JPanel */ - if (y2 > starty && y1 < av.getEndSeq()) { - - fillBackground(g, - Color.white, - (int)((x1-startx)*charWidth), + /* if (y2 > starty && y1 < av.getEndSeq()) + { + fillBackground(g, + Color.red, + (x1-startx)*charWidth, offset + AlignmentUtil.getPixelHeight(starty,y1,av.getCharHeight()), - (int)((x2-x1+1)*charWidth), + (x2-x1+1)*charWidth, offset + AlignmentUtil.getPixelHeight(y1,y2,av.getCharHeight())); - } + }*/ - for (int i = y1 ; i < y2 ;i++) { - - RendererI r = sr; -/* - if (av.getSelection().contains(av.getAlignment().getSequenceAt(i))) { - r = fr; - System.out.println("use feature renderer"); - } else if ( i == 0) { - // r = br; - } else if (av.getAlignment().getSequenceAt(i).getName().equals("CpG")) { - r = cgr; - System.out.println("cg renderer"); - } -*/ + SequenceI nextSeq; + + /// First draw the sequences + ///////////////////////////// + for (int i = y1 ; i < y2 ;i++) + { + nextSeq = av.alignment.getSequenceAt(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(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); + } + } + // + ///////////////////////////////////// - r.drawSequence(g,cs,av.getAlignment().getSequenceAt(i), - x1, - x2, - (int)((x1-startx)*charWidth), - offset + AlignmentUtil.getPixelHeight(starty,i,av.getCharHeight()), - charWidth, - charHeight,showScores,av.getShowBoxes(),av.getShowText(),null,i,av); + // 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 (group != null) + do + { + 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; + + + 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; + } + } + } + + 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.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) + { + SequenceRenderer ssr = (SequenceRenderer) sr; + ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq), + searchStart, + searchEnd, + (searchStart - startx) * av.charWidth, + offset + + AlignmentUtil.getPixelHeight(starty, searchSeq, + av.charHeight), + av.charWidth, + av.charHeight); + } + } + } - public void fillBackground(Graphics g,Color c, int x1,int y1,int width,int height) { - g.setColor(c); - g.fillRect(x1,y1,width,height); } + public int getChunkWidth() { return chunkWidth; } + public void highlightSearchResults(int [] results) + { + // results are in the order sequence, startRes, endRes + if(results==null) + displaySearch = false; + else + displaySearch = true; + + searchResults = results; + + repaint(); + } + + }