X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FUserColourScheme.java;h=0e037977b54caff62acdd07f078cc9c351dd1491;hb=7bc213bae5828287329a3490faba291706599b03;hp=660441e2fecf2ae8ff089a740bb8c5e1a0f12cba;hpb=8d65a2442bff46de796159b54b036644d046a505;p=jalview.git

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 660441e..0e03797 100755
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -19,27 +19,29 @@
 package jalview.schemes;
 
 import java.awt.*;
+import java.util.StringTokenizer;
 
 public class UserColourScheme
     extends ResidueColourScheme
 {
   protected String schemeName;
 
-  public UserColourScheme(String colour)
+  public UserColourScheme()
+  {  }
+
+  public UserColourScheme(Color[] newColors)
   {
-    Color col = null;
-    try{
-      int value = Integer.parseInt(colour, 16);
-      col = new Color(value);
-    }
-    catch(NumberFormatException ex){}
+    colors = newColors;
+  }
 
-    if(col==null)
-      col = ColourSchemeProperty.getAWTColorFromName(colour);
+  public UserColourScheme(String colour)
+  {
+    Color col = getColourFromString(colour);
 
     if(col==null)
     {
       System.out.println("Unknown colour!! "+colour);
+      col = createColourFromName(colour);
     }
 
     colors = new Color[24];
@@ -47,11 +49,6 @@ public class UserColourScheme
       colors[i] = col;
   }
 
-  public UserColourScheme(Color[] newColors)
-  {
-    colors = newColors;
-  }
-
   public Color[] getColours()
   {
     return colors;
@@ -61,8 +58,100 @@ public class UserColourScheme
   {
     schemeName = name;
   }
+
   public String getName()
   {
     return schemeName;
   }
+
+  public Color getColourFromString(String colour)
+  {
+    colour = colour.trim();
+
+    Color col = null;
+    try
+    {
+      int value = Integer.parseInt(colour, 16);
+      col = new Color(value);
+    }
+    catch (NumberFormatException ex)
+    {}
+
+    if (col == null)
+      col = ColourSchemeProperty.getAWTColorFromName(colour);
+
+    if (col == null)
+    {
+      try
+      {
+        java.util.StringTokenizer st = new java.util.StringTokenizer(colour,
+            ",");
+        int r = Integer.parseInt(st.nextToken());
+        int g = Integer.parseInt(st.nextToken());
+        int b = Integer.parseInt(st.nextToken());
+        col = new Color(r, g, b);
+      }
+      catch (Exception ex)
+      {}
+    }
+
+    return col;
+
+  }
+
+  public Color createColourFromName(String name)
+  {
+    int r, g, b;
+
+    int lsize = name.length();
+    int start = 0, end = lsize / 3;
+
+    int rgbOffset = Math.abs(name.hashCode() % 10) * 15;
+
+    r = Math.abs(name.substring(start, end).hashCode() + rgbOffset) % 210 + 20;
+    start = end;
+    end += lsize / 3;
+    if (end > lsize)
+      end = lsize;
+
+    g = Math.abs(name.substring(start, end).hashCode() + rgbOffset) % 210 + 20;
+
+    b = Math.abs(name.substring(end).hashCode() + rgbOffset) % 210 + 20;
+
+    Color color = new Color(r, g, b);
+
+    return color;
+  }
+
+  public void parseAppletParameter(String paramValue)
+  {
+    StringTokenizer st = new StringTokenizer(paramValue, ";");
+    StringTokenizer st2;
+    String token=null, colour, residues;
+    try{
+      while (st.hasMoreElements())
+      {
+        token = st.nextToken().trim();
+        residues = token.substring(0, token.indexOf("="));
+        colour = token.substring(token.indexOf("=") + 1);
+
+        st2 = new StringTokenizer(residues, " ,");
+        while (st2.hasMoreTokens())
+        {
+          int colIndex =
+              ( (Integer) ResidueProperties.aaHash.
+               get(st2.nextToken())).intValue();
+
+          colors[colIndex] = getColourFromString(colour);
+        }
+      }
+    }
+    catch(Exception ex)
+  {
+    System.out.println("Error parsing userDefinedColours:\n"
+                       +token+"\n"+ex);
+  }
+
+  }
+
 }