package jalview.gui;\r
\r
import java.awt.*;\r
+import java.awt.Graphics2D.*;\r
+\r
import javax.swing.*;\r
import jalview.datamodel.*;\r
import jalview.analysis.*;\r
public class IdCanvas extends JPanel\r
{\r
- protected Image img;\r
- protected Graphics gg;\r
-\r
- protected int imgWidth;\r
- protected int imgHeight;\r
-\r
protected AlignViewport av;\r
\r
public boolean paintFlag = false;\r
PaintRefresher.Register(this);\r
}\r
\r
- public void drawIdString(Graphics g,SequenceI ds,int i, int starty, int ypos) {\r
+ public void drawIdString(Graphics gg,SequenceI ds,int i, int starty, int ypos) {\r
int charHeight = av.getCharHeight();\r
\r
if (av.getSelection().contains(ds)) {\r
- gg.setColor(Color.gray);\r
+ gg.setColor(Color.lightGray);\r
gg.fillRect(0,AlignmentUtil.getPixelHeight(starty,i,charHeight)+ ypos,getWidth(),charHeight);\r
gg.setColor(Color.white);\r
} else {\r
\r
String string = ds.getName() + "/" + ds.getStart() + "-" + ds.getEnd();\r
\r
- gg.drawString(string,0,AlignmentUtil.getPixelHeight(starty,i,charHeight) + ypos + charHeight/2);\r
+ gg.drawString(string,0,AlignmentUtil.getPixelHeight(starty,i,charHeight) + ypos + charHeight- (charHeight/5));\r
\r
}\r
\r
- public void paintComponent(Graphics g) {\r
+ public void paintComponent(Graphics gg) {\r
AlignmentI da = av.getAlignment();\r
- int charWidth = (int)av.getCharWidth();\r
int charHeight = av.getCharHeight();\r
- Font f = av.getFont();\r
-\r
- if (img == null ||\r
- imgWidth != getWidth() ||\r
- imgHeight != getHeight() ||\r
- paintFlag == true) {\r
-\r
- imgWidth = getWidth();\r
- imgHeight = getHeight();\r
-\r
- if (imgWidth <= 0 ) {\r
- imgWidth = 700;\r
- }\r
- if (imgHeight <= 0 ) {\r
- imgHeight = 500;\r
- }\r
-\r
- img = createImage(imgWidth,imgHeight);\r
-\r
- gg = img.getGraphics();\r
- gg.setColor(Color.white);\r
- gg.fillRect(0,0,imgWidth,imgHeight);\r
-\r
- gg.setFont(f);\r
-\r
- paintFlag = false;\r
-\r
- }\r
-\r
+ gg.setFont(av.getFont());\r
\r
//Fill in the background\r
gg.setColor(Color.white);\r
- gg.fillRect(0,0,imgWidth,imgHeight);\r
+ gg.fillRect(0,0,getWidth(),getHeight());\r
\r
Color currentColor = Color.white;\r
Color currentTextColor = Color.black;\r
\r
//Which ids are we printing\r
int starty = av.getStartSeq();\r
- int endy = av.getEndSeq();\r
-\r
-\r
-\r
- if (av.getWrapAlignment()) {\r
- starty = starty%av.getChunkHeight();\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
- endy = starty + da.getHeight();\r
-\r
- if (endy > da.getHeight()) {\r
- endy = da.getHeight();\r
- }\r
-\r
- for (int i = starty; i < endy; i++) {\r
- SequenceI s = da.getSequenceAt(i);\r
- drawIdString(gg,s,i,starty,ypos);\r
- }\r
- if (rowstart == 0) {\r
- ypos = ypos + av.getChunkHeight();\r
- } else if (rowstart == 1) {\r
- ypos = ypos + av.getChunkHeight();\r
- } else {\r
- ypos = ypos + av.getChunkHeight() - rowstart*charHeight;\r
- }\r
+ int endy = av.endSeq;\r
\r
- starty = 0;\r
-\r
- int chunkwidth = av.getChunkWidth();\r
- int startx = (int)(av.getEndSeq()/chunkwidth)*chunkwidth;\r
- int endx = startx + chunkwidth;\r
-\r
-\r
- while (ypos <= getHeight() && endx < da.getWidth()) {\r
-\r
- for (int i = starty; i < endy; i++) {\r
- SequenceI s = da.getSequenceAt(i);\r
- drawIdString(gg,s,i,starty,ypos);\r
- }\r
-\r
- ypos += av.getChunkHeight();\r
- startx += chunkwidth;\r
- endx = startx + chunkwidth;\r
-\r
- if (endx > da.getWidth()) {\r
- endx = da.getWidth();\r
- }\r
-\r
- starty = 0;\r
-\r
- if (endy > da.getHeight()) {\r
- endy = da.getHeight();\r
- }\r
+ if (av.getWrapAlignment())\r
+ {\r
+ // Draw the rest of the panels\r
+ int chunkHeight = (da.getHeight() + 2)*av.charHeight;\r
+ int row = av.getStartRes() / av.chunkWidth ;\r
+ for(int ypos=2*av.charHeight;\r
+ ypos <= getHeight() && row*av.chunkWidth<da.getWidth();\r
+ ypos += chunkHeight, row++ )\r
+ {\r
+ for (int i = starty; i < av.alignment.getHeight(); i++)\r
+ {\r
+ SequenceI s = da.getSequenceAt(i);\r
+ drawIdString(gg, s, i, 0, ypos);\r
+ }\r
+ }\r
\r
- }\r
- } else {\r
\r
- //Now draw the id strings\r
- for (int i = starty; i < endy; i++)\r
+ } else\r
{\r
\r
- // Selected sequence colours\r
-\r
- if (av.getSelection().contains(da.getSequenceAt(i))) {\r
- if (currentColor != Color.gray) {\r
- currentColor = Color.gray;\r
+ //Now draw the id strings\r
+ for (int i = starty; i < endy; i++)\r
+ {\r
+ // Selected sequence colours\r
+ if (av.getSelection().contains(da.getSequenceAt(i)))\r
+ {\r
+ currentColor = Color.lightGray;\r
+ currentTextColor = Color.black;\r
+ }\r
+ else\r
+ {\r
+ currentColor = da.getSequenceAt(i).getColor();\r
currentTextColor = Color.black;\r
}\r
- } else if (da.getSequenceAt(i).getColor() != null)\r
- {\r
- currentColor = Color.white;\r
- /* Color newcol = da.getSequenceAt(i).getColor();\r
- if (newcol != currentColor) {\r
- currentColor = newcol;\r
- if (newcol == Color.black) {\r
- currentTextColor = Color.white;\r
- } else {\r
- currentTextColor = Color.black;\r
- }\r
- }*/\r
- }\r
\r
- gg.setColor(currentColor);\r
+ gg.setColor(currentColor);\r
\r
- if (currentColor != Color.white) {\r
gg.fillRect(0,\r
- AlignmentUtil.getPixelHeight(starty,i,charHeight),\r
+ AlignmentUtil.getPixelHeight(starty, i, charHeight),\r
getWidth(),\r
charHeight);\r
- }\r
-\r
- gg.setColor(currentTextColor);\r
-\r
- String string = da.getSequenceAt(i).getDisplayId();\r
\r
- gg.drawString(string,0,AlignmentUtil.getPixelHeight(starty,i,charHeight) + charHeight- (charHeight/5));\r
- }\r
+ gg.setColor(currentTextColor);\r
+ String string = da.getSequenceAt(i).getDisplayId();\r
+ gg.drawString(string, 0,\r
+ AlignmentUtil.getPixelHeight(starty, i, charHeight) +\r
+ charHeight - (charHeight / 5));\r
+ }\r
}\r
\r
- g.drawImage(img,0,0,this);\r
}\r
\r
\r
public Dimension getLabelWidth()\r
{\r
+ if(getGraphics()==null)\r
+ return null;\r
\r
FontMetrics fm = this.getGraphics().getFontMetrics(av.font);\r
AlignmentI al = av.getAlignment();\r
git://source.jalview.org / jalview.git / blobdiff