X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FTreeColorSet.java;h=9ab1846141086a86b30299bafc5aec42a764ca82;hb=693353f5ea85d3e50a77f9b1cd9d87711d23412b;hp=f90ec22ee215f03512872381247a55db8ef5c33c;hpb=fea4064e24c6cb362b0e033cf7047afd20f5f53f;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/TreeColorSet.java b/forester/java/src/org/forester/archaeopteryx/TreeColorSet.java index f90ec22..9ab1846 100644 --- a/forester/java/src/org/forester/archaeopteryx/TreeColorSet.java +++ b/forester/java/src/org/forester/archaeopteryx/TreeColorSet.java @@ -57,7 +57,7 @@ public final class TreeColorSet { TAXONOMY, CONFIDENCE, BRANCH_LENGTH, BRANCH, NODE_BOX, COLLAPSED, MATCHING_NODES_A, MATCHING_NODES_B, MATCHING_NODES_A_AND_B, DUPLICATION, SPECIATION, DUPLICATION_OR_SPECATION, DOMAIN_LABEL, DOMAIN_BASE, BINARY_DOMAIN_COMBINATIONS, ANNOTATION, OVERVIEW }; - static final String[] SCHEME_NAMES = { "Default", "Black", "Black & White", "Silver", "Green", + static final String[] SCHEME_NAMES = { "Default", "Black", "Black & White", "Simple", "Silver", "Green", "White & Blue", "Cyan", "Orange", "Blue", "Blue & White", "Neon" }; private int _color_scheme; private final Color[][] _color_schemes = { { new Color( 0, 0, 0 ), // background_color @@ -120,7 +120,40 @@ public final class TreeColorSet { new Color( 0, 0, 0 ), // binary_domain_combinations_color new Color( 0, 0, 0 ) // annotation , new Color( 220, 220, 220 ) // ov - }, { new Color( 0, 0, 0 ), // background_color + }, + + + + + { new Color( 255, 255, 255 ), // background_color + new Color( 0, 255, 255 ), // background_color_gradient_bottom + new Color( 0, 0, 153 ), //sequence __ NEW + new Color( 0, 0, 102 ), // taxonomy + new Color( 0, 0, 204 ), // support + new Color( 0, 51, 255 ), // branch_length_color + new Color( 0, 0, 0 ), // branch_color + new Color( 0, 51, 255 ), // box_color + new Color( 0, 51, 255 ), // collapesed_fill_color + new Color( 0, 0, 255 ), // found_color 0 + new Color( 0, 255, 0 ), // found_color 1 + new Color( 0, 255, 255 ), // found_color 0 + 1 + new Color( 102, 51, 255 ), // duplication_box_color + new Color( 153, 153, 153 ), // speciation_box_color + new Color( 255, 255, 0 ), // duplication_speciation_color + new Color( 51, 51, 51), // domain_label + new Color( 51, 51, 51 ), // domains_base + new Color( 0, 0, 153 ), // binary_domain_combinations_color + new Color( 0, 0, 153 ),// annotation + new Color( 51, 51, 51 ) // ov + } , + + + + + + + + { new Color( 0, 0, 0 ), // background_color new Color( 0, 255, 255 ), // background_color_gradient_bottom new Color( 220, 220, 220 ), // sequence __ Silver new Color( 180, 180, 180 ), // taxonomy @@ -351,7 +384,7 @@ public final class TreeColorSet { return box_color; } - Color getBranchColor() { + public Color getBranchColor() { return branch_color; } @@ -391,15 +424,15 @@ public final class TreeColorSet { return duplication_or_specation_color; } - Color getFoundColor0() { + public Color getFoundColor0() { return found_color_0; } - Color getFoundColor0and1() { + public Color getFoundColor0and1() { return found_color_0_and_1; } - Color getFoundColor1() { + public Color getFoundColor1() { return found_color_1; }