X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FUserColourScheme.java;h=4b963fe4702acd7498f1ada03fa136ad70b37ed9;hb=fbd79f8f62abc6337af57ab87ff07311eff1c74e;hp=38a12910e1a842a65fc455ef1eb957e6e919f969;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 38a1291..4b963fe 100755
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -1,32 +1,78 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.schemes;
 
 import java.awt.*;
 
+public class UserColourScheme
+    extends ResidueColourScheme
+{
+  protected String schemeName;
 
-public class UserColourScheme extends ResidueColourScheme {
-    public UserColourScheme(Color[] newColors) {
-        colors = newColors;
+  public UserColourScheme(String colour)
+  {
+    Color col = null;
+    try{
+      int value = Integer.parseInt(colour, 16);
+      col = new Color(value);
     }
+    catch(NumberFormatException ex){}
 
-    public Color[] getColours() {
-        return colors;
+    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){}
+    }
+
+    if(col==null)
+    {
+      System.out.println("Unknown colour!! "+colour);
     }
+
+    colors = new Color[24];
+    for(int i=0; i<24; i++)
+      colors[i] = col;
+  }
+
+  public UserColourScheme(Color[] newColors)
+  {
+    colors = newColors;
+  }
+
+  public Color[] getColours()
+  {
+    return colors;
+  }
+
+  public void setName(String name)
+  {
+    schemeName = name;
+  }
+  public String getName()
+  {
+    return schemeName;
+  }
 }