X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FOptions.java;h=f388e14994dda9af56cf16362b6c583b55baf7e3;hb=8571ac663cce8aade42941742402a8fe37c27ff4;hp=4ba2ded5c90c4bb94ef548098314ac1372648c7b;hpb=8cb65713b89737f529cedce7bcd39f2b9f9fc8a1;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/Options.java b/forester/java/src/org/forester/archaeopteryx/Options.java index 4ba2ded..f388e14 100644 --- a/forester/java/src/org/forester/archaeopteryx/Options.java +++ b/forester/java/src/org/forester/archaeopteryx/Options.java @@ -28,6 +28,8 @@ package org.forester.archaeopteryx; import java.awt.Font; import org.forester.phylogeny.PhylogenyNodeI.NH_CONVERSION_SUPPORT_VALUE_STYLE; +import org.forester.phylogeny.data.NodeData; +import org.forester.phylogeny.data.NodeData.NODE_DATA; import org.forester.phylogeny.data.NodeVisualization; import org.forester.phylogeny.data.NodeVisualization.NodeFill; import org.forester.phylogeny.data.NodeVisualization.NodeShape; @@ -78,6 +80,7 @@ final public class Options { private boolean _show_default_node_shapes; private boolean _show_confidence_stddev; private NH_CONVERSION_SUPPORT_VALUE_STYLE _nh_conversion_support_value_style; + private NODE_DATA _ext_desc_data_to_return; private Options() { init(); @@ -189,6 +192,7 @@ final public class Options { _color_labels_same_as_parent_branch = false; _show_confidence_stddev = true; _nh_conversion_support_value_style = NH_CONVERSION_SUPPORT_VALUE_STYLE.NONE; + _ext_desc_data_to_return = NODE_DATA.UNKNOWN; } boolean isShowConfidenceStddev() { @@ -515,6 +519,9 @@ final public class Options { } instance.setTaxonomyColorizeNodeShapes( configuration.isTaxonomyColorizeNodeShapes() ); instance.setShowDefaultNodeShapes( configuration.isShowDefaultNodeShapes() ); + if ( configuration.getExtDescNodeDataToReturn() != null ) { + instance.setExtDescNodeDataToReturn( configuration.getExtDescNodeDataToReturn() ); + } } return instance; } @@ -552,4 +559,12 @@ final public class Options { public static enum PHYLOGENY_GRAPHICS_TYPE { RECTANGULAR, TRIANGULAR, EURO_STYLE, ROUNDED, CONVEX, CURVED, UNROOTED, CIRCULAR; } + + public NodeData.NODE_DATA getExtDescNodeDataToReturn() { + return _ext_desc_data_to_return; + } + + public void setExtDescNodeDataToReturn( final NODE_DATA ext_desc_data_to_return ) { + _ext_desc_data_to_return = ext_desc_data_to_return; + } }