X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeProperty.java;h=cc303d65e21308178bd79cd596701250d85897e8;hb=f6483e3414133aeadc65a9fb24f1b81cbbf3f39f;hp=bb961d33f31cff579560ea7c69179533d5fb508a;hpb=b7e51870168c54685e7cc6f7307400ecf8ddf794;p=jalview.git diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java index bb961d3..cc303d6 100755 --- a/src/jalview/schemes/ColourSchemeProperty.java +++ b/src/jalview/schemes/ColourSchemeProperty.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) * 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. + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.schemes; @@ -86,15 +88,17 @@ 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 = 17; + /** * 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 = RNAINTERACTION; /** * DOCUMENT ME! @@ -169,6 +173,10 @@ public class ColourSchemeProperty { ret = PURINEPYRIMIDINE; } + else if (name.equalsIgnoreCase("RNA Interaction type")) + { + ret = RNAINTERACTION; + } else if (name.equalsIgnoreCase("RNA Helices")) { ret = RNAHELIX; @@ -344,6 +352,11 @@ public class ColourSchemeProperty ret = "T-Coffee Scores"; break; + + case RNAINTERACTION: + ret = "RNA Interaction type"; + + break; case RNAHELIX: ret = "RNA Helices"; @@ -500,15 +513,14 @@ public class ColourSchemeProperty case TCOFFEE: cs = new TCoffeeColourScheme(coll); break; - + case RNAHELIX: cs = new RNAHelicesColour(coll); break; - - // case COVARIATION: - // cs = new CovariationColourScheme(annotation); - // break; + // case COVARIATION: + // cs = new CovariationColourScheme(annotation); + // break; case USER_DEFINED: Color[] col = new Color[24];