X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeProperty.java;h=899669147737ed44f810e71d29fdaac8a09ad1ca;hb=5ba9b9ce2c9b6e887430d4ac80efde577ca434d4;hp=45dd6d1aac11790c76f0a8e66e52843a1887f2c9;hpb=323a457c9d0643be2406b6661246e8e988c0d0f6;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 45dd6d1..8996691 100755
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -1,26 +1,29 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview 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 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
 
-import java.awt.*;
+import jalview.datamodel.AnnotatedCollectionI;
+
+import java.awt.Color;
 
 /**
- * ColourSchemeProperty Binds names to hardwired colourschemes and tries to deal
+ * ColourSchemeProperty binds names to hardwired colourschemes and tries to deal
  * intelligently with mapping unknown names to user defined colourschemes (that
  * exist or can be created from the string representation of the colourscheme
  * name - either a hex RGB triplet or a named colour under java.awt.color ). The
@@ -82,12 +85,18 @@ public class ColourSchemeProperty
 
   public static final int COVARIATION = 14;
 
+  public static final int TCOFFEE = 15;
+  
+  public static final int RNAHELIX = 16;
+
+  public static final int RNAINTERACTION = 16;
+
   /**
    * index of first colourscheme (includes 'None')
    */
   public static final int FIRST_COLOUR = NONE;
 
-  public static final int LAST_COLOUR = NUCLEOTIDE;
+  public static final int LAST_COLOUR = RNAHELIX;
 
   /**
    * DOCUMENT ME!
@@ -145,6 +154,11 @@ public class ColourSchemeProperty
     {
       ret = NUCLEOTIDE;
     }
+    else if (name.equalsIgnoreCase("T-Coffee Scores"))
+    {
+      ret = TCOFFEE;
+    }
+
     else if (name.equalsIgnoreCase("User Defined"))
     {
       ret = USER_DEFINED;
@@ -157,6 +171,14 @@ public class ColourSchemeProperty
     {
       ret = PURINEPYRIMIDINE;
     }
+    else if (name.equalsIgnoreCase("RNA Interaction type"))
+    {
+      ret = RNAINTERACTION;
+    }
+    else if (name.equalsIgnoreCase("RNA Helices"))
+    {
+      ret = RNAHELIX;
+    }
     // else if (name.equalsIgnoreCase("Covariation"))
     // {
     // ret = COVARIATION;
@@ -226,6 +248,20 @@ public class ColourSchemeProperty
     {
       index = PURINEPYRIMIDINE;
     }
+    else if (cs instanceof TCoffeeColourScheme)
+    {
+      index = TCOFFEE;
+    }
+<<<<<<< HEAD
+   
+    
+    
+=======
+    else if (cs instanceof RNAHelicesColour)
+    {
+      index = RNAHELIX;
+    }
+>>>>>>> JAL-952_rnahelix
     /*
      * else if (cs instanceof CovariationColourScheme) { index = COVARIATION; }
      */
@@ -316,6 +352,22 @@ public class ColourSchemeProperty
 
       break;
 
+    case TCOFFEE:
+      ret = "T-Coffee Scores";
+
+      break;
+<<<<<<< HEAD
+      
+    case RNAINTERACTION:
+        ret = "RNA Interaction type";
+
+        break;
+=======
+    case RNAHELIX:
+      ret = "RNA Helices";
+
+      break;
+>>>>>>> JAL-952_rnahelix
     /*
      * case COVARIATION: ret = "Covariation";
      * 
@@ -336,22 +388,6 @@ public class ColourSchemeProperty
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param al
-   *          DOCUMENT ME!
-   * @param name
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
-   */
-  public static ColourSchemeI getColour(jalview.datamodel.AlignmentI al,
-          String name)
-  {
-    return getColour(al.getSequences(), al.getWidth(), name);
-  }
-
-  /**
    * retrieve or create colourscheme associated with name
    * 
    * @param seqs
@@ -363,7 +399,7 @@ public class ColourSchemeProperty
    *          string to parse as colour for new coloursheme
    * @return Valid Colourscheme
    */
-  public static ColourSchemeI getColour(java.util.Vector seqs, int width,
+  public static ColourSchemeI getColour(AnnotatedCollectionI alignment,
           String name)
   {
     int colindex = getColourIndexFromName(name);
@@ -396,30 +432,34 @@ public class ColourSchemeProperty
         }
       }
     }
-    return getColour(seqs, width, getColourIndexFromName(name));
+    return getColour(alignment, getColourIndexFromName(name));
   }
 
   /**
-   * DOCUMENT ME!
+   * Construct an instance of ColourSchemeI corresponding to the given
+   * colourscheme index
    * 
    * @param seqs
-   *          DOCUMENT ME!
+   *          sequences to be coloured by colourscheme
    * @param width
-   *          DOCUMENT ME!
+   *          geometry of alignment
    * @param index
-   *          DOCUMENT ME!
+   *          colourscheme number
    * 
-   * @return DOCUMENT ME!
+   * @return null or an instance of the colourscheme configured to colour given
+   *         sequence set
    */
-  public static ColourSchemeI getColour(java.util.Vector seqs, int width,
-          int index)
+  public static ColourSchemeI getColour(
+          jalview.datamodel.AnnotatedCollectionI coll, int index)
   {
+    // TODO 3.0 2.8 refactor signature to take an alignmentI like container so
+    // colourschemes based on annotation can be initialised
     ColourSchemeI cs = null;
 
     switch (index)
     {
     case CLUSTAL:
-      cs = new ClustalxColourScheme(seqs, width);
+      cs = new ClustalxColourScheme(coll, null);
 
       break;
 
@@ -477,9 +517,16 @@ public class ColourSchemeProperty
 
       break;
 
-    // case COVARIATION:
-    // cs = new CovariationColourScheme(annotation);
-
+    case TCOFFEE:
+      cs = new TCoffeeColourScheme(coll);
+      break;
+    
+    case RNAHELIX:
+      cs = new RNAHelicesColour(coll);
+      break;
+      
+      // case COVARIATION:
+      // cs = new CovariationColourScheme(annotation);
     // break;
 
     case USER_DEFINED: