public class UserColourScheme\r
extends ResidueColourScheme\r
{\r
+ Color [] lowerCaseColours;\r
+\r
protected String schemeName;\r
\r
public UserColourScheme()\r
return colors;\r
}\r
\r
+ public Color[] getLowerCaseColours()\r
+ {\r
+ return lowerCaseColours;\r
+ }\r
+\r
public void setName(String name)\r
{\r
schemeName = name;\r
st2 = new StringTokenizer(residues, " ,");\r
while (st2.hasMoreTokens())\r
{\r
- int colIndex =\r
- ( (Integer) ResidueProperties.aaHash.\r
- get(st2.nextToken())).intValue();\r
-\r
- colors[colIndex] = getColourFromString(colour);\r
+ token = st2.nextToken();\r
+\r
+ if (ResidueProperties.aaIndex[token.charAt(0)]==-1)\r
+ continue;\r
+\r
+ int colIndex = ResidueProperties.aaIndex[token.charAt(0)];\r
+\r
+ if(token.equalsIgnoreCase("lowerCase"))\r
+ {\r
+ if (lowerCaseColours == null)\r
+ lowerCaseColours = new Color[23];\r
+ for (int i = 0; i < 23; i++)\r
+ if (lowerCaseColours[i] == null)\r
+ lowerCaseColours[i] = getColourFromString(colour);\r
+\r
+ continue;\r
+ }\r
+\r
+ if(token.equals(token.toLowerCase()))\r
+ {\r
+ if(lowerCaseColours==null)\r
+ {\r
+ lowerCaseColours = new Color[23];\r
+ }\r
+ lowerCaseColours[colIndex] = getColourFromString(colour);\r
+ }\r
+ else\r
+ colors[colIndex] = getColourFromString(colour);\r
}\r
}\r
}\r
\r
}\r
\r
+\r
+\r
+ public Color findColour(String s, int j)\r
+ {\r
+ int index = ResidueProperties.aaIndex[s.charAt(0)];\r
+\r
+ if ((threshold == 0) || aboveThreshold(ResidueProperties.aa[index], j))\r
+ {\r
+ if(lowerCaseColours!=null && 'a' <= s.charAt(0) && s.charAt(0) <= 'z')\r
+ currentColour = lowerCaseColours[index];\r
+ else\r
+ currentColour = colors[index];\r
+ }\r
+ else\r
+ {\r
+ currentColour = Color.white;\r
+ }\r
+\r
+ if(conservationColouring)\r
+ applyConservation(j);\r
+\r
+\r
+ return currentColour;\r
+ }\r
+\r
+ public void setLowerCaseColours(Color [] lcolours)\r
+ {\r
+ lowerCaseColours = lcolours;\r
+ }\r
+\r
}\r