X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;h=14f0ce6098555ba01d9b728a83532539a970c245;hb=e3e2a13d4cf421bfece25e0a199a5244519b19b2;hp=c556bb22064d7ca4e7b059254ab88be9d5b3f0a4;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java index c556bb2..14f0ce6 100755 --- a/src/jalview/schemes/ClustalxColourScheme.java +++ b/src/jalview/schemes/ClustalxColourScheme.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -51,9 +51,7 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements colhash.put("ORANGE", new Color((float) 0.9, (float) 0.6, (float) 0.3)); colhash.put("CYAN", new Color((float) 0.1, (float) 0.7, (float) 0.7)); colhash.put("PINK", new Color((float) 0.9, (float) 0.5, (float) 0.5)); - colhash - .put("MAGENTA", - new Color((float) 0.8, (float) 0.3, (float) 0.8)); + colhash.put("MAGENTA", new Color((float) 0.8, (float) 0.3, (float) 0.8)); colhash.put("YELLOW", new Color((float) 0.8, (float) 0.8, (float) 0.0)); } @@ -212,12 +210,13 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements tmp5[3] = conses[19]; // Q colours[4] = new ConsensusColour((Color) colhash.get("RED"), tmp5); - Consensus[] tmp6 = new Consensus[5]; + Consensus[] tmp6 = new Consensus[6]; tmp6[0] = conses[3]; // - tmp6[1] = conses[29]; // D tmp6[2] = conses[10]; // E - tmp6[3] = conses[6]; // q + tmp6[3] = conses[6]; // QE tmp6[4] = conses[19]; // Q + tmp6[5] = conses[2]; // DE colours[5] = new ConsensusColour((Color) colhash.get("MAGENTA"), tmp6); Consensus[] tmp7 = new Consensus[5];