\r
public class SeqCanvas extends JPanel\r
{\r
+ FeatureRenderer fr;\r
Image img;\r
Graphics gg;\r
int imgWidth;\r
public SeqCanvas(AlignViewport av)\r
{\r
this.av = av;\r
+ fr = new FeatureRenderer(av);\r
setLayout(new BorderLayout());\r
PaintRefresher.Register(this);\r
\r
}\r
\r
- public void drawScale(int startx, int endx,int charWidth, int charHeight,int ypos) {\r
+ public void drawScale(Graphics g, int startx, int endx,int ypos) {\r
int scalestartx = startx - startx%10 + 10;\r
\r
- gg.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
\r
- for (int i=scalestartx;i < endx;i+= 10) {\r
- String string = String.valueOf(i);\r
- gg.drawString(string,(int)((i-startx-1)*charWidth),ypos+15 - charHeight*(2));\r
}\r
+\r
}\r
\r
\r
* in the adjustment listener in SeqPanel when the scrollbars move.\r
*/\r
\r
- public void paintComponent(Graphics g) {\r
-\r
- AlignmentI da = av.getAlignment();\r
+ public void paintComponent(Graphics g)\r
+ {\r
\r
- if (img == null ||\r
- imgWidth != getWidth() ||\r
- imgHeight != getHeight()\r
- || paintFlag)\r
+ if (img==null || imgWidth!=getWidth() || imgHeight!=getHeight() || paintFlag)\r
{\r
-\r
imgWidth = getWidth();\r
imgHeight = getHeight();\r
-\r
img = createImage(imgWidth,imgHeight);\r
gg = img.getGraphics();\r
-\r
gg.setFont(av.getFont());\r
-\r
paintFlag = false;\r
}\r
\r
+\r
chunkWidth = getWidth()/av.charWidth;\r
- chunkHeight = (da.getHeight() + 2)*av.charHeight;\r
+ chunkHeight = (av.getAlignment().getHeight() + 2)*av.charHeight;\r
\r
av.setChunkHeight(chunkHeight);\r
av.setChunkWidth(chunkWidth);\r
\r
-\r
-\r
fillBackground(gg,Color.WHITE,0,0,imgWidth,imgHeight);\r
\r
- /* if (av.getWrapAlignment()) {\r
- int offy = av.getStartSeq();\r
- startx = (int)(offy/chunkWidth)*chunkWidth;\r
- endx = startx + chunkWidth;\r
- starty = offy%chunkHeight;\r
- endy = starty + da.getHeight();\r
-\r
- int ypos = 0;\r
- int rowstart = starty;\r
-\r
- if (starty == 0) {\r
- ypos = 2*charHeight;\r
- } else if (starty == 1) {\r
- starty = 0;\r
- ypos = charHeight;\r
- }\r
-\r
- if (endy > da.getHeight()) {\r
- endy = da.getHeight();\r
- }\r
-\r
- if (endx > da.getWidth()) {\r
- endx = da.getWidth();\r
- }\r
-\r
- if (rowstart < 2) {\r
- drawScale(startx,endx,charWidth,charHeight,ypos);\r
- }\r
-\r
- drawPanel(gg,startx,endx,starty,endy,startx,starty,ypos);\r
-\r
- if (rowstart == 0) {\r
- ypos = ypos + chunkHeight;\r
- } else if (rowstart == 1) {\r
- ypos = ypos + chunkHeight;\r
- } else {\r
- ypos = ypos + chunkHeight - rowstart*charHeight;\r
- }\r
-\r
- startx += chunkWidth;\r
- endx = startx + chunkWidth;\r
- starty = 0;\r
-\r
- if (endx > da.getWidth()) {\r
- endx = da.getWidth();\r
- }\r
- // Draw the rest of the panels\r
-\r
- while (ypos <= getHeight()) {\r
- drawScale(startx,endx,charWidth,charHeight,ypos);\r
- drawPanel(gg,startx,endx,0,da.getHeight(),startx,starty,ypos);\r
-\r
- ypos += chunkHeight;\r
- startx += chunkWidth;\r
- endx = startx + chunkWidth;\r
-\r
- if (endy > da.getHeight()) {\r
- endy = da.getHeight();\r
- }\r
-\r
- if (endx > da.getWidth()) {\r
- endx = da.getWidth();\r
- }\r
-\r
- }\r
- }\r
- else*/\r
- {\r
- drawPanel(gg,av.startRes,av.endRes,av.startSeq,av.endSeq,av.startRes,av.startSeq,0);\r
- }\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
- /* if ((oldendy -oldstarty) > (getWidth() / av.getCharWidth())) {\r
- System.out.println("LIMITS ERROR LIMITS ERROR");\r
- System.out.println("Corrds " + (oldendy-oldstarty) + " " + (getWidth()/av.getCharWidth()) + " " + getWidth() + " " + av.getCharWidth());\r
- }*/\r
\r
g.drawImage(img,0,0,this);\r
\r
}\r
\r
+ public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes)\r
+ {\r
+ AlignmentI da = av.getAlignment();\r
+\r
+ int cWidth = canvasWidth/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
+\r
+ while (ypos <= canvasHeight)\r
+ {\r
+ drawScale(g, startRes, endx, ypos);\r
+ drawPanel(g, startRes, endx, 0, da.getHeight(), startRes, 0, ypos);\r
+\r
+ ypos += cHeight;\r
+ startRes += cWidth;\r
+ endx = startRes + cWidth - 1;\r
\r
+ if (endx > da.getWidth())\r
+ endx = da.getWidth();\r
+ }\r
+\r
+ }\r
\r
\r
public void drawPanel(Graphics g,int x1,int x2, int y1, int y2,int startx, int starty,int offset) {\r
\r
SequenceI nextSeq;\r
SequenceGroup group=null;\r
+ SequenceGroup [] groups=null;\r
boolean inGroup=false; // are we in a defined group?\r
boolean inRB=false; //Are we in a rubberband group?\r
int sx=-1, sy=-1, ex=-1, ey=-1;\r
nextSeq = av.getAlignment().getSequenceAt(i);\r
\r
group = av.alignment.findGroup( nextSeq );\r
+ groups = av.alignment.findAllGroups( nextSeq );\r
\r
- sr.drawSequence(g, nextSeq, group,x1,x2,\r
+ sr.drawSequence(g, nextSeq, groups,x1,x2,\r
(x1 - startx) * charWidth,\r
offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()),\r
charWidth,charHeight,null, i);\r
\r
+ if(av.showSequenceFeatures)\r
+ {\r
+ fr.drawSequence(g, nextSeq, groups, x1, x2,\r
+ (x1 - startx) * charWidth,\r
+ offset +\r
+ AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()),\r
+ charWidth, charHeight, null, i);\r
+ }\r
+\r
+\r
+\r
\r
if( group!=null )\r
{\r
int searchStart = searchResults[r+1];\r
int searchEnd = searchResults[r+2];\r
\r
- if (searchSeq >= y1 && searchSeq <= y2)\r
+ if (searchSeq >= y1 && searchSeq < y2)\r
{\r
SequenceRenderer ssr = (SequenceRenderer) sr;\r
- ssr.drawHighlightedText(g, av.getAlignment().getSequenceAt(searchSeq),\r
+ ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),\r
searchStart,\r
searchEnd,\r
(searchStart - startx) * charWidth,\r
git://source.jalview.org / jalview.git / blobdiff