all can threshold

[jalview.git] / src / jalview / schemes / ColourSchemeProperty.java

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 6488b8d..8317bd7 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -44,6 +44,39 @@ public class ColourSchemeProperty
     return ret;\r
   }\r
 \r
+  public static String getColourName(ColourSchemeI cs)\r
+  {\r
+    if(cs instanceof ConservationColourScheme)\r
+     cs = ((ConservationColourScheme)cs).cs;\r
+\r
+\r
+    int index = 11;\r
+    if(cs instanceof ClustalxColourScheme)\r
+      index = CLUSTAL;\r
+    else if(cs instanceof  Blosum62ColourScheme)\r
+      index = BLOSUM;\r
+    else if(cs instanceof  PIDColourScheme)\r
+      index = PID;\r
+    else if(cs instanceof  ZappoColourScheme)\r
+      index = ZAPPO;\r
+    else if(cs instanceof  HydrophobicColourScheme)\r
+      index = HYDROPHOBIC;\r
+    else if(cs instanceof  HelixColourScheme)\r
+      index = HELIX;\r
+    else if(cs instanceof  StrandColourScheme)\r
+      index = STRAND;\r
+    else if(cs instanceof  TurnColourScheme)\r
+      index = TURN;\r
+    else if(cs instanceof  BuriedColourScheme)\r
+      index = BURIED;\r
+    else if(cs instanceof  NucleotideColourScheme)\r
+      index = NUCLEOTIDE;\r
+    else if(cs instanceof  UserColourScheme)\r
+      index = USER_DEFINED;\r
+\r
+    return getColourName(index);\r
+  }\r
+\r
   public static String getColourName(int index)\r
   {\r
     String ret=null;\r
@@ -85,11 +118,7 @@ public class ColourSchemeProperty
       case TURN: cs = new TurnColourScheme(); break;\r
       case BURIED: cs = new BuriedColourScheme(); break;\r
       case NUCLEOTIDE: cs = new NucleotideColourScheme(); break;\r
-      case USER_DEFINED:\r
-       // if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)\r
-        {\r
-       //   cs = jalview.gui.UserDefinedColours.loadDefaultColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));\r
-        }\r
+      case USER_DEFINED: cs = new UserColourScheme(null);\r
         break;\r
 \r
       default: break;\r