From 353236b63bd005adee3fb297984228e26bc9d66c Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Fri, 10 Dec 2004 14:36:33 +0000 Subject: [PATCH] Now draws group, rubberband --- src/jalview/gui/SeqCanvas.java | 233 +++++++++------------------------------- 1 file changed, 50 insertions(+), 183 deletions(-) diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 00b4e95..8fcca78 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -10,18 +10,13 @@ import jalview.analysis.*; public class SeqCanvas extends JPanel { - ColourSchemeI globalColorScheme = null; Image img; Graphics 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; @@ -72,42 +67,29 @@ public class SeqCanvas extends JPanel || paintFlag) { - imgWidth = (getWidth() > 0 ? getWidth() : 1); - imgHeight = (getHeight() > 0 ? getHeight() : 1); + imgWidth = getWidth(); + imgHeight = getHeight(); img = createImage(imgWidth,imgHeight); gg = img.getGraphics(); gg.setFont(av.getFont()); - oldstartx = -1; - oldendx = -1; - oldstarty = -1; - oldendy = -1; paintFlag = false; } - 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; + chunkWidth = getWidth()/av.charWidth; + chunkHeight = (da.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()) { + fillBackground(gg,Color.WHITE,0,0,imgWidth,imgHeight); + + /* if (av.getWrapAlignment()) { + int offy = av.getStartSeq(); startx = (int)(offy/chunkWidth)*chunkWidth; endx = startx + chunkWidth; starty = offy%chunkHeight; @@ -172,98 +154,16 @@ public class SeqCanvas extends JPanel } } - else + 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 = (startx - oldstartx) * charWidth; - int delx2 = (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 = (oldstartx - startx) * charWidth; - int delx2 = (endx - oldstartx +1) * charWidth; - - gg.copyArea(0,0,delx2,AlignmentUtil.getPixelHeight(starty,endy,charHeight),delx,0); - - 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,(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); + drawPanel(gg,av.startRes,av.endRes,av.startSeq,av.endSeq,av.startRes,av.startSeq,0); } - oldstarty = starty; - oldendy = endy; - } else if (oldstarty > starty) { - - // Vertical scrollbar up - int dely = AlignmentUtil.getPixelHeight(endy,oldendy,charHeight); - int dely2 = AlignmentUtil.getPixelHeight(oldstarty,endy,charHeight); - - gg.copyArea(0,0,(endx-startx+1)*charWidth,dely2,0,dely); - - if (oldstarty > endy) { - drawPanel(gg,startx,endx,starty,endy,startx,starty,0); - } else { - drawPanel(gg,startx,endx,starty,oldstarty,startx,starty,0); - } - - oldstarty = starty; - oldendy = endy; - } - - if ((oldendy -oldstarty) > (getWidth() / av.getCharWidth())) { + /* 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); @@ -274,32 +174,12 @@ public class SeqCanvas extends JPanel 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); -*/ 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++) @@ -319,7 +199,7 @@ public class SeqCanvas extends JPanel 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, @@ -329,7 +209,7 @@ public class SeqCanvas extends JPanel SequenceI nextSeq; SequenceGroup group=null; boolean newGroup=false; - int sx, sy, ex, ey; + int sx=-1, sy=-1, ex=-1, ey=-1; int oldStartX=0,oldEndX=0,oldY=0; for (int i = y1 ; i < y2 ;i++) { @@ -350,7 +230,7 @@ public class SeqCanvas extends JPanel if( group!=null ) { - g.setColor(Color.GREEN); + g.setColor(Color.lightGray); sx = (group.getStartRes()-startx)*charWidth; sy = offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()); @@ -374,6 +254,40 @@ public class SeqCanvas extends JPanel oldY = ey; } + else if(sx>-1) + { + g.setColor(Color.lightGray); + g.drawLine(sx, ey, ex, ey); // Horizontal, bottom of old box + } + + group = av.getRubberbandGroup(); + if( group !=null && group.sequences.contains(nextSeq) ) + { + g.setColor(Color.red); + + 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()); + + if (newGroup) + { + g.drawLine(oldStartX, oldY, oldEndX, oldY); // Horizontal, bottom of old box + g.drawLine(sx, sy, ex, sy); // Horizontal, top of new box + } + + 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 + + // oldStartX = sx; + // oldEndX = ex; + // oldY = ey; + + } } @@ -402,55 +316,8 @@ public class SeqCanvas extends JPanel } } - - - - /*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