import java.awt.*;\r
import java.util.*;\r
\r
-public class SequenceRenderer implements RendererI\r
+public class SequenceRenderer\r
{\r
AlignViewport av;\r
FontMetrics fm;\r
boolean renderGaps = true;\r
SequenceGroup currentSequenceGroup = null;\r
- Color color;\r
+ SequenceGroup [] allGroups = null;\r
+ Color resBoxColour;\r
+ Graphics graphics;\r
\r
public SequenceRenderer(AlignViewport av)\r
{\r
\r
public Color getResidueBoxColour(ColourSchemeI cs, SequenceI seq, int i)\r
{\r
- Color c = Color.white;\r
- try{\r
- c = cs.findColour(seq, seq.getSequence(i, i + 1), i, null);\r
- }catch(Exception ex){}\r
+ getBoxColour(cs, seq, i);\r
+ return resBoxColour;\r
+ }\r
\r
- return c;\r
+ void getBoxColour(ColourSchemeI cs, SequenceI seq, int i)\r
+ {\r
+ if (cs != null)\r
+ resBoxColour = cs.findColour(seq.getSequence(i, i + 1), i);\r
+ else\r
+ resBoxColour = Color.white;\r
}\r
\r
- public void drawSequence(Graphics g,SequenceI seq,SequenceGroup sg, int start, int end, int x1, int y1, int width, int height, Vector pid, int seqnum)\r
+ public void drawSequence(Graphics g,SequenceI seq,SequenceGroup [] sg, int start, int end, int x1, int y1, int width, int height)\r
{\r
- currentSequenceGroup = sg;\r
+ allGroups = sg;\r
+\r
+ graphics = g;\r
\r
- drawBoxes(g, seq, start, end, x1, y1, (int) width, height, pid);\r
+ drawBoxes(seq, start, end, x1, y1, (int) width, height);\r
\r
fm = g.getFontMetrics();\r
- drawText(g,seq,start,end,x1,y1,(int)width,height);\r
+ drawText(seq,start,end,x1,y1,(int)width,height);\r
\r
}\r
\r
- public void drawBoxes(Graphics g, SequenceI seq,int start, int end, int x1, int y1, int width, int height,Vector freq) {\r
+ public void drawBoxes(SequenceI seq,int start, int end, int x1, int y1, int width, int height) {\r
int i = start;\r
int length = seq.getLength();\r
\r
- Color currentColor = Color.WHITE;\r
-\r
- int curStart = x1;\r
+ int curStart = -1;\r
int curWidth = width;\r
\r
- // int threshold = 80;\r
-\r
+ Color tempColour = null;\r
while (i <= end && i < length)\r
{\r
- color = color.white;\r
-\r
if(inCurrentSequenceGroup(i))\r
{\r
if( currentSequenceGroup.getDisplayBoxes())\r
- color = getResidueBoxColour(currentSequenceGroup.cs, seq, i);\r
+ getBoxColour(currentSequenceGroup.cs, seq, i);\r
}\r
else if(av.getShowBoxes())\r
- color = getResidueBoxColour(av.getGlobalColourScheme(), seq, i);\r
-\r
+ getBoxColour(av.getGlobalColourScheme(), seq, i);\r
+ else\r
+ resBoxColour = Color.white;\r
\r
- // Hashtable hash = (Hashtable)freq.elementAt(i-start);\r
- // String s = (String)hash.get("maxResidue");\r
- // int count = ((Integer)hash.get("maxCount")).intValue();\r
- // int max = ((Integer)hash.get("size")).intValue();\r
- // int nongap = ((Integer)hash.get("nongap")).intValue();\r
- // float frac = (float)(count*1.0/(1.0*nongap));\r
\r
- //System.out.println("Frac/count/nongap " + frac + " " + count + " " + nongap);\r
- /* if (!seq.getSequence().substring(i,i+1).equals(s) ||\r
- s.equals("-") ||\r
- s.equals(".") ||\r
- s.equals(" "))\r
- {\r
- c = Color.white;\r
- } else {\r
- if (frac > 0.9) {\r
- c = Color.red;\r
- } else if (frac > 0.8) {\r
- c = Color.orange;\r
- } else if (frac > 0.7) {\r
- c = Color.pink;\r
- } else if (frac > 0.5) {\r
- c = Color.yellow;\r
- } else if (frac> 0.3) {\r
- c = Color.lightGray;\r
- }\r
- }*/\r
-\r
- if (color != currentColor || color != null)\r
+ if (resBoxColour != tempColour)\r
{\r
- g.fillRect(x1+width*(curStart-start),y1,curWidth,height);\r
-\r
- currentColor = color;\r
- g.setColor(color);\r
+ if(tempColour!=null)\r
+ graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height);\r
+ graphics.setColor(resBoxColour);\r
\r
curStart = i;\r
curWidth = width;\r
+ tempColour = resBoxColour;\r
+\r
}\r
else\r
curWidth += width;\r
\r
i++;\r
}\r
- g.fillRect(x1+width*(curStart-start),y1,curWidth,height);\r
+\r
+\r
+ graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height);\r
}\r
\r
- public void drawText(Graphics g, SequenceI seq,int start, int end, int x1, int y1, int width, int height)\r
+ public void drawText(SequenceI seq,int start, int end, int x1, int y1, int width, int height)\r
{\r
int pady = height/5;\r
int charOffset=0;\r
- g.setColor(Color.black);\r
-\r
char s;\r
// Need to find the sequence position here.\r
+\r
+ graphics.setColor(Color.black);\r
+ String sequence = seq.getSequence();\r
for (int i = start; i <= end; i++)\r
{\r
- if(i<seq.getLength())\r
- s = seq.getSequence().charAt(i);\r
+ if(i<sequence.length())\r
+ s = sequence.charAt(i);\r
else\r
s = ' ';\r
\r
- if(!renderGaps && (s=='-' || s=='.' || s==' '))\r
+ if(!renderGaps && jalview.util.Comparison.isGap(s))\r
continue;\r
\r
- g.setColor(Color.black);\r
\r
if (inCurrentSequenceGroup(i))\r
{\r
if(!currentSequenceGroup.getDisplayText())\r
continue;\r
\r
- if(currentSequenceGroup.getColourText())\r
- g.setColor(getResidueBoxColour(currentSequenceGroup.cs, seq, i).darker());\r
+ if (currentSequenceGroup.getColourText())\r
+ {\r
+ getBoxColour(currentSequenceGroup.cs, seq, i);\r
+ graphics.setColor(resBoxColour.darker());\r
+ }\r
}\r
else\r
{\r
continue;\r
\r
if(av.getColourText())\r
- g.setColor(getResidueBoxColour(av.getGlobalColourScheme(), seq, i).darker());\r
+ {\r
+ getBoxColour(av.getGlobalColourScheme(), seq, i);\r
+ if(av.getShowBoxes())\r
+ graphics.setColor(resBoxColour.darker());\r
+ else\r
+ graphics.setColor(resBoxColour);\r
+ }\r
}\r
\r
- charOffset = (width - fm.charWidth(s))/2;\r
- g.drawString(String.valueOf(s), charOffset + x1 + width * (i - start), y1 + height - pady);\r
- }\r
+ charOffset = (width - fm.charWidth(s))/2;\r
+ graphics.drawString(String.valueOf(s),\r
+ charOffset + x1 + width * (i - start),\r
+ y1 + height - pady);\r
+ }\r
\r
\r
}\r
\r
boolean inCurrentSequenceGroup(int res)\r
{\r
- if(currentSequenceGroup==null)\r
+ if(allGroups ==null)\r
return false;\r
\r
- return (currentSequenceGroup.getStartRes()<=res && currentSequenceGroup.getEndRes()>=res)?true:false;\r
+ for(int i=0; i<allGroups.length; i++)\r
+ if(allGroups[i].getStartRes()<=res && allGroups[i].getEndRes()>=res)\r
+ {\r
+ currentSequenceGroup = allGroups[i];\r
+ return true;\r
+ }\r
+\r
+ return false;\r
}\r
\r
- public void drawHighlightedText(Graphics g, SequenceI seq,int start, int end, int x1, int y1, int width, int height)\r
+ public void drawHighlightedText(SequenceI seq,int start, int end, int x1, int y1, int width, int height)\r
{\r
int pady = height/5;\r
int charOffset=0;\r
- g.setColor(Color.BLACK);\r
- g.fillRect(x1,y1,width*(end-start+1),height);\r
- g.setColor(Color.white);\r
+ graphics.setColor(Color.BLACK);\r
+ graphics.fillRect(x1,y1,width*(end-start+1),height);\r
+ graphics.setColor(Color.white);\r
\r
char s='~';\r
// Need to find the sequence position here.\r
if(i<seq.getLength())\r
s = seq.getSequence().charAt(i);\r
\r
- charOffset = (width - fm.charWidth(s))/2;\r
- g.drawString(String.valueOf(s), charOffset + x1 + width * (i - start), y1 + height - pady);\r
+ charOffset = (width - fm.charWidth(s))/2;\r
+ graphics.drawString(String.valueOf(s), charOffset + x1 + width * (i - start), y1 + height - pady);\r
}\r
}\r
\r
git://source.jalview.org / jalview.git / blobdiff