X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;fp=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;h=ec1334390adf639547b1816a6cdacaee368eb3cd;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=9df7ab83fd182961c379ff12b052aab6c8e562b4;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java index 9df7ab8..ec13343 100755 --- a/src/jalview/schemes/ClustalxColourScheme.java +++ b/src/jalview/schemes/ClustalxColourScheme.java @@ -43,8 +43,8 @@ public class ClustalxColourScheme extends ResidueColourScheme { RED(0.9f, 0.2f, 0.1f), BLUE(0.5f, 0.7f, 0.9f), GREEN(0.1f, 0.8f, 0.1f), ORANGE(0.9f, 0.6f, 0.3f), CYAN(0.1f, 0.7f, 0.7f), - PINK(0.9f, 0.5f, 0.5f), MAGENTA(0.8f, 0.3f, 0.8f), YELLOW(0.8f, 0.8f, - 0.0f); + PINK(0.9f, 0.5f, 0.5f), MAGENTA(0.8f, 0.3f, 0.8f), + YELLOW(0.8f, 0.8f, 0.0f); final Color colour; @@ -53,6 +53,7 @@ public class ClustalxColourScheme extends ResidueColourScheme colour = new Color(r, g, b); } } + private class ConsensusColour { Consensus[] cons; @@ -296,8 +297,7 @@ public class ClustalxColourScheme extends ResidueColourScheme for (int k = 0; k < residueColour[i].cons.length; k++) { - if (residueColour[i].cons[k].isConserved(cons2, j, size, - includeGaps)) + if (residueColour[i].cons[k].isConserved(cons2, j, size, includeGaps)) { colour = residueColour[i].c; }